From bf3edc2f5527e16b8ce7a22ac517d5e95437efed Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Sun, 26 Sep 2021 17:27:50 -0400
Subject: [PATCH] DB Updates

---
 ...09_26_06_world_2018_05_08_00_world_335.sql |  17 ++
 ...09_26_07_world_2018_05_08_01_world_335.sql |  35 +++
 ...09_26_08_world_2018_05_08_02_world_335.sql |  26 +++
 ...09_26_09_world_2018_05_08_03_world_335.sql |  11 +
 ...09_26_10_world_2018_05_08_04_world_335.sql | 206 ++++++++++++++++++
 ...09_26_11_world_2018_05_08_05_world_335.sql |   9 +
 ...09_26_12_world_2018_05_08_06_world_335.sql |  16 ++
 ...09_26_13_world_2018_05_08_07_world_335.sql |  79 +++++++
 ...09_26_14_world_2018_05_13_00_world_335.sql |  35 +++
 ...021_09_26_15_world_2018_05_14_00_world.sql |  13 ++
 ...09_26_16_world_2018_05_15_00_world_335.sql |   5 +
 ...09_26_17_world_2018_05_15_01_world_335.sql |   6 +
 ...09_26_18_world_2018_05_15_02_world_335.sql |  28 +++
 ...09_26_19_world_2018_05_15_03_world_335.sql |   7 +
 ...021_09_26_20_world_2018_05_16_00_world.sql |   2 +
 15 files changed, 495 insertions(+)
 create mode 100644 sql/updates/world/master/2021_09_26_06_world_2018_05_08_00_world_335.sql
 create mode 100644 sql/updates/world/master/2021_09_26_07_world_2018_05_08_01_world_335.sql
 create mode 100644 sql/updates/world/master/2021_09_26_08_world_2018_05_08_02_world_335.sql
 create mode 100644 sql/updates/world/master/2021_09_26_09_world_2018_05_08_03_world_335.sql
 create mode 100644 sql/updates/world/master/2021_09_26_10_world_2018_05_08_04_world_335.sql
 create mode 100644 sql/updates/world/master/2021_09_26_11_world_2018_05_08_05_world_335.sql
 create mode 100644 sql/updates/world/master/2021_09_26_12_world_2018_05_08_06_world_335.sql
 create mode 100644 sql/updates/world/master/2021_09_26_13_world_2018_05_08_07_world_335.sql
 create mode 100644 sql/updates/world/master/2021_09_26_14_world_2018_05_13_00_world_335.sql
 create mode 100644 sql/updates/world/master/2021_09_26_15_world_2018_05_14_00_world.sql
 create mode 100644 sql/updates/world/master/2021_09_26_16_world_2018_05_15_00_world_335.sql
 create mode 100644 sql/updates/world/master/2021_09_26_17_world_2018_05_15_01_world_335.sql
 create mode 100644 sql/updates/world/master/2021_09_26_18_world_2018_05_15_02_world_335.sql
 create mode 100644 sql/updates/world/master/2021_09_26_19_world_2018_05_15_03_world_335.sql
 create mode 100644 sql/updates/world/master/2021_09_26_20_world_2018_05_16_00_world.sql

diff --git a/sql/updates/world/master/2021_09_26_06_world_2018_05_08_00_world_335.sql b/sql/updates/world/master/2021_09_26_06_world_2018_05_08_00_world_335.sql
new file mode 100644
index 000000000..d43b74049
--- /dev/null
+++ b/sql/updates/world/master/2021_09_26_06_world_2018_05_08_00_world_335.sql
@@ -0,0 +1,17 @@
+-- 
+-- Gaeriyan --> Fix Gossip Texts
+DELETE FROM `gossip_menu` WHERE `MenuID`=1914 AND `TextID` IN (2567,2569);
+INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES
+(1914,2567,0),
+(1914,2569,0);
+
+DELETE FROM `npc_text` WHERE `ID`=2569;
+INSERT INTO `npc_text` (`ID`, `BroadcastTextID0`, `Probability0`) VALUES
+(2569,4826,1);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=1914;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(14,1914,2567,0,0,14,0,3912,0,0,0,0,0,"","Show gossip text 2567 if quest 'Meet at the Grave' is not taken"),
+(14,1914,2568,0,0,14,0,3912,0,0,1,0,0,"","Show gossip text 2568 if quest 'Meet at the Grave' is taken"),
+(14,1914,2568,0,0,14,0,3913,0,0,0,0,0,"","Show gossip text 2568 if quest 'A Grave Situation' is not taken"),
+(14,1914,2569,0,0,14,0,3913,0,0,1,0,0,"","Show gossip text 2569 if quest 'A Grave Situation' is taken");
diff --git a/sql/updates/world/master/2021_09_26_07_world_2018_05_08_01_world_335.sql b/sql/updates/world/master/2021_09_26_07_world_2018_05_08_01_world_335.sql
new file mode 100644
index 000000000..6b780a9c1
--- /dev/null
+++ b/sql/updates/world/master/2021_09_26_07_world_2018_05_08_01_world_335.sql
@@ -0,0 +1,35 @@
+-- Quest "The Videre Elixir"
+-- Miblon's Bait
+UPDATE `gameobject_template` SET `AIName`="SmartGameObjectAI" WHERE `entry`=164758;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=164758 AND `source_type`=1;
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(164758,1,0,0,1,0,100,1,0,0,0,1000,45,1,1,0,0,0,0,19,9467,50,0,0,0,0,0,"Miblon's Bait - Out of Combat - Set Data to Miblon Snarltooth (No Repeat)");
+
+-- Miblon Snarltooth
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=9467;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=9467 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=946700 AND `source_type`=9;
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(9467,0,0,0,11,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Miblon Snarltooth - On Respawn - Set Event Phase 1"),
+(9467,0,1,0,38,1,100,0,1,1,0,0,80,946700,0,0,0,0,0,1,0,0,0,0,0,0,0,"Miblon Snarltooth - On Data Set - Run Script (Phase 1)"),
+(946700,9,0,0,0,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Miblon Snarltooth - On Script - Set Event Phase 0"),
+(946700,9,1,0,0,0,100,0,0,0,0,0,83,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Miblon Snarltooth - On Script - Remove NPC Flag Gossip"),
+(946700,9,2,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Miblon Snarltooth - On Script - Say Line 0"),
+(946700,9,3,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,20,164758,0,0,0,0,0,0,"Miblon Snarltooth - On Script - Set Orientation"),
+(946700,9,4,0,0,0,100,0,1000,1000,0,0,41,0,115,0,0,0,0,14,17428,164729,0,0,0,0,0,"Miblon Snarltooth - On Script - Despawn Gameobject 'Miblon's Door'"),
+(946700,9,5,0,0,0,100,0,0,0,0,0,59,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Miblon Snarltooth - On Script - Set Run On"),
+(946700,9,6,0,0,0,100,0,1000,1000,0,0,69,0,0,0,0,0,0,20,164758,0,0,0,0,0,0,"Miblon Snarltooth - On Script - Move to Closest Gameobject 'Miblon's Bait'"),
+(946700,9,7,0,0,0,100,0,3000,3000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Miblon Snarltooth - On Script - Say Line 1"),
+(946700,9,8,0,0,0,100,0,3000,3000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Miblon Snarltooth - On Script - Say Line 2"),
+(946700,9,9,0,0,0,100,0,4000,4000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Miblon Snarltooth - On Script - Say Line 3"),
+(946700,9,10,0,0,0,100,0,105000,105000,0,0,24,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Miblon Snarltooth - On Script - Evade"),
+(946700,9,11,0,0,0,100,0,0,0,0,0,82,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Miblon Snarltooth - On Script - Add NPC Flag Gossip"),
+(946700,9,12,0,0,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Miblon Snarltooth - On Script - Set Event Phase 1");
+
+-- Texts
+DELETE FROM `creature_text` WHERE `CreatureID`=9467;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(9467,0,0,"%s abandons the block he was holding up in the doorway, and looks towards the bait.",16,0,100,0,0,0,4836,0,"Miblon Snarltooth"),
+(9467,1,0,"%s sniffs the bait.",16,0,100,0,0,0,4768,0,"Miblon Snarltooth"),
+(9467,2,0,"Grumble...",12,0,100,0,0,0,4766,0,"Miblon Snarltooth"),
+(9467,3,0,"%s gnaws at the bait ravenously.",16,0,100,0,0,0,4771,0,"Miblon Snarltooth");
diff --git a/sql/updates/world/master/2021_09_26_08_world_2018_05_08_02_world_335.sql b/sql/updates/world/master/2021_09_26_08_world_2018_05_08_02_world_335.sql
new file mode 100644
index 000000000..a53ddcf65
--- /dev/null
+++ b/sql/updates/world/master/2021_09_26_08_world_2018_05_08_02_world_335.sql
@@ -0,0 +1,26 @@
+-- 
+-- Niby the Almighty --> Add gossip chatter
+DELETE FROM `gossip_menu` WHERE `MenuId` IN (5841,5842,5843,5844);
+INSERT INTO `gossip_menu` (`MenuId`, `TextId`, `VerifiedBuild`) VALUES
+(5844,7002,0),
+(5843,7003,0),
+(5842,7004,0),
+(5841,7005,0);
+
+DELETE FROM `gossip_menu_option` WHERE `MenuId` IN (5845,5844,5843,5842);
+INSERT INTO `gossip_menu_option` (`MenuId`, `OptionIndex`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`, `VerifiedBuild`) VALUES
+(5845,0,0,"I am in search of a great and powerful Warlock.",9625,1,1,0),
+(5844,0,0,"What task?",9627,1,1,0),
+(5843,0,0,"This is all very interesting but what is it that you want?",9629,1,1,0),
+(5842,0,0,"How do I do that?",9631,1,1,0);
+
+DELETE FROM `gossip_menu_option_action` WHERE `MenuId` IN (5845,5844,5843,5842);
+INSERT INTO `gossip_menu_option_action` (`MenuId`, `OptionIndex`, `ActionMenuId`, `ActionPoiId`) VALUES
+(5845,0,5844,0),
+(5844,0,5843,0),
+(5843,0,5842,0),
+(5842,0,5841,0);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=5845;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(15,5845,0,0,0,15,0,256,0,0,0,0,0,"","Show gossip option if player is a Warlock");
diff --git a/sql/updates/world/master/2021_09_26_09_world_2018_05_08_03_world_335.sql b/sql/updates/world/master/2021_09_26_09_world_2018_05_08_03_world_335.sql
new file mode 100644
index 000000000..f5874b28a
--- /dev/null
+++ b/sql/updates/world/master/2021_09_26_09_world_2018_05_08_03_world_335.sql
@@ -0,0 +1,11 @@
+-- 
+-- Ur'dan --> Add Gossip Text
+UPDATE `creature_template` SET `gossip_menu_id`=5864 WHERE `entry`=14522;
+
+DELETE FROM `gossip_menu` WHERE `MenuID`=5864;
+INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES
+(5864,7037,0);
+
+DELETE FROM `gossip_menu_option` WHERE `MenuID`=5864;
+INSERT INTO `gossip_menu_option` (`MenuID`, `OptionIndex`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`, `VerifiedBuild`) VALUES
+(5864,0,1,"I wish to purchase from you.",9734,3,128,0);
diff --git a/sql/updates/world/master/2021_09_26_10_world_2018_05_08_04_world_335.sql b/sql/updates/world/master/2021_09_26_10_world_2018_05_08_04_world_335.sql
new file mode 100644
index 000000000..9980bbc1d
--- /dev/null
+++ b/sql/updates/world/master/2021_09_26_10_world_2018_05_08_04_world_335.sql
@@ -0,0 +1,206 @@
+-- 
+-- Quest "Forces of Jaedenar"
+DELETE FROM `quest_details` WHERE `ID`=5155;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(5155,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6 WHERE `ID`=5155;
+UPDATE `quest_offer_reward` SET `Emote1`=4, `Emote2`=1, `Emote3`=1 WHERE `ID`=5155;
+
+-- Quest "Collection of the Corrupt Water"
+DELETE FROM `quest_details` WHERE `ID`=5157;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(5157,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=5157;
+UPDATE `quest_offer_reward` SET `Emote1`=2, `Emote2`=1 WHERE `ID`=5157;
+
+-- Quest "Seeking Spiritual Aid"
+DELETE FROM `quest_details` WHERE `ID`=5158;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(5158,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=2 WHERE `ID`=5158;
+UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1 WHERE `ID`=5158;
+
+-- Quest "Cleansed Water Returns to Felwood"
+DELETE FROM `quest_details` WHERE `ID`=5159;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(5159,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=2 WHERE `ID`=5159;
+UPDATE `quest_offer_reward` SET `Emote1`=4, `Emote2`=1 WHERE `ID`=5159;
+
+-- Quest "Dousing the Flames of Protection"
+DELETE FROM `quest_details` WHERE `ID`=5165;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(5165,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=5165;
+UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1 WHERE `ID`=5165;
+
+-- Quest "A Final Blow"
+DELETE FROM `quest_details` WHERE `ID`=5242;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(5242,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=5242;
+UPDATE `quest_offer_reward` SET `Emote1`=4, `Emote2`=1, `Emote3`=2 WHERE `ID`=5242;
+
+-- Quest "Verifying the Corruption"
+DELETE FROM `quest_details` WHERE `ID`=5156;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(5156,1,1,1,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=5156;
+
+-- Quest "Cleansing Felwood"
+DELETE FROM `quest_details` WHERE `ID` IN (4101,4102);
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(4101,1,0,0,0,0,0,0,0,0),
+(4102,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=5, `EmoteOnComplete`=5 WHERE `ID` IN (4101,4102);
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID` IN (4101,4102);
+
+-- Quest "Salve via Hunting"
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID` IN (4103,4108,5882,5887);
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID` IN (4103,4108,5882,5887);
+
+-- Quest "A Strange One"
+DELETE FROM `quest_details` WHERE `ID`=6605;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(6605,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=6 WHERE `ID`=6605;
+
+-- Quest "Well of Corruption"
+DELETE FROM `quest_details` WHERE `ID`=4505;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(4505,1,1,1,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=5, `EmoteOnComplete`=5 WHERE `ID`=4505;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=4505;
+
+-- Quest "Corrupted Sabers"
+DELETE FROM `quest_details` WHERE `ID`=4506;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(4506,1,11,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=5 WHERE `ID`=4506;
+UPDATE `quest_offer_reward` SET `Emote1`=4, `Emote2`=11 WHERE `ID`=4506;
+
+-- Quest "A Husband's Last Battle"
+DELETE FROM `quest_details` WHERE `ID`=6162;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(6162,1,1,5,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=6162;
+UPDATE `quest_offer_reward` SET `Emote1`=2, `Emote2`=1 WHERE `ID`=6162;
+
+-- Quest "Timbermaw Ally"
+DELETE FROM `quest_details` WHERE `ID`=8460;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(8460,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=8460;
+
+-- Quest "Speak to Nafien"
+DELETE FROM `quest_details` WHERE `ID`=8462;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(8462,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=8462;
+
+-- Quest "Feathers for Grazle"
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1, `EmoteOnComplete`=0 WHERE `ID`=8466;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=8466;
+
+-- Quest "Feathers for Nafien"
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1, `EmoteOnComplete`=0 WHERE `ID`=8467;
+
+-- Quest "Wild Guardians"
+DELETE FROM `quest_details` WHERE `ID`=4521;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(4521,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=25 WHERE `ID`=4521;
+
+-- Quest "Wild Guardians (Part 2)"
+DELETE FROM `quest_details` WHERE `ID`=4741;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(4741,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=4741;
+
+-- Quest "Wild Guardians (Part 3)"
+DELETE FROM `quest_details` WHERE `ID`=4721;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(4721,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=25 WHERE `ID`=4721;
+
+-- Quest "The Corruption of the Jadefire"
+DELETE FROM `quest_details` WHERE `ID`=4421;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(4421,1,2,1,0,0,0,0,0,0);
+
+-- Quest "Further Corruption"
+DELETE FROM `quest_details` WHERE `ID`=4906;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(4906,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=20 WHERE `ID`=4906;
+UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=2 WHERE `ID`=4906;
+
+-- Quest "Flute of Xavaric"
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=939;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=939;
+
+-- Quest "Felbound Ancients"
+DELETE FROM `quest_details` WHERE `ID`=4441;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(4441,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=4441;
+UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=4441;
+
+-- Quest "Purified!"
+DELETE FROM `quest_details` WHERE `ID`=4442;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(4442,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=4442;
+
+-- Quest "Ancient Spirit"
+UPDATE `quest_offer_reward` SET `Emote1`=2, `RewardText`="Yes, $N. Felwood has been through much hardship. Thank you for what you have done.$B$BOne day, we may be able to reclaim Felwood from the corruption; every kind deed helps." WHERE `ID`=4261;
+
+-- Quest "A Strange Red Key"
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=5202;
+UPDATE `quest_offer_reward` SET `Emote1`=4 WHERE `ID`=5202;
+
+-- Quest "Rescue From Jaedenar"
+DELETE FROM `quest_details` WHERE `ID`=5203;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(5203,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=1, `Emote3`=1 WHERE `ID`=5203;
+
+-- Quest "Retribution of the Light"
+DELETE FROM `quest_details` WHERE `ID`=5204;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(5204,1,1,1,0,0,0,0,0,0);
+
+-- Quest "The Remains of Trey Lightforge"
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6 WHERE `ID`=5385;
+UPDATE `quest_offer_reward` SET `Emote1`=2 WHERE `ID`=5385;
+
+-- Quest "An Imp's Request"
+DELETE FROM `quest_details` WHERE `ID`=8419;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(8419,1,0,0,0,0,0,0,0,0);
+
+-- Quest "What Niby Commands"
+DELETE FROM `quest_details` WHERE `ID`=7601;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(7601,1,1,1,1,0,0,0,0,0);
+
+-- Quest "Kroshius' Infernal Core"
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=7603;
+UPDATE `quest_offer_reward` SET `Emote1`=5 WHERE `ID`=7603;
+
+-- Quest "Sacred Cloth"
+UPDATE `quest_request_items` SET `EmoteOnComplete`=0 WHERE `ID`=6032;
+
+-- Quest "The Root of All Evil"
+DELETE FROM `quest_details` WHERE `ID`=8481;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(8481,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1 WHERE `ID`=8481;
+
+-- Quest "The Brokering of Peace"
+DELETE FROM `quest_details` WHERE `ID` IN (8484,8485);
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(8484,1,1,0,0,0,0,0,0,0),
+(8485,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=2 WHERE `ID` IN (8484,8485);
+UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1 WHERE `ID` IN (8484,8485);
diff --git a/sql/updates/world/master/2021_09_26_11_world_2018_05_08_05_world_335.sql b/sql/updates/world/master/2021_09_26_11_world_2018_05_08_05_world_335.sql
new file mode 100644
index 000000000..3ada38bcd
--- /dev/null
+++ b/sql/updates/world/master/2021_09_26_11_world_2018_05_08_05_world_335.sql
@@ -0,0 +1,9 @@
+-- 
+-- Ulathek
+DELETE FROM `smart_scripts` WHERE `entryorguid`=14523 AND `source_type`=0 AND `id`=6;
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(14523,0,6,0,4,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ulathek - On Aggro - Say Line 0");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=14523;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(14523,0,0,"You dog!  Now I'll trap your soul into a shard and give you to my imp as a plaything!",12,0,100,0,0,0,9735,0,"Ulathek");
diff --git a/sql/updates/world/master/2021_09_26_12_world_2018_05_08_06_world_335.sql b/sql/updates/world/master/2021_09_26_12_world_2018_05_08_06_world_335.sql
new file mode 100644
index 000000000..610a14a97
--- /dev/null
+++ b/sql/updates/world/master/2021_09_26_12_world_2018_05_08_06_world_335.sql
@@ -0,0 +1,16 @@
+-- 
+DELETE FROM `smart_scripts` WHERE `entryorguid`=946700 AND `source_type`=9;
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(946700,9,0,0,0,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Miblon Snarltooth - On Script - Set Event Phase 0"),
+(946700,9,1,0,0,0,100,0,0,0,0,0,83,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Miblon Snarltooth - On Script - Remove NPC Flag Gossip"),
+(946700,9,2,0,0,0,100,0,1000,1000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Miblon Snarltooth - On Script - Say Line 2"),
+(946700,9,3,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Miblon Snarltooth - On Script - Say Line 0"),
+(946700,9,4,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,20,164758,0,0,0,0,0,0,"Miblon Snarltooth - On Script - Set Orientation"),
+(946700,9,5,0,0,0,100,0,1000,1000,0,0,41,0,115,0,0,0,0,14,17428,164729,0,0,0,0,0,"Miblon Snarltooth - On Script - Despawn Gameobject 'Miblon's Door'"),
+(946700,9,6,0,0,0,100,0,0,0,0,0,59,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Miblon Snarltooth - On Script - Set Run On"),
+(946700,9,7,0,0,0,100,0,1000,1000,0,0,69,0,0,0,0,0,0,20,164758,0,0,0,0,0,0,"Miblon Snarltooth - On Script - Move to Closest Gameobject 'Miblon's Bait'"),
+(946700,9,8,0,0,0,100,0,3000,3000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Miblon Snarltooth - On Script - Say Line 1"),
+(946700,9,9,0,0,0,100,0,4000,4000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Miblon Snarltooth - On Script - Say Line 3"),
+(946700,9,10,0,0,0,100,0,108000,108000,0,0,24,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Miblon Snarltooth - On Script - Evade"),
+(946700,9,11,0,0,0,100,0,0,0,0,0,82,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Miblon Snarltooth - On Script - Add NPC Flag Gossip"),
+(946700,9,12,0,0,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Miblon Snarltooth - On Script - Set Event Phase 1");
diff --git a/sql/updates/world/master/2021_09_26_13_world_2018_05_08_07_world_335.sql b/sql/updates/world/master/2021_09_26_13_world_2018_05_08_07_world_335.sql
new file mode 100644
index 000000000..0931f5dbf
--- /dev/null
+++ b/sql/updates/world/master/2021_09_26_13_world_2018_05_08_07_world_335.sql
@@ -0,0 +1,79 @@
+-- 
+-- World Invisible Trigger
+-- SET @GUID := 64987;
+-- DELETE FROM `creature` WHERE `guid`=@GUID;
+-- INSERT INTO `creature` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`) VALUES
+-- (@GUID,12999,1,0,0,1,1,0,0,5416.44,-742.98,346.204,1.75579,300,0,0,7212,0,0,0,0,0,"",0);
+
+-- Niby the Almighty
+DELETE FROM `smart_scripts` WHERE `entryorguid`=14469 AND `source_type`=0 AND `id` IN (1,2,3,4,5);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (1446900,1446901,1446902,1446903) AND `source_type`=9;
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(14469,0,1,0,40,0,100,0,1,14469,0,0,0,80,1446901,0,0,0,0,0,1,0,0,0,0,0,0,0,"Niby the Almighty - On Waypoint 1 Reached - Run Script"),
+(14469,0,2,0,40,0,100,0,2,14469,0,0,0,80,1446902,0,0,0,0,0,1,0,0,0,0,0,0,0,"Niby the Almighty - On Waypoint 2 Reached - Run Script"),
+(14469,0,3,0,1,1,100,0,1000,15000,150000,180000,0,80,1446903,0,0,0,0,0,1,0,0,0,0,0,0,0,"Niby the Almighty - Out of Combat - Run Script"),
+(14469,0,4,0,11,0,100,0,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Niby the Almighty - On Respawn - Set Event Phase 1"),
+(14469,0,5,0,38,0,100,0,1,1,0,0,0,69,0,0,0,0,0,0,8,0,0,0,5413.9,-737.721,344.624,0,"Niby the Almighty - On Data Set - Move to Position"),
+(1446900,9,0,0,0,0,100,0,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Niby the Almighty - On Script - Set Event Phase 0"),
+(1446900,9,1,0,0,0,100,0,0,0,0,0,0,83,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Niby the Almighty - On Script - Remove Npc Flag Questgiver+Gossip"),
+(1446900,9,2,0,0,0,100,0,0,0,0,0,0,53,0,14469,0,0,0,0,1,0,0,0,0,0,0,0,"Niby the Almighty - On Script - Start Waypoint"),
+(1446901,9,0,0,0,0,100,0,0,0,0,0,0,54,23000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Niby the Almighty - On Script - Pause Waypoint"),
+(1446901,9,1,0,0,0,100,0,1000,1000,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,1.2,"Niby the Almighty - On Script - Set Orientation"),
+(1446901,9,2,0,0,0,100,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Niby the Almighty - On Script - Say Line 0"),
+(1446901,9,3,0,0,0,100,0,6000,6000,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Niby the Almighty - On Script - Say Line 1"),
+(1446901,9,4,0,0,0,100,0,0,0,0,0,0,11,23056,0,0,0,0,0,19,12999,0,0,0,0,0,0,"Niby the Almighty - On Script - Cast 'Call Infernal Destroyer'"),
+(1446901,9,5,0,0,0,100,0,6000,6000,0,0,0,1,0,0,0,0,0,0,19,14470,100,0,0,0,0,0,"Niby the Almighty - On Script - Say Line 0"),
+(1446901,9,6,0,0,0,100,0,0,0,0,0,0,1,1,0,0,0,0,0,19,14470,100,0,0,0,0,0,"Niby the Almighty - On Script - Say Line 1"),
+(1446901,9,7,0,0,0,100,0,4000,4000,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Niby the Almighty - On Script - Say Line 2"),
+(1446902,9,0,0,0,0,100,0,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,1.653,"Niby the Almighty - On Script - Set Orientation"),
+(1446902,9,1,0,0,0,100,0,0,0,0,0,0,82,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Niby the Almighty - On Script - Add Npc Flag Questgiver+Gossip"),
+(1446902,9,2,0,0,0,100,0,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Niby the Almighty - On Script - Set Event Phase 1"),
+(1446903,9,0,0,0,0,100,0,0,0,0,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Niby the Almighty - On Script - Say Line 3"),
+(1446903,9,1,0,0,0,100,0,5000,5000,0,0,0,11,23053,0,0,0,0,0,1,0,0,0,0,0,0,0,"Niby the Almighty - On Script - Cast 'Infernal Conjure Dummy DND'"),
+(1446903,9,2,0,0,0,100,0,3000,3000,0,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,"Niby the Almighty - On Script - Say Line 4"),
+(1446903,9,3,0,0,0,100,0,1000,1000,0,0,0,1,2,0,0,0,0,0,19,14470,0,0,0,0,0,0,"Niby the Almighty - On Script - Say Line 2 (Impsy)"),
+(1446903,9,4,0,0,0,100,0,5000,5000,0,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0,"Niby the Almighty - On Script - Say Line 5"),
+(1446903,9,5,0,0,0,100,0,0,0,0,0,0,45,1,1,0,0,0,0,19,14470,0,0,0,0,0,0,"Niby the Almighty - On Script - Set Data to Impsy"),
+(1446903,9,6,0,0,0,100,0,0,0,0,0,0,29,1,180,0,0,0,0,19,14470,0,0,0,0,0,0,"Niby the Almighty - On Script - Start Follow"),
+(1446903,9,7,0,0,0,100,0,3000,3000,0,0,0,1,3,0,0,0,0,0,19,14470,0,0,0,0,0,0,"Niby the Almighty - On Script - Say Line 3 (Impsy)");
+
+-- Impsy
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=14470;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=14470 AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(14470,0,0,0,38,0,100,0,1,1,0,0,0,89,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Impsy - On Data Set - Stop Random Movement"),
+(14470,0,1,0,38,0,100,0,1,1,0,0,0,53,1,14470,0,0,0,0,1,0,0,0,0,0,0,0,"Impsy - On Data Set - Start Waypoint"),
+(14470,0,2,0,40,0,100,0,11,14470,0,0,0,45,1,1,0,0,0,0,19,14469,0,0,0,0,0,0,"Impsy - On Waypoint 11 Reached - Set Data to Niby the Almighty"),
+(14470,0,3,0,40,0,100,0,11,14470,0,0,0,89,5,0,0,0,0,0,1,0,0,0,0,0,0,0,"Impsy - On Waypoint 11 Reached - Start Random Movement"),
+(14470,0,4,0,11,0,100,0,0,0,0,0,0,89,5,0,0,0,0,0,1,0,0,0,0,0,0,0,"Impsy - On Respawn - Start Random Movement");
+
+-- Texts
+DELETE FROM `creature_text` WHERE `CreatureID`=14469 AND `GroupID` IN (3,4,5);
+DELETE FROM `creature_text` WHERE `CreatureID`=14470 AND `GroupID` IN (2,3);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(14469,3,0,"This is it, Impsy. I can feel it! This is the big one!",12,0,100,5,0,0,9615,0,"Niby the Almighty"),
+(14469,3,1,"Brace yourself for the glorious impact, Impsy!",12,0,100,5,0,0,9616,0,"Niby the Almighty"),
+(14469,3,2,"Kick me out, will they!? I'll show those uptight cone heads in Stormwind the true power of Niby! BEHOLD!",12,0,100,15,0,0,9617,0,"Niby the Almighty"),
+(14469,4,0,"%s shakes his fist in frustration.",16,0,100,0,0,0,9618,0,"Niby the Almighty"),
+(14469,5,0,"Why you little!",12,0,100,0,0,0,9622,0,"Niby the Almighty"),
+(14470,2,0,"Niby, you are stupid.",12,0,100,0,0,0,9619,0,"Impsy"),
+(14470,2,1,"Oh my, what a surprise! Another failure!? But how, oh great one??",12,0,100,0,0,0,9620,0,"Impsy"),
+(14470,2,2,"Awe inspiring, master. Your ineptitude is awe inspiring.",12,0,100,0,0,0,9621,0,"Impsy"),
+(14470,3,0,"Ack! Help! Crazed gnome trying to kill me!",12,0,100,0,0,0,9623,0,"Impsy");
+
+-- Waypoints
+DELETE FROM `waypoints` WHERE `entry` IN (14469,14470);
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`) VALUES
+(14469,1,5407.19,-753,350.82),
+(14469,2,5413.9,-737.721,344.624),
+(14470,1,5399.15,-735.454,343.567),
+(14470,2,5386.63,-729.446,343.992),
+(14470,3,5384.08,-722.534,345.173),
+(14470,4,5396.26,-713.693,346.403),
+(14470,5,5415.7,-722.556,344.598),
+(14470,6,5434.85,-723.435,342.78),
+(14470,7,5444.68,-732.313,342.527),
+(14470,8,5440.93,-743.161,343.643),
+(14470,9,5427.72,-750.631,347.609),
+(14470,10,5416.55,-749.533,348.499),
+(14470,11,5407.59,-736.618,344.249);
diff --git a/sql/updates/world/master/2021_09_26_14_world_2018_05_13_00_world_335.sql b/sql/updates/world/master/2021_09_26_14_world_2018_05_13_00_world_335.sql
new file mode 100644
index 000000000..8dd102b65
--- /dev/null
+++ b/sql/updates/world/master/2021_09_26_14_world_2018_05_13_00_world_335.sql
@@ -0,0 +1,35 @@
+-- 
+DELETE FROM `creature` WHERE `guid` IN (48255, 75558,88485, 103543,106482, 106483,106486, 106487,107837, 142693,142694, 142695,142696, 142697,142710, 143230,143231, 143232,143263, 143264,143268, 143269,143271, 143272,143273, 143697,143700, 143705,143708, 143713,143715, 143921,144009, 144094,144785, 144789,144792, 144794,144796, 203124);
+DELETE FROM `creature_addon` WHERE `guid` IN (48255, 75558,88485, 103543,106482, 106483,106486, 106487,107837, 142693,142694, 142695,142696, 142697,142710, 143230,143231, 143232,143263, 143264,143268, 143269,143271, 143272,143273, 143697,143700, 143705,143708, 143713,143715, 143921,144009, 144094,144785, 144789,144792, 144794,144796, 203124);
+DELETE FROM `creature` WHERE `id`=31401 AND `guid` IN (111931, 111932, 111933, 111934, 111935);
+
+DELETE FROM `waypoint_data` WHERE `id`=1325600;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(1325600, 25, -4210.05, 3036.03, 359.272, 0, 0, 1, 0, 100, 0),
+(1325600, 24, -4197.81, 3024.34, 366.188, 0, 0, 1, 0, 100, 0),
+(1325600, 23, -4166.6, 3015.78, 353.327, 0, 0, 1, 0, 100, 0),
+(1325600, 22, -4119.36, 3000.52, 350.383, 0, 0, 1, 0, 100, 0),
+(1325600, 21, -4078.06, 3004.44, 346.771, 0, 0, 1, 0, 100, 0),
+(1325600, 20, -4047.5, 3033.21, 346.827, 0, 0, 1, 0, 100, 0),
+(1325600, 19, -4037.82, 3075.94, 350.938, 0, 0, 1, 0, 100, 0),
+(1325600, 18, -4037.22, 3122.49, 345.133, 0, 0, 1, 0, 100, 0),
+(1325600, 17, -4020.08, 3150.26, 329.883, 0, 0, 1, 0, 100, 0),
+(1325600, 16, -3983.11, 3172.78, 330.133, 0, 0, 1, 0, 100, 0),
+(1325600, 15, -3945.8, 3163.18, 338.493, 0, 0, 1, 0, 100, 0),
+(1325600, 14, -3906.74, 3138.08, 347.049, 0, 0, 1, 0, 100, 0),
+(1325600, 13, -3872.96, 3116.54, 357.438, 0, 0, 1, 0, 100, 0),
+(1325600, 12, -3857.7, 3086.13, 367.605, 0, 0, 1, 0, 100, 0),
+(1325600, 11, -3866.05, 3043.05, 372.104, 0, 0, 1, 0, 100, 0),
+(1325600, 10, -3902.36, 3025, 374.716, 0, 0, 1, 0, 100, 0),
+(1325600, 9, -3939.95, 3047.44, 368.138, 0, 0, 1, 0, 100, 0),
+(1325600, 8, -3976.81, 3075.32, 357.966, 0, 0, 1, 0, 100, 0),
+(1325600, 7, -4015.78, 3101.06, 352.327, 0, 0, 1, 0, 100, 0),
+(1325600, 6, -4057.3, 3120.64, 344.022, 0, 0, 1, 0, 100, 0),
+(1325600, 5, -4093.99, 3151.9, 340.022, 0, 0, 1, 0, 100, 0),
+(1325600, 4, -4133.58, 3148.63, 338.077, 0, 0, 1, 0, 100, 0),
+(1325600, 3, -4161.6, 3113.01, 348.633, 0, 0, 1, 0, 100, 0),
+(1325600, 2, -4193.34, 3081.12, 359.272, 0, 0, 1, 0, 100, 0),
+(1325600, 1, -4214.1, 3060.08, 359.272, 0, 0, 1, 0, 100, 0);
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-143921) AND `source_type`=0;
+DELETE FROM `spawn_group` WHERE `spawnType`=0 AND `SpawnId` IN (48255,106482,106483,106486,106487,107837,111931,111932,111933,111934,111935,142710);
diff --git a/sql/updates/world/master/2021_09_26_15_world_2018_05_14_00_world.sql b/sql/updates/world/master/2021_09_26_15_world_2018_05_14_00_world.sql
new file mode 100644
index 000000000..d39666704
--- /dev/null
+++ b/sql/updates/world/master/2021_09_26_15_world_2018_05_14_00_world.sql
@@ -0,0 +1,13 @@
+-- 
+DELETE FROM `creature` WHERE `guid` IN (48255,64988,64989,64990,64991,64992,64993,75558,84444,84484);
+INSERT INTO `creature` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnDifficulties`, `phaseId`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`) VALUES
+(48255, 20038, 550, 0, 0, '4', 0, 0, 0, 310.438, 41.6756, -2.38937, 3.79216, 300, 0, 0, 48902, 0, 0, 0, 0, 0, "", 0),
+(64988, 20038, 550, 0, 0, '4', 0, 0, 0, 313.605, 38.1466, -2.38937, 3.53769, 300, 0, 0, 48902, 0, 0, 0, 0, 0, "", 0),
+(64989, 20037, 550, 0, 0, '4', 0, 0, 1, 319.51, 43.7734, -2.38937, 3.57472, 300, 0, 0, 100520, 16155, 0, 0, 0, 0, "", 0),
+(64990, 20037, 550, 0, 0, '4', 0, 0, 1, 339.52, -50.6231, -2.38754, 0.416626, 300, 0, 0, 100520, 16155, 0, 0, 0, 0, "", 0),
+(64991, 20038, 550, 0, 0, '4', 0, 0, 0, 348.485, -42.0046, -2.38833, 0.531368, 300, 0, 0, 48902, 0, 0, 0, 0, 0, "", 0),
+(64992, 20038, 550, 0, 0, '4', 0, 0, 0, 352.302, -40.07, -2.38816, 0.492098, 300, 0, 0, 48902, 0, 0, 0, 0, 0, "", 0),
+(64993, 20037, 550, 0, 0, '4', 0, 0, 1, 358.22, -39.9547, -2.38682, 0.465866, 300, 0, 0, 100520, 16155, 0, 0, 0, 0, "", 0),
+(75558, 20052, 550, 0, 0, '4', 0, 0, 0, 433.013, 324.812, 15.4822, 1.68793, 300, 0, 0, 125668, 0, 0, 0, 0, 0, "", 0),
+(84444, 20052, 550, 0, 0, '4', 0, 0, 0, 479.372, 376.597, 15.5883, 3.10479, 300, 0, 0, 125668, 0, 0, 0, 0, 0, "", 0),
+(84484, 20042, 550, 0, 0, '4', 0, 0, 0, 401.508, 356.858, 14.8947, 3.68035, 300, 0, 0, 125668, 0, 0, 0, 0, 0, "", 0);
diff --git a/sql/updates/world/master/2021_09_26_16_world_2018_05_15_00_world_335.sql b/sql/updates/world/master/2021_09_26_16_world_2018_05_15_00_world_335.sql
new file mode 100644
index 000000000..75cb96019
--- /dev/null
+++ b/sql/updates/world/master/2021_09_26_16_world_2018_05_15_00_world_335.sql
@@ -0,0 +1,5 @@
+-- 
+DELETE FROM `disables` WHERE `sourceType`=1 AND `entry` IN (4485,4486);
+INSERT INTO `disables` (`sourceType`, `entry`, `flags`, `params_0`, `params_1`, `comment`) VALUES
+(1,4485,0,"","","Deprecated quest"),
+(1,4486,0,"","","Deprecated quest");
diff --git a/sql/updates/world/master/2021_09_26_17_world_2018_05_15_01_world_335.sql b/sql/updates/world/master/2021_09_26_17_world_2018_05_15_01_world_335.sql
new file mode 100644
index 000000000..3cb0398b9
--- /dev/null
+++ b/sql/updates/world/master/2021_09_26_17_world_2018_05_15_01_world_335.sql
@@ -0,0 +1,6 @@
+-- 
+-- Quest "Tome of Divinity (1641)"
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=19 AND `SourceEntry`=1641;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(19,0,1641,0,0,14,0,2998,0,0,0,0,0,"","Quest 'Tome of Divinity (1641)' can only be taken if quest 'Tome of Divinity (2998)' is not taken"),
+(19,0,1641,0,0,14,0,3681,0,0,0,0,0,"","Quest 'Tome of Divinity (1641)' can only be taken if quest 'Tome of Divinity (3681)' is not taken");
diff --git a/sql/updates/world/master/2021_09_26_18_world_2018_05_15_02_world_335.sql b/sql/updates/world/master/2021_09_26_18_world_2018_05_15_02_world_335.sql
new file mode 100644
index 000000000..866680f3d
--- /dev/null
+++ b/sql/updates/world/master/2021_09_26_18_world_2018_05_15_02_world_335.sql
@@ -0,0 +1,28 @@
+-- 
+-- Jordan Stilwell
+DELETE FROM `creature_text` WHERE `CreatureID`=6181;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(6181,0,0,"Let's get to work, $n!",12,0,100,1,0,0,2501,0,"Jordan Stilwell"),
+(6181,1,0,"Here you are, $n.",12,0,100,1,0,0,2504,0,"Jordan Stilwell");
+
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=6181;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=6181 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (618100,618101) AND `source_type`=9;
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(6181,0,0,0,19,0,100,0,1806,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jordan Stilwell - On Quest 'The Test of Righteousness (Part 3)' Taken - Remove Npc Flag Questgiver"),
+(6181,0,1,0,19,0,100,0,1806,0,0,0,53,0,6181,0,0,0,0,1,0,0,0,0,0,0,0,"Jordan Stilwell - On Quest 'The Test of Righteousness (Part 3)' Taken - Start Waypoint"),
+(6181,0,2,0,19,0,100,0,1806,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jordan Stilwell - On Quest 'The Test of Righteousness (Part 3)' Taken - Say Line 0"),
+(6181,0,3,0,40,0,100,0,1,6181,0,0,80,618100,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jordan Stilwell - On Waypoint 1 Reached - Run Script"),
+(6181,0,4,0,40,0,100,0,2,6181,0,0,80,618101,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jordan Stilwell - On Waypoint 2 Reached - Run Script"),
+(618100,9,0,0,0,0,100,0,0,0,0,0,54,23000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jordan Stilwell - On Script - Pause Waypoint"),
+(618100,9,1,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.90077,"Jordan Stilwell - On Script - Set Orientation"),
+(618100,9,2,0,0,0,100,0,1000,1000,0,0,17,233,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jordan Stilwell - On Script - Set Emote State 233"),
+(618100,9,3,0,0,0,100,0,21000,21000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jordan Stilwell - On Script - Set Emote State 0"),
+(618101,9,0,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.77704,"Jordan Stilwell - On Script - Set Orientation"),
+(618101,9,1,0,0,0,100,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jordan Stilwell - On Script - Say Line 1"),
+(618101,9,2,0,0,0,100,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jordan Stilwell - On Script - Add Npc Flag Questgiver");
+
+DELETE FROM `waypoints` WHERE `entry`=6181;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(6181,1,-5094.12,-786.116,495.226,""),
+(6181,2,-5089.28,-782.95,495.279,"");
diff --git a/sql/updates/world/master/2021_09_26_19_world_2018_05_15_03_world_335.sql b/sql/updates/world/master/2021_09_26_19_world_2018_05_15_03_world_335.sql
new file mode 100644
index 000000000..145fead74
--- /dev/null
+++ b/sql/updates/world/master/2021_09_26_19_world_2018_05_15_03_world_335.sql
@@ -0,0 +1,7 @@
+-- 
+-- Quintis Jonespyre --> Add Gossip Text
+UPDATE `creature_template` SET `gossip_menu_id`=1922 WHERE `entry`=7879;
+
+DELETE FROM `gossip_menu_option` WHERE `MenuId`=1922;
+INSERT INTO `gossip_menu_option` (`MenuId`, `OptionIndex`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`, `VerifiedBuild`) VALUES
+(1922,0,1,"I'd like to purchase more Tharlendris seeds.",4851,3,128,0);
diff --git a/sql/updates/world/master/2021_09_26_20_world_2018_05_16_00_world.sql b/sql/updates/world/master/2021_09_26_20_world_2018_05_16_00_world.sql
new file mode 100644
index 000000000..fc74a81d6
--- /dev/null
+++ b/sql/updates/world/master/2021_09_26_20_world_2018_05_16_00_world.sql
@@ -0,0 +1,2 @@
+-- 
+DELETE FROM `creature` WHERE `id`=20782;