From cfa8025a11edc1287ff430deae695a87a5c05d58 Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Mon, 27 Sep 2021 10:54:30 -0400
Subject: [PATCH] DB Updates

---
 ...09_26_21_world_2018_05_21_00_world_335.sql | 19 +++++++
 ...09_26_22_world_2018_05_21_01_world_335.sql | 38 +++++++++++++
 ...09_26_23_world_2018_05_21_02_world_335.sql | 56 +++++++++++++++++++
 ...09_26_24_world_2018_05_23_00_world_335.sql | 47 ++++++++++++++++
 ...09_26_25_world_2018_05_26_01_world_335.sql | 31 ++++++++++
 ...09_26_26_world_2018_05_26_02_world_335.sql | 15 +++++
 ...09_26_27_world_2018_05_26_03_world_335.sql | 17 ++++++
 ...09_26_28_world_2018_05_29_00_world_335.sql |  9 +++
 ...09_26_29_world_2018_05_29_01_world_335.sql | 12 ++++
 ...09_26_30_world_2018_05_29_03_world_335.sql | 43 ++++++++++++++
 ...09_26_31_world_2018_05_29_04_world_335.sql | 16 ++++++
 ...09_26_32_world_2018_05_29_05_world_335.sql | 21 +++++++
 ...09_26_33_world_2018_05_29_06_world_335.sql | 22 ++++++++
 ...021_09_26_34_world_2018_05_31_00_world.sql |  5 ++
 ...021_09_26_35_world_2018_05_31_01_world.sql |  2 +
 ...09_26_36_world_2018_05_31_02_world_335.sql |  5 ++
 ...09_26_37_world_2018_05_31_03_world_335.sql |  4 ++
 ...021_09_26_38_world_2018_06_03_00_world.sql |  2 +
 ...09_26_39_world_2018_06_03_01_world_335.sql |  9 +++
 19 files changed, 373 insertions(+)
 create mode 100644 sql/updates/world/master/2021_09_26_21_world_2018_05_21_00_world_335.sql
 create mode 100644 sql/updates/world/master/2021_09_26_22_world_2018_05_21_01_world_335.sql
 create mode 100644 sql/updates/world/master/2021_09_26_23_world_2018_05_21_02_world_335.sql
 create mode 100644 sql/updates/world/master/2021_09_26_24_world_2018_05_23_00_world_335.sql
 create mode 100644 sql/updates/world/master/2021_09_26_25_world_2018_05_26_01_world_335.sql
 create mode 100644 sql/updates/world/master/2021_09_26_26_world_2018_05_26_02_world_335.sql
 create mode 100644 sql/updates/world/master/2021_09_26_27_world_2018_05_26_03_world_335.sql
 create mode 100644 sql/updates/world/master/2021_09_26_28_world_2018_05_29_00_world_335.sql
 create mode 100644 sql/updates/world/master/2021_09_26_29_world_2018_05_29_01_world_335.sql
 create mode 100644 sql/updates/world/master/2021_09_26_30_world_2018_05_29_03_world_335.sql
 create mode 100644 sql/updates/world/master/2021_09_26_31_world_2018_05_29_04_world_335.sql
 create mode 100644 sql/updates/world/master/2021_09_26_32_world_2018_05_29_05_world_335.sql
 create mode 100644 sql/updates/world/master/2021_09_26_33_world_2018_05_29_06_world_335.sql
 create mode 100644 sql/updates/world/master/2021_09_26_34_world_2018_05_31_00_world.sql
 create mode 100644 sql/updates/world/master/2021_09_26_35_world_2018_05_31_01_world.sql
 create mode 100644 sql/updates/world/master/2021_09_26_36_world_2018_05_31_02_world_335.sql
 create mode 100644 sql/updates/world/master/2021_09_26_37_world_2018_05_31_03_world_335.sql
 create mode 100644 sql/updates/world/master/2021_09_26_38_world_2018_06_03_00_world.sql
 create mode 100644 sql/updates/world/master/2021_09_26_39_world_2018_06_03_01_world_335.sql

diff --git a/sql/updates/world/master/2021_09_26_21_world_2018_05_21_00_world_335.sql b/sql/updates/world/master/2021_09_26_21_world_2018_05_21_00_world_335.sql
new file mode 100644
index 000000000..0c6dd9878
--- /dev/null
+++ b/sql/updates/world/master/2021_09_26_21_world_2018_05_21_00_world_335.sql
@@ -0,0 +1,19 @@
+-- 
+-- Quests "Investigate the Blue Recluse" & "Investigate the Alchemist Shop"
+DELETE FROM `creature_text` WHERE `CreatureID` IN (5497,4568);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(5497,0,0,"Here, $n.  Take a chest of containment coffers and a cantation of manifestation.  You will need them for your mission.",12,7,100,25,0,0,2681,0,"Jennea Cannon"),
+(4568,0,0,"Take a chest of containment coffers and a cantation of manifestation, $n.  You will need them for your mission.",12,1,100,25,0,0,2682,0,"Anastasia Hartwell");
+
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry` IN (5497,4568);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (5497,4568) AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (549700,456800) 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
+(5497,0,0,0,19,0,100,0,1920,0,0,0,80,549700,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jennea Cannon - On Quest 'Investigate the Blue Recluse' Taken - Run Script"),
+(4568,0,0,0,19,0,100,0,1960,0,0,0,80,456800,0,0,0,0,0,1,0,0,0,0,0,0,0,"Anastasia Hartwell - On Quest 'Investigate the Alchemist Shop' Taken - Run Script"),
+(549700,9,0,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.96646,"Jennea Cannon - On Script - Set Orientation"),
+(549700,9,1,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Jennea Cannon - On Script - Say Line 0"),
+(549700,9,2,0,0,0,100,0,10000,10000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.858,"Jennea Cannon - On Script - Set Orientation"),
+(456800,9,0,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.77319,"Anastasia Hartwell - On Script - Set Orientation"),
+(456800,9,1,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Anastasia Hartwell - On Script - Say Line 0"),
+(456800,9,2,0,0,0,100,0,10000,10000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,3.05433,"Anastasia Hartwell - On Script - Set Orientation");
diff --git a/sql/updates/world/master/2021_09_26_22_world_2018_05_21_01_world_335.sql b/sql/updates/world/master/2021_09_26_22_world_2018_05_21_01_world_335.sql
new file mode 100644
index 000000000..aef0bd7c4
--- /dev/null
+++ b/sql/updates/world/master/2021_09_26_22_world_2018_05_21_01_world_335.sql
@@ -0,0 +1,38 @@
+-- 
+-- Wynne Larson
+DELETE FROM `creature_text` WHERE `CreatureID`=1309;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(1309,0,0,"These are fine pieces, $n.  Let me get started on your robe.",12,7,100,1,0,0,2647,0,"Wynne Larson"),
+(1309,1,0,"That's it!  It's all finished, $n.",12,7,100,1,0,0,2648,0,"Wynne Larson"),
+(1309,2,0,"Ok, let's get to work!",12,7,100,0,0,0,2649,0,"Wynne Larson"),
+(1309,3,0,"Now where did I put that silver spool...",12,7,100,0,0,0,2651,0,"Wynne Larson"),
+(1309,4,0,"Aha!  There it is.",12,7,100,0,0,0,2650,0,"Wynne Larson");
+
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=1309;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=1309 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (130900,130901,130902,130903) 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
+(1309,0,0,0,20,0,100,0,1921,0,0,0,80,130900,0,0,0,0,0,1,0,0,0,0,0,0,0,"Wynne Larson - On Quest 'Gathering Materials' Finished - Run Script"),
+(1309,0,1,0,20,0,100,0,1940,0,0,0,80,130901,0,0,0,0,0,1,0,0,0,0,0,0,0,"Wynne Larson - On Quest 'Pristine Spider Silk' Finished - Run Script"),
+(1309,0,2,0,40,0,100,0,1,1309,0,0,80,130902,0,0,0,0,0,1,0,0,0,0,0,0,0,"Wynne Larson - On Waypoint 1 Reached - Run Script"),
+(1309,0,3,0,40,0,100,0,2,1309,0,0,80,130903,0,0,0,0,0,1,0,0,0,0,0,0,0,"Wynne Larson - On Waypoint 2 Reached - Run Script"),
+(130900,9,0,0,0,0,100,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Wynne Larson - On Script - Remove Npc Flag Questgiver"),
+(130900,9,1,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Wynne Larson - On Script - Say Line 0"),
+(130900,9,2,0,0,0,100,0,4000,4000,0,0,11,9157,0,0,0,0,0,1,0,0,0,0,0,0,0,"Wynne Larson - On Script - Cast 'Create Mage's Robe'"),
+(130900,9,3,0,0,0,100,0,5000,5000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Wynne Larson - On Script - Say Line 1"),
+(130900,9,4,0,0,0,100,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Wynne Larson - On Script - Add Npc Flag Questgiver"),
+(130901,9,0,0,0,0,100,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Wynne Larson - On Script - Remove Npc Flag Questgiver"),
+(130901,9,1,0,0,0,100,0,1000,1000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Wynne Larson - On Script - Say Line 2"),
+(130901,9,2,0,0,0,100,0,4000,4000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Wynne Larson - On Script - Say Line 3"),
+(130901,9,3,0,0,0,100,0,2000,2000,0,0,53,0,1309,0,0,0,0,1,0,0,0,0,0,0,0,"Wynne Larson - On Script - Start Waypoint"),
+(130902,9,0,0,0,0,100,0,0,0,0,0,54,10000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Wynne Larson - On Script - Pause Waypoint"),
+(130902,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,3.80513,"Wynne Larson - On Script - Set Orientation"),
+(130902,9,2,0,0,0,100,0,1000,1000,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,"Wynne Larson - On Script - Say Line 4"),
+(130902,9,3,0,0,0,100,0,3000,3000,0,0,11,9157,0,0,0,0,0,1,0,0,0,0,0,0,0,"Wynne Larson - On Script - Cast 'Create Mage's Robe'"),
+(130903,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,3.846,"Wynne Larson - On Script - Set Orientation"),
+(130903,9,1,0,0,0,100,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Wynne Larson - On Script - Add Npc Flag Questgiver");
+
+DELETE FROM `waypoints` WHERE `entry`=1309;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(1309,1,-8964.6,824.703,109.447,""),
+(1309,2,-8963,822.517,109.447,"");
diff --git a/sql/updates/world/master/2021_09_26_23_world_2018_05_21_02_world_335.sql b/sql/updates/world/master/2021_09_26_23_world_2018_05_21_02_world_335.sql
new file mode 100644
index 000000000..48726ed69
--- /dev/null
+++ b/sql/updates/world/master/2021_09_26_23_world_2018_05_21_02_world_335.sql
@@ -0,0 +1,56 @@
+-- Tabetha
+DELETE FROM `creature_text` WHERE `CreatureID`=6546 AND `GroupID` IN (1,2,3,4,5,6,7,8,9);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(6546,1,0,"Ok, let's get this orb made...",12,0,100,0,0,0,2663,0,"Tabetha"),
+(6546,2,0,"All right.  It's made!",12,0,100,1,0,0,2664,0,"Tabetha"),
+(6546,3,0,"Stand back, and ... hold your breath.  I haven't done this in a while.",12,0,100,1,0,0,2708,0,"Tabetha"),
+(6546,4,0,"It worked!  Amazing!  I guess I haven't lost my touch...",12,0,100,4,0,0,2709,0,"Tabetha"),
+(6546,5,0,"Good luck out there, $n.",12,0,100,0,0,0,2624,0,"Tabetha"),
+(6546,6,0,"I just have one thing to check...",12,0,100,0,0,0,2656,0,"Tabetha"),
+(6546,7,0,"That's it!  It worked!",12,0,100,4,0,0,2657,0,"Tabetha"),
+(6546,8,0,"Thanks for your patience, $n.",12,0,100,2,0,0,2658,0,"Tabetha"),
+(6546,9,0,"I'll just keep this here until we need it...	",12,0,100,1,0,0,2659,0,"Tabetha");
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`=6546 AND `source_type`=0 AND `id` IN (1,2,6,7,8,9,10);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (654604,654605,654606) 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
+(6546,0,1,0,20,0,100,0,1957,0,0,0,41,0,600,0,0,0,0,14,28294,103680,0,0,0,0,0,"Tabetha - On Quest 'Mana Surges' Finished - Despawn Gameobject 'Mana Rift'"),
+(6546,0,2,3,19,0,100,0,1957,0,0,0,70,600,0,0,0,0,0,14,28294,103680,0,0,0,0,0,"Tabetha - On Quest 'Mana Surges' Taken - Respawn Gameobject 'Mana Rift'"),
+(6546,0,6,0,20,0,100,0,1957,0,0,0,80,654604,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tabetha - On Quest 'Mana Surges' Finished - Run Script"),
+(6546,0,7,0,19,0,100,0,1952,0,0,0,80,654605,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tabetha - On Quest 'Mage's Wand' Taken - Run Script"),
+(6546,0,8,0,19,0,100,0,1957,0,0,0,11,9079,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tabetha - On Quest 'Mana Surges' Taken - Cast 'Create Rift'"),
+(6546,0,9,0,19,0,100,0,1957,0,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tabetha - On Quest 'Mana Surges' Taken - Say Line 5"),
+(6546,0,10,0,20,0,100,0,1947,0,0,0,80,654606,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tabetha - On Quest 'Journey to the Marsh' Finished - Run Script"),
+(654604,9,0,0,0,0,100,0,0,0,0,0,83,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tabetha - On Script - Remove Npc Flag Questgiver+Gossip"),
+(654604,9,1,0,0,0,100,0,1000,1000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tabetha - On Script - Say Line 1"),
+(654604,9,2,0,0,0,100,0,0,0,0,0,11,9156,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tabetha - On Script - Cast 'Create Mage's Orb'"),
+(654604,9,3,0,0,0,100,0,5500,5500,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tabetha - On Script - Say Line 2"),
+(654604,9,4,0,0,0,100,0,0,0,0,0,82,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tabetha - On Script - Add Npc Flag Questgiver+Gossip"),
+(654605,9,0,0,0,0,100,0,0,0,0,0,83,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tabetha - On Script - Remove Npc Flag Questgiver+Gossip"),
+(654605,9,1,0,0,0,100,0,1000,1000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tabetha - On Script - Say Line 3"),
+(654605,9,2,0,0,0,100,0,3000,3000,0,0,11,32990,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tabetha - On Script - Cast 'Enchanting Cast Visual'"),
+(654605,9,3,0,0,0,100,0,6000,6000,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tabetha - On Script - Say Line 4"),
+(654605,9,4,0,0,0,100,0,0,0,0,0,82,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tabetha - On Script - Add Npc Flag Questgiver+Gossip"),
+(654606,9,0,0,0,0,100,0,0,0,0,0,83,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tabetha - On Script - Remove Npc Flag Questgiver+Gossip"),
+(654606,9,1,0,0,0,100,0,0,0,0,0,1,6,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tabetha - On Script - Say Line 6"),
+(654606,9,2,0,0,0,100,0,2000,2000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,0.499598,"Tabetha - On Script - Set Orientation"),
+(654606,9,3,0,0,0,100,0,1000,1000,0,0,17,133,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tabetha - On Script - Set Emote State 133"),
+(654606,9,4,0,0,0,100,0,10000,10000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tabetha - On Script - Set Emote State 0"),
+(654606,9,5,0,0,0,100,0,500,500,0,0,1,7,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tabetha - On Script - Say Line 7"),
+(654606,9,6,0,0,0,100,0,4000,4000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.1293,"Tabetha - On Script - Set Orientation"),
+(654606,9,7,0,0,0,100,0,0,0,0,0,1,8,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tabetha - On Script - Say Line 8"),
+(654606,9,9,0,0,0,100,0,5000,5000,0,0,1,9,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tabetha - On Script - Say Line 9"),
+(654606,9,10,0,0,0,100,0,0,0,0,0,82,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tabetha - On Script - Add Npc Flag Questgiver+Gossip");
+
+-- Mana Rift
+-- UPDATE `gameobject` SET `spawntimesecs`=-600, `state`=1 WHERE `guid`=28294;
+
+-- Mana Surge
+DELETE FROM `smart_scripts` WHERE `entryorguid`=6550 AND `source_type`=0 AND `id`=3;
+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
+(6550,0,3,0,54,0,100,0,0,0,0,0,11,9096,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mana Surge - On Just Summoned - Cast 'Rift SPawn Manifestation'");
+
+-- Condition
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry`=6550 AND `ConditionTypeOrReference`=9;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(22,2,6550,0,0,9,0,1957,0,0,0,0,0,"","SAI triggers only if player has quest 'Mana Surges' taken");
diff --git a/sql/updates/world/master/2021_09_26_24_world_2018_05_23_00_world_335.sql b/sql/updates/world/master/2021_09_26_24_world_2018_05_23_00_world_335.sql
new file mode 100644
index 000000000..3f718ac2d
--- /dev/null
+++ b/sql/updates/world/master/2021_09_26_24_world_2018_05_23_00_world_335.sql
@@ -0,0 +1,47 @@
+-- Quest "Get the Scoop"
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup` IN (21211, 21212,21217);
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=231;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(15,21211,0,0,0,9,0,1950,0,0,0,0,0,"","Show gossip option if quest 'Get the Scoop' is taken"), -- Goblin Pit Crewman
+(15,21212,0,0,0,9,0,1950,0,0,0,0,0,"","Show gossip option if quest 'Get the Scoop' is taken"), -- Gnome Pit Crewman
+(15,21217,0,0,0,9,0,1950,0,0,0,0,0,"","Show gossip option if quest 'Get the Scoop' is taken"), -- Race Master Kronkrider
+(14,231,739,0,0,9,0,1950,0,0,1,0,0,"","Show gossip text 739 if quest 'Get the Scoop' is not taken");  -- "Plucky" Johnson
+
+DELETE FROM `gossip_menu` WHERE `MenuId` IN (281, 283,433);
+DELETE FROM `gossip_menu` WHERE `MenuId`=231 AND `TextID`=739;
+INSERT INTO `gossip_menu` (`MenuId`, `TextID`, `VerifiedBuild`) VALUES
+(281,779,0), -- Goblin Pit Crewman
+(283,781,0), -- Gnome Pit Crewman
+(433,930,0), -- Race Master Kronkrider
+(231,739,0); -- "Plucky" Johnson
+
+DELETE FROM `gossip_menu_option` WHERE `MenuId` IN (21211, 21212,21217);
+INSERT INTO `gossip_menu_option` (`MenuId`, `OptionIndex`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`, `VerifiedBuild`) VALUES
+(21211,0,0,"Where is Tirth's assistant?",2769,1,1,0), -- Goblin Pit Crewman
+(21212,0,0,"Where is Tirth's assistant?",2779,1,1,0), -- Gnome Pit Crewman
+(21217,0,0,"Where is Tirth's assistant?",2779,1,1,0); -- Race Master Kronkrider
+
+DELETE FROM `gossip_menu_option_action` WHERE `MenuId` IN (21211, 21212,21217);
+INSERT INTO `gossip_menu_option_action` (`MenuId`, `OptionIndex`, `ActionMenuId`, `ActionPoiId`) VALUES
+(21211,0,281,0), -- Goblin Pit Crewman
+(21212,0,283,0), -- Gnome Pit Crewman
+(21217,0,433,0); -- Race Master Kronkrider
+
+DELETE FROM `npc_text` WHERE `ID`=739;
+INSERT INTO `npc_text` (`ID`, `BroadcastTextID0`, `Probability0`) VALUES
+(739,2722,1);
+
+-- "Plucky" Johnson
+DELETE FROM `smart_scripts` WHERE `entryorguid`=6626 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=662600 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
+(6626,0,0,0,22,0,100,0,22,0,0,0,0,80,662600,0,0,0,0,0,1,0,0,0,0,0,0,0,"\"Plucky\" Johnson - On Received Emote 'Chicken' - Run Script"),
+(6626,0,1,2,22,0,100,0,7,0,0,0,0,11,9192,2,0,0,0,0,1,0,0,0,0,0,0,0,"\"Plucky\" Johnson - On Received Emote 'Beckon' - Cast \"Plucky\" Resumes Human Form"),
+(6626,0,2,3,61,0,100,0,0,0,0,0,0,82,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"\"Plucky\" Johnson - On Received Emote 'Beckon' - Add NPC Flag Gossip"),
+(6626,0,3,0,61,0,100,0,0,0,0,0,0,69,1,0,0,0,0,0,7,0,0,0,0,0,0,0,"\"Plucky\" Johnson - On Received Emote 'Beckon' - Move To Invoker"),
+(6626,0,4,0,62,0,100,0,231,0,0,0,0,15,1950,0,0,0,0,0,7,0,0,0,0,0,0,0,"\"Plucky\" Johnson - On Gossip Option 0 Selected - Complete Quest 'Get the Scoop'"),
+(6626,0,5,0,23,0,100,0,9192,0,1000,1000,0,81,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"\"Plucky\" Johnson - On Has No Aura \"Plucky\" Resumes Human Form - Set NPC Flag 0"),
+(662600,9,0,0,0,0,100,0,0,0,0,0,0,11,9192,0,0,0,0,0,1,0,0,0,0,0,0,0,"\"Plucky\" Johnson - On Script - Cast \"Plucky\" Resumes Human Form"),
+(662600,9,1,0,0,0,100,0,0,0,0,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"\"Plucky\" Johnson - On Script - Set Orientation"),
+(662600,9,2,0,0,0,100,0,500,500,0,0,0,5,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"\"Plucky\" Johnson - On Script - Play Emote 'Wave'"),
+(662600,9,3,0,0,0,100,0,3500,3500,0,0,0,28,9192,0,0,0,0,0,1,0,0,0,0,0,0,0,"\"Plucky\" Johnson - On Script - Remove Aura \"Plucky\" Resumes Human Form");
diff --git a/sql/updates/world/master/2021_09_26_25_world_2018_05_26_01_world_335.sql b/sql/updates/world/master/2021_09_26_25_world_2018_05_26_01_world_335.sql
new file mode 100644
index 000000000..20b5ee6ef
--- /dev/null
+++ b/sql/updates/world/master/2021_09_26_25_world_2018_05_26_01_world_335.sql
@@ -0,0 +1,31 @@
+-- Old Town Thug
+DELETE FROM `creature_text` WHERE `CreatureID` IN (4969,38867);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(4969,0,0,"Yeah, okay, boss. No problem.",12,0,100,0,0,0,1715,0,"Old Town Thug"),
+(38867,0,0,"All right, boss. You sure though? Just seems like a waste of good practice.",12,0,100,0,0,0,1716,0,"Old Town Thug"),
+(38867,1,0,"%s cracks his knuckles.",16,0,100,0,0,0,1717,0,"Old Town Thug");
+
+UPDATE `smart_scripts` SET `event_param1`=18000, `event_param2`=18000 WHERE `entryorguid`=496900 AND `source_type`=9 AND `id`=2;
+
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=38867;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=38867 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
+(38867,0,0,1,54,0,100,0,0,0,0,0,0,42,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Old Town Thug - Just Summoned - Set Invinciblity"),
+(38867,0,1,0,61,0,100,0,0,0,0,0,0,49,0,0,0,0,0,0,21,30,0,0,0,0,0,0,"Old Town Thug - Just Summoned - Start Attacking"),
+(38867,0,2,0,38,0,100,1,1,1,0,0,0,80,496900,2,0,0,0,0,1,0,0,0,0,0,0,0,"Old Town Thug - On Data Set - Run Script");
+
+-- Dashel Stonefist
+UPDATE `smart_scripts` SET `action_param1`=38867 WHERE `entryorguid`=496100 AND `source_type`=9 AND `id`=4;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=496101 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
+(496101,9,0,0,0,0,100,0,0,0,0,0,0,15,1447,0,0,0,0,0,7,0,0,0,0,0,0,0,"Dashel Stonefist - On Script - Quest Credit 'The Missing Diplomat'"),
+(496101,9,1,0,0,0,100,0,0,0,0,0,0,45,1,1,0,0,0,0,11,4969,30,0,0,0,0,0,"Dashel Stonefist - On Script - Set Data to Old Town Thug"),
+(496101,9,2,0,0,0,100,0,0,0,0,0,0,45,1,1,0,0,0,0,11,38867,30,0,0,0,0,0,"Dashel Stonefist - On Script - Set Data to Old Town Thug"),
+(496101,9,3,0,0,0,100,0,0,0,0,0,0,24,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dashel Stonefist - On Script - Evade"),
+(496101,9,4,0,0,0,100,0,0,0,0,0,0,2,84,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dashel Stonefist - On Script - Set Faction 84"),
+(496101,9,5,0,0,0,100,0,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dashel Stonefist - On Script - Say Line 1"),
+(496101,9,6,0,0,0,100,0,6000,6000,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dashel Stonefist - On Script - Say Line 2"),
+(496101,9,7,0,0,0,100,0,0,0,0,0,0,42,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dashel Stonefist - On Script - Set Invincibility Off"),
+(496101,9,8,0,0,0,100,0,4000,4000,0,0,0,1,0,0,0,0,0,0,19,4969,0,0,0,0,0,0,"Dashel Stonefist - On Script - Say Line 0 (Old Town Thug)"),
+(496101,9,9,0,0,0,100,0,3000,3000,0,0,0,1,0,0,0,0,0,0,19,38867,0,0,0,0,0,0,"Dashel Stonefist - On Script - Say Line 0 (Old Town Thug)"),
+(496101,9,10,0,0,0,100,0,0,0,0,0,0,1,1,0,0,0,0,0,19,38867,0,0,0,0,0,0,"Dashel Stonefist - On Script - Say Line 1 (Old Town Thug)");
diff --git a/sql/updates/world/master/2021_09_26_26_world_2018_05_26_02_world_335.sql b/sql/updates/world/master/2021_09_26_26_world_2018_05_26_02_world_335.sql
new file mode 100644
index 000000000..d175fdb9f
--- /dev/null
+++ b/sql/updates/world/master/2021_09_26_26_world_2018_05_26_02_world_335.sql
@@ -0,0 +1,15 @@
+-- Daryn Lightwind
+DELETE FROM `creature_text` WHERE `CreatureID`=7907;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(7907,0,0,"Take a look around, $n. Perhaps you will find something that I have missed.",12,0,100,0,0,0,4042,0,"Daryn Lightwind"),
+(7907,1,0,"%s gestures at the piles of books.",16,0,100,25,0,0,4043,0,"Daryn Lightwind");
+
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=7907;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=7907 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=790700 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
+(7907,0,0,0,20,0,100,0,2939,0,0,0,80,790700,0,0,0,0,0,1,0,0,0,0,0,0,0,"Daryn Lightwind - On Quest 'In Search of Knowledge' Finished - Run Script"),
+(790700,9,0,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,0.127147,"Daryn Lightwind - On Script - Set Orientation"),
+(790700,9,1,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Daryn Lightwind - On Script - Say Line 0"),
+(790700,9,2,0,0,0,100,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Daryn Lightwind - On Script - Say Line 1"),
+(790700,9,3,0,0,0,100,0,10000,10000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,3.82227,"Daryn Lightwind - On Script - Set Orientation");
diff --git a/sql/updates/world/master/2021_09_26_27_world_2018_05_26_03_world_335.sql b/sql/updates/world/master/2021_09_26_27_world_2018_05_26_03_world_335.sql
new file mode 100644
index 000000000..a07d156b6
--- /dev/null
+++ b/sql/updates/world/master/2021_09_26_27_world_2018_05_26_03_world_335.sql
@@ -0,0 +1,17 @@
+-- Troyas Moonbreeze
+DELETE FROM `creature_text` WHERE `CreatureID`=7764;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(7764,0,0,"Feralas: A History... Hmmmm... Let me examine this for a moment.",12,0,100,0,0,0,4039,0,"Troyas Moonbreeze"),
+(7764,1,0,"%s skims the pages of the book.",16,0,100,0,0,0,4040,0,"Troyas Moonbreeze"),
+(7764,2,0,"Amazing! I think I have found it, $n!",12,0,100,5,0,0,4041,0,"Troyas Moonbreeze");
+
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=7764;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=7764 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=776400 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
+(7764,0,0,0,20,0,100,0,2943,0,0,0,80,776400,0,0,0,0,0,1,0,0,0,0,0,0,0,"Troyas Moonbreeze - On Quest 'Return to Troyas' Finished - Run Script"),
+(776400,9,0,0,0,0,100,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Troyas Moonbreeze - On Script - Remove Npc Flag Questgiver"),
+(776400,9,1,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Troyas Moonbreeze - On Script - Say Line 0"),
+(776400,9,2,0,0,0,100,0,3000,3000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Troyas Moonbreeze - On Script - Say Line 1"),
+(776400,9,3,0,0,0,100,0,5000,5000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Troyas Moonbreeze - On Script - Say Line 2"),
+(776400,9,4,0,0,0,100,0,2000,2000,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Troyas Moonbreeze - On Script - Add Npc Flag Questgiver");
diff --git a/sql/updates/world/master/2021_09_26_28_world_2018_05_29_00_world_335.sql b/sql/updates/world/master/2021_09_26_28_world_2018_05_29_00_world_335.sql
new file mode 100644
index 000000000..16358d444
--- /dev/null
+++ b/sql/updates/world/master/2021_09_26_28_world_2018_05_29_00_world_335.sql
@@ -0,0 +1,9 @@
+-- Lucius
+DELETE FROM `creature_text` WHERE `CreatureID`=6966;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(6966,0,0,"Oh! I almost forgot! I slipped you a set of thieven' tools. You'll need those where you're going.",12,0,100,0,0,0,3562,0,"Lucius");
+
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=6966;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=6966 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`, `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
+(6966,0,0,0,19,0,100,0,2282,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Lucius - On Quest 'Alther's Mill' Taken - Say Line 0");
diff --git a/sql/updates/world/master/2021_09_26_29_world_2018_05_29_01_world_335.sql b/sql/updates/world/master/2021_09_26_29_world_2018_05_29_01_world_335.sql
new file mode 100644
index 000000000..0f8b10e60
--- /dev/null
+++ b/sql/updates/world/master/2021_09_26_29_world_2018_05_29_01_world_335.sql
@@ -0,0 +1,12 @@
+-- Klaven Mortwake
+UPDATE `creature_text` SET `Emote`=5 WHERE `CreatureID`=7053 AND `GroupID`=2;
+UPDATE `creature_text` SET `Emote`=11 WHERE `CreatureID`=7053 AND `GroupID`=1;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=7053;
+DELETE FROM `creature_text` WHERE `CreatureID`=7053 AND `GroupID`=5;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(7053,5,0,"You cannot hide from me, rogue. I can smell your fear.",12,0,100,0,0,0,3092,0,"Klaven Mortwake");
+
+UPDATE `smart_scripts` SET `action_param6`=2 WHERE `entryorguid`=7053 AND `source_type`=0 AND `id`=1;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=7053 AND `source_type`=0 AND `id`=3;
+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
+(7053,0,3,0,4,0,100,0,0,0,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0,"Klaven Mortwake - On Aggro - Say Line 5");
diff --git a/sql/updates/world/master/2021_09_26_30_world_2018_05_29_03_world_335.sql b/sql/updates/world/master/2021_09_26_30_world_2018_05_29_03_world_335.sql
new file mode 100644
index 000000000..d441f8817
--- /dev/null
+++ b/sql/updates/world/master/2021_09_26_30_world_2018_05_29_03_world_335.sql
@@ -0,0 +1,43 @@
+-- Doc Mixilpixil
+DELETE FROM `creature_text` WHERE `CreatureID`=7207;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(7207,0,0,"Just /lay down anywhere, $n. I promise, this won't hurt a bit!",12,0,100,0,0,0,3567,0,"Doc Mixilpixil"),
+(7207,1,0,"%s prepares his syringe.",16,0,100,0,0,0,3563,0,"Doc Mixilpixil"),
+(7207,2,0,"%s examines the blood in the bottle.",16,0,100,0,0,0,3564,0,"Doc Mixilpixil"),
+(7207,3,0,"Very interesting!",12,0,100,0,0,0,3565,0,"Doc Mixilpixil"),
+(7207,4,0,"%s seems to be talking to the squirrel and the statue. He periodically points in your direction.",16,0,100,0,0,0,3566,0,"Doc Mixilpixil"),
+(7207,5,0,"This doesn't look good!",12,0,100,274,0,0,3568,0,"Doc Mixilpixil");
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`=7207 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (720700,720701) 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
+(7207,0,0,0,19,0,100,0,2608,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Doc Mixilpixil - On Quest 'The Touch of Zanzil (Part 2)' Taken - Say Line 0"),
+(7207,0,1,0,22,0,100,0,61,15000,15000,0,0,80,720700,0,0,0,0,0,1,0,0,0,0,0,0,0,"Doc Mixilpixil - On Received Emote 'Lay Down' - Run Script"),
+(7207,0,2,0,20,0,100,0,2608,0,0,0,0,83,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Doc Mixilpixil - On Quest 'The Touch of Zanzil (Part 2)' Finished - Remove Npc Flag Questgiver+Gossip"),
+(7207,0,3,0,20,0,100,0,2608,0,0,0,0,53,0,7207,0,0,0,0,1,0,0,0,0,0,0,0,"Doc Mixilpixil - On Quest 'The Touch of Zanzil (Part 2)' Finished - Start Waypoint"),
+(7207,0,4,0,40,0,100,0,1,7207,0,0,0,80,720701,0,0,0,0,0,1,0,0,0,0,0,0,0,"Doc Mixilpixil - On Waypoint 1 Reached - Run Script"),
+(7207,0,5,0,40,0,100,0,2,7207,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,3.15905,"Doc Mixilpixil - On Waypoint 2 Reached - Set Orientation"),
+(7207,0,6,0,40,0,100,0,2,7207,0,0,0,82,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Doc Mixilpixil - On Waypoint 2 Reached - Add Npc Flag Questgiver+Gossip"),
+(7207,0,7,0,40,0,100,0,2,7207,0,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0,"Doc Mixilpixil - On Waypoint 2 Reached - Say Line 5"),
+(720700,9,0,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,"Doc Mixilpixil - On Script - Remove Npc Flag Questgiver+Gossip"),
+(720700,9,1,0,0,0,100,0,2000,2000,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Doc Mixilpixil - On Script - Say Line 1"),
+(720700,9,2,0,0,0,100,0,0,0,0,0,0,90,8,0,0,0,0,0,1,0,0,0,0,0,0,0,"Doc Mixilpixil - On Script - Set Flag Standstate 'Kneel'"),
+(720700,9,3,0,0,0,100,0,6000,6000,0,0,0,91,8,0,0,0,0,0,1,0,0,0,0,0,0,0,"Doc Mixilpixil - On Script - Set Emote State 233"),
+(720700,9,4,0,0,0,100,0,2000,2000,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Doc Mixilpixil - On Script - Say Line 2"),
+(720700,9,5,0,0,0,100,0,3000,3000,0,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Doc Mixilpixil - On Script - Say Line 3"),
+(720700,9,6,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,"Doc Mixilpixil - On Script - Add Npc Flag Questgiver+Gossip"),
+(720700,9,7,0,0,0,100,0,0,0,0,0,0,15,2608,0,0,0,0,0,7,0,0,0,0,0,0,0,"Doc Mixilpixil - On Script - Complete Quest 'The Touch of Zanzil (Part 2)'"),
+(720701,9,0,0,0,0,100,0,0,0,0,0,0,54,17000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Doc Mixilpixil - On Script - Pause Waypoint"),
+(720701,9,1,0,0,0,100,0,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,0.291581,"Doc Mixilpixil - On Script - Set Orientation"),
+(720701,9,2,0,0,0,100,0,1000,1000,0,0,0,17,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Doc Mixilpixil - On Script - Set Emote State 1"),
+(720701,9,3,0,0,0,100,0,0,0,0,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,"Doc Mixilpixil - On Script - Say Line 4"),
+(720701,9,4,0,0,0,100,0,15000,15000,0,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Doc Mixilpixil - On Script - Set Emote State 0");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry`=7207;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(22,2,7207,0,0,9,0,2608,0,0,0,0,0,"","SAI triggers only if quest 'The Touch of Zanzil (Part 2)' is taken");
+
+DELETE FROM `waypoints` WHERE `entry`=7207;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(7207,1,-8806.36,338.259,95.0989,""),
+(7207,2,-8805.56,331.968,95.0986,"");
diff --git a/sql/updates/world/master/2021_09_26_31_world_2018_05_29_04_world_335.sql b/sql/updates/world/master/2021_09_26_31_world_2018_05_29_04_world_335.sql
new file mode 100644
index 000000000..710c5c32c
--- /dev/null
+++ b/sql/updates/world/master/2021_09_26_31_world_2018_05_29_04_world_335.sql
@@ -0,0 +1,16 @@
+-- Lord Baurles K. Wishock
+DELETE FROM `creature_text` WHERE `CreatureID`=1439;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(1439,0,0,"My, that Black Claw stout packs quite a punch!",12,7,100,33,0,0,387,0,"Lord Baurles K. Wishock"),
+(1439,1,0,"I feel... dizzy.  It's so hot... in... here...",12,7,100,0,0,0,388,0,"Lord Baurles K. Wishock");
+
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=1439;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=1439 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=143900 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
+(1439,0,0,0,20,0,100,0,336,0,0,0,80,143900,0,0,0,0,0,1,0,0,0,0,0,0,0,"Lord Baurles K. Wishock - On Quest 'A Noble Brew (Part 2)' Finished - Run Script"),
+(143900,9,0,0,0,0,100,0,0,0,0,0,5,7,0,0,0,0,0,1,0,0,0,0,0,0,0,"Lord Baurles K. Wishock - On Script - Play Emote 'Eat'"),
+(143900,9,1,0,0,0,100,0,3000,3000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Lord Baurles K. Wishock - On Script - Say Line 0"),
+(143900,9,2,0,0,0,100,0,4000,4000,0,0,17,64,0,0,0,0,0,1,0,0,0,0,0,0,0,"Lord Baurles K. Wishock - On Script - Set Emote State 'Stun'"),
+(143900,9,3,0,0,0,100,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Lord Baurles K. Wishock - On Script - Say Line 1"),
+(143900,9,4,0,0,0,100,0,5000,5000,0,0,11,2596,0,0,0,0,0,1,0,0,0,0,0,0,0,"Lord Baurles K. Wishock - On Script - Cast touch-of-the-black-claw");
diff --git a/sql/updates/world/master/2021_09_26_32_world_2018_05_29_05_world_335.sql b/sql/updates/world/master/2021_09_26_32_world_2018_05_29_05_world_335.sql
new file mode 100644
index 000000000..7dd67a2f8
--- /dev/null
+++ b/sql/updates/world/master/2021_09_26_32_world_2018_05_29_05_world_335.sql
@@ -0,0 +1,21 @@
+-- Menara Voidrender
+DELETE FROM `creature_text` WHERE `CreatureID`=6266;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(6266,1,0,"Ok, let's get this orb made...",12,0,100,0,0,0,2663,0,"Menara Voidrender"),
+(6266,2,0,"All right.  It's made!",12,0,100,1,0,0,2664,0,"Menara Voidrender");
+
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=6266;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=6266 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=626600 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
+(6266,0,0,0,19,0,100,0,4975,0,0,0,80,626600,0,0,0,0,0,1,0,0,0,0,0,0,0,"Menara Voidrender - On Quest 'The Completed Orb of Noh'Orahil' Taken - Run Script"),
+(6266,0,1,0,19,0,100,0,4964,0,0,0,80,626600,0,0,0,0,0,1,0,0,0,0,0,0,0,"Menara Voidrender - On Quest 'The Completed Orb of Dar'Orahil' Taken - Run Script"),
+(626600,9,0,0,0,0,100,0,0,0,0,0,83,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tabetha - On Script - Remove Npc Flag Questgiver+Gossip"),
+(626600,9,1,0,0,0,100,0,1000,1000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tabetha - On Script - Say Line 1"),
+(626600,9,2,0,0,0,100,0,0,0,0,0,11,9156,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tabetha - On Script - Cast 'Create Mage's Orb'"),
+(626600,9,3,0,0,0,100,0,5500,5500,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tabetha - On Script - Say Line 2"),
+(626600,9,4,0,0,0,100,0,0,0,0,0,15,4975,0,0,0,0,0,7,0,0,0,0,0,0,0,"Tabetha - On Script - Complete Quest 'The Completed Orb of Noh'Orahil'"),
+(626600,9,5,0,0,0,100,0,0,0,0,0,15,4964,0,0,0,0,0,7,0,0,0,0,0,0,0,"Tabetha - On Script - Complete Quest 'The Completed Orb of Dar'Orahil'"),
+(626600,9,6,0,0,0,100,0,0,0,0,0,82,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tabetha - On Script - Add Npc Flag Questgiver+Gossip");
+
+UPDATE `quest_template_addon` SET `SpecialFlags`=2 WHERE `ID`=4964;
diff --git a/sql/updates/world/master/2021_09_26_33_world_2018_05_29_06_world_335.sql b/sql/updates/world/master/2021_09_26_33_world_2018_05_29_06_world_335.sql
new file mode 100644
index 000000000..188efff91
--- /dev/null
+++ b/sql/updates/world/master/2021_09_26_33_world_2018_05_29_06_world_335.sql
@@ -0,0 +1,22 @@
+-- 
+DELETE FROM `gossip_menu` WHERE `MenuID`=2912 AND `TextID`=3591;
+DELETE FROM `gossip_menu` WHERE `MenuID`=2913 AND `TextID`=3592;
+DELETE FROM `gossip_menu` WHERE `MenuID`=2603 AND `TextID` IN (3594,3299);
+INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES
+(2912,3591,0),
+(2913,3592,0),
+(2603,3594,0),
+(2603,3299,0);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup` IN (2912,2913,2603);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(14,2912,3591,0,0,14,0,1799,0,0,1,0,0,"","Show gossip text 3591 if quest 'Fragments of the Orb of Orahil' is taken"),
+(14,2912,3591,0,0,8,0,4963,0,0,1,0,0,"","Show gossip text 3591 if quest 'Shard of an Infernal' is not rewarded"),
+(14,2912,3591,0,0,8,0,4962,0,0,1,0,0,"","Show gossip text 3591 if quest 'Shard of a Felhound' is not rewarded"),
+(14,2913,3592,0,0,14,0,1799,0,0,1,0,0,"","Show gossip text 3592 if quest 'Fragments of the Orb of Orahil' is taken"),
+(14,2913,3592,0,0,8,0,4963,0,0,1,0,0,"","Show gossip text 3592 if quest 'Shard of an Infernal' is not rewarded"),
+(14,2913,3592,0,0,8,0,4962,0,0,1,0,0,"","Show gossip text 3592 if quest 'Shard of a Felhound' is not rewarded"),
+(14,2603,3594,0,0,14,0,1799,0,0,1,0,0,"","Show gossip text 3592 if quest 'Fragments of the Orb of Orahil' is taken"),
+(14,2603,3594,0,0,8,0,4963,0,0,1,0,0,"","Show gossip text 3592 if quest 'Shard of an Infernal' is not rewarded"),
+(14,2603,3298,0,0,15,0,1279,0,0,0,0,0,"","Show gossip text 3299 if if Player is not a Warlock"),
+(14,2603,3299,0,0,15,0,256,0,0,0,0,0,"","Show gossip text 3299 if if Player is a Warlock");
diff --git a/sql/updates/world/master/2021_09_26_34_world_2018_05_31_00_world.sql b/sql/updates/world/master/2021_09_26_34_world_2018_05_31_00_world.sql
new file mode 100644
index 000000000..1deccbc47
--- /dev/null
+++ b/sql/updates/world/master/2021_09_26_34_world_2018_05_31_00_world.sql
@@ -0,0 +1,5 @@
+-- 
+UPDATE `gameobject_template` SET `AIName`="SmartGameObjectAI" WHERE `entry`=184906;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=184906 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
+(184906,1,0,0,70,0,100,0,2,0,0,0,41,1500,0,0,0,0,0,1,0,0,0,0,0,0,0,"Power Converter - On state changed - despawn");
diff --git a/sql/updates/world/master/2021_09_26_35_world_2018_05_31_01_world.sql b/sql/updates/world/master/2021_09_26_35_world_2018_05_31_01_world.sql
new file mode 100644
index 000000000..68706279f
--- /dev/null
+++ b/sql/updates/world/master/2021_09_26_35_world_2018_05_31_01_world.sql
@@ -0,0 +1,2 @@
+-- 
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=4 AND `SourceEntry`=36904;
diff --git a/sql/updates/world/master/2021_09_26_36_world_2018_05_31_02_world_335.sql b/sql/updates/world/master/2021_09_26_36_world_2018_05_31_02_world_335.sql
new file mode 100644
index 000000000..d31d13d84
--- /dev/null
+++ b/sql/updates/world/master/2021_09_26_36_world_2018_05_31_02_world_335.sql
@@ -0,0 +1,5 @@
+-- 
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=19 AND `SourceEntry` IN (4975,4964);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(19,0,4975,0,0,8,0,4963,0,0,0,0,0,"","Quest 'The Completed Orb of Noh'Orahil' can only be taken if quest 'Shard of an Infernal' is rewarded"),
+(19,0,4964,0,0,8,0,4962,0,0,0,0,0,"","Quest 'The Completed Orb of Dar'Orahil' can only be taken if quest 'Shard of a Felhound' is rewarded");
diff --git a/sql/updates/world/master/2021_09_26_37_world_2018_05_31_03_world_335.sql b/sql/updates/world/master/2021_09_26_37_world_2018_05_31_03_world_335.sql
new file mode 100644
index 000000000..3ccdbc07a
--- /dev/null
+++ b/sql/updates/world/master/2021_09_26_37_world_2018_05_31_03_world_335.sql
@@ -0,0 +1,4 @@
+-- Lady Jaina Proudmoore
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=2465;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(14,2465,3158,0,0,8,0,1267,0,0,0,0,0,"","Show gossip text 3158 if quest 'The Missing Diplomat (Part 17)' is rewarded");
diff --git a/sql/updates/world/master/2021_09_26_38_world_2018_06_03_00_world.sql b/sql/updates/world/master/2021_09_26_38_world_2018_06_03_00_world.sql
new file mode 100644
index 000000000..5039bedb1
--- /dev/null
+++ b/sql/updates/world/master/2021_09_26_38_world_2018_06_03_00_world.sql
@@ -0,0 +1,2 @@
+-- 
+UPDATE `gossip_menu_option` SET `OptionType`=1, `OptionNpcFlag`=1 WHERE `MenuID`  IN (7441, 7442, 7443) AND `OptionIndex`=0;
diff --git a/sql/updates/world/master/2021_09_26_39_world_2018_06_03_01_world_335.sql b/sql/updates/world/master/2021_09_26_39_world_2018_06_03_01_world_335.sql
new file mode 100644
index 000000000..be6c7bb53
--- /dev/null
+++ b/sql/updates/world/master/2021_09_26_39_world_2018_06_03_01_world_335.sql
@@ -0,0 +1,9 @@
+-- Anchorite Delan --> Fix gossip text
+DELETE FROM `gossip_menu` WHERE `MenuID`=7364 AND `TextID`=8799;
+INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES
+(7364,8799,0);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=7364;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(14,7364,8799,0,0,16,0,1024,0,0,0,0,0,"","Show gossip text if player is a Draenei"),
+(14,7364,8798,0,0,16,0,767,0,0,0,0,0,"","Show gossip text if player is not a Draenei");