Fix periodic healing auras being scaled twice

RDF Exceptions for Holidays and Crypt Scarab enhancements

conf/individualProgression.conf.dist

@@ -184,6 +184,8 @@ IndividualProgression.FishingFix = 1
 #                     Water Breath Timer to 1 Minute (Vanilla value, changed to 3 Minutes in WotLK)
 #                     Disable Quest Object sparkle and object quest markers (added in patch 2.3)
 #                     Enable PlayerSettings (required by Individual Progression module)
+#                     Disable the LFG tool, aside from special Holiday events otherwise inaccessible
+#                     Do not enforce DBC Item Attributes, so that Vanilla item changes can override client values
 #
 #        Default:   1 - Enabled
 #                   0 - Disabled
@@ -328,3 +330,12 @@ IndividualProgression.AllowEarlyDungeonSet2 = 1
 #
 
 IndividualProgression.PvPGearRequirements = 1
+#
+#    IndividualProgression.DisableRDF
+#        Description: Enable or disable the Random Dungeon Finder feature within the context of Individual Progression. 
+#        Queuing for specific dungeons and Holiday Events will still be possible. (Use DungeonFinder.OptionsMask in worldserver.conf to completely disable the LFG tool.)
+#        Please note that the LFG tool is disabled (except for Holiday events) by default if SimpleConfigOverride is enabled.
+#        Default:     0 - Enabled
+#                     1 - Disabled
+#
+IndividualProgression.DisableRDF = 0

sql/world/base/naxx40_creatures.sql

@@ -79,11 +79,11 @@ REPLACE INTO `creature_template` (`entry`, `modelid1`, `name`, `subname`, `minle
 (351076, 16586, "Guardian of Icecrown", "", 60, 60, 21, 4.8, 1.71429, 20.0, 1.0, 1, 0, 20.75, 2000, 1650, 1.0, 1.0, 1, 0, 2048, 0, 6, 72, 0, 0, 0, 0, 0, '', 1, 1.0, 500.0, 1.0, 1.1, 1.0, 174, 1, 1019427442, 0, 0, 'boss_kelthuzad_minion_40'),
 (351077, 14710, "Plagued Gargoyle", "", 61, 61, 21, 1.0, 1.42857, 20.0, 1.0, 1, 0, 37.5, 3000, 1265, 1.0, 1.0, 2, 0, 2048, 0, 6, 8, 351077, 0, 0, 1, 138065, '', 0, 1.0, 100.0, 3.0, 1.45, 1.0, 144, 1, 1073725439, 0, 0, ''),
 (351078, 10627, "Plagued Ghoul", "", 61, 61, 21, 0.777776, 1.42857, 20.0, 1.0, 1, 0, 26.25, 1500, 1265, 1.0, 1.0, 1, 32832, 2048, 0, 6, 72, 351078, 0, 0, 3878, 8925, 'SmartAI', 0, 1.0, 30.0, 1.0, 1.15, 1.0, 144, 1, 1021518352, 0, 0, ''),
-(351079, 16213, "Web Wrap", "", 60, 60, 16, 1.0, 1.0, 18.0, 1.0, 0, 0, 0.6, 2000, 2000, 1.0, 1.0, 1, 0, 2048, 0, 10, 0, 0, 0, 0, 0, 0, '', 0, 1.0, 2.0, 1.0, 0.7, 1.0, 0, 1, 0, 0, 0, 'boss_maexxna_webwrap'),
+(351079, 16213, "Web Wrap", "", 60, 60, 16, 1.0, 1.0, 18.0, 1.0, 0, 0, 0.6, 2000, 2000, 1.0, 1.0, 1, 0, 2048, 0, 10, 0, 0, 0, 0, 0, 0, '', 0, 1.0, 2.0, 1.0, 0.7, 1.0, 0, 1, 0, 0, 0, 'boss_maexxna_webwrap40'),
 (351080, 16605, "Naxxramas Follower", "", 61, 61, 21, 1.0, 1.42857, 20.0, 1.0, 1, 0, 59.2, 2000, 1265, 1.0, 1.0, 8, 32832, 2048, 0, 7, 72, 0, 0, 0, 0, 0, 'SmartAI', 0, 1.0, 45.0, 10.0, 1.15, 1.0, 144, 1, 1023391482, 0, 0, ''),
 (351081, 16603, "Naxxramas Worshipper", "", 61, 61, 21, 1.0, 1.42857, 20.0, 1.0, 1, 0, 35.0, 2000, 1265, 1.0, 1.0, 8, 32832, 2048, 0, 7, 72, 0, 0, 0, 0, 0, 'SmartAI', 0, 1.0, 40.0, 10.0, 1.0, 1.0, 144, 1, 1023391482, 0, 0, ''),
 (351082, 14698, "Crypt Guard", "", 61, 61, 21, 1.0, 1.42857, 20.0, 1.0, 1, 0, 14.7, 1000, 1265, 1.0, 1.0, 1, 64, 2048, 0, 6, 72, 0, 0, 0, 0, 0, 'SmartAI', 0, 1.0, 65.0, 1.0, 1.15, 1.0, 144, 1, 1023391482, 0, 0, ''),
-(351083, 10005, "Corpse Scarab", "", 60, 60, 21, 0.833332, 2.14286, 18.0, 1.0, 0, 0, 2.1, 1000, 1265, 1.0, 1.0, 1, 0, 2048, 0, 10, 72, 0, 0, 0, 0, 0, 'SmartAI', 2, 1.0, 2.0, 1.0, 0.7, 1.0, 188, 1, 1022042641, 0, 0, ''),
+(351083, 10005, "Corpse Scarab", "", 60, 60, 21, 0.833332, 2.14286, 18.0, 1.0, 0, 0, 2.1, 1000, 1265, 1.0, 1.0, 1, 0, 2048, 0, 10, 72, 0, 0, 0, 0, 0, 'SmartAI', 0, 1.0, 2.0, 1.0, 0.7, 1.0, 188, 1, 1022042641, 0, 0, ''),
 (351084, 16539, "Deathknight Understudy", "", 60, 60, 21, 1.0, 1.42857, 20.0, 1.0, 1, 0, 45.5, 3500, 1265, 1.0, 1.0, 1, 32832, 2048, 0, 7, 72, 0, 0, 0, 0, 0, '', 0, 1.0, 30.0, 2.0, 2.0, 1.0, 144, 1, 1022049874, 0, 0, 'boss_razuvious_minion_40'),
 (351085, 2606, "Plagued Guardian", "", 61, 61, 21, 1.0, 1.42857, 20.0, 1.0, 1, 0, 24.25, 3000, 2000, 1.0, 1.0, 8, 0, 2048, 0, 6, 72, 0, 0, 0, 0, 0, 'SmartAI', 0, 1.0, 8.0, 18.0, 1.15, 1.0, 144, 1, 1015751184, 0, 0, ''),
 (351086, 7847, "Plagued Champion", "", 61, 61, 21, 0.888888, 1.42857, 20.0, 1.0, 1, 0, 26.85, 2000, 2000, 1.0, 1.0, 1, 64, 2048, 0, 6, 72, 0, 0, 0, 0, 0, 'SmartAI', 0, 1.0, 11.0, 1.0, 1.15, 1.0, 144, 1, 1015226896, 0, 0, ''),

sql/world/base/vanilla_vendors.sql

@@ -20,6 +20,13 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (227,
 DELETE FROM `npc_vendor` WHERE `entry` = 228 AND `item` = 28053;
 
 
+/* NPC Karm Ironquill - 372 */
+/* Remove non-Vanilla item Jeweler's Kit */
+DELETE FROM `npc_vendor` WHERE `entry` = 372 AND `item` = 20815;
+/* Remove non-Vanilla item Simple Grinder */
+DELETE FROM `npc_vendor` WHERE `entry` = 372 AND `item` = 20824;
+
+
 /* NPC Katie Hunter - 384 */
 /* Add Missing Vanilla item White Stallion Bridle */
 DELETE FROM `npc_vendor` WHERE `entry` = 384 AND `item` = 12353;
@@ -70,6 +77,13 @@ DELETE FROM `npc_vendor` WHERE `entry` = 789 AND `item` = 11285;
 DELETE FROM `npc_vendor` WHERE `entry` = 789 AND `item` = 28053;
 
 
+/* NPC Karen Taylor - 790 */
+/* Remove non-Vanilla item Jeweler's Kit */
+DELETE FROM `npc_vendor` WHERE `entry` = 790 AND `item` = 20815;
+/* Remove non-Vanilla item Simple Grinder */
+DELETE FROM `npc_vendor` WHERE `entry` = 790 AND `item` = 20824;
+
+
 /* NPC Lindsay Ashlock - 791 */
 /* Add Missing Vanilla item Flint and Tinder */
 DELETE FROM `npc_vendor` WHERE `entry` = 791 AND `item` = 4471;
@@ -82,7 +96,18 @@ DELETE FROM `npc_vendor` WHERE `entry` = 843 AND `item` = 2692;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (843, 2692, 0, 0);
 
 
+/* NPC Antonio Perelli - 844 */
+/* Remove non-Vanilla item Enchanted Vial */
+DELETE FROM `npc_vendor` WHERE `entry` = 844 AND `item` = 40411;
+
+
 /* NPC Dawn Brightstar - 958 */
+/* Remove non-Vanilla item Flintweed Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 958 AND `item` = 22147;
+/* Remove non-Vanilla item Wild Quillvine */
+DELETE FROM `npc_vendor` WHERE `entry` = 958 AND `item` = 22148;
+/* Remove non-Vanilla item Enchanted Vial */
+DELETE FROM `npc_vendor` WHERE `entry` = 958 AND `item` = 40411;
 /* Add Missing Vanilla item Arcane Dust */
 DELETE FROM `npc_vendor` WHERE `entry` = 958 AND `item` = 17019;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (958, 17019, 0, 0);
@@ -98,6 +123,12 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (960,
 
 
 /* NPC Thultazor - 983 */
+/* Remove non-Vanilla item Flintweed Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 983 AND `item` = 22147;
+/* Remove non-Vanilla item Wild Quillvine */
+DELETE FROM `npc_vendor` WHERE `entry` = 983 AND `item` = 22148;
+/* Remove non-Vanilla item Enchanted Vial */
+DELETE FROM `npc_vendor` WHERE `entry` = 983 AND `item` = 40411;
 /* Add Missing Vanilla item Arcane Dust */
 DELETE FROM `npc_vendor` WHERE `entry` = 983 AND `item` = 17019;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (983, 17019, 0, 0);
@@ -196,6 +227,12 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (1286,
 
 
 /* NPC Keldric Boucher - 1257 */
+/* Remove non-Vanilla item Flintweed Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 1257 AND `item` = 22147;
+/* Remove non-Vanilla item Wild Quillvine */
+DELETE FROM `npc_vendor` WHERE `entry` = 1257 AND `item` = 22148;
+/* Remove non-Vanilla item Enchanted Vial */
+DELETE FROM `npc_vendor` WHERE `entry` = 1257 AND `item` = 40411;
 /* Add Missing Vanilla item Arcane Dust */
 DELETE FROM `npc_vendor` WHERE `entry` = 1257 AND `item` = 17019;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (1257, 17019, 0, 0);
@@ -211,6 +248,10 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (1261,
 
 
 /* NPC Kyra Boucher - 1275 */
+/* Remove non-Vanilla item Flintweed Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 1275 AND `item` = 22147;
+/* Remove non-Vanilla item Wild Quillvine */
+DELETE FROM `npc_vendor` WHERE `entry` = 1275 AND `item` = 22148;
 /* Add Missing Vanilla item Arcane Dust */
 DELETE FROM `npc_vendor` WHERE `entry` = 1275 AND `item` = 17019;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (1275, 17019, 0, 0);
@@ -232,17 +273,30 @@ DELETE FROM `npc_vendor` WHERE `entry` = 1298 AND `item` = 28053;
 
 
 /* NPC Charys Yserian - 1307 */
+/* Remove non-Vanilla item Flintweed Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 1307 AND `item` = 22147;
+/* Remove non-Vanilla item Wild Quillvine */
+DELETE FROM `npc_vendor` WHERE `entry` = 1307 AND `item` = 22148;
 /* Add Missing Vanilla item Arcane Dust */
 DELETE FROM `npc_vendor` WHERE `entry` = 1307 AND `item` = 17019;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (1307, 17019, 0, 0);
 
 
 /* NPC Owen Vaughn - 1308 */
+/* Remove non-Vanilla item Flintweed Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 1308 AND `item` = 22147;
+/* Remove non-Vanilla item Wild Quillvine */
+DELETE FROM `npc_vendor` WHERE `entry` = 1308 AND `item` = 22148;
 /* Add Missing Vanilla item Arcane Dust */
 DELETE FROM `npc_vendor` WHERE `entry` = 1308 AND `item` = 17019;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (1308, 17019, 0, 0);
 
 
+/* NPC Maria Lumere - 1313 */
+/* Remove non-Vanilla item Enchanted Vial */
+DELETE FROM `npc_vendor` WHERE `entry` = 1313 AND `item` = 40411;
+
+
 /* NPC Jessara Cordell - 1318 */
 /* Add Missing Vanilla item Formula: Enchant Chest - Minor Mana */
 DELETE FROM `npc_vendor` WHERE `entry` = 1318 AND `item` = 6342;
@@ -327,6 +381,10 @@ DELETE FROM `npc_vendor` WHERE `entry` = 1347 AND `item` = 38426;
 
 
 /* NPC Brother Cassius - 1351 */
+/* Remove non-Vanilla item Flintweed Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 1351 AND `item` = 22147;
+/* Remove non-Vanilla item Wild Quillvine */
+DELETE FROM `npc_vendor` WHERE `entry` = 1351 AND `item` = 22148;
 /* Add Missing Vanilla item Arcane Dust */
 DELETE FROM `npc_vendor` WHERE `entry` = 1351 AND `item` = 17019;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (1351, 17019, 0, 0);
@@ -348,6 +406,11 @@ DELETE FROM `npc_vendor` WHERE `entry` = 1452 AND `item` = 4471;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (1452, 4471, 0, 0);
 
 
+/* NPC Dewin Shimmerdawn - 1453 */
+/* Remove non-Vanilla item Enchanted Vial */
+DELETE FROM `npc_vendor` WHERE `entry` = 1453 AND `item` = 40411;
+
+
 /* NPC Jennabink Powerseam - 1454 */
 /* Remove non-Vanilla item Eternium Thread */
 DELETE FROM `npc_vendor` WHERE `entry` = 1454 AND `item` = 38426;
@@ -443,6 +506,10 @@ DELETE FROM `npc_vendor` WHERE `entry` = 1462 AND `item` = 28053;
 
 
 /* NPC Falkan Armonis - 1463 */
+/* Remove non-Vanilla item Flintweed Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 1463 AND `item` = 22147;
+/* Remove non-Vanilla item Wild Quillvine */
+DELETE FROM `npc_vendor` WHERE `entry` = 1463 AND `item` = 22148;
 /* Add Missing Vanilla item Arcane Dust */
 DELETE FROM `npc_vendor` WHERE `entry` = 1463 AND `item` = 17019;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (1463, 17019, 0, 0);
@@ -465,6 +532,10 @@ DELETE FROM `npc_vendor` WHERE `entry` = 1672 AND `item` = 38426;
 
 
 /* NPC Alyssa Eva - 1673 */
+/* Remove non-Vanilla item Flintweed Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 1673 AND `item` = 22147;
+/* Remove non-Vanilla item Wild Quillvine */
+DELETE FROM `npc_vendor` WHERE `entry` = 1673 AND `item` = 22148;
 /* Add Missing Vanilla item Arcane Dust */
 DELETE FROM `npc_vendor` WHERE `entry` = 1673 AND `item` = 17019;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (1673, 17019, 0, 0);
@@ -574,6 +645,11 @@ DELETE FROM `npc_vendor` WHERE `entry` = 11189 AND `item` = 3777;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (11189, 3777, 0, 0);
 
 
+/* NPC Nandar Branson - 2380 */
+/* Remove non-Vanilla item Enchanted Vial */
+DELETE FROM `npc_vendor` WHERE `entry` = 2380 AND `item` = 40411;
+
+
 /* NPC Micha Yance - 2381 */
 /* Remove non-Vanilla item Simple Flour */
 DELETE FROM `npc_vendor` WHERE `entry` = 2381 AND `item` = 30817;
@@ -620,6 +696,16 @@ DELETE FROM `npc_vendor` WHERE `entry` = 2401 AND `item` = 4471;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (2401, 4471, 0, 0);
 
 
+/* NPC Bro'kin - 2480 */
+/* Remove non-Vanilla item Enchanted Vial */
+DELETE FROM `npc_vendor` WHERE `entry` = 2480 AND `item` = 40411;
+
+
+/* NPC Bliztik - 2481 */
+/* Remove non-Vanilla item Enchanted Vial */
+DELETE FROM `npc_vendor` WHERE `entry` = 2481 AND `item` = 40411;
+
+
 /* NPC Zarena Cromwind - 2482 */
 /* Add Missing Vanilla item Friendship Bread */
 DELETE FROM `npc_vendor` WHERE `entry` = 2482 AND `item` = 23160;
@@ -787,6 +873,10 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (2803,
 
 
 /* NPC Deneb Walker - 2805 */
+/* Remove non-Vanilla item Flintweed Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 2805 AND `item` = 22147;
+/* Remove non-Vanilla item Wild Quillvine */
+DELETE FROM `npc_vendor` WHERE `entry` = 2805 AND `item` = 22148;
 /* Add Missing Vanilla item Expert First Aid - Under Wraps */
 DELETE FROM `npc_vendor` WHERE `entry` = 2805 AND `item` = 16084;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (2805, 16084, 0, 0);
@@ -856,6 +946,11 @@ DELETE FROM `npc_vendor` WHERE `entry` = 2810 AND `item` = 3777;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (2810, 3777, 0, 0);
 
 
+/* NPC Drovnar Strongbrew - 2812 */
+/* Remove non-Vanilla item Enchanted Vial */
+DELETE FROM `npc_vendor` WHERE `entry` = 2812 AND `item` = 40411;
+
+
 /* NPC Androd Fadran - 2816 */
 /* Remove non-Vanilla item Eternium Thread */
 DELETE FROM `npc_vendor` WHERE `entry` = 2816 AND `item` = 38426;
@@ -965,6 +1060,11 @@ DELETE FROM `npc_vendor` WHERE `entry` = 2839 AND `item` = 28053;
 DELETE FROM `npc_vendor` WHERE `entry` = 2846 AND `item` = 38426;
 
 
+/* NPC Glyx Brewright - 2848 */
+/* Remove non-Vanilla item Enchanted Vial */
+DELETE FROM `npc_vendor` WHERE `entry` = 2848 AND `item` = 40411;
+
+
 /* NPC Grawl - 2908 */
 /* Remove non-Vanilla item Wicked Arrow */
 DELETE FROM `npc_vendor` WHERE `entry` = 2908 AND `item` = 28053;
@@ -975,6 +1075,13 @@ DELETE FROM `npc_vendor` WHERE `entry` = 2908 AND `item` = 4471;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (2908, 4471, 0, 0);
 
 
+/* NPC Kurm Stonehoof - 3002 */
+/* Remove non-Vanilla item Jeweler's Kit */
+DELETE FROM `npc_vendor` WHERE `entry` = 3002 AND `item` = 20815;
+/* Remove non-Vanilla item Simple Grinder */
+DELETE FROM `npc_vendor` WHERE `entry` = 3002 AND `item` = 20824;
+
+
 /* NPC Fyr Mistrunner - 3003 */
 /* Remove non-Vanilla item Mag'har Grainbread */
 DELETE FROM `npc_vendor` WHERE `entry` = 3003 AND `item` = 27855;
@@ -989,6 +1096,11 @@ DELETE FROM `npc_vendor` WHERE `entry` = 3003 AND `item` = 35950;
 DELETE FROM `npc_vendor` WHERE `entry` = 3005 AND `item` = 38426;
 
 
+/* NPC Mani Winterhoof - 3010 */
+/* Remove non-Vanilla item Enchanted Vial */
+DELETE FROM `npc_vendor` WHERE `entry` = 3010 AND `item` = 40411;
+
+
 /* NPC Nata Dawnstrider - 3012 */
 /* Add Missing Vanilla item Formula: Enchant Chest - Minor Mana */
 DELETE FROM `npc_vendor` WHERE `entry` = 3012 AND `item` = 6342;
@@ -1104,6 +1216,10 @@ DELETE FROM `npc_vendor` WHERE `entry` = 3096 AND `item` = 38426;
 
 
 /* NPC Herble Baubbletump - 3133 */
+/* Remove non-Vanilla item Jeweler's Kit */
+DELETE FROM `npc_vendor` WHERE `entry` = 3133 AND `item` = 20815;
+/* Remove non-Vanilla item Simple Grinder */
+DELETE FROM `npc_vendor` WHERE `entry` = 3133 AND `item` = 20824;
 /* Remove non-Vanilla item Hair Trigger */
 DELETE FROM `npc_vendor` WHERE `entry` = 3133 AND `item` = 39684;
 /* Remove non-Vanilla item Walnut Stock */
@@ -1152,6 +1268,13 @@ DELETE FROM `npc_vendor` WHERE `entry` = 3164 AND `item` = 4471;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3164, 4471, 0, 0);
 
 
+/* NPC Wuark - 3167 */
+/* Remove non-Vanilla item Jeweler's Kit */
+DELETE FROM `npc_vendor` WHERE `entry` = 3167 AND `item` = 20815;
+/* Remove non-Vanilla item Simple Grinder */
+DELETE FROM `npc_vendor` WHERE `entry` = 3167 AND `item` = 20824;
+
+
 /* NPC Flakk - 3168 */
 /* Remove non-Vanilla item Simple Flour */
 DELETE FROM `npc_vendor` WHERE `entry` = 3168 AND `item` = 30817;
@@ -1193,6 +1316,16 @@ DELETE FROM `npc_vendor` WHERE `entry` = 3322 AND `item` = 28060;
 
 
 /* NPC Horthus - 3323 */
+/* Remove non-Vanilla item Flintweed Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 3323 AND `item` = 22147;
+/* Remove non-Vanilla item Wild Quillvine */
+DELETE FROM `npc_vendor` WHERE `entry` = 3323 AND `item` = 22148;
+/* Remove non-Vanilla item Wild Spineleaf */
+DELETE FROM `npc_vendor` WHERE `entry` = 3323 AND `item` = 44605;
+/* Remove non-Vanilla item Starleaf Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 3323 AND `item` = 44614;
+/* Remove non-Vanilla item Devout Candle */
+DELETE FROM `npc_vendor` WHERE `entry` = 3323 AND `item` = 44615;
 /* Add Missing Vanilla item Arcane Dust */
 DELETE FROM `npc_vendor` WHERE `entry` = 3323 AND `item` = 17019;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3323, 17019, 0, 0);
@@ -1244,6 +1377,10 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3334,
 
 
 /* NPC Hagrus - 3335 */
+/* Remove non-Vanilla item Flintweed Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 3335 AND `item` = 22147;
+/* Remove non-Vanilla item Wild Quillvine */
+DELETE FROM `npc_vendor` WHERE `entry` = 3335 AND `item` = 22148;
 /* Add Missing Vanilla item Arcane Dust */
 DELETE FROM `npc_vendor` WHERE `entry` = 3335 AND `item` = 17019;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3335, 17019, 0, 0);
@@ -1264,6 +1401,11 @@ DELETE FROM `npc_vendor` WHERE `entry` = 3346 AND `item` = 6342;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3346, 6342, 1, 7200);
 
 
+/* NPC Kor'geld - 3348 */
+/* Remove non-Vanilla item Enchanted Vial */
+DELETE FROM `npc_vendor` WHERE `entry` = 3348 AND `item` = 40411;
+
+
 /* NPC Asoran - 3350 */
 /* Remove non-Vanilla item Wicked Arrow */
 DELETE FROM `npc_vendor` WHERE `entry` = 3350 AND `item` = 28053;
@@ -1275,11 +1417,22 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3350,
 
 
 /* NPC Magenius - 3351 */
+/* Remove non-Vanilla item Flintweed Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 3351 AND `item` = 22147;
+/* Remove non-Vanilla item Wild Quillvine */
+DELETE FROM `npc_vendor` WHERE `entry` = 3351 AND `item` = 22148;
 /* Add Missing Vanilla item Arcane Dust */
 DELETE FROM `npc_vendor` WHERE `entry` = 3351 AND `item` = 17019;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3351, 17019, 0, 0);
 
 
+/* NPC Gorina - 3358 */
+/* Remove non-Vanilla item Jeweler's Kit */
+DELETE FROM `npc_vendor` WHERE `entry` = 3358 AND `item` = 20815;
+/* Remove non-Vanilla item Simple Grinder */
+DELETE FROM `npc_vendor` WHERE `entry` = 3358 AND `item` = 20824;
+
+
 /* NPC Ogunaro Wolfrunner - 3362 */
 /* Remove non-Vanilla item Horn of the Black Wolf */
 DELETE FROM `npc_vendor` WHERE `entry` = 3362 AND `item` = 46099;
@@ -1355,6 +1508,8 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3400,
 /* NPC Zeal'aya - 3405 */
 /* Remove non-Vanilla item Imbued Vial */
 DELETE FROM `npc_vendor` WHERE `entry` = 3405 AND `item` = 18256;
+/* Remove non-Vanilla item Enchanted Vial */
+DELETE FROM `npc_vendor` WHERE `entry` = 3405 AND `item` = 40411;
 
 
 /* NPC Jin'sora - 3410 */
@@ -1399,6 +1554,10 @@ DELETE FROM `npc_vendor` WHERE `entry` = 3485 AND `item` = 38426;
 
 
 /* NPC Hula'mahi - 3490 */
+/* Remove non-Vanilla item Flintweed Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 3490 AND `item` = 22147;
+/* Remove non-Vanilla item Wild Quillvine */
+DELETE FROM `npc_vendor` WHERE `entry` = 3490 AND `item` = 22148;
 /* Add Missing Vanilla item Dust of Decay */
 DELETE FROM `npc_vendor` WHERE `entry` = 3490 AND `item` = 2928;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3490, 2928, 0, 0);
@@ -1461,6 +1620,13 @@ DELETE FROM `npc_vendor` WHERE `entry` = 3499 AND `item` = 2928;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3499, 2928, 0, 0);
 
 
+/* NPC Tarhus - 3500 */
+/* Remove non-Vanilla item Flintweed Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 3500 AND `item` = 22147;
+/* Remove non-Vanilla item Wild Quillvine */
+DELETE FROM `npc_vendor` WHERE `entry` = 3500 AND `item` = 22148;
+
+
 /* NPC Thomas Miller - 3518 */
 /* Remove non-Vanilla item Mag'har Grainbread */
 DELETE FROM `npc_vendor` WHERE `entry` = 3518 AND `item` = 27855;
@@ -1481,6 +1647,10 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3541,
 
 
 /* NPC Jaysin Lanyda - 3542 */
+/* Remove non-Vanilla item Flintweed Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 3542 AND `item` = 22147;
+/* Remove non-Vanilla item Wild Quillvine */
+DELETE FROM `npc_vendor` WHERE `entry` = 3542 AND `item` = 22148;
 /* Add Missing Vanilla item Dust of Decay */
 DELETE FROM `npc_vendor` WHERE `entry` = 3542 AND `item` = 2928;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3542, 2928, 0, 0);
@@ -1519,6 +1689,11 @@ DELETE FROM `npc_vendor` WHERE `entry` = 3542 AND `item` = 17019;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3542, 17019, 0, 0);
 
 
+/* NPC Selina Weston - 3548 */
+/* Remove non-Vanilla item Enchanted Vial */
+DELETE FROM `npc_vendor` WHERE `entry` = 3548 AND `item` = 40411;
+
+
 /* NPC Patrice Dwyer - 3551 */
 /* Add Missing Vanilla item Dust of Decay */
 DELETE FROM `npc_vendor` WHERE `entry` = 3551 AND `item` = 2928;
@@ -1601,11 +1776,22 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3561,
 
 
 /* NPC Alaindia - 3562 */
+/* Remove non-Vanilla item Flintweed Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 3562 AND `item` = 22147;
+/* Remove non-Vanilla item Wild Quillvine */
+DELETE FROM `npc_vendor` WHERE `entry` = 3562 AND `item` = 22148;
 /* Add Missing Vanilla item Arcane Dust */
 DELETE FROM `npc_vendor` WHERE `entry` = 3562 AND `item` = 17019;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3562, 17019, 0, 0);
 
 
+/* NPC Dalaran Miner - 3578 */
+/* Remove non-Vanilla item Jeweler's Kit */
+DELETE FROM `npc_vendor` WHERE `entry` = 3578 AND `item` = 20815;
+/* Remove non-Vanilla item Simple Grinder */
+DELETE FROM `npc_vendor` WHERE `entry` = 3578 AND `item` = 20824;
+
+
 /* NPC Aldia - 3608 */
 /* Add Missing Vanilla item Flint and Tinder */
 DELETE FROM `npc_vendor` WHERE `entry` = 3608 AND `item` = 4471;
@@ -1628,6 +1814,13 @@ DELETE FROM `npc_vendor` WHERE `entry` = 3685 AND `item` = 15292;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3685, 15292, 0, 0);
 
 
+/* NPC Jadenvis Seawatcher - 3700 */
+/* Remove non-Vanilla item Flintweed Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 3700 AND `item` = 22147;
+/* Remove non-Vanilla item Wild Quillvine */
+DELETE FROM `npc_vendor` WHERE `entry` = 3700 AND `item` = 22148;
+
+
 /* NPC Syurana - 3779 */
 /* Remove non-Vanilla item Blacksmith Hammer */
 DELETE FROM `npc_vendor` WHERE `entry` = 3779 AND `item` = 5956;
@@ -1694,6 +1887,11 @@ DELETE FROM `npc_vendor` WHERE `entry` = 3955 AND `item` = 16072;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3955, 16072, 0, 0);
 
 
+/* NPC Harklan Moongrove - 3956 */
+/* Remove non-Vanilla item Enchanted Vial */
+DELETE FROM `npc_vendor` WHERE `entry` = 3956 AND `item` = 40411;
+
+
 /* NPC Lardan - 3958 */
 /* Remove non-Vanilla item Eternium Thread */
 DELETE FROM `npc_vendor` WHERE `entry` = 3958 AND `item` = 38426;
@@ -1748,6 +1946,10 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3969,
 
 
 /* NPC Llana - 3970 */
+/* Remove non-Vanilla item Flintweed Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 3970 AND `item` = 22147;
+/* Remove non-Vanilla item Wild Quillvine */
+DELETE FROM `npc_vendor` WHERE `entry` = 3970 AND `item` = 22148;
 /* Add Missing Vanilla item Arcane Dust */
 DELETE FROM `npc_vendor` WHERE `entry` = 3970 AND `item` = 17019;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3970, 17019, 0, 0);
@@ -1760,6 +1962,10 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (4082,
 
 
 /* NPC Jeeda - 4083 */
+/* Remove non-Vanilla item Flintweed Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 4083 AND `item` = 22147;
+/* Remove non-Vanilla item Wild Quillvine */
+DELETE FROM `npc_vendor` WHERE `entry` = 4083 AND `item` = 22148;
 /* Add Missing Vanilla item Arcane Dust */
 DELETE FROM `npc_vendor` WHERE `entry` = 4083 AND `item` = 17019;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (4083, 17019, 0, 0);
@@ -1873,9 +2079,15 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (4194,
 /* NPC Chardryn - 4216 */
 /* Remove non-Vanilla item Imbued Vial */
 DELETE FROM `npc_vendor` WHERE `entry` = 4216 AND `item` = 18256;
+/* Remove non-Vanilla item Enchanted Vial */
+DELETE FROM `npc_vendor` WHERE `entry` = 4216 AND `item` = 40411;
 
 
 /* NPC Cyroen - 4220 */
+/* Remove non-Vanilla item Flintweed Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 4220 AND `item` = 22147;
+/* Remove non-Vanilla item Wild Quillvine */
+DELETE FROM `npc_vendor` WHERE `entry` = 4220 AND `item` = 22148;
 /* Add Missing Vanilla item Arcane Dust */
 DELETE FROM `npc_vendor` WHERE `entry` = 4220 AND `item` = 17019;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (4220, 17019, 0, 0);
@@ -1938,6 +2150,8 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (4229,
 
 
 /* NPC Ulthir - 4226 */
+/* Remove non-Vanilla item Enchanted Vial */
+DELETE FROM `npc_vendor` WHERE `entry` = 4226 AND `item` = 40411;
 /* Add Missing Vanilla item Recipe: Superior Mana Potion */
 DELETE FROM `npc_vendor` WHERE `entry` = 4226 AND `item` = 13477;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (4226, 13477, 1, 7200);
@@ -1978,6 +2192,13 @@ DELETE FROM `npc_vendor` WHERE `entry` = 4241 AND `item` = 4471;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (4241, 4471, 0, 0);
 
 
+/* NPC Golnir Bouldertoe - 4256 */
+/* Remove non-Vanilla item Jeweler's Kit */
+DELETE FROM `npc_vendor` WHERE `entry` = 4256 AND `item` = 20815;
+/* Remove non-Vanilla item Simple Grinder */
+DELETE FROM `npc_vendor` WHERE `entry` = 4256 AND `item` = 20824;
+
+
 /* NPC Nyoma - 4265 */
 /* Remove non-Vanilla item Simple Flour */
 DELETE FROM `npc_vendor` WHERE `entry` = 4265 AND `item` = 30817;
@@ -2049,6 +2270,16 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (4561,
 
 
 /* NPC Thomas Mordan - 4562 */
+/* Remove non-Vanilla item Flintweed Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 4562 AND `item` = 22147;
+/* Remove non-Vanilla item Wild Quillvine */
+DELETE FROM `npc_vendor` WHERE `entry` = 4562 AND `item` = 22148;
+/* Remove non-Vanilla item Wild Spineleaf */
+DELETE FROM `npc_vendor` WHERE `entry` = 4562 AND `item` = 44605;
+/* Remove non-Vanilla item Starleaf Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 4562 AND `item` = 44614;
+/* Remove non-Vanilla item Devout Candle */
+DELETE FROM `npc_vendor` WHERE `entry` = 4562 AND `item` = 44615;
 /* Add Missing Vanilla item Arcane Dust */
 DELETE FROM `npc_vendor` WHERE `entry` = 4562 AND `item` = 17019;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (4562, 17019, 0, 0);
@@ -2072,6 +2303,10 @@ DELETE FROM `npc_vendor` WHERE `entry` = 4571 AND `item` = 35954;
 
 
 /* NPC Hannah Akeley - 4575 */
+/* Remove non-Vanilla item Flintweed Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 4575 AND `item` = 22147;
+/* Remove non-Vanilla item Wild Quillvine */
+DELETE FROM `npc_vendor` WHERE `entry` = 4575 AND `item` = 22148;
 /* Add Missing Vanilla item Arcane Dust */
 DELETE FROM `npc_vendor` WHERE `entry` = 4575 AND `item` = 17019;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (4575, 17019, 0, 0);
@@ -2130,12 +2365,21 @@ DELETE FROM `npc_vendor` WHERE `entry` = 4587 AND `item` = 40533;
 DELETE FROM `npc_vendor` WHERE `entry` = 4589 AND `item` = 38426;
 
 
+/* NPC Sarah Killian - 4599 */
+/* Remove non-Vanilla item Jeweler's Kit */
+DELETE FROM `npc_vendor` WHERE `entry` = 4599 AND `item` = 20815;
+/* Remove non-Vanilla item Simple Grinder */
+DELETE FROM `npc_vendor` WHERE `entry` = 4599 AND `item` = 20824;
+
+
 /* NPC Abigail Sawyer - 4604 */
 /* Remove non-Vanilla item Wicked Arrow */
 DELETE FROM `npc_vendor` WHERE `entry` = 4604 AND `item` = 28053;
 
 
 /* NPC Algernon - 4610 */
+/* Remove non-Vanilla item Enchanted Vial */
+DELETE FROM `npc_vendor` WHERE `entry` = 4610 AND `item` = 40411;
 /* Add Missing Vanilla item Recipe: Superior Mana Potion */
 DELETE FROM `npc_vendor` WHERE `entry` = 4610 AND `item` = 13477;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (4610, 13477, 1, 2700);
@@ -2144,6 +2388,8 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (4610,
 /* NPC Katrina Alliestar - 4615 */
 /* Remove non-Vanilla item Imbued Vial */
 DELETE FROM `npc_vendor` WHERE `entry` = 4615 AND `item` = 18256;
+/* Remove non-Vanilla item Enchanted Vial */
+DELETE FROM `npc_vendor` WHERE `entry` = 4615 AND `item` = 40411;
 
 
 /* NPC Thaddeus Webb - 4617 */
@@ -2224,6 +2470,10 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (4877,
 
 
 /* NPC Montarr - 4878 */
+/* Remove non-Vanilla item Flintweed Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 4878 AND `item` = 22147;
+/* Remove non-Vanilla item Wild Quillvine */
+DELETE FROM `npc_vendor` WHERE `entry` = 4878 AND `item` = 22148;
 /* Add Missing Vanilla item Arcane Dust */
 DELETE FROM `npc_vendor` WHERE `entry` = 4878 AND `item` = 17019;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (4878, 17019, 0, 0);
@@ -2317,6 +2567,10 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (4897,
 
 
 /* NPC Balai Lok'Wein - 13476 */
+/* Remove non-Vanilla item Flintweed Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 13476 AND `item` = 22147;
+/* Remove non-Vanilla item Wild Quillvine */
+DELETE FROM `npc_vendor` WHERE `entry` = 13476 AND `item` = 22148;
 /* Add Missing Vanilla item Manual: Mageweave Bandage */
 DELETE FROM `npc_vendor` WHERE `entry` = 13476 AND `item` = 16113;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (13476, 16113, 0, 0);
@@ -2331,6 +2585,8 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (13476
 /* NPC Uma Bartulm - 4899 */
 /* Remove non-Vanilla item Greater Healing Potion */
 DELETE FROM `npc_vendor` WHERE `entry` = 4899 AND `item` = 1710;
+/* Remove non-Vanilla item Enchanted Vial */
+DELETE FROM `npc_vendor` WHERE `entry` = 4899 AND `item` = 40411;
 
 
 /* NPC Namdo Bizzfizzle - 2683 */
@@ -2386,6 +2642,10 @@ DELETE FROM `npc_vendor` WHERE `entry` = 5109 AND `item` = 35950;
 
 
 /* NPC Barim Jurgenstaad - 5110 */
+/* Remove non-Vanilla item Flintweed Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 5110 AND `item` = 22147;
+/* Remove non-Vanilla item Wild Quillvine */
+DELETE FROM `npc_vendor` WHERE `entry` = 5110 AND `item` = 22148;
 /* Add Missing Vanilla item Arcane Dust */
 DELETE FROM `npc_vendor` WHERE `entry` = 5110 AND `item` = 17019;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (5110, 17019, 0, 0);
@@ -2430,12 +2690,18 @@ DELETE FROM `npc_vendor` WHERE `entry` = 5128 AND `item` = 38426;
 /* NPC Gwina Stonebranch - 5138 */
 /* Remove non-Vanilla item Imbued Vial */
 DELETE FROM `npc_vendor` WHERE `entry` = 5138 AND `item` = 18256;
+/* Remove non-Vanilla item Enchanted Vial */
+DELETE FROM `npc_vendor` WHERE `entry` = 5138 AND `item` = 40411;
 /* Add Missing Vanilla item Copper Rod */
 DELETE FROM `npc_vendor` WHERE `entry` = 5138 AND `item` = 6217;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (5138, 6217, 0, 0);
 
 
 /* NPC Ginny Longberry - 5151 */
+/* Remove non-Vanilla item Flintweed Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 5151 AND `item` = 22147;
+/* Remove non-Vanilla item Wild Quillvine */
+DELETE FROM `npc_vendor` WHERE `entry` = 5151 AND `item` = 22148;
 /* Add Missing Vanilla item Arcane Dust */
 DELETE FROM `npc_vendor` WHERE `entry` = 5151 AND `item` = 17019;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (5151, 17019, 0, 0);
@@ -2548,6 +2814,11 @@ DELETE FROM `npc_vendor` WHERE `entry` = 5175 AND `item` = 16042;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (5175, 16042, 1, 10800);
 
 
+/* NPC Soolie Berryfizz - 5178 */
+/* Remove non-Vanilla item Enchanted Vial */
+DELETE FROM `npc_vendor` WHERE `entry` = 5178 AND `item` = 40411;
+
+
 /* NPC Erika Tate - 5483 */
 /* Remove non-Vanilla item Simple Flour */
 DELETE FROM `npc_vendor` WHERE `entry` = 5483 AND `item` = 30817;
@@ -2562,6 +2833,15 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (5483,
 /* NPC Eldraeith - 5503 */
 /* Remove non-Vanilla item Imbued Vial */
 DELETE FROM `npc_vendor` WHERE `entry` = 5503 AND `item` = 18256;
+/* Remove non-Vanilla item Enchanted Vial */
+DELETE FROM `npc_vendor` WHERE `entry` = 5503 AND `item` = 40411;
+
+
+/* NPC Brooke Stonebraid - 5514 */
+/* Remove non-Vanilla item Jeweler's Kit */
+DELETE FROM `npc_vendor` WHERE `entry` = 5514 AND `item` = 20815;
+/* Remove non-Vanilla item Simple Grinder */
+DELETE FROM `npc_vendor` WHERE `entry` = 5514 AND `item` = 20824;
 
 
 /* NPC Billibub Cogspinner - 5519 */
@@ -2576,6 +2856,11 @@ DELETE FROM `npc_vendor` WHERE `entry` = 5519 AND `item` = 40533;
 DELETE FROM `npc_vendor` WHERE `entry` = 5565 AND `item` = 38426;
 
 
+/* NPC Alchemist Pestlezugg - 5594 */
+/* Remove non-Vanilla item Enchanted Vial */
+DELETE FROM `npc_vendor` WHERE `entry` = 5594 AND `item` = 40411;
+
+
 /* NPC Lilly - 5757 */
 /* Add Missing Vanilla item Formula: Enchant Chest - Minor Mana */
 DELETE FROM `npc_vendor` WHERE `entry` = 5757 AND `item` = 6342;
@@ -2625,6 +2910,13 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (5817,
 DELETE FROM `npc_vendor` WHERE `entry` = 5944 AND `item` = 38426;
 
 
+/* NPC Thelgrum Stonehammer - 6298 */
+/* Remove non-Vanilla item Jeweler's Kit */
+DELETE FROM `npc_vendor` WHERE `entry` = 6298 AND `item` = 20815;
+/* Remove non-Vanilla item Simple Grinder */
+DELETE FROM `npc_vendor` WHERE `entry` = 6298 AND `item` = 20824;
+
+
 /* NPC Gorbold Steelhand - 6301 */
 /* Remove non-Vanilla item Rune Thread */
 DELETE FROM `npc_vendor` WHERE `entry` = 6301 AND `item` = 14341;
@@ -3000,11 +3292,36 @@ DELETE FROM `npc_vendor` WHERE `entry` = 15174 AND `item` = 4471;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (15174, 4471, 0, 0);
 
 
+/* NPC Logannas - 8157 */
+/* Remove non-Vanilla item Enchanted Vial */
+DELETE FROM `npc_vendor` WHERE `entry` = 8157 AND `item` = 40411;
+
+
+/* NPC Bronk - 8158 */
+/* Remove non-Vanilla item Enchanted Vial */
+DELETE FROM `npc_vendor` WHERE `entry` = 8158 AND `item` = 40411;
+
+
 /* NPC Nioma - 8160 */
 /* Remove non-Vanilla item Eternium Thread */
 DELETE FROM `npc_vendor` WHERE `entry` = 8160 AND `item` = 38426;
 
 
+/* NPC Rartar - 8177 */
+/* Remove non-Vanilla item Enchanted Vial */
+DELETE FROM `npc_vendor` WHERE `entry` = 8177 AND `item` = 40411;
+
+
+/* NPC Nina Lightbrew - 8178 */
+/* Remove non-Vanilla item Enchanted Vial */
+DELETE FROM `npc_vendor` WHERE `entry` = 8178 AND `item` = 40411;
+
+
+/* NPC Kixxle - 8305 */
+/* Remove non-Vanilla item Enchanted Vial */
+DELETE FROM `npc_vendor` WHERE `entry` = 8305 AND `item` = 40411;
+
+
 /* NPC Tarban Hearthgrain - 8307 */
 /* Remove non-Vanilla item Simple Flour */
 DELETE FROM `npc_vendor` WHERE `entry` = 8307 AND `item` = 30817;
@@ -3017,6 +3334,16 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (8307,
 
 
 /* NPC Chepi - 8361 */
+/* Remove non-Vanilla item Flintweed Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 8361 AND `item` = 22147;
+/* Remove non-Vanilla item Wild Quillvine */
+DELETE FROM `npc_vendor` WHERE `entry` = 8361 AND `item` = 22148;
+/* Remove non-Vanilla item Wild Spineleaf */
+DELETE FROM `npc_vendor` WHERE `entry` = 8361 AND `item` = 44605;
+/* Remove non-Vanilla item Starleaf Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 8361 AND `item` = 44614;
+/* Remove non-Vanilla item Devout Candle */
+DELETE FROM `npc_vendor` WHERE `entry` = 8361 AND `item` = 44615;
 /* Add Missing Vanilla item Arcane Dust */
 DELETE FROM `npc_vendor` WHERE `entry` = 8361 AND `item` = 17019;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (8361, 17019, 0, 0);
@@ -3164,7 +3491,16 @@ DELETE FROM `npc_vendor` WHERE `entry` = 11185 AND `item` = 16047;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (11185, 16047, 1, 10800);
 
 
+/* NPC Lunnix Sprocketslip - 11186 */
+/* Remove non-Vanilla item Jeweler's Kit */
+DELETE FROM `npc_vendor` WHERE `entry` = 11186 AND `item` = 20815;
+/* Remove non-Vanilla item Simple Grinder */
+DELETE FROM `npc_vendor` WHERE `entry` = 11186 AND `item` = 20824;
+
+
 /* NPC Evie Whirlbrew - 11188 */
+/* Remove non-Vanilla item Enchanted Vial */
+DELETE FROM `npc_vendor` WHERE `entry` = 11188 AND `item` = 40411;
 /* Add Missing Vanilla item Pattern: Mooncloth */
 DELETE FROM `npc_vendor` WHERE `entry` = 11188 AND `item` = 14526;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (11188, 14526, 0, 0);
@@ -3700,6 +4036,10 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (14738
 
 
 /* NPC Mystic Yayo'jin - 14739 */
+/* Remove non-Vanilla item Flintweed Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 14739 AND `item` = 22147;
+/* Remove non-Vanilla item Wild Quillvine */
+DELETE FROM `npc_vendor` WHERE `entry` = 14739 AND `item` = 22148;
 /* Add Missing Vanilla item Arcane Dust */
 DELETE FROM `npc_vendor` WHERE `entry` = 14739 AND `item` = 17019;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (14739, 17019, 0, 0);
@@ -3880,6 +4220,10 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (14847
 
 
 /* NPC Khur Hornstriker - 15175 */
+/* Remove non-Vanilla item Flintweed Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 15175 AND `item` = 22147;
+/* Remove non-Vanilla item Wild Quillvine */
+DELETE FROM `npc_vendor` WHERE `entry` = 15175 AND `item` = 22148;
 /* Add Missing Vanilla item Dust of Decay */
 DELETE FROM `npc_vendor` WHERE `entry` = 15175 AND `item` = 2928;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (15175, 2928, 0, 0);
@@ -3921,12 +4265,23 @@ DELETE FROM `npc_vendor` WHERE `entry` = 15419 AND `item` = 6342;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (15419, 6342, 1, 7200);
 
 
+/* NPC Vi'el - 16015 */
+/* Remove non-Vanilla item Flintweed Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 16015 AND `item` = 22147;
+/* Remove non-Vanilla item Wild Quillvine */
+DELETE FROM `npc_vendor` WHERE `entry` = 16015 AND `item` = 22148;
+
+
 /* NPC Renn'az - 17598 */
 /* Remove non-Vanilla item Wicked Arrow */
 DELETE FROM `npc_vendor` WHERE `entry` = 17598 AND `item` = 28053;
 
 
 /* NPC Kurdrum Barleybeard - 5139 */
+/* Remove non-Vanilla item Flintweed Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 5139 AND `item` = 22147;
+/* Remove non-Vanilla item Wild Quillvine */
+DELETE FROM `npc_vendor` WHERE `entry` = 5139 AND `item` = 22148;
 /* Add Missing Vanilla item Dust of Decay */
 DELETE FROM `npc_vendor` WHERE `entry` = 5139 AND `item` = 2928;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (5139, 2928, 0, 0);
@@ -4321,6 +4676,10 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (10367
 
 
 /* NPC Yaelika Farclaw - 10364 */
+/* Remove non-Vanilla item Flintweed Seed */
+DELETE FROM `npc_vendor` WHERE `entry` = 10364 AND `item` = 22147;
+/* Remove non-Vanilla item Wild Quillvine */
+DELETE FROM `npc_vendor` WHERE `entry` = 10364 AND `item` = 22148;
 /* Add Missing Vanilla item Dust of Decay */
 DELETE FROM `npc_vendor` WHERE `entry` = 10364 AND `item` = 2928;
 INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (10364, 2928, 0, 0);
@@ -4349,6 +4708,9 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (13432
 /* Delete Simple Flour from TBC pre-60 vendors - they should technically have it but it is a catch-up mechanic so wait until TBC areas for it to be available */
 DELETE FROM `npc_vendor` WHERE `entry` IN (17246, 16253, 16262, 16261, 16677, 17490, 16718) AND `item` = 30817;
 
+/* Remove Wicked Arrow and Impact Shot from vendors - these skip all end-game vanilla ammo progression */
+DELETE FROM `npc_vendor` WHERE `item` IN (28060, 28053);
+
 /* PvP Gear Vendor Rep Requirements */
 REPLACE INTO conditions (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `comment`) VALUES
 (23, 13219, 17349, 5, 729, 16 + 32 + 64 + 128, 'Vanilla PvP Gear Conditions'),

src/IndividualProgression.cpp

@@ -352,10 +352,12 @@ public:
         if (sIndividualProgression->simpleConfigOverride)
         {
             sWorld->setIntConfig(CONFIG_WATER_BREATH_TIMER, 60000);
+            sWorld->setIntConfig(CONFIG_LFG_OPTIONSMASK, 4);
             sWorld->setBoolConfig(CONFIG_OBJECT_QUEST_MARKERS, false);
             sWorld->setBoolConfig(CONFIG_OBJECT_SPARKLES, false);
             sWorld->setBoolConfig(CONFIG_PLAYER_SETTINGS_ENABLED, true);
             sWorld->setBoolConfig(CONFIG_LOW_LEVEL_REGEN_BOOST, false);
+            sWorld->setBoolConfig(CONFIG_DBC_ENFORCE_ITEM_ATTRIBUTES, false);
         }
     }
 };

src/IndividualProgressionPlayer.cpp

@@ -347,21 +347,36 @@ public:
     }
 
     void OnQueueRandomDungeon(Player* player, uint32& rDungeonId) override
+{
+    // List of exceptions for seasonal event dungeons
+    std::set<uint32> seasonalEventDungeons = { 285, 286, 287, 288 };
+    if (seasonalEventDungeons.find(rDungeonId) != seasonalEventDungeons.end())
     {
-        if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_NAXX40))
-        {
-            rDungeonId = RDF_CLASSIC;
-        }
-        else if (rDungeonId == RDF_WRATH_OF_THE_LICH_KING && !sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5))
-        {
-            rDungeonId = RDF_THE_BURNING_CRUSADE;
-        }
-        else if (rDungeonId == RDF_WRATH_OF_THE_LICH_KING_HEROIC && !sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5))
-        {
-            rDungeonId = RDF_THE_BURNING_CRUSADE_HEROIC;
-        }
+        return;
     }
 
+    // Check if RDF is disabled in the context of Individual Progression
+    if (sConfigMgr->GetOption<bool>("IndividualProgression.DisableRDF", false))
+    {
+        player->GetSession()->SendNotification("The Random Dungeon feature is currently disabled by the Individual Progression module.");
+        rDungeonId = 1000; // Set dungeon ID to an invalid value to cancel the queuing
+        return;
+    }
+
+    if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_NAXX40))
+    {
+        rDungeonId = RDF_CLASSIC;
+    }
+    else if (rDungeonId == RDF_WRATH_OF_THE_LICH_KING && !sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5))
+    {
+        rDungeonId = RDF_THE_BURNING_CRUSADE;
+    }
+    else if (rDungeonId == RDF_WRATH_OF_THE_LICH_KING_HEROIC && !sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5))
+    {
+        rDungeonId = RDF_THE_BURNING_CRUSADE_HEROIC;
+    }
+}
+
     bool CanEquipItem(Player* player, uint8 /*slot*/, uint16& /*dest*/, Item* pItem, bool /*swap*/, bool /*not_loading*/) override
     {
         if (sIndividualProgression->pvpGearRequirements)
@@ -561,6 +576,13 @@ public:
         }
 
         // Skip percentage based heals or spells already nerfed by damage reduction
+        for (uint8 i = 0; i < 3; i++)
+        {
+            if (spellInfo->Effects[i].Effect == SPELL_EFFECT_HEAL_MAX_HEALTH)
+            {
+                return;
+            }
+        }
         if (spellInfo->Id == SPELL_RUNE_TAP || spellInfo->Id == SPELL_LIFE_STEAL)
         {
             return;
@@ -641,11 +663,20 @@ public:
         }
     }
 
-    void ModifyPeriodicDamageAurasTick(Unit* /*target*/, Unit* attacker, uint32& damage, SpellInfo const* /*spellInfo*/) override
+    void ModifyPeriodicDamageAurasTick(Unit* /*target*/, Unit* attacker, uint32& damage, SpellInfo const* spellInfo) override
     {
         if (!sIndividualProgression->enabled || !attacker)
             return;
 
+        // Do not apply reductions to healing auras - these are already modified in the ModifyHeal hook
+        for (uint8 j = 0; j < MAX_SPELL_EFFECTS; ++j)
+        {
+            if (spellInfo->Effects[j].Effect == SPELL_EFFECT_APPLY_AURA && spellInfo->Effects[j].ApplyAuraName == SPELL_AURA_PERIODIC_HEAL)
+            {
+                return;
+            }
+        }
+
         bool isPet = attacker->GetOwner() && attacker->GetOwner()->GetTypeId() == TYPEID_PLAYER;
         if (!isPet && attacker->GetTypeId() != TYPEID_PLAYER)
         {

src/naxx40Scripts/boss_anubrekhan_40.cpp

@@ -37,6 +37,7 @@ enum Spells
 {
     SPELL_IMPALE                    = 28783,
     SPELL_LOCUST_SWARM              = 28785,
+    SPELL_LOCUST_SWARM_TRIGGER      = 28786, // periodic effect 
     SPELL_SUMMON_CORPSE_SCRABS_5    = 90001, // Changed from 29105 to Level 60 Mob ID for summon
     SPELL_SUMMON_CORPSE_SCRABS_10   = 90002, //  Changed from 29105 to Level 60 Mob ID for summon
     SPELL_BERSERK                   = 26662
@@ -89,11 +90,8 @@ public:
 
         void SummonCryptGuards()
         {
-            if (Is25ManRaid())
-            {
-                me->SummonCreature(NPC_CRYPT_GUARD, 3299.732f, -3502.489f, 287.077f, 2.378f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60000);
-                me->SummonCreature(NPC_CRYPT_GUARD, 3299.086f, -3450.929f, 287.077f, 3.999f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60000);
-            }
+            me->SummonCreature(NPC_CRYPT_GUARD, 3299.732f, -3502.489f, 287.077f, 2.378f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60000);
+            me->SummonCreature(NPC_CRYPT_GUARD, 3299.086f, -3450.929f, 287.077f, 3.999f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60000);
         }
 
         void Reset() override
@@ -113,15 +111,19 @@ public:
 
         void JustSummoned(Creature* cr) override
         {
-            if (me->IsInCombat())
-            {
-                cr->SetInCombatWithZone();
+                if (me->IsInCombat())
+                {
+                cr->SetInCombatWithZone(); // This line will set the creature in combat with the zone.
                 if (cr->GetEntry() == NPC_CRYPT_GUARD)
                 {
-                    cr->AI()->Talk(EMOTE_SPAWN, me);
+                     cr->AI()->Talk(EMOTE_SPAWN, me);
                 }
-            }
-            summons.Summon(cr);
+                else if (cr->GetEntry() == NPC_CORPSE_SCARAB) // Explicitly check for Corpse Scarabs here.
+                {
+                     cr->SetInCombatWithZone(); // Set the Corpse Scarabs in combat with the zone too.
+                }
+             }
+             summons.Summon(cr);
         }
 
         void SummonedCreatureDies(Creature* cr, Unit*) override
@@ -164,7 +166,7 @@ public:
         void JustEngagedWith(Unit* who) override
         {
             BossAI::JustEngagedWith(who);
-            me->CallForHelp(30.0f);
+            me->CallForHelp(60.0f);
             Talk(SAY_AGGRO);
             if (pInstance)
             {
@@ -232,14 +234,21 @@ public:
                     events.RepeatEvent(20000);
                     break;
                 case EVENT_LOCUST_SWARM:
+                {
                     Talk(EMOTE_LOCUST);
+                    // Set damage for periodic trigger effect to a random value between 875 and 1125
+                    int32 modifiedLocustSwarmDamage = urand(875, 1125);
                     me->CastSpell(me, SPELL_LOCUST_SWARM, false);
+                    // Update the periodic trigger effect with custom damage
+                    me->CastCustomSpell(me, SPELL_LOCUST_SWARM_TRIGGER, &modifiedLocustSwarmDamage, nullptr, nullptr, true, nullptr, nullptr, me->GetGUID());
+
                     events.ScheduleEvent(EVENT_SPAWN_GUARD, 3000);
                     events.RepeatEvent(90000);
                     break;
+                }
                 case EVENT_SPAWN_GUARD:
                     me->SummonCreature(NPC_CRYPT_GUARD, 3331.217f, -3476.607f, 287.074f, 3.269f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60000);
-                    break;
+                    break; 
                 case EVENT_BERSERK:
                     me->CastSpell(me, SPELL_BERSERK, true);
                     break;

src/naxx40Scripts/boss_maexxna_40.cpp

@@ -16,40 +16,44 @@
  */
 
 #include "PassiveAI.h"
+#include "Player.h"
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
+#include "SpellAuras.h"
 #include "naxxramas.h"
 
+
 enum Spells
 {
-    SPELL_WEB_WRAP                      = 28622,
-    SPELL_WEB_SPRAY                     = 29484,
-    SPELL_POISON_SHOCK                  = 28741,
-    SPELL_NECROTIC_POISON               = 54121,
-    SPELL_FRENZY                        = 54123,
+    SPELL_WEB_WRAP = 28622,
+    SPELL_WEB_SPRAY = 29484,
+    SPELL_POISON_SHOCK = 28741,
+    SPELL_NECROTIC_POISON = 54121,
+    SPELL_FRENZY = 54123,
 };
 
 enum Events
 {
-    EVENT_WEB_SPRAY                     = 1,
-    EVENT_POISON_SHOCK                  = 2,
-    EVENT_NECROTIC_POISON               = 3,
-    EVENT_WEB_WRAP                      = 4,
-    EVENT_HEALTH_CHECK                  = 5,
-    EVENT_SUMMON_SPIDERLINGS            = 6
+    EVENT_WEB_SPRAY = 1,
+    EVENT_POISON_SHOCK = 2,
+    EVENT_NECROTIC_POISON = 3,
+    EVENT_WEB_WRAP = 4,
+    EVENT_HEALTH_CHECK = 5,
+    EVENT_SUMMON_SPIDERLINGS = 6,
+    EVENT_MODIFY_WEB_SPRAY_AURA = 7
 };
 
 enum Emotes
 {
-    EMOTE_SPIDERS                       = 0,
-    EMOTE_WEB_WRAP                      = 1,
-    EMOTE_WEB_SPRAY                     = 2
+    EMOTE_SPIDERS = 0,
+    EMOTE_WEB_WRAP = 1,
+    EMOTE_WEB_SPRAY = 2
 };
 
 enum Misc
 {
-    NPC_WEB_WRAP                        = 351079,
-    NPC_MAEXXNA_SPIDERLING              = 351088
+    NPC_WEB_WRAP = 351079,
+    NPC_MAEXXNA_SPIDERLING = 351088
 };
 
 const Position PosWrap[3] =
@@ -59,6 +63,8 @@ const Position PosWrap[3] =
     {3497.067f, -3843.384f, 302.384f, 0.0f}
 };
 
+
+
 class boss_maexxna_40 : public CreatureScript
 {
 public:
@@ -144,7 +150,7 @@ public:
             }
         }
 
-        void JustDied(Unit*  killer) override
+        void JustDied(Unit* killer) override
         {
             BossAI::JustDied(killer);
             summons.DespawnAll();
@@ -164,71 +170,110 @@ public:
 
             switch (events.ExecuteEvent())
             {
-                case EVENT_WEB_SPRAY:
-                    Talk(EMOTE_WEB_SPRAY);
-                    me->CastSpell(me, SPELL_WEB_SPRAY, true);
-                    events.RepeatEvent(40000);
-                    break;
-                case EVENT_POISON_SHOCK:
-                    me->CastSpell(me->GetVictim(), SPELL_POISON_SHOCK, false);
-                    events.RepeatEvent(10000);
-                    break;
-                case EVENT_NECROTIC_POISON:
-                    me->CastSpell(me->GetVictim(), SPELL_NECROTIC_POISON, false);
-                    events.RepeatEvent(30000);
-                    break;
-                case EVENT_SUMMON_SPIDERLINGS:
-                    Talk(EMOTE_SPIDERS);
-                    for (uint8 i = 0; i < 8; ++i)
+            case EVENT_WEB_SPRAY:
+                Talk(EMOTE_WEB_SPRAY);
+                me->CastSpell(me, SPELL_WEB_SPRAY, true);
+                events.ScheduleEvent(EVENT_MODIFY_WEB_SPRAY_AURA, 500);  // Schedule the modify aura event with a 500ms delay
+                events.RepeatEvent(40000);
+                break;
+
+            case EVENT_MODIFY_WEB_SPRAY_AURA:
+            {
+                Map::PlayerList const& PlayerList = me->GetMap()->GetPlayers();
+                for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
+                {
+                    if (Player* player = i->GetSource())
                     {
-                        me->SummonCreature(NPC_MAEXXNA_SPIDERLING, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation());
-                    }
-                    events.RepeatEvent(40000);
-                    break;
-                case EVENT_HEALTH_CHECK:
-                    if (me->GetHealthPct() < 30)
-                    {
-                        me->CastSpell(me, SPELL_FRENZY, true);
-                        break;
-                    }
-                    events.RepeatEvent(1000);
-                    break;
-                case EVENT_WEB_WRAP:
-                    Talk(EMOTE_WEB_WRAP);
-                    for (uint8 i = 0; i < 2; ++i)
-                    {
-                        if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0, true, true, -SPELL_WEB_WRAP))
+                        if (player->IsAlive() && player->HasAura(SPELL_WEB_SPRAY))
                         {
-                            target->RemoveAura(SPELL_WEB_SPRAY);
-                            uint8 pos = urand(0, 2);
-                            if (Creature* wrap = me->SummonCreature(NPC_WEB_WRAP, PosWrap[pos].GetPositionX(), PosWrap[pos].GetPositionY(), PosWrap[pos].GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 60000))
+                            if (Aura* aura = player->GetAura(SPELL_WEB_SPRAY))
                             {
-                                wrap->AI()->SetGUID(target->GetGUID());
-                                target->GetMotionMaster()->MoveJump(PosWrap[pos].GetPositionX(), PosWrap[pos].GetPositionY(), PosWrap[pos].GetPositionZ(), 20, 20);
+                                aura->SetDuration(8000);  // Set the duration to 8 seconds 
                             }
                         }
                     }
-                    events.RepeatEvent(40000);
+                }
+            }
+            break;
+            case EVENT_POISON_SHOCK:
+            {
+                int32 modifiedPoisonShockDamage = urand(1750, 2250);  // Set damage to a random value between 1750 and 2250
+                me->CastCustomSpell(me->GetVictim(), SPELL_POISON_SHOCK, &modifiedPoisonShockDamage, nullptr, nullptr, false, nullptr, nullptr, me->GetGUID());
+                events.RepeatEvent(10000);
+                break;
+            }
+            case EVENT_NECROTIC_POISON:
+                me->CastSpell(me->GetVictim(), SPELL_NECROTIC_POISON, false);
+                events.RepeatEvent(30000);
+                break;
+            case EVENT_SUMMON_SPIDERLINGS:
+                Talk(EMOTE_SPIDERS);
+                for (uint8 i = 0; i < 8; ++i)
+                {
+                    me->SummonCreature(NPC_MAEXXNA_SPIDERLING, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation());
+                }
+                events.RepeatEvent(40000);
+                break;
+            case EVENT_HEALTH_CHECK:
+                if (me->GetHealthPct() < 30)
+                {
+                    me->CastSpell(me, SPELL_FRENZY, true);
                     break;
+                }
+                events.RepeatEvent(1000);
+                break;
+            case EVENT_WEB_WRAP:
+                Talk(EMOTE_WEB_WRAP);
+                for (uint8 i = 0; i < 2; ++i)
+                {
+                    if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0, true, true, -SPELL_WEB_WRAP))
+                    {
+                        target->RemoveAura(SPELL_WEB_SPRAY);
+                        float x, y, z;
+                        target->GetPosition(x, y, z);  // Get the current position of the target player
+
+                        // Set the destination position for the Web Wrap NPC
+                        uint8 pos = urand(0, 2);
+                        float destX = PosWrap[pos].GetPositionX();
+                        float destY = PosWrap[pos].GetPositionY();
+                        float destZ = PosWrap[pos].GetPositionZ();
+
+                        if (Creature* wrap = me->SummonCreature(NPC_WEB_WRAP, x, y, z, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 60000))
+                        {
+                            wrap->AI()->SetGUID(target->GetGUID());
+                            wrap->GetMotionMaster()->MoveJump(destX, destY, destZ, 20, 20);  // Make the Web Wrap NPC fly to the destination
+
+                            // Make the player fly to the same destination as Web Wrap NPC
+                            target->GetMotionMaster()->MoveJump(destX, destY, destZ, 20, 20);
+
+                            int32 modifiedBaseDamage = urand(650, 850);  // Set damage to a random value between 650 and 850
+                            int32 damageForEffect2 = modifiedBaseDamage;
+                            target->CastCustomSpell(target, SPELL_WEB_WRAP, nullptr, &damageForEffect2, nullptr, true, nullptr, nullptr, wrap->GetGUID());
+                        }
+                    }
+                }
+                events.RepeatEvent(40000);
+                break;
             }
             DoMeleeAttackIfReady();
         }
     };
 };
 
-class boss_maexxna_webwrap : public CreatureScript
+
+class boss_maexxna_webwrap40 : public CreatureScript
 {
 public:
-    boss_maexxna_webwrap() : CreatureScript("boss_maexxna_webwrap") { }
+    boss_maexxna_webwrap40() : CreatureScript("boss_maexxna_webwrap40") { }
 
     CreatureAI* GetAI(Creature* pCreature) const override
     {
-        return GetNaxxramasAI<boss_maexxna_webwrapAI>(pCreature);
+        return GetNaxxramasAI<boss_maexxna_webwrap40AI>(pCreature);
     }
 
-    struct boss_maexxna_webwrapAI : public NullCreatureAI
+    struct boss_maexxna_webwrap40AI : public NullCreatureAI
     {
-        explicit boss_maexxna_webwrapAI(Creature* c) : NullCreatureAI(c) {}
+        explicit boss_maexxna_webwrap40AI(Creature* c) : NullCreatureAI(c) {}
 
         ObjectGuid victimGUID;
 
@@ -236,22 +281,30 @@ public:
         {
             victimGUID = guid;
 
-            if (me->m_spells[0] && victimGUID)
+            if (victimGUID)
             {
                 if (Unit* victim = ObjectAccessor::GetUnit(*me, victimGUID))
                 {
-                    victim->CastSpell(victim, me->m_spells[0], true, nullptr, nullptr, me->GetGUID());
+                    if (victim->GetTypeId() == TYPEID_PLAYER && victim->GetEntry() != NPC_WEB_WRAP)
+                    {
+                        int32 modifiedBaseDamage = urand(650, 850);  // Set damage to a random value between 650 and 850
+                        int32 damageForEffect2 = modifiedBaseDamage;
+                        victim->CastCustomSpell(victim, SPELL_WEB_WRAP, nullptr, &damageForEffect2, nullptr, true, nullptr, nullptr, me->GetGUID());
+                    }
                 }
             }
         }
 
         void JustDied(Unit* /*killer*/) override
         {
-            if (me->m_spells[0] && victimGUID)
+            if (victimGUID)
             {
                 if (Unit* victim = ObjectAccessor::GetUnit(*me, victimGUID))
                 {
-                    victim->RemoveAurasDueToSpell(me->m_spells[0], me->GetGUID());
+                    if (victim->HasAura(SPELL_WEB_WRAP))
+                    {
+                        victim->RemoveAurasDueToSpell(SPELL_WEB_WRAP, me->GetGUID());
+                    }
                 }
             }
         }
@@ -261,5 +314,5 @@ public:
 void AddSC_boss_maexxna_40()
 {
     new boss_maexxna_40();
-//    new boss_maexxna_webwrap();
+    new boss_maexxna_webwrap40();
 }