aboutsummaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
Diffstat (limited to 'sql')
-rw-r--r--sql/updates/world/master/2020_04_06_00_world_2017_01_15_02_world.sql48
-rw-r--r--sql/updates/world/master/2020_04_06_01_world_2017_01_15_03_world.sql72
-rw-r--r--sql/updates/world/master/2020_04_06_01_world_2017_01_15_04_world.sql75
-rw-r--r--sql/updates/world/master/2020_04_10_00_world_2017_01_15_05_world.sql32
-rw-r--r--sql/updates/world/master/2020_04_10_01_world_2017_01_15_06_world.sql37
-rw-r--r--sql/updates/world/master/2020_04_10_02_world_2017_01_15_07_world.sql34
-rw-r--r--sql/updates/world/master/2020_04_10_03_world_2017_01_15_08_world.sql28
-rw-r--r--sql/updates/world/master/2020_04_10_04_world_2017_01_15_09_world.sql36
-rw-r--r--sql/updates/world/master/2020_04_10_05_world_2017_01_15_10_world.sql125
-rw-r--r--sql/updates/world/master/2020_04_10_06_world_2017_01_16_00_world.sql143
-rw-r--r--sql/updates/world/master/2020_04_10_07_world_2017_01_16_01_world.sql41
-rw-r--r--sql/updates/world/master/2020_04_10_08_world_2017_01_16_02_world.sql42
-rw-r--r--sql/updates/world/master/2020_04_10_09_world_2017_01_16_03_world.sql28
-rw-r--r--sql/updates/world/master/2020_04_10_10_world_2017_01_16_04_world.sql98
-rw-r--r--sql/updates/world/master/2020_04_10_11_world_2017_01_16_05_world.sql35
-rw-r--r--sql/updates/world/master/2020_04_10_12_world_2017_01_16_06_world.sql60
-rw-r--r--sql/updates/world/master/2020_04_10_13_world_2017_01_17_00_world.sql279
-rw-r--r--sql/updates/world/master/2020_04_10_14_world_2017_01_20_02_world.sql91
-rw-r--r--sql/updates/world/master/2020_04_10_15_world_2017_01_20_03_world.sql168
-rw-r--r--sql/updates/world/master/2020_04_10_16_world_2017_01_20_04_world.sql224
-rw-r--r--sql/updates/world/master/2020_04_10_17_world_2017_01_20_05_world.sql142
-rw-r--r--sql/updates/world/master/2020_04_10_18_world_2017_01_22_07_world.sql6
-rw-r--r--sql/updates/world/master/2020_04_10_19_world_2017_01_22_08_world.sql40
-rw-r--r--sql/updates/world/master/2020_04_10_20_world_2017_01_22_09_world.sql131
-rw-r--r--sql/updates/world/master/2020_04_10_21_world_2017_01_22_12_world.sql148
-rw-r--r--sql/updates/world/master/2020_04_10_22_world_2017_01_23_03_world.sql7
-rw-r--r--sql/updates/world/master/2020_04_10_22_world_2017_01_24_01_world.sql77
-rw-r--r--sql/updates/world/master/2020_04_10_23_world_2017_01_25_01_world.sql4
-rw-r--r--sql/updates/world/master/2020_04_14_00_world_2017_03_03_00_world.sql2
-rw-r--r--sql/updates/world/master/2020_04_14_01_world_2017_03_16_02_world.sql5
-rw-r--r--sql/updates/world/master/2020_04_14_02_world_2017_03_17_02_world.sql12
-rw-r--r--sql/updates/world/master/2020_04_14_03_world_2017_03_17_03_world.sql23
-rw-r--r--sql/updates/world/master/2020_04_16_00_world_2017_03_24_00_world.sql14
-rw-r--r--sql/updates/world/master/2020_04_16_01_world_2017_03_25_01_world.sql1
-rw-r--r--sql/updates/world/master/2020_04_16_02_world_2017_03_26_00_world.sql2
-rw-r--r--sql/updates/world/master/2020_04_16_03_world_2017_03_26_01_world_335.sql6
-rw-r--r--sql/updates/world/master/2020_04_16_04_world_2017_03_26_02_world.sql11
-rw-r--r--sql/updates/world/master/2020_04_16_05_world_2017_03_26_03_world.sql43
-rw-r--r--sql/updates/world/master/2020_04_16_06_world_2017_03_27_00_world_335.sql11
-rw-r--r--sql/updates/world/master/2020_04_17_00_world_2017_03_27_01_world.sql23
-rw-r--r--sql/updates/world/master/2020_04_17_01_world_2017_03_30_01_world.sql19
-rw-r--r--sql/updates/world/master/2020_04_17_02_world_2017_03_31_00_world.sql23
42 files changed, 2446 insertions, 0 deletions
diff --git a/sql/updates/world/master/2020_04_06_00_world_2017_01_15_02_world.sql b/sql/updates/world/master/2020_04_06_00_world_2017_01_15_02_world.sql
new file mode 100644
index 00000000000..0a2e3a24e9b
--- /dev/null
+++ b/sql/updates/world/master/2020_04_06_00_world_2017_01_15_02_world.sql
@@ -0,0 +1,48 @@
+-- Nurse Judith -- http://wotlk.openwow.com/npc=19455
+UPDATE `creature_template_addon` SET `bytes1`=0 WHERE `entry`=19455;
+
+-- Nurse Judith SAI
+SET @ENTRY := 19455;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,25,0,100,0,0,0,0,0,53,0,19455,1,0,0,1,0,0,0,0,0,0,0,0,"Nurse Judith - On Reset - Start Waypoint"),
+(@ENTRY,0,1,0,64,0,100,0,0,0,0,0,54,180000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nurse Judith - On Gossip Hello - Pause Waypoint"),
+(@ENTRY,0,2,3,40,0,100,0,2,19455,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Nurse Judith - On Waypoint 2 Reached - Run Script"),
+(@ENTRY,0,3,0,61,0,100,0,2,19455,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.76273,"Nurse Judith - On Waypoint 2 Reached - Set Orientation 2,76273"),
+(@ENTRY,0,4,5,40,0,100,0,5,19455,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Nurse Judith - On Waypoint 5 Reached - Run Script"),
+(@ENTRY,0,5,0,61,0,100,0,5,19455,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.1529,"Nurse Judith - On Waypoint 5 Reached - Set Orientation 4,1529"),
+(@ENTRY,0,5,6,40,0,100,0,7,19455,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Nurse Judith - On Waypoint 7 Reached - Run Script"),
+(@ENTRY,0,6,0,61,0,100,0,7,19455,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.25502,"Nurse Judith - On Waypoint 7 Reached - Set Orientation 4.25502"),
+(@ENTRY,0,7,8,40,0,100,0,9,19455,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Nurse Judith - On Waypoint 9 Reached - Run Script"),
+(@ENTRY,0,8,0,61,0,100,0,9,19455,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.969,"Nurse Judith - On Waypoint 9 Reached - Set Orientation 2.969"),
+(@ENTRY,0,9,10,40,0,100,0,12,19455,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Nurse Judith - On Waypoint 12 Reached - Run Script"),
+(@ENTRY,0,10,0,61,0,100,0,12,19455,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.17224,"Nurse Judith - On Waypoint 12 Reached - Set Orientation 4.17224"),
+(@ENTRY,0,11,12,40,0,100,0,15,19455,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Nurse Judith - On Waypoint 15 Reached - Run Script"),
+(@ENTRY,0,12,0,61,0,100,0,15,19455,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.1529,"Nurse Judith - On Waypoint 15 Reached - Set Orientation 2.41624");
+
+-- Actionlist SAI
+SET @ENTRY := 1945500;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,54,12000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nurse Judith - On Script - Pause Waypoint"),
+(@ENTRY,9,1,0,0,0,100,0,4000,4000,0,0,90,8,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nurse Judith - On Script - Set Flag Standstate Kneel"),
+(@ENTRY,9,2,0,0,0,100,0,6000,6000,0,0,91,8,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nurse Judith - On Script - Remove Flag Standstate Kneel");
+
+DELETE FROM `waypoints` WHERE `entry`=19455;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(19455, 1, -365.789, 981.419, 54.195, 'Nurse Judith'),
+(19455, 2, -368.858, 982.56, 54.1727, 'Nurse Judith'),
+(19455, 3, -363.252, 980.47, 54.2127, 'Nurse Judith'),
+(19455, 4, -357.494, 978.322, 54.2425, 'Nurse Judith'),
+(19455, 5, -358.948, 975.922, 54.243, 'Nurse Judith'),
+(19455, 6, -357.512, 973.939, 54.2493, 'Nurse Judith'),
+(19455, 7, -360.045, 968.102, 54.2344, 'Nurse Judith'),
+(19455, 8, -358.571, 965.26, 54.2447, 'Nurse Judith'),
+(19455, 9, -362.99, 962.005, 54.2135, 'Nurse Judith'),
+(19455, 10, -352.415, 973.809, 54.2617, 'Nurse Judith'),
+(19455, 11, -349.296, 971.591, 54.2724, 'Nurse Judith'),
+(19455, 12, -349.964, 970.224, 54.2733, 'Nurse Judith'),
+(19455, 13, -350.597, 974.797, 54.2635, 'Nurse Judith'),
+(19455, 14, -362.665, 981.665, 54.2171, 'Nurse Judith'),
+(19455, 15, -364.29, 984.89, 54.2066, 'Nurse Judith');
diff --git a/sql/updates/world/master/2020_04_06_01_world_2017_01_15_03_world.sql b/sql/updates/world/master/2020_04_06_01_world_2017_01_15_03_world.sql
new file mode 100644
index 00000000000..fbb73cd39e8
--- /dev/null
+++ b/sql/updates/world/master/2020_04_06_01_world_2017_01_15_03_world.sql
@@ -0,0 +1,72 @@
+-- Consortium Nether Runner -- http://wotlk.openwow.com/npc=19667
+UPDATE `creature` SET `position_x`=-2057.45, `position_y`=8528.71, `position_z`=24.6556, `orientation`=2.05449, `spawntimesecs`=120 WHERE `guid`=70166;
+
+-- Consortium Nether Runner SAI
+SET @ENTRY := 19667;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,25,0,100,0,0,0,0,0,53,0,19667,0,0,0,1,1,0,0,0,0,0,0,0,"Consortium Nether Runner - On Reset - Start Waypoint"),
+(@ENTRY,0,1,0,64,0,100,0,0,0,0,0,54,180000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Consortium Nether Runner - On Gossip Hello - Pause Waypoint"),
+(@ENTRY,0,2,0,40,0,100,0,1,19667,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Consortium Nether Runner - On Waypoint 1 Reached - Run Script"),
+(@ENTRY,0,3,0,40,0,100,0,5,19667,0,0,80,@ENTRY*100+01,2,0,0,0,0,1,0,0,0,0,0,0,0,"Consortium Nether Runner - On Waypoint 5 Reached - Run Script"),
+(@ENTRY,0,4,0,40,0,100,0,8,19667,0,0,80,@ENTRY*100+02,2,0,0,0,0,1,0,0,0,0,0,0,0,"Consortium Nether Runner - On Waypoint 8 Reached - Run Script");
+
+-- Actionlist SAI
+SET @ENTRY := 1966700;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,54,3000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Consortium Nether Runner - On Script - Pause Waypoint"),
+(@ENTRY,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.05449,"Consortium Nether Runner - On Script - Set Orientation 2.05449"),
+(@ENTRY,9,2,0,0,0,100,0,0,0,0,0,11,34427,0,0,0,0,0,1,0,0,0,0,0,0,0,"Consortium Nether Runner - On Script - Cast 'Ethereal Teleport'");
+
+-- Actionlist SAI
+SET @ENTRY := 1966701;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,54,11000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Consortium Nether Runner - On Script - Pause Waypoint"),
+(@ENTRY,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.57111,"Consortium Nether Runner - On Script - Set Orientation 3.57111"),
+(@ENTRY,9,2,0,0,0,100,0,1000,1000,0,0,1,0,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Consortium Nether Runner - On Script - Say Line 0"),
+(@ENTRY,9,3,0,0,0,100,0,3000,3000,0,0,45,1,1,0,0,0,0,10,65554,18265,0,0,0,0,0,"Consortium Nether Runner - On Script - Set Data 1 1"),
+(@ENTRY,9,4,0,0,0,100,0,3000,3000,0,0,1,0,5000,0,0,0,0,10,65554,18265,0,0,0,0,0,"Consortium Nether Runner - On Script - Say Line 0"),
+(@ENTRY,9,5,0,0,0,100,0,5000,5000,0,0,1,1,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Consortium Nether Runner - On Script - Say Line 1"),
+(@ENTRY,9,6,0,0,0,100,0,0,0,0,0,45,2,2,0,0,0,0,10,65554,18265,0,0,0,0,0,"Consortium Nether Runner - On Script - Set Data 1 1");
+
+-- Actionlist SAI
+SET @ENTRY := 1966702;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,54,3000,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Pause Waypoint"),
+(@ENTRY,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,0.573574,"On Script - Set Orientation 0,573574"),
+(@ENTRY,9,2,0,0,0,100,0,1000,1000,0,0,11,34427,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Cast 'Ethereal Teleport'"),
+(@ENTRY,9,3,0,0,0,100,0,2000,2000,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Despawn Instant");
+
+-- Buddy AI
+-- Gezhe SAI
+SET @ENTRY := 18265;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,38,0,100,0,1,1,0,0,66,0,0,0,0,0,0,10,70166,19667,0,0,0,0,0,"Gezhe - On Data Set 1 1 - Set Orientation Closest Creature 'Consortium Nether Runner'"),
+(@ENTRY,0,1,0,38,0,100,0,2,2,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.513270,"Gezhe - On Data Set 2 2 - Set Orientation 2,513270");
+
+DELETE FROM `creature_text` WHERE `CreatureID` IN (19667, 18265);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `comment`) VALUES
+-- Consortium Nether Runner
+(19667, 0, 0, 'Hail, Gezhe! Seventeen more orders have been placed in the Hara''samid Sector. The markets of heavy veldarite have all but collapsed, as you predicted.', 12, 0, 100, 0, 0, 0, 17184, 'Consortium Nether Runner'),
+(19667, 0, 1, 'Heraazi exports are on the rise, sir. We''ve already bribed the appropriate taxation officers and contraband will begin to arrive within days.', 12, 0, 100, 0, 0, 0, 17186, 'Consortium Nether Runner'),
+(19667, 1, 0, 'By your leave, sir.', 12, 0, 100, 0, 0, 0, 17185, 'Consortium Nether Runner'),
+-- Gezhe
+(18265, 0, 0, 'Nothing surprising there. Come back with some real news, will you?', 12, 0, 100, 0, 0, 0, 17191, 'Gezhe'),
+(18265, 0, 1, 'As expected. Very well, dismissed.', 12, 0, 100, 0, 0, 0, 17190, 'Gezhe');
+
+DELETE FROM `waypoints` WHERE `entry`=19667;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(19667, 1, -2057.45, 8528.71, 24.6556, 'Consortium Nether Runner'),
+(19667, 2, -2058.23, 8547.79, 24.0203, 'Consortium Nether Runner'),
+(19667, 3, -2064.09, 8554.57, 23.9054, 'Consortium Nether Runner'),
+(19667, 4, -2075.08, 8562.74, 22.9801, 'Consortium Nether Runner'),
+(19667, 5, -2083.14, 8565.28, 22.0791, 'Consortium Nether Runner'),
+(19667, 6, -2062.94, 8574.57, 23.1942, 'Consortium Nether Runner'),
+(19667, 7, -2056.25, 8597.59, 21.3663, 'Consortium Nether Runner'),
+(19667, 8, -2049.12, 8603.37, 22.7377, 'Consortium Nether Runner');
diff --git a/sql/updates/world/master/2020_04_06_01_world_2017_01_15_04_world.sql b/sql/updates/world/master/2020_04_06_01_world_2017_01_15_04_world.sql
new file mode 100644
index 00000000000..df5d193be2d
--- /dev/null
+++ b/sql/updates/world/master/2020_04_06_01_world_2017_01_15_04_world.sql
@@ -0,0 +1,75 @@
+-- Experimental Pilot -- http://wotlk.openwow.com/npc=19776
+
+-- Experimental Pilot SAI
+SET @ENTRY := 19776;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,25,0,100,0,0,0,0,0,53,0,19776,1,0,0,0,1,0,0,0,0,0,0,0,"Experimental Pilot - On Reset - Start Waypoint"),
+(@ENTRY,0,1,0,64,0,100,0,0,0,0,0,54,180000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Experimental Pilot - On Gossip Hello - Pause Waypoint"),
+(@ENTRY,0,2,0,40,0,100,0,8,19776,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Experimental Pilot - On Waypoint 8 Reached - Run Script"),
+(@ENTRY,0,3,4,40,0,100,0,15,19776,0,0,54,300000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Experimental Pilot - On Waypoint 15 Reached - Pause Waypoint"),
+(@ENTRY,0,4,0,61,0,100,0,15,19776,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.0689,"Experimental Pilot - On Waypoint 15 Reached - Set Orientation 5,0689");
+
+-- Actionlist SAI
+SET @ENTRY := 1977600;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,54,140000,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Pause Waypoint"),
+(@ENTRY,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.111339,"On Script - Set Orientation 2.111339"),
+(@ENTRY,9,2,0,0,0,100,0,4000,4000,0,0,45,1,1,0,0,0,0,10,70614,19737,0,0,0,0,0,"On Script - Set Data 1 1"),
+(@ENTRY,9,3,0,0,0,100,0,1000,1000,0,0,1,0,15000,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Say Line 0"),
+(@ENTRY,9,4,0,0,0,100,0,15000,15000,0,0,1,0,20000,0,0,0,0,10,70614,19737,0,0,0,0,0,"On Script - Say Line 0"),
+(@ENTRY,9,5,0,0,0,100,0,20000,20000,0,0,1,1,20000,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Say Line 1"),
+(@ENTRY,9,6,0,0,0,100,0,0,0,0,0,5,6,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Play Emote 6"),
+(@ENTRY,9,7,0,0,0,100,0,20000,20000,0,0,1,1,15000,0,0,0,0,10,70614,19737,0,0,0,0,0,"On Script - Say Line 1"),
+(@ENTRY,9,8,0,0,0,100,0,15000,15000,0,0,5,6,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Play Emote 6"),
+(@ENTRY,9,9,0,0,0,100,0,0,0,0,0,1,2,15000,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Say Line 2"),
+(@ENTRY,9,10,0,0,0,100,0,15000,15000,0,0,1,2,10000,0,0,0,0,10,70614,19737,0,0,0,0,0,"On Script - Say Line 2"),
+(@ENTRY,9,11,0,0,0,100,0,10000,10000,0,0,1,3,15000,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Say Line 3"),
+(@ENTRY,9,12,0,0,0,100,0,0,0,0,0,5,6,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Play Emote 6"),
+(@ENTRY,9,13,0,0,0,100,0,15000,15000,0,0,1,3,10000,0,0,0,0,10,70614,19737,0,0,0,0,0,"On Script - Say Line 3"),
+(@ENTRY,9,14,0,0,0,100,0,10000,10000,0,0,1,4,15000,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Say Line 4"),
+(@ENTRY,9,15,0,0,0,100,0,15000,15000,0,0,1,4,0,0,0,0,0,10,70614,19737,0,0,0,0,0,"On Script - Say Line 4"),
+(@ENTRY,9,16,0,0,0,100,0,0,0,0,0,45,2,2,0,0,0,0,10,70614,19737,0,0,0,0,0,"On Script - Set Data 2 2");
+
+-- Buddy AI
+-- Engineering Crewmember SAI
+SET @GUID := -70614;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=19737;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@GUID 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
+(@GUID,0,0,0,38,0,100,0,1,1,0,0,66,0,0,0,0,0,0,10,70731,19776,0,0,0,0,0,"Engineering Crewmember - On Data Set 1 1 - Set Orientation Closest Creature 'Experimental Pilot'"),
+(@GUID,0,1,0,38,0,100,0,2,2,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.199120,"Engineering Crewmember - On Data Set 2 2 - Set Orientation 2,199120");
+
+DELETE FROM `creature_text` WHERE `CreatureID` IN (19737, 19776);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `comment`) VALUES
+(19776, 0, 0, 'All my bags are packed, I''m ready to go.', 12, 0, 100, 0, 0, 0, 17413, 'Experimental Pilot'),
+(19776, 1, 0, 'You need to do what? All this science, I don''t understand... Look, this is just my job, five days a week.', 12, 0, 100, 0, 0, 0, 17416, 'Experimental Pilot'),
+(19776, 2, 0, 'I can''t. I''m not the man they think I am at home. Besides, I didn''t bring them out here.', 12, 0, 100, 0, 0, 0, 17419, 'Experimental Pilot'),
+(19776, 3, 0, 'This isn''t the kind of place to raise your kids. It''s cold, and there''d be no one to raise them.', 12, 0, 100, 0, 0, 0, 17421, 'Experimental Pilot'),
+(19776, 4, 0, 'Oh no, no, no... I''m a rocket man.', 12, 0, 100, 0, 0, 0, 17423, 'Experimental Pilot'),
+--
+(19737, 0, 0, 'The ship''s not ready yet. We still need to calibrate the fuse length to make sure that it doesn''t burn out and leave you up there alone.', 12, 0, 100, 0, 0, 0, 17414, 'Engineering Crewmember'),
+(19737, 1, 0, 'Essentially, it''s going to be a long, long time till we are ready to launch. Maybe you should just head back home to your family.', 12, 0, 100, 0, 0, 0, 17417, 'Engineering Crewmember'),
+(19737, 2, 0, 'Why not? A family can give you strength.', 12, 0, 100, 0, 0, 0, 17420, 'Engineering Crewmember'),
+(19737, 3, 0, 'Couldn''t you raise them?', 12, 0, 100, 0, 0, 0, 17422, 'Engineering Crewmember'),
+(19737, 4, 0, 'Well, it''s like I said; it''s going to be a while before we get this ship ready for flight. We''ll keep you informed.', 12, 0, 100, 0, 0, 0, 17424, 'Engineering Crewmember');
+
+DELETE FROM `waypoints` WHERE `entry`=19776;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(19776, 1, 2976.31, 3709.67, 142.398, 'Experimental Pilot'),
+(19776, 2, 2987.82, 3686.2, 142.681, 'Experimental Pilot'),
+(19776, 3, 2987.82, 3652.62, 143.244, 'Experimental Pilot'),
+(19776, 4, 2999.17, 3645.03, 143.849, 'Experimental Pilot'),
+(19776, 5, 3006.7, 3648.63, 143.771, 'Experimental Pilot'),
+(19776, 6, 3042.1, 3645.08, 142.808, 'Experimental Pilot'),
+(19776, 7, 3047.12, 3648.91, 142.832, 'Experimental Pilot'),
+(19776, 8, 3043.87, 3652.34, 142.88, 'Experimental Pilot'),
+(19776, 9, 3026.43, 3641.43, 143.507, 'Experimental Pilot'),
+(19776, 10, 2989.67, 3650.38, 143.486, 'Experimental Pilot'),
+(19776, 11, 2988.99, 3685.32, 142.73, 'Experimental Pilot'),
+(19776, 12, 2975.27, 3712.82, 142.309, 'Experimental Pilot'),
+(19776, 13, 2975.12, 3725.84, 142.688, 'Experimental Pilot'),
+(19776, 14, 2965.31, 3733.57, 143.503, 'Experimental Pilot'),
+(19776, 15, 2966.14, 3733, 143.472, 'Experimental Pilot');
diff --git a/sql/updates/world/master/2020_04_10_00_world_2017_01_15_05_world.sql b/sql/updates/world/master/2020_04_10_00_world_2017_01_15_05_world.sql
new file mode 100644
index 00000000000..84ec22473d4
--- /dev/null
+++ b/sql/updates/world/master/2020_04_10_00_world_2017_01_15_05_world.sql
@@ -0,0 +1,32 @@
+-- Levixus SAI
+SET @ENTRY := 19847;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,11,0,100,1,0,0,0,0,11,24313,0,0,0,0,0,1,0,0,0,0,0,0,0,"Levixus - On Respawn - Cast 'Shade' (No Repeat)"),
+(@ENTRY,0,1,0,0,0,100,0,3000,7000,13000,17000,11,11443,0,0,0,0,0,2,0,0,0,0,0,0,0,"Levixus - In Combat - Cast 'Cripple'"),
+(@ENTRY,0,2,0,0,0,100,0,9000,14000,13000,17000,11,7645,1,0,0,0,0,6,0,0,0,0,0,0,0,"Levixus - In Combat - Cast 'Dominate Mind'"),
+(@ENTRY,0,3,0,0,0,100,0,10000,13000,18000,22000,11,38939,1,0,0,0,0,2,0,0,0,0,0,0,0,"Levixus - In Combat - Cast 'Inferno'"),
+(@ENTRY,0,4,0,1,0,100,0,0,0,20000,20000,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Levixus - Out of Combat - Run Script");
+
+-- Actionlist SAI
+SET @ENTRY := 1984700;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,1000,1000,0,0,1,0,1000,0,0,0,0,1,0,0,0,0,0,0,0,"Levixus - On Script - Say Line 0"),
+(@ENTRY,9,1,0,0,0,100,0,1000,1000,0,0,1,1,8000,0,0,0,0,1,0,0,0,0,0,0,0,"Levixus - On Script - Say Line 1"),
+(@ENTRY,9,2,0,0,0,100,0,8000,8000,0,0,1,0,1000,0,0,0,0,1,0,0,0,0,0,0,0,"Levixus - On Script - Say Line 0"),
+(@ENTRY,9,3,0,0,0,100,0,1000,1000,0,0,1,1,5000,0,0,0,0,1,0,0,0,0,0,0,0,"Levixus - On Script - Say Line 1");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=19847;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `comment`) VALUES
+(19847, 0, 0, '%s reads from the book of the dead.', 16, 0, 100, 0, 0, 0, 17446, 'Levixus'),
+--
+(19847, 1, 0, 'Shane Dabiri, Lee, Alex T., Rob F., J. A. B., A. Mayberry!', 12, 8, 100, 15, 0, 0, 17454, 'Levixus'),
+(19847, 1, 1, 'Jeffrey Kaplan! Tom Chilton! Rob Pardo!', 12, 8, 100, 15, 0, 0, 17447, 'Levixus'),
+(19847, 1, 2, 'Justin Thavirat! Roman Kenney! Our entire awesome art and animation team!', 12, 8, 100, 15, 0, 0, 17448, 'Levixus'),
+(19847, 1, 3, 'Kevin Jordan and Jonathan LeCraft!', 12, 8, 100, 15, 0, 0, 17453, 'Levixus'),
+(19847, 1, 4, 'CHRIS METZEN!', 12, 8, 100, 15, 0, 0, 17449, 'Levixus'),
+(19847, 1, 5, 'Pat Nagle! World design team! Cory Stockton, Paul C., Jim Chadwick, Staats, Ed Hanes, Morris, Gotcher, Jesse!, Sarah B., Victor C., Dave A.! All of our amazing exterior artists!', 12, 8, 100, 15, 0, 0, 17450, 'Levixus'),
+(19847, 1, 6, 'Scott Mercer! Geoff, Wyatt, Joe, Travis, Kris, Steven! Brazie!', 12, 8, 100, 15, 0, 0, 17451, 'Levixus'),
+(19847, 1, 7, 'Luis, Brianna and Eric! Blizzard QA team! Of course our fans!', 12, 8, 100, 15, 0, 0, 17452, 'Levixus');
diff --git a/sql/updates/world/master/2020_04_10_01_world_2017_01_15_06_world.sql b/sql/updates/world/master/2020_04_10_01_world_2017_01_15_06_world.sql
new file mode 100644
index 00000000000..230e6b1efe9
--- /dev/null
+++ b/sql/updates/world/master/2020_04_10_01_world_2017_01_15_06_world.sql
@@ -0,0 +1,37 @@
+-- Eye of the Citadel -- http://wotlk.openwow.com/npc=21134
+-- Warlord Morkh SAI
+SET @ENTRY := 16964;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,0,0,100,0,9000,9000,17000,17000,11,34080,1,0,0,0,0,1,0,0,0,0,0,0,0,"Warlord Morkh - In Combat - Cast 'Riposte Stance'"),
+(@ENTRY,0,1,0,0,0,100,0,7000,7000,8000,8000,11,11978,1,0,0,0,0,2,0,0,0,0,0,0,0,"Warlord Morkh - In Combat - Cast 'Kick'"),
+(@ENTRY,0,2,3,2,0,100,1,0,20,0,0,11,8599,1,0,0,0,0,1,0,0,0,0,0,0,0,"Warlord Morkh - Between 0-20% Health - Cast 'Enrage' (No Repeat)"),
+(@ENTRY,0,3,0,61,0,100,0,0,20,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warlord Morkh - Between 0-20% Health - Say Line 0 (No Repeat)"),
+(@ENTRY,0,4,5,6,0,100,0,0,0,0,0,64,1,0,0,0,0,0,7,0,0,0,0,0,0,0,"Warlord Morkh - On Just Died - Store Targetlist"),
+(@ENTRY,0,5,6,61,0,100,0,0,0,0,0,100,1,0,0,0,0,0,10,86039,21134,0,0,0,0,0,"Warlord Morkh - On Just Died - Send Target 1"),
+(@ENTRY,0,6,0,61,0,100,0,0,0,0,0,45,1,1,0,0,0,0,10,86039,21134,0,0,0,0,0,"Warlord Morkh - On Just Died - Set Data 1 1");
+
+-- Eye of the Citadel SAI
+SET @ENTRY := 21134;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,38,0,100,0,1,1,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Eye of the Citadel - On Data Set 1 1 - Run Script"),
+(@ENTRY,0,1,0,25,0,100,0,0,0,0,0,47,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Eye of the Citadel - On Reset - Set Visibility Off");
+
+-- Actionlist SAI
+SET @ENTRY := 2113400;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,3000,3000,0,0,1,0,3000,0,0,0,0,1,0,0,0,0,0,0,0,"Eye of the Citadel - On Script - Say Line 0"),
+(@ENTRY,9,1,0,0,0,100,0,0,0,0,0,47,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Eye of the Citadel - On Script - Set Visibility On"),
+(@ENTRY,9,2,0,0,0,100,0,3000,3000,0,0,1,1,4000,0,0,0,0,12,1,0,0,0,0,0,0,"Eye of the Citadel - On Script - Say Line 1"),
+(@ENTRY,9,3,0,0,0,100,0,4000,4000,0,0,1,2,5000,0,0,0,0,1,0,0,0,0,0,0,0,"Eye of the Citadel - On Script - Say Line 2"),
+(@ENTRY,9,4,0,0,0,100,0,3000,3000,0,0,47,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Eye of the Citadel - On Script - Set Visibility Off");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=21134;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `comment`, `TextRange`) VALUES
+(21134, 0, 0, 'A deep, bone chilling voice echoes from the %s...', 16, 0, 100, 0, 0, 0, 18774, 'Eye of the Citadel', 0),
+(21134, 1, 0, 'How dare you trifle with my playthings, $n!', 12, 0, 100, 0, 0, 0, 18775, 'Eye of the Citadel', 0),
+(21134, 2, 0, 'The orcs in my citadel will drink your blood and dovour you!', 12, 0, 100, 0, 0, 0, 18776, 'Eye of the Citadel', 0);
diff --git a/sql/updates/world/master/2020_04_10_02_world_2017_01_15_07_world.sql b/sql/updates/world/master/2020_04_10_02_world_2017_01_15_07_world.sql
new file mode 100644
index 00000000000..0d688f4ac08
--- /dev/null
+++ b/sql/updates/world/master/2020_04_10_02_world_2017_01_15_07_world.sql
@@ -0,0 +1,34 @@
+-- Painmistress Gabrissa -- http://wotlk.openwow.com/npc=21309
+-- Painmistress Gabrissa SAI
+SET @ENTRY := 21309;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,0,0,100,0,5000,7000,20000,25000,11,38048,0,0,0,0,0,2,0,0,0,0,0,0,0,"Painmistress Gabrissa - In Combat - Cast 'Curse of Pain'"),
+(@ENTRY,0,1,0,0,0,100,0,6000,7000,17000,20000,11,38169,0,0,0,0,0,2,0,0,0,0,0,0,0,"Painmistress Gabrissa - In Combat - Cast 'Subservience'"),
+(@ENTRY,0,2,0,25,0,100,0,0,0,0,0,53,0,21309,1,0,0,2,0,0,0,0,0,0,0,0,"Painmistress Gabrissa - On Reset - Start Waypoint"),
+(@ENTRY,0,3,0,40,0,100,0,5,21309,0,0,80,@ENTRY*100+00,0,0,0,0,0,1,0,0,0,0,0,0,0,"Painmistress Gabrissa - On Waypoint 5 Reached - Run Script"),
+(@ENTRY,0,4,5,40,0,100,0,9,21309,0,0,54,20000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Painmistress Gabrissa - On Waypoint 9 Reached - Pause Waypoint"),
+(@ENTRY,0,5,0,61,0,100,0,9,21309,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,3.37533,"Painmistress Gabrissa - On Waypoint 9 Reached - Set Orientation 3.37533"),
+(@ENTRY,0,6,0,4,0,100,0,0,0,0,0,49,0,0,0,0,0,0,2,0,0,0,0,0,0,0,"Painmistress Gabrissa - On Aggro - Start Attacking");
+
+-- Actionlist SAI
+SET @ENTRY := 2130900;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,54,6000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Painmistress Gabrissa - On Script - Pause Waypoint"),
+(@ENTRY,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.60702,"Painmistress Gabrissa - On Script - Set Orientation 3,60702"),
+(@ENTRY,9,2,0,0,0,100,0,1000,1000,0,0,11,36578,0,0,0,0,0,10,74619,21310,0,0,0,0,0,"Painmistress Gabrissa - On Script - Cast 'Fool's Fortune'"),
+(@ENTRY,9,3,0,0,0,100,0,4000,4000,0,0,92,0,36578,1,0,0,0,1,0,0,0,0,0,0,0,"Painmistress Gabrissa - On Script - Interrupt Spell 'Fool's Fortune'");
+
+DELETE FROM `waypoints` WHERE `entry`=21309;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(21309, 1, -3697.1, 2669.77, 107.186, 'Painmistress Gabrissa'),
+(21309, 2, -3697.68, 2673.34, 108.569, 'Painmistress Gabrissa'),
+(21309, 3, -3692.22, 2678.74, 108.66, 'Painmistress Gabrissa'),
+(21309, 4, -3690.04, 2682.79, 108.752, 'Painmistress Gabrissa'),
+(21309, 5, -3692.89, 2684.18, 108.485, 'Painmistress Gabrissa'),
+(21309, 6, -3690.92, 2682.03, 108.744, 'Painmistress Gabrissa'),
+(21309, 7, -3694.07, 2677.51, 108.537, 'Painmistress Gabrissa'),
+(21309, 8, -3697.53, 2673.77, 108.581, 'Painmistress Gabrissa'),
+(21309, 9, -3693.46, 2668.44, 107.174, 'Painmistress Gabrissa');
diff --git a/sql/updates/world/master/2020_04_10_03_world_2017_01_15_08_world.sql b/sql/updates/world/master/2020_04_10_03_world_2017_01_15_08_world.sql
new file mode 100644
index 00000000000..eb7ba4dd25c
--- /dev/null
+++ b/sql/updates/world/master/2020_04_10_03_world_2017_01_15_08_world.sql
@@ -0,0 +1,28 @@
+-- Chancellor Bloodleaf -- http://wotlk.openwow.com/npc=22012
+-- Chancellor Bloodleaf SAI
+SET @ENTRY := 22012;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,1,0,100,0,15000,15000,130000,130000,80,@ENTRY*100+00,0,0,0,0,0,1,0,0,0,0,0,0,0,"Chancellor Bloodleaf - Out of Combat - Run Script"),
+(@ENTRY,0,1,0,0,0,100,0,5000,6000,5000,6000,11,34517,0,0,0,0,0,1,0,0,0,0,0,0,0,"Chancellor Bloodleaf - In Combat - Cast 'Arcane Explosion'");
+
+-- Actionlist SAI
+SET @ENTRY := 2201200;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,1000,1000,0,0,1,0,8000,0,0,0,0,1,0,0,0,0,0,0,0,"Chancellor Bloodleaf - On Script - Say Line 0"),
+(@ENTRY,9,1,0,0,0,100,0,1000,1000,0,0,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Chancellor Bloodleaf - On Script - Play Emote 1"),
+(@ENTRY,9,2,0,0,0,100,0,9000,9000,0,0,1,0,6000,0,0,0,0,10,77086,22011,0,0,0,0,0,"Chancellor Bloodleaf - On Script - Say Line 0"),
+(@ENTRY,9,3,0,0,0,100,0,6000,6000,0,0,1,1,7000,0,0,0,0,1,0,0,0,0,0,0,0,"Chancellor Bloodleaf - On Script - Say Line 1"),
+(@ENTRY,9,4,0,0,0,100,0,1000,1000,0,0,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Chancellor Bloodleaf - On Script - Play Emote 1"),
+(@ENTRY,9,5,0,0,0,100,0,6000,6000,0,0,1,2,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Chancellor Bloodleaf - On Script - Say Line 2");
+
+DELETE FROM `creature_text` WHERE `CreatureID` IN (22011, 22012);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `comment`) VALUES
+-- Corok the Mighty
+(22011, 0, 0, 'And... if we do not?', 12, 0, 100, 0, 0, 0, 19695, 'Corok the Mighty'),
+-- Chancellor Bloodleaf
+(22012, 0, 0, 'Lend us the strength of the giants of Shadowmoon, Corok. The master is a just ruler. He will be sure to take care of those that assisted in subduing the dissidents of this world.', 12, 0, 100, 0, 0, 0, 19693, 'Chancellor Bloodleaf'),
+(22012, 1, 0, 'Then you become enemies of my lord, Illidan. Enemies of Illidan are destroyed. Are your giants able to withstand an attack from the forces of Eclipse Point?', 12, 0, 100, 0, 0, 0, 19696, 'Chancellor Bloodleaf'),
+(22012, 2, 0, 'No... I did not think so...', 12, 0, 100, 0, 0, 0, 19697, 'Chancellor Bloodleaf');
diff --git a/sql/updates/world/master/2020_04_10_04_world_2017_01_15_09_world.sql b/sql/updates/world/master/2020_04_10_04_world_2017_01_15_09_world.sql
new file mode 100644
index 00000000000..e50d903be51
--- /dev/null
+++ b/sql/updates/world/master/2020_04_10_04_world_2017_01_15_09_world.sql
@@ -0,0 +1,36 @@
+-- Mordenai -- http://wotlk.openwow.com/npc=22113
+-- Mordenai SAI
+SET @ENTRY := 22113;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,25,0,100,0,0,0,0,0,53,0,22113,1,0,0,2,1,0,0,0,0,0,0,0,"Mordenai - On Reset - Start Waypoint"),
+(@ENTRY,0,1,0,64,0,100,0,0,0,0,0,54,180000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mordenai - On Gossip Hello - Pause Waypoint"),
+(@ENTRY,0,2,3,40,0,100,0,1,22113,0,0,54,12000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mordenai - On Waypoint 1 Reached - Pause Waypoint"),
+(@ENTRY,0,3,0,61,0,100,0,1,22113,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.59702,"Mordenai - On Waypoint 1 Reached - Set Orientation 4.59702"),
+(@ENTRY,0,4,0,40,0,100,0,2,22113,0,0,49,0,0,0,0,0,0,19,21478,80,0,0,0,0,0,"Mordenai - On Waypoint 2 Reached - Start Attacking"),
+(@ENTRY,0,5,0,40,0,100,0,12,22113,0,0,49,0,0,0,0,0,0,19,21478,80,0,0,0,0,0,"Mordenai - On Waypoint 12 Reached - Start Attacking"),
+(@ENTRY,0,6,0,0,0,100,0,0,0,2300,3900,11,41440,64,0,0,0,0,2,0,0,0,0,0,0,0,"Mordenai - In Combat - Cast 'Shoot'"),
+(@ENTRY,0,7,0,0,0,100,0,6000,9000,27000,28000,11,41448,0,0,0,0,0,2,0,0,0,0,0,0,0,"Mordenai - In Combat - Cast 'Multi-Shot'"),
+(@ENTRY,0,8,0,0,0,100,0,5000,5000,18000,18000,11,38370,0,0,0,0,0,2,0,0,0,0,0,0,0,"Mordenai - In Combat - Cast 'Aimed Shot'");
+
+DELETE FROM `waypoints` WHERE `entry`=22113;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(22113, 1, -4100.05, 969.276, 24.9571, 'Mordenai'),
+(22113, 2, -4104.06, 931.187, 18.8469, 'Mordenai'),
+(22113, 3, -4105.65, 911.224, 16.1353, 'Mordenai'),
+(22113, 4, -4106.05, 889.833, 14.4649, 'Mordenai'),
+(22113, 5, -4118.47, 857.928, 8.29486, 'Mordenai'),
+(22113, 6, -4122.4, 839.518, 10.4151, 'Mordenai'),
+(22113, 7, -4143.45, 803.2, 9.22043, 'Mordenai'),
+(22113, 8, -4150.96, 769.769, 6.31908, 'Mordenai'),
+(22113, 9, -4153.1, 760.191, 3.47747, 'Mordenai'),
+(22113, 10, -4155.08, 747.368, 1.8985, 'Mordenai'),
+(22113, 11, -4151.37, 769.929, 6.42453, 'Mordenai'),
+(22113, 12, -4132.84, 797.355, 8.16607, 'Mordenai'),
+(22113, 13, -4137.32, 823.672, 9.68296, 'Mordenai'),
+(22113, 14, -4119.16, 842.164, 9.89524, 'Mordenai'),
+(22113, 15, -4115.26, 851.276, 7.68533, 'Mordenai'),
+(22113, 16, -4109.66, 883.088, 13.8876, 'Mordenai'),
+(22113, 17, -4110.74, 914.769, 17.723, 'Mordenai'),
+(22113, 18, -4106.89, 948.026, 23.0078, 'Mordenai');
diff --git a/sql/updates/world/master/2020_04_10_05_world_2017_01_15_10_world.sql b/sql/updates/world/master/2020_04_10_05_world_2017_01_15_10_world.sql
new file mode 100644
index 00000000000..6d4923d8960
--- /dev/null
+++ b/sql/updates/world/master/2020_04_10_05_world_2017_01_15_10_world.sql
@@ -0,0 +1,125 @@
+-- Armorer Orkuruk --
+UPDATE `creature_addon` SET `path_id`=0 WHERE `guid`=125542;
+DELETE FROM `waypoint_data` WHERE `id`=1255420;
+UPDATE `creature` SET `MovementType`=0 WHERE `guid`=125542;
+
+-- Armorer Orkuruk SAI
+SET @ENTRY := 25274;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,25,0,100,0,0,0,0,0,53,0,25274,1,0,0,0,1,0,0,0,0,0,0,0,"Armorer Orkuruk - On Reset - Start Waypoint"),
+(@ENTRY,0,1,0,64,0,100,0,0,0,0,0,54,180000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Armorer Orkuruk - On Gossip Hello - Pause Waypoint"),
+(@ENTRY,0,2,3,40,0,100,0,17,25274,0,0,80,@ENTRY*100+00,0,0,0,0,0,1,0,0,0,0,0,0,0,"Armorer Orkuruk - On Waypoint 17 Reached - Run Script"),
+(@ENTRY,0,3,0,61,0,100,0,17,25274,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,3.38169,"Armorer Orkuruk - On Waypoint 17 Reached - Set Orientation 3,38169"),
+(@ENTRY,0,4,5,40,0,100,0,71,25274,0,0,80,@ENTRY*100+00,0,0,0,0,0,1,0,0,0,0,0,0,0,"Armorer Orkuruk - On Waypoint 71 Reached - Run Script"),
+(@ENTRY,0,5,0,61,0,100,0,71,25274,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.88465,"Armorer Orkuruk - On Waypoint 71 Reached - Set Orientation 2,88465");
+
+-- Actionlist SAI
+SET @ENTRY := 2527400;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,54,15000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Armorer Orkuruk - On Script - Pause Waypoint"),
+(@ENTRY,9,1,0,0,0,100,0,2000,2000,0,0,5,5,0,0,0,0,0,1,0,0,0,0,0,0,0,"Armorer Orkuruk - On Script - Play Emote 5"),
+(@ENTRY,9,2,0,0,0,100,0,3000,3000,0,0,1,0,10000,0,0,0,0,1,0,0,0,0,0,0,0,"Armorer Orkuruk - On Script - Say Line 0");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=25274;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `comment`) VALUES
+(25274, 0, 0, 'Keep ''em hot you big dummy!', 12, 1, 100, 0, 0, 0, 25133, 'Armorer Orkuruk'),
+(25274, 0, 1, 'Those weapons ain''t gonna build themselves! Faster!', 12, 1, 100, 0, 0, 0, 25134, 'Armorer Orkuruk'),
+(25274, 0, 2, 'You call that a hammer strike? What kind of amateurs am I workin'' with here?', 12, 1, 100, 0, 0, 0, 25135, 'Armorer Orkuruk'),
+(25274, 0, 3, 'You keep that garbage up and I''ll ship you back to your momma in a box with a note strapped to your chest that reads: FAILURE.', 12, 1, 100, 0, 0, 0, 25136, 'Armorer Orkuruk'),
+(25274, 0, 4, 'And WHAT are our soldiers supposed to do with that shoddy piece of junk?', 12, 1, 100, 0, 0, 0, 25137, 'Armorer Orkuruk'),
+(25274, 0, 5, 'You''re an embarassment to this entire operation! Pack up your stuff and get out!', 12, 1, 100, 0, 0, 0, 25138, 'Armorer Orkuruk');
+
+DELETE FROM `waypoints` WHERE `entry`=25274;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(25274, 1, 2761.85, 6187.82, 83.448, 'Armorer Orkuruk'),
+(25274, 2, 2763.1, 6203.83, 83.4409, 'Armorer Orkuruk'),
+(25274, 3, 2765.37, 6209.65, 83.4451, 'Armorer Orkuruk'),
+(25274, 4, 2772.92, 6217.22, 83.4475, 'Armorer Orkuruk'),
+(25274, 5, 2766.39, 6211.48, 83.437, 'Armorer Orkuruk'),
+(25274, 6, 2762.96, 6202.62, 83.4409, 'Armorer Orkuruk'),
+(25274, 7, 2762.31, 6187.53, 83.4546, 'Armorer Orkuruk'),
+(25274, 8, 2765.22, 6178.21, 83.4565, 'Armorer Orkuruk'),
+(25274, 9, 2762.24, 6188.36, 83.4575, 'Armorer Orkuruk'),
+(25274, 10, 2763.33, 6204.33, 83.4432, 'Armorer Orkuruk'),
+(25274, 11, 2766.61, 6211.59, 83.4381, 'Armorer Orkuruk'),
+(25274, 12, 2773.5, 6217.87, 83.4484, 'Armorer Orkuruk'),
+(25274, 13, 2765.7, 6210.09, 83.4438, 'Armorer Orkuruk'),
+(25274, 14, 2762.77, 6202.1, 83.4395, 'Armorer Orkuruk'),
+(25274, 15, 2762.54, 6187.41, 83.4578, 'Armorer Orkuruk'),
+(25274, 16, 2765.46, 6178.01, 83.4598, 'Armorer Orkuruk'),
+(25274, 17, 2764.09, 6182.25, 83.4576, 'Armorer Orkuruk'),
+(25274, 18, 2762.03, 6188.66, 83.4549, 'Armorer Orkuruk'),
+(25274, 19, 2763.21, 6203.82, 83.4422, 'Armorer Orkuruk'),
+(25274, 20, 2766.87, 6211.5, 83.4422, 'Armorer Orkuruk'),
+(25274, 21, 2773.88, 6218.09, 83.4497, 'Armorer Orkuruk'),
+(25274, 22, 2765.7, 6210.09, 83.4438, 'Armorer Orkuruk'),
+(25274, 23, 2762.77, 6202.1, 83.4395, 'Armorer Orkuruk'),
+(25274, 24, 2762.54, 6187.41, 83.4578, 'Armorer Orkuruk'),
+(25274, 25, 2765.46, 6178.01, 83.4598, 'Armorer Orkuruk'),
+(25274, 26, 2762.24, 6188.36, 83.4575, 'Armorer Orkuruk'),
+(25274, 27, 2763.33, 6204.33, 83.4432, 'Armorer Orkuruk'),
+(25274, 28, 2766.61, 6211.59, 83.4381, 'Armorer Orkuruk'),
+(25274, 29, 2773.5, 6217.87, 83.4484, 'Armorer Orkuruk'),
+(25274, 30, 2765.7, 6210.09, 83.4438, 'Armorer Orkuruk'),
+(25274, 31, 2762.77, 6202.1, 83.4395, 'Armorer Orkuruk'),
+(25274, 32, 2762.54, 6187.41, 83.4578, 'Armorer Orkuruk'),
+(25274, 33, 2765.46, 6178.01, 83.4598, 'Armorer Orkuruk'),
+(25274, 34, 2762.24, 6188.36, 83.4575, 'Armorer Orkuruk'),
+(25274, 35, 2763.33, 6204.33, 83.4432, 'Armorer Orkuruk'),
+(25274, 36, 2766.61, 6211.59, 83.4381, 'Armorer Orkuruk'),
+(25274, 37, 2773.5, 6217.87, 83.4484, 'Armorer Orkuruk'),
+(25274, 38, 2765.7, 6210.09, 83.4438, 'Armorer Orkuruk'),
+(25274, 39, 2762.77, 6202.1, 83.4395, 'Armorer Orkuruk'),
+(25274, 40, 2762.54, 6187.41, 83.4578, 'Armorer Orkuruk'),
+(25274, 41, 2765.46, 6178.01, 83.4598, 'Armorer Orkuruk'),
+(25274, 42, 2762.24, 6188.36, 83.4575, 'Armorer Orkuruk'),
+(25274, 43, 2763.33, 6204.33, 83.4432, 'Armorer Orkuruk'),
+(25274, 44, 2766.61, 6211.59, 83.4381, 'Armorer Orkuruk'),
+(25274, 45, 2773.5, 6217.87, 83.4484, 'Armorer Orkuruk'),
+(25274, 46, 2765.7, 6210.09, 83.4438, 'Armorer Orkuruk'),
+(25274, 47, 2762.77, 6202.1, 83.4395, 'Armorer Orkuruk'),
+(25274, 48, 2762.54, 6187.41, 83.4578, 'Armorer Orkuruk'),
+(25274, 49, 2765.46, 6178.01, 83.4598, 'Armorer Orkuruk'),
+(25274, 50, 2762.24, 6188.36, 83.4575, 'Armorer Orkuruk'),
+(25274, 51, 2763.33, 6204.33, 83.4432, 'Armorer Orkuruk'),
+(25274, 52, 2766.61, 6211.59, 83.4381, 'Armorer Orkuruk'),
+(25274, 53, 2773.5, 6217.87, 83.4484, 'Armorer Orkuruk'),
+(25274, 54, 2765.7, 6210.09, 83.4438, 'Armorer Orkuruk'),
+(25274, 55, 2762.77, 6202.1, 83.4395, 'Armorer Orkuruk'),
+(25274, 56, 2762.54, 6187.41, 83.4578, 'Armorer Orkuruk'),
+(25274, 57, 2765.46, 6178.01, 83.4598, 'Armorer Orkuruk'),
+(25274, 58, 2762.24, 6188.36, 83.4575, 'Armorer Orkuruk'),
+(25274, 59, 2763.33, 6204.33, 83.4432, 'Armorer Orkuruk'),
+(25274, 60, 2766.61, 6211.59, 83.4381, 'Armorer Orkuruk'),
+(25274, 61, 2773.5, 6217.87, 83.4484, 'Armorer Orkuruk'),
+(25274, 62, 2765.7, 6210.09, 83.4438, 'Armorer Orkuruk'),
+(25274, 63, 2762.77, 6202.1, 83.4395, 'Armorer Orkuruk'),
+(25274, 64, 2762.54, 6187.41, 83.4578, 'Armorer Orkuruk'),
+(25274, 65, 2765.46, 6178.01, 83.4598, 'Armorer Orkuruk'),
+(25274, 66, 2762.24, 6188.36, 83.4575, 'Armorer Orkuruk'),
+(25274, 67, 2763.33, 6204.33, 83.4432, 'Armorer Orkuruk'),
+(25274, 68, 2766.61, 6211.59, 83.4381, 'Armorer Orkuruk'),
+(25274, 69, 2773.5, 6217.87, 83.4484, 'Armorer Orkuruk'),
+(25274, 70, 2766.07, 6210.93, 83.4391, 'Armorer Orkuruk'),
+(25274, 71, 2762.53, 6207.16, 83.4206, 'Armorer Orkuruk'),
+(25274, 72, 2762.16, 6187.79, 83.4531, 'Armorer Orkuruk'),
+(25274, 73, 2765.46, 6178.01, 83.4598, 'Armorer Orkuruk'),
+(25274, 74, 2761.85, 6187.82, 83.448, 'Armorer Orkuruk'),
+(25274, 75, 2763.1, 6203.83, 83.4409, 'Armorer Orkuruk'),
+(25274, 76, 2765.37, 6209.65, 83.4451, 'Armorer Orkuruk'),
+(25274, 77, 2772.92, 6217.22, 83.4475, 'Armorer Orkuruk'),
+(25274, 78, 2766.39, 6211.48, 83.437, 'Armorer Orkuruk'),
+(25274, 79, 2762.96, 6202.62, 83.4409, 'Armorer Orkuruk'),
+(25274, 80, 2762.31, 6187.53, 83.4546, 'Armorer Orkuruk'),
+(25274, 81, 2765.22, 6178.21, 83.4565, 'Armorer Orkuruk'),
+(25274, 82, 2762.24, 6188.36, 83.4575, 'Armorer Orkuruk'),
+(25274, 83, 2763.33, 6204.33, 83.4432, 'Armorer Orkuruk'),
+(25274, 84, 2766.61, 6211.59, 83.4381, 'Armorer Orkuruk'),
+(25274, 85, 2773.5, 6217.87, 83.4484, 'Armorer Orkuruk'),
+(25274, 86, 2765.7, 6210.09, 83.4438, 'Armorer Orkuruk'),
+(25274, 87, 2762.77, 6202.1, 83.4395, 'Armorer Orkuruk'),
+(25274, 88, 2762.54, 6187.41, 83.4578, 'Armorer Orkuruk'),
+(25274, 89, 2765.46, 6178.01, 83.4598, 'Armorer Orkuruk');
diff --git a/sql/updates/world/master/2020_04_10_06_world_2017_01_16_00_world.sql b/sql/updates/world/master/2020_04_10_06_world_2017_01_16_00_world.sql
new file mode 100644
index 00000000000..8bae4281411
--- /dev/null
+++ b/sql/updates/world/master/2020_04_10_06_world_2017_01_16_00_world.sql
@@ -0,0 +1,143 @@
+-- Wind Master To'bor & Warsong Wind Rider Script -- http://wotlk.openwow.com/npc=25289
+-- Warsong Wind Rider SAI
+SET @ENTRY := 25286;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,25,0,100,0,0,0,0,0,60,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warsong Wind Rider - On Reset - Set Fly Off");
+UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=25286;
+
+-- Warsong Wind Rider SAI
+SET @GUID := -125578;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=25286;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@GUID 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
+(@GUID,0,0,0,25,0,100,0,0,0,0,0,60,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warsong Wind Rider - On Reset - Set Fly Off"),
+(@GUID,0,1,0,38,0,100,0,1,1,0,0,80,12557800,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warsong Wind Rider - On Data Set 1 1 - Run Script"),
+(@GUID,0,2,3,40,0,100,0,9,125578,0,0,60,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warsong Wind Rider - On Waypoint 9 Reached - Set Fly On"),
+(@GUID,0,3,0,61,0,100,0,9,125578,0,0,59,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warsong Wind Rider - On Waypoint 9 Reached - Set Run On"),
+(@GUID,0,4,0,40,0,100,0,1,125578,0,0,54,5000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warsong Wind Rider - On Waypoint 1 Reached - Pause Waypoint"),
+(@GUID,0,5,6,40,0,100,0,42,125578,0,0,59,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warsong Wind Rider - On Waypoint 42 Reached - Set Run Off"),
+(@GUID,0,6,0,61,0,100,0,42,125578,0,0,60,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warsong Wind Rider - On Waypoint 42 Reached - Set Fly Off"),
+(@GUID,0,7,8,40,0,100,0,46,125578,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.19912,"Warsong Wind Rider - On Waypoint 46 Reached - Set Orientation 2,19912"),
+(@GUID,0,8,0,61,0,100,0,46,125578,0,0,48,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warsong Wind Rider - On Waypoint 46 Reached - Set Active Off");
+
+-- Actionlist SAI
+SET @ENTRY := 12557800;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,48,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warsong Wind Rider - On Script - Set Active On"),
+(@ENTRY,9,1,0,0,0,100,0,0,0,0,0,1,0,5000,0,0,0,0,1,0,0,0,0,0,0,0,"Warsong Wind Rider - On Script - Say Line 0"),
+(@ENTRY,9,2,0,0,0,100,0,2000,2000,0,0,53,0,125578,0,0,0,1,1,0,0,0,0,0,0,0,"Warsong Wind Rider - On Script - Start Waypoint");
+
+UPDATE `creature` SET `MovementType`=0 WHERE `guid`=125584;
+DELETE FROM `waypoint_data` WHERE `id`=1255840;
+UPDATE `creature_addon` SET `path_id`=0 WHERE `guid`=125584;
+
+-- Wind Master To'bor SAI
+SET @ENTRY := 25289;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,25,0,100,0,0,0,0,0,53,0,25289,1,0,0,1,1,0,0,0,0,0,0,0,"Wind Master To'bor - On Reset - Start Waypoint"),
+(@ENTRY,0,1,0,64,0,100,0,0,0,0,0,54,180000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Wind Master To'bor - On Gossip Hello - Pause Waypoint"),
+(@ENTRY,0,2,0,40,0,100,0,9,25289,0,0,80,@ENTRY*100+00,0,0,0,0,0,1,0,0,0,0,0,0,0,"Wind Master To'bor - On Waypoint 9 Reached - Run Script");
+
+-- Actionlist SAI
+SET @ENTRY := 2528900;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,54,12000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Wind Master To'bor - On Script - Pause Waypoint"),
+(@ENTRY,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,5.14906,"Wind Master To'bor - On Script - Set Orientation 5,14906"),
+(@ENTRY,9,2,0,0,0,100,0,0,0,0,0,48,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Wind Master To'bor - On Script - Set Active On"),
+(@ENTRY,9,3,0,0,0,100,0,3000,3000,0,0,1,0,3000,0,0,0,0,1,0,0,0,0,0,0,0,"Wind Master To'bor - On Script - Say Line 0"),
+(@ENTRY,9,4,0,0,0,100,0,3000,3000,0,0,45,1,1,0,0,0,0,10,125578,25286,0,0,0,0,0,"Wind Master To'bor - On Script - Set Data 1 1"),
+(@ENTRY,9,5,0,0,0,100,0,0,0,0,0,48,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Wind Master To'bor - On Script - Set Active Off");
+
+DELETE FROM `creature_text` WHERE `CreatureID` IN (25289, 25286);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `comment`) VALUES
+(25289, 0, 0, 'Aye, solja! Lift off time!', 12, 1, 100, 1, 0, 0, 24521, 'Wind Master To''bor'),
+(25286, 0, 0, 'Yes sir!', 12, 1, 100, 0, 0, 0, 24522, 'Warsong Wind Rider');
+
+DELETE FROM `waypoints` WHERE `entry`=25289;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(25289, 1, 2802.31, 6147.69, 208.197, 'Wind Master To''bor'),
+(25289, 2, 2760.18, 6107.54, 208.576, 'Wind Master To''bor'),
+(25289, 3, 2802.31, 6147.69, 208.197, 'Wind Master To''bor'),
+(25289, 4, 2760.18, 6107.54, 208.576, 'Wind Master To''bor'),
+(25289, 5, 2802.31, 6147.69, 208.197, 'Wind Master To''bor'),
+(25289, 6, 2760.18, 6107.54, 208.576, 'Wind Master To''bor'),
+(25289, 7, 2802.31, 6147.69, 208.197, 'Wind Master To''bor'),
+(25289, 8, 2760.18, 6107.54, 208.576, 'Wind Master To''bor'),
+(25289, 9, 2767.55, 6112.47, 208.234, 'Wind Master To''bor'),
+(25289, 10, 2802.31, 6147.69, 208.197, 'Wind Master To''bor'),
+(25289, 11, 2760.18, 6107.54, 208.576, 'Wind Master To''bor'),
+(25289, 12, 2802.31, 6147.69, 208.197, 'Wind Master To''bor'),
+(25289, 13, 2760.18, 6107.54, 208.576, 'Wind Master To''bor'),
+(25289, 14, 2802.31, 6147.69, 208.197, 'Wind Master To''bor'),
+(25289, 15, 2760.18, 6107.54, 208.576, 'Wind Master To''bor'),
+(25289, 16, 2802.31, 6147.69, 208.197, 'Wind Master To''bor'),
+(25289, 17, 2760.18, 6107.54, 208.576, 'Wind Master To''bor'),
+(25289, 18, 2802.31, 6147.69, 208.197, 'Wind Master To''bor'),
+(25289, 19, 2760.18, 6107.54, 208.576, 'Wind Master To''bor'),
+(25289, 20, 2802.31, 6147.69, 208.197, 'Wind Master To''bor'),
+(25289, 21, 2760.18, 6107.54, 208.576, 'Wind Master To''bor'),
+(25289, 22, 2802.31, 6147.69, 208.197, 'Wind Master To''bor'),
+(25289, 23, 2760.18, 6107.54, 208.576, 'Wind Master To''bor'),
+(25289, 24, 2802.31, 6147.69, 208.197, 'Wind Master To''bor'),
+(25289, 25, 2760.18, 6107.54, 208.576, 'Wind Master To''bor'),
+(25289, 26, 2802.31, 6147.69, 208.197, 'Wind Master To''bor'),
+(25289, 27, 2760.18, 6107.54, 208.576, 'Wind Master To''bor'),
+(25289, 28, 2802.31, 6147.69, 208.197, 'Wind Master To''bor'),
+(25289, 29, 2760.18, 6107.54, 208.576, 'Wind Master To''bor'),
+(25289, 30, 2802.31, 6147.69, 208.197, 'Wind Master To''bor'),
+(25289, 31, 2760.18, 6107.54, 208.576, 'Wind Master To''bor');
+
+DELETE FROM `waypoints` WHERE `entry`=125578;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(125578, 1, 2772.24, 6103.7, 209.008, 'Warsong Wind Rider'),
+(125578, 2, 2766.12, 6109.4, 208.372, 'Warsong Wind Rider'),
+(125578, 3, 2763.93, 6113.74, 208.298, 'Warsong Wind Rider'),
+(125578, 4, 2769.51, 6121.43, 208.123, 'Warsong Wind Rider'),
+(125578, 5, 2793.61, 6143.72, 208.129, 'Warsong Wind Rider'),
+(125578, 6, 2801.04, 6151.28, 208.13, 'Warsong Wind Rider'),
+(125578, 7, 2801.21, 6154.14, 208.287, 'Warsong Wind Rider'),
+(125578, 8, 2797.93, 6153.58, 208.192, 'Warsong Wind Rider'),
+(125578, 9, 2785.39, 6137.84, 208.123, 'Warsong Wind Rider'),
+(125578, 10, 2775.29, 6128.2, 208.123, 'Warsong Wind Rider'),
+(125578, 11, 2765.01, 6118.83, 216.447, 'Warsong Wind Rider'),
+(125578, 12, 2746.45, 6098.37, 238.299, 'Warsong Wind Rider'),
+(125578, 13, 2724.52, 6069.8, 238.299, 'Warsong Wind Rider'),
+(125578, 14, 2707, 6047.38, 238.299, 'Warsong Wind Rider'),
+(125578, 15, 2680.77, 6017.05, 238.299, 'Warsong Wind Rider'),
+(125578, 16, 2643.17, 5992.25, 216.577, 'Warsong Wind Rider'),
+(125578, 17, 2617.43, 5969.46, 190.605, 'Warsong Wind Rider'),
+(125578, 18, 2594.97, 5950.58, 168.994, 'Warsong Wind Rider'),
+(125578, 19, 2577.94, 5924.14, 149.911, 'Warsong Wind Rider'),
+(125578, 20, 2550.24, 5897.53, 149.911, 'Warsong Wind Rider'),
+(125578, 21, 2562.29, 5866.69, 149.911, 'Warsong Wind Rider'),
+(125578, 22, 2596.48, 5847.32, 149.911, 'Warsong Wind Rider'),
+(125578, 23, 2626.64, 5851.95, 149.911, 'Warsong Wind Rider'),
+(125578, 24, 2647.13, 5873.16, 149.911, 'Warsong Wind Rider'),
+(125578, 25, 2645.8, 5899.81, 149.911, 'Warsong Wind Rider'),
+(125578, 26, 2640.92, 5934.65, 149.911, 'Warsong Wind Rider'),
+(125578, 27, 2627.54, 5981.53, 138.022, 'Warsong Wind Rider'),
+(125578, 28, 2646.58, 6020.77, 125.022, 'Warsong Wind Rider'),
+(125578, 29, 2650.72, 6063.53, 100.244, 'Warsong Wind Rider'),
+(125578, 30, 2658.58, 6107.69, 80.8551, 'Warsong Wind Rider'),
+(125578, 31, 2650.11, 6144.21, 80.8551, 'Warsong Wind Rider'),
+(125578, 32, 2644.45, 6182.45, 80.8551, 'Warsong Wind Rider'),
+(125578, 33, 2657.69, 6217.98, 91.7996, 'Warsong Wind Rider'),
+(125578, 34, 2675, 6225.02, 121.827, 'Warsong Wind Rider'),
+(125578, 35, 2699.94, 6246.2, 121.827, 'Warsong Wind Rider'),
+(125578, 36, 2721.17, 6228.85, 152.188, 'Warsong Wind Rider'),
+(125578, 37, 2731.05, 6205.52, 168.188, 'Warsong Wind Rider'),
+(125578, 38, 2752.55, 6184.18, 181.438, 'Warsong Wind Rider'),
+(125578, 39, 2764.62, 6189.2, 199.411, 'Warsong Wind Rider'),
+(125578, 40, 2779.31, 6168.48, 221.641, 'Warsong Wind Rider'),
+(125578, 41, 2792.78, 6160.51, 219.669, 'Warsong Wind Rider'),
+(125578, 42, 2797.35, 6154.19, 209.197, 'Warsong Wind Rider'),
+(125578, 43, 2790.22, 6145.23, 208.123, 'Warsong Wind Rider'),
+(125578, 44, 2778.24, 6132.59, 208.123, 'Warsong Wind Rider'),
+(125578, 45, 2764.71, 6113.99, 208.27, 'Warsong Wind Rider'),
+(125578, 46, 2772.627197, 6102.89990, 209.02432, 'Warsong Wind Rider');
diff --git a/sql/updates/world/master/2020_04_10_07_world_2017_01_16_01_world.sql b/sql/updates/world/master/2020_04_10_07_world_2017_01_16_01_world.sql
new file mode 100644
index 00000000000..4f5d31b9e73
--- /dev/null
+++ b/sql/updates/world/master/2020_04_10_07_world_2017_01_16_01_world.sql
@@ -0,0 +1,41 @@
+-- Karen I Don't Caribou the Culler SAI
+SET @ENTRY := 25803;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,0,0,100,0,8000,10000,10000,15000,11,42724,0,0,0,0,0,2,0,0,0,0,0,0,0,"Karen I Don't Caribou the Culler - In Combat - Cast 'Cleave'"),
+(@ENTRY,0,1,0,0,0,100,0,4000,4000,15000,21000,11,48280,0,0,0,0,0,1,0,0,0,0,0,0,0,"Karen I Don't Caribou the Culler - In Combat - Cast 'Whirlwind'"),
+(@ENTRY,0,2,0,9,0,100,0,8,25,10000,10000,11,27577,0,0,0,0,0,2,0,0,0,0,0,0,0,"Karen I Don't Caribou the Culler - Within 8-25 Range - Cast 'Intercept'"),
+(@ENTRY,0,3,0,25,0,100,0,0,0,0,0,53,0,25803,1,0,0,2,1,0,0,0,0,0,0,0,"Karen I Don't Caribou the Culler - On Reset - Start Waypoint"),
+(@ENTRY,0,4,5,40,0,100,0,15,25803,0,0,54,26000,0,0,0,0,0,0,0,0,0,0,0,0,0,"Karen I Don't Caribou the Culler - On Waypoint 15 Reached - Pause Waypoint"),
+(@ENTRY,0,5,6,61,0,100,0,15,25803,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,0.698295,"Karen I Don't Caribou the Culler - On Waypoint 15 Reached - Set Orientation 0.698295"),
+(@ENTRY,0,6,0,61,0,100,0,15,25803,0,0,11,46147,0,0,0,0,0,1,0,0,0,0,0,0,0,"Karen I Don't Caribou the Culler - On Waypoint 15 Reached - Cast 'Karen Eats'");
+
+DELETE FROM `waypoints` WHERE `entry`=25803;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(25803, 1, 2732.85, 5267, 70.526, 'Karen I Don''t Caribou the Cullerr'),
+(25803, 2, 2726.15, 5264.63, 71.5126, 'Karen I Don''t Caribou the Cullerr'),
+(25803, 3, 2721.45, 5267.05, 71.632, 'Karen I Don''t Caribou the Cullerr'),
+(25803, 4, 2721.44, 5276.07, 70.8437, 'Karen I Don''t Caribou the Cullerr'),
+(25803, 5, 2729.39, 5276.17, 71.4764, 'Karen I Don''t Caribou the Cullerr'),
+(25803, 6, 2732.85, 5267, 70.526, 'Karen I Don''t Caribou the Cullerr'),
+(25803, 7, 2726.15, 5264.63, 71.5126, 'Karen I Don''t Caribou the Cullerr'),
+(25803, 8, 2721.45, 5267.05, 71.632, 'Karen I Don''t Caribou the Cullerr'),
+(25803, 9, 2721.44, 5276.07, 70.8437, 'Karen I Don''t Caribou the Cullerr'),
+(25803, 10, 2729.39, 5276.17, 71.4764, 'Karen I Don''t Caribou the Cullerr'),
+(25803, 11, 2732.85, 5267, 70.526, 'Karen I Don''t Caribou the Cullerr'),
+(25803, 12, 2726.15, 5264.63, 71.5126, 'Karen I Don''t Caribou the Cullerr'),
+(25803, 13, 2721.45, 5267.05, 71.632, 'Karen I Don''t Caribou the Cullerr'),
+(25803, 14, 2721.44, 5276.07, 70.8437, 'Karen I Don''t Caribou the Cullerr'),
+(25803, 15, 2728.34, 5281.66, 71.0141, 'Karen I Don''t Caribou the Cullerr'),
+(25803, 16, 2729.39, 5276.17, 71.4764, 'Karen I Don''t Caribou the Cullerr'),
+(25803, 17, 2732.85, 5267, 70.526, 'Karen I Don''t Caribou the Cullerr'),
+(25803, 18, 2726.15, 5264.63, 71.5126, 'Karen I Don''t Caribou the Cullerr'),
+(25803, 19, 2721.45, 5267.05, 71.632, 'Karen I Don''t Caribou the Cullerr'),
+(25803, 20, 2721.44, 5276.07, 70.8437, 'Karen I Don''t Caribou the Cullerr'),
+(25803, 21, 2729.39, 5276.17, 71.4764, 'Karen I Don''t Caribou the Cullerr'),
+(25803, 22, 2732.85, 5267, 70.526, 'Karen I Don''t Caribou the Cullerr'),
+(25803, 23, 2726.15, 5264.63, 71.5126, 'Karen I Don''t Caribou the Cullerr'),
+(25803, 24, 2721.45, 5267.05, 71.632, 'Karen I Don''t Caribou the Cullerr'),
+(25803, 25, 2721.44, 5276.07, 70.8437, 'Karen I Don''t Caribou the Cullerr'),
+(25803, 26, 2729.39, 5276.17, 71.4764, 'Karen I Don''t Caribou the Cullerr');
diff --git a/sql/updates/world/master/2020_04_10_08_world_2017_01_16_02_world.sql b/sql/updates/world/master/2020_04_10_08_world_2017_01_16_02_world.sql
new file mode 100644
index 00000000000..3287e8a0f5e
--- /dev/null
+++ b/sql/updates/world/master/2020_04_10_08_world_2017_01_16_02_world.sql
@@ -0,0 +1,42 @@
+-- Fruits of Our Labor - http://wotlk.openwow.com/quest=11904
+-- Cart Release SAI
+SET @ENTRY := 188104;
+UPDATE `gameobject_template` SET `AIName`="SmartGameObjectAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,1,0,0,70,0,100,0,2,0,0,0,45,1,1,0,0,0,0,19,25986,20,0,0,0,0,0,"Cart Release - On Gameobject State Changed - Set Data 1 1");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=25986;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `comment`) VALUES
+(25986, 0, 0, 'The Ore Cart squeaks against the rails as it is released.', 16, 0, 100, 0, 0, 0, 25416, 'Ore Cart');
+
+UPDATE `creature` SET `spawntimesecs`=1 WHERE `guid`=132773;
+
+-- Ore Cart SAI
+SET @ENTRY := 25986;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,1,38,0,100,1,1,1,0,0,48,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ore Cart - On Data Set 1 1 - Set Active On (No Repeat)"),
+(@ENTRY,0,1,3,61,0,100,0,1,1,0,0,53,0,25986,0,0,0,0,1,0,0,0,0,0,0,0,"Ore Cart - On Data Set 1 1 - Start Waypoint (No Repeat)"),
+(@ENTRY,0,2,4,40,0,100,0,15,25986,0,0,41,100,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ore Cart - On Waypoint 15 Reached - Despawn In 100 ms"),
+(@ENTRY,0,3,0,61,0,100,0,1,1,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ore Cart - On Data Set 1 1 - Say Line 0 (No Repeat)"),
+(@ENTRY,0,4,0,61,0,100,0,15,25986,0,0,48,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ore Cart - On Waypoint 15 Reached - Set Active Off");
+
+DELETE FROM `waypoints` WHERE `entry`=25986;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(25986,1,2797.49,5277.37,22.0435, 'Ore Cart'),
+(25986,2,2794.32,5281.92,22.4205, 'Ore Cart'),
+(25986,3,2790.66,5285.51,21.9443, 'Ore Cart'),
+(25986,4,2783.22,5291.11,22.7502, 'Ore Cart'),
+(25986,5,2776.37,5297,24.6788, 'Ore Cart'),
+(25986,6,2772.41,5299.31,25.5129, 'Ore Cart'),
+(25986,7,2767.82,5300.13,26.1103, 'Ore Cart'),
+(25986,8,2764.16,5299.4,26.2145, 'Ore Cart'),
+(25986,9,2760.57,5297.91,26.187, 'Ore Cart'),
+(25986,10,2757.37,5295.31,25.8549, 'Ore Cart'),
+(25986,11,2755.49,5291.84,25.142, 'Ore Cart'),
+(25986,12,2752.95,5288.89,24.7977, 'Ore Cart'),
+(25986,13,2748.91,5286.94,24.7359, 'Ore Cart'),
+(25986,14,2746.13,5285.9,24.8515, 'Ore Cart'),
+(25986,15,2733.06,5284.92,27.2962, 'Ore Cart');
diff --git a/sql/updates/world/master/2020_04_10_09_world_2017_01_16_03_world.sql b/sql/updates/world/master/2020_04_10_09_world_2017_01_16_03_world.sql
new file mode 100644
index 00000000000..459a6a5fe6f
--- /dev/null
+++ b/sql/updates/world/master/2020_04_10_09_world_2017_01_16_03_world.sql
@@ -0,0 +1,28 @@
+-- Librarian Hamilton -- http://www.wowhead.com/npc=27141/librarian-hamilton
+-- Librarian Hamilton SAI
+SET @ENTRY := 27141;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,25,0,100,0,0,0,0,0,53,0,27141,1,0,0,1,1,0,0,0,0,0,0,0,"Librarian Hamilton - On Reset - Start Waypoint"),
+(@ENTRY,0,1,0,64,0,100,0,0,0,0,0,54,180000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Librarian Hamilton - On Gossip Hello - Pause Waypoint"),
+(@ENTRY,0,2,0,40,0,100,0,1,27141,0,0,54,60000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Librarian Hamilton - On Waypoint 1 Reached - Pause Waypoint"),
+(@ENTRY,0,3,0,40,0,100,0,2,27141,0,0,80,@ENTRY*100+00,0,0,0,0,0,1,0,0,0,0,0,0,0,"Librarian Hamilton - On Waypoint 2 Reached - Run Script"),
+(@ENTRY,0,4,0,40,0,100,0,3,27141,0,0,54,60000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Librarian Hamilton - On Waypoint 3 Reached - Pause Waypoint"),
+(@ENTRY,0,5,6,40,0,100,0,4,27141,0,0,80,@ENTRY*100+00,0,0,0,0,0,1,0,0,0,0,0,0,0,"Librarian Hamilton - On Waypoint 4 Reached - Run Script"),
+(@ENTRY,0,6,0,61,0,100,0,4,27141,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,3.15815,"Librarian Hamilton - On Waypoint 4 Reached - Set Orientation 3,15815");
+
+-- Actionlist SAI
+SET @ENTRY := 2714100;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,54,17000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Librarian Hamilton - On Script - Pause Waypoint"),
+(@ENTRY,9,1,0,0,0,100,0,3000,3000,0,0,90,8,0,0,0,0,0,1,0,0,0,0,0,0,0,"Librarian Hamilton - On Script - Set Flag Standstate Kneel"),
+(@ENTRY,9,2,0,0,0,100,0,11000,11000,0,0,91,8,0,0,0,0,0,1,0,0,0,0,0,0,0,"Librarian Hamilton - On Script - Remove Flag Standstate Kneel");
+
+DELETE FROM `waypoints` WHERE `entry`=27141;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(27141, 1, 3595.1, 5959.01, 136.328, 'Librarian Hamilton'),
+(27141, 2, 3590.25, 5953.57, 136.203, 'Librarian Hamilton'),
+(27141, 3, 3595.1, 5959.01, 136.328, 'Librarian Hamilton'),
+(27141, 4, 3593.01, 5963.17, 136.328, 'Librarian Hamilton');
diff --git a/sql/updates/world/master/2020_04_10_10_world_2017_01_16_04_world.sql b/sql/updates/world/master/2020_04_10_10_world_2017_01_16_04_world.sql
new file mode 100644
index 00000000000..3b30a8c1743
--- /dev/null
+++ b/sql/updates/world/master/2020_04_10_10_world_2017_01_16_04_world.sql
@@ -0,0 +1,98 @@
+-- Initiate Vernon SAI
+SET @ENTRY := 27300;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,1,38,0,100,0,1,1,0,0,103,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Initiate Vernon - On Data Set 1 1 - Set Rooted On"),
+(@ENTRY,0,1,0,61,0,100,0,1,1,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Initiate Vernon - On Data Set 1 1 - Set Emote State 0"),
+(@ENTRY,0,2,0,38,0,100,0,2,2,0,0,66,0,0,0,0,0,0,10,111281,27299,0,0,0,0,0,"Initiate Vernon - On Data Set 2 2 - Set Orientation Closest Creature 'Initiate Greer'"),
+(@ENTRY,0,3,0,38,0,100,0,3,3,0,0,11,48254,0,0,0,0,0,1,0,0,0,0,0,0,0,"Initiate Vernon - On Data Set 3 3 - Cast 'Prototype Neural Needle Impact'"),
+(@ENTRY,0,4,0,38,0,100,0,4,4,0,0,103,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Initiate Vernon - On Data Set 4 4 - Set Rooted Off");
+
+SET @MAXGUID := 915;
+SET @SCRIPTID := 11130700;
+DELETE FROM `waypoint_scripts` WHERE `id` IN (@SCRIPTID+0);
+INSERT INTO `waypoint_scripts` (`id`, `delay`, `command`, `datalong`, `datalong2`, `dataint`, `x`, `y`, `z`, `o`, `guid`) VALUES
+(@SCRIPTID+0, 2, 1, 69, 1, 0, 0, 0, 0, 0, (@MAXGUID := @MAXGUID + 1)),
+(@SCRIPTID+0, 17, 1, 0, 1, 0, 0, 0, 0, 0, (@MAXGUID := @MAXGUID + 1));
+
+SET @NPC := 111307;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`, `action`, `orientation`) VALUES
+(@PATH, 1, 3647.87, 5909.61, 174.578, 21000, @SCRIPTID, 1.26067),
+(@PATH, 2, 3640.9, 5911.28, 174.579, 21000, @SCRIPTID, 1.26067);
+
+UPDATE `waypoint_data` SET `action_chance`=100 WHERE `action` IN (@SCRIPTID);
+
+-- Initiate Greer SAI
+SET @ENTRY := 27299;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,25,0,100,0,0,0,0,0,53,0,27299,1,0,0,1,1,0,0,0,0,0,0,0,"Initiate Greer - On Reset - Start Waypoint"),
+(@ENTRY,0,1,0,64,0,100,0,0,0,0,0,54,180000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Initiate Greer - On Gossip Hello - Pause Waypoint"),
+(@ENTRY,0,2,3,40,0,100,0,5,27299,0,0,80,@ENTRY*100+00,0,0,0,0,0,1,0,0,0,0,0,0,0,"Initiate Greer - On Waypoint 5 Reached - Run Script"),
+(@ENTRY,0,3,0,61,0,100,0,5,27299,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.76692,"Initiate Greer - On Waypoint 5 Reached - Set Orientation 2,76692"),
+(@ENTRY,0,4,5,40,0,100,0,11,27299,0,0,80,@ENTRY*100+01,0,0,0,0,0,1,0,0,0,0,0,0,0,"Initiate Greer - On Waypoint 11 Reached - Run Script"),
+(@ENTRY,0,5,0,61,0,100,0,11,27299,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.84897,"Initiate Greer - On Waypoint 11 Reached - Set Orientation 5,84897");
+
+-- Actionlist SAI
+SET @ENTRY := 2729900;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,54,55000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Initiate Greer - On Script - Pause Waypoint"),
+(@ENTRY,9,1,0,0,0,100,0,0,0,0,0,48,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Initiate Greer - On Script - Set Active On"),
+(@ENTRY,9,2,0,0,0,100,0,3000,3000,0,0,17,133,0,0,0,0,0,1,0,0,0,0,0,0,0,"Initiate Greer - On Script - Set Emote State 133"),
+(@ENTRY,9,3,0,0,0,100,0,10000,10000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Initiate Greer - On Script - Set Emote State 0"),
+(@ENTRY,9,4,0,0,0,100,0,3000,3000,0,0,1,0,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Initiate Greer - On Script - Say Line 0"),
+(@ENTRY,9,5,0,0,0,100,0,5000,5000,0,0,45,3,3,0,0,0,0,10,111307,27300,0,0,0,0,0,"Initiate Greer - On Script - Set Data 3 3"),
+(@ENTRY,9,6,0,0,0,100,0,1000,1000,0,0,45,1,1,0,0,0,0,10,111307,27300,0,0,0,0,0,"Initiate Greer - On Script - Set Data 1 1"),
+(@ENTRY,9,7,0,0,0,100,0,6000,6000,0,0,1,1,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Initiate Greer - On Script - Say Line 1"),
+(@ENTRY,9,8,0,0,0,100,0,4000,4000,0,0,45,2,2,0,0,0,0,10,111307,27300,0,0,0,0,0,"Initiate Greer - On Script - Set Data 2 2"),
+(@ENTRY,9,9,0,0,0,100,0,2000,2000,0,0,1,0,6000,0,0,0,0,10,111307,27300,0,0,0,0,0,"Initiate Greer - On Script - Say Line 0"),
+(@ENTRY,9,10,0,0,0,100,0,14000,14000,0,0,1,2,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Initiate Greer - On Script - Say Line 2"),
+(@ENTRY,9,11,0,0,0,100,0,0,0,0,0,45,4,4,0,0,0,0,10,111307,27300,0,0,0,0,0,"Initiate Greer - On Script - Set Data 4 4"),
+(@ENTRY,9,12,0,0,0,100,0,2000,2000,0,0,48,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Initiate Greer - On Script - Set Active Off");
+
+-- Actionlist SAI
+SET @ENTRY := 2729901;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,54,70000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Initiate Greer - On Script - Pause Waypoint"),
+(@ENTRY,9,1,0,0,0,100,0,0,0,0,0,48,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Initiate Greer - On Script - Set Active On"),
+(@ENTRY,9,2,0,0,0,100,0,3000,3000,0,0,17,133,0,0,0,0,0,1,0,0,0,0,0,0,0,"Initiate Greer - On Script - Set Emote State 133"),
+(@ENTRY,9,3,0,0,0,100,0,64000,64000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Initiate Greer - On Script - Set Emote State 0"),
+(@ENTRY,9,4,0,0,0,100,0,0,0,0,0,48,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Initiate Greer - On Script - Set Active Off");
+
+DELETE FROM `creature_text` WHERE `CreatureID` IN (27299, 27300);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `comment`) VALUES
+(27299, 0, 0, 'Tell me if this hurts.', 12, 0, 100, 0, 0, 0, 26296, 'Initiate Greer'),
+(27299, 0, 1, 'Let''s try this one out...', 12, 0, 100, 0, 0, 0, 26298, 'Initiate Greer'),
+(27299, 0, 2, 'I think I''ve got it this time..', 12, 0, 100, 0, 0, 0, 26297, 'Initiate Greer'),
+(27299, 1, 0, 'How''d that feel?', 12, 0, 100, 0, 0, 0, 26299, 'Initiate Greer'),
+(27299, 1, 1, 'Was that potent enough?', 12, 0, 100, 0, 0, 0, 26302, 'Initiate Greer'),
+(27299, 1, 2, 'Do you think that will get some answers?', 12, 0, 100, 0, 0, 0, 26300, 'Initiate Greer'),
+(27299, 2, 0, 'Hmm...', 12, 0, 100, 0, 0, 0, 26304, 'Initiate Greer'),
+(27299, 2, 1, 'True, our enemies would show us no mercy.', 12, 0, 100, 0, 0, 0, 26320, 'Initiate Greer'),
+(27299, 2, 2, 'True, but how far should we push? At what point are we no better than our enemies?', 12, 0, 100, 0, 0, 0, 26319, 'Initiate Greer'),
+(27300, 0, 0, 'You need more bite. Do not show our enemies any mercy.', 12, 0, 100, 0, 0, 0, 26305, 'Initiate Vernon'),
+(27300, 0, 1, 'The more pain we can inflict, the quicker we can get our answers.', 12, 0, 100, 0, 0, 0, 26306, 'Initiate Vernon');
+
+UPDATE `creature` SET `spawndist`=0, `MovementType`=0 WHERE `guid`=111281;
+DELETE FROM `waypoints` WHERE `entry`=27299;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(27299, 1, 3640.38, 5908, 174.576, 'Initiate Greer'),
+(27299, 2, 3642.54, 5905.63, 174.572, 'Initiate Greer'),
+(27299, 3, 3645.93, 5904.91, 174.571, 'Initiate Greer'),
+(27299, 4, 3647.52, 5906.78, 174.576, 'Initiate Greer'),
+(27299, 5, 3646.7, 5907.29, 174.578, 'Initiate Greer'),
+(27299, 6, 3647.49, 5906.69, 174.578, 'Initiate Greer'),
+(27299, 7, 3646.49, 5905.07, 174.576, 'Initiate Greer'),
+(27299, 8, 3643.7, 5905.04, 174.568, 'Initiate Greer'),
+(27299, 9, 3641.21, 5906.38, 174.577, 'Initiate Greer'),
+(27299, 10, 3640.11, 5908.16, 174.577, 'Initiate Greer'),
+(27299, 11, 3641.55, 5908.3, 174.577, 'Initiate Greer');
diff --git a/sql/updates/world/master/2020_04_10_11_world_2017_01_16_05_world.sql b/sql/updates/world/master/2020_04_10_11_world_2017_01_16_05_world.sql
new file mode 100644
index 00000000000..b4351d0c775
--- /dev/null
+++ b/sql/updates/world/master/2020_04_10_11_world_2017_01_16_05_world.sql
@@ -0,0 +1,35 @@
+-- Apprentice Trotter -- http://www.wowhead.com/npc=27301
+-- Apprentice Trotter SAI
+SET @ENTRY := 27301;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,25,0,100,0,0,0,0,0,53,0,27301,1,0,0,1,1,0,0,0,0,0,0,0,"Apprentice Trotter - On Reset - Start Waypoint"),
+(@ENTRY,0,1,0,64,0,100,0,0,0,0,0,54,180000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Apprentice Trotter - On Gossip Hello - Pause Waypoint"),
+(@ENTRY,0,2,3,40,0,100,0,3,27301,0,0,80,@ENTRY*100+00,0,0,0,0,0,1,0,0,0,0,0,0,0,"Apprentice Trotter - On Waypoint 3 Reached - Run Script"),
+(@ENTRY,0,3,0,61,0,100,0,3,27301,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.20907,"Apprentice Trotter - On Waypoint 3 Reached - Set Orientation 5,20907"),
+(@ENTRY,0,4,5,40,0,100,0,5,27301,0,0,80,@ENTRY*100+00,0,0,0,0,0,1,0,0,0,0,0,0,0,"Apprentice Trotter - On Waypoint 5 Reached - Run Script"),
+(@ENTRY,0,5,0,61,0,100,0,5,27301,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,6.1162,"Apprentice Trotter - On Waypoint 5 Reached - Set Orientation 6,1162"),
+(@ENTRY,0,6,7,40,0,100,0,8,27301,0,0,80,@ENTRY*100+00,0,0,0,0,0,1,0,0,0,0,0,0,0,"Apprentice Trotter - On Waypoint 8 Reached - Run Script"),
+(@ENTRY,0,7,0,61,0,100,0,8,27301,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,6.10835,"Apprentice Trotter - On Waypoint 8 Reached - Set Orientation 6,10835");
+
+-- Actionlist SAI
+SET @ENTRY := 2730100;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,54,16000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Apprentice Trotter - On Script - Pause Waypoint"),
+(@ENTRY,9,1,0,0,0,100,0,3000,3000,0,0,17,133,0,0,0,0,0,1,0,0,0,0,0,0,0,"Apprentice Trotter - On Script - Set Emote State 133"),
+(@ENTRY,9,2,0,0,0,100,0,8000,8000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Apprentice Trotter - On Script - Set Emote State 0");
+
+UPDATE `creature` SET `spawndist`=0, `MovementType`=0 WHERE `guid`=111400;
+DELETE FROM `waypoints` WHERE `entry`=27301;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(27301, 1, 3655.39, 5880.89, 174.576, 'Apprentice Trotter'),
+(27301, 2, 3648.21, 5875.72, 174.554, 'Apprentice Trotter'),
+(27301, 3, 3649.17, 5874.43, 174.578, 'Apprentice Trotter'),
+(27301, 4, 3656.08, 5881.3, 174.577, 'Apprentice Trotter'),
+(27301, 5, 3659.29, 5880.93, 174.577, 'Apprentice Trotter'),
+(27301, 6, 3658.57, 5882.95, 174.577, 'Apprentice Trotter'),
+(27301, 7, 3659.6, 5887.87, 174.577, 'Apprentice Trotter'),
+(27301, 8, 3661.47, 5888.53, 174.577, 'Apprentice Trotter'),
+(27301, 9, 3659.61, 5887.48, 174.576, 'Apprentice Trotter');
diff --git a/sql/updates/world/master/2020_04_10_12_world_2017_01_16_06_world.sql b/sql/updates/world/master/2020_04_10_12_world_2017_01_16_06_world.sql
new file mode 100644
index 00000000000..c781ef0e9d3
--- /dev/null
+++ b/sql/updates/world/master/2020_04_10_12_world_2017_01_16_06_world.sql
@@ -0,0 +1,60 @@
+-- Warden Nork Bloodfrenzy SAI
+SET @ENTRY := 25379;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0 AND `id`=4;
+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
+(@ENTRY,0,4,0,1,0,100,0,10000,10000,470000,470000,80,@ENTRY*100+00,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warden Nork Bloodfrenzy - Out of Combat - Run Script");
+
+-- Actionlist SAI
+SET @ENTRY := 2537900;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,48,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warden Nork Bloodfrenzy - On Script - Set Active On"),
+(@ENTRY,9,1,0,0,0,100,0,2000,2000,0,0,1,1,3000,0,0,0,0,1,0,0,0,0,0,0,0,"Warden Nork Bloodfrenzy - On Script - Say Line 1"),
+(@ENTRY,9,2,0,0,0,100,0,3000,3000,0,0,1,0,10000,0,0,0,0,10,125421,25426,0,0,0,0,0,"Warden Nork Bloodfrenzy - On Script - Say Line 0"),
+(@ENTRY,9,3,0,0,0,100,0,8000,8000,0,0,5,11,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warden Nork Bloodfrenzy - On Script - Play Emote 11"),
+(@ENTRY,9,4,0,0,0,100,0,2000,2000,0,0,1,2,1000,0,0,0,0,1,0,0,0,0,0,0,0,"Warden Nork Bloodfrenzy - On Script - Say Line 2"),
+(@ENTRY,9,5,0,0,0,100,0,1000,1000,0,0,1,3,5000,0,0,0,0,1,0,0,0,0,0,0,0,"Warden Nork Bloodfrenzy - On Script - Say Line 3"),
+(@ENTRY,9,6,0,0,0,100,0,5000,5000,0,0,1,1,6000,0,0,0,0,10,125421,25426,0,0,0,0,0,"Warden Nork Bloodfrenzy - On Script - Say Line 1"),
+(@ENTRY,9,7,0,0,0,100,0,6000,6000,0,0,1,4,3000,0,0,0,0,1,0,0,0,0,0,0,0,"Warden Nork Bloodfrenzy - On Script - Say Line 4"),
+(@ENTRY,9,8,0,0,0,100,0,3000,3000,0,0,1,5,10000,0,0,0,0,1,0,0,0,0,0,0,0,"Warden Nork Bloodfrenzy - On Script - Say Line 5"),
+(@ENTRY,9,9,0,0,0,100,0,5000,5000,0,0,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warden Nork Bloodfrenzy - On Script - Play Emote 1"),
+(@ENTRY,9,10,0,0,0,100,0,5000,5000,0,0,1,2,8000,0,0,0,0,10,125421,25426,0,0,0,0,0,"Warden Nork Bloodfrenzy - On Script - Say Line 2"),
+(@ENTRY,9,11,0,0,0,100,0,8000,8000,0,0,1,6,9000,0,0,0,0,1,0,0,0,0,0,0,0,"Warden Nork Bloodfrenzy - On Script - Say Line 6"),
+(@ENTRY,9,12,0,0,0,100,0,5000,5000,0,0,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warden Nork Bloodfrenzy - On Script - Play Emote 1"),
+(@ENTRY,9,13,0,0,0,100,0,4000,4000,0,0,1,7,5000,0,0,0,0,1,0,0,0,0,0,0,0,"Warden Nork Bloodfrenzy - On Script - Say Line 7"),
+(@ENTRY,9,14,0,0,0,100,0,5000,5000,0,0,1,8,7000,0,0,0,0,1,0,0,0,0,0,0,0,"Warden Nork Bloodfrenzy - On Script - Say Line 8"),
+(@ENTRY,9,15,0,0,0,100,0,7000,7000,0,0,1,3,3000,0,0,0,0,10,125421,25426,0,0,0,0,0,"Warden Nork Bloodfrenzy - On Script - Say Line 3"),
+(@ENTRY,9,16,0,0,0,100,0,3000,3000,0,0,1,4,5000,0,0,0,0,10,125421,25426,0,0,0,0,0,"Warden Nork Bloodfrenzy - On Script - Say Line 4"),
+(@ENTRY,9,17,0,0,0,100,0,5000,5000,0,0,1,5,3000,0,0,0,0,10,125421,25426,0,0,0,0,0,"Warden Nork Bloodfrenzy - On Script - Say Line 5"),
+(@ENTRY,9,18,0,0,0,100,0,3000,3000,0,0,1,6,5000,0,0,0,0,10,125421,25426,0,0,0,0,0,"Warden Nork Bloodfrenzy - On Script - Say Line 6"),
+(@ENTRY,9,19,0,0,0,100,0,5000,5000,0,0,1,9,2000,0,0,0,0,1,0,0,0,0,0,0,0,"Warden Nork Bloodfrenzy - On Script - Say Line 9"),
+(@ENTRY,9,20,0,0,0,100,0,2000,2000,0,0,1,10,7000,0,0,0,0,1,0,0,0,0,0,0,0,"Warden Nork Bloodfrenzy - On Script - Say Line 10"),
+(@ENTRY,9,21,0,0,0,100,0,4000,4000,0,0,5,15,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warden Nork Bloodfrenzy - On Script - Play Emote 15"),
+(@ENTRY,9,22,0,0,0,100,0,3000,3000,0,0,1,11,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Warden Nork Bloodfrenzy - On Script - Say Line 11"),
+(@ENTRY,9,23,0,0,0,100,0,3000,3000,0,0,5,5,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warden Nork Bloodfrenzy - On Script - Play Emote 5"),
+(@ENTRY,9,24,0,0,0,100,0,2000,2000,0,0,48,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warden Nork Bloodfrenzy - On Script - Set Active Off");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=25379 AND `GroupID` >=1;
+DELETE FROM `creature_text` WHERE `CreatureID`=25426;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `comment`) VALUES
+-- Warden Nork Bloodfrenzy
+(25379, 1, 0, 'Look at \'em, Ug. You know what those are?', 12, 1, 100, 25, 0, 0, 24631, 'Warden Nork Bloodfrenzy'),
+(25379, 2, 0, 'Those...', 12, 1, 100, 25, 0, 0, 24633, 'Warden Nork Bloodfrenzy'),
+(25379, 3, 0, 'Those are cowards.', 12, 1, 100, 1, 0, 0, 24634, 'Warden Nork Bloodfrenzy'),
+(25379, 4, 0, '%s shakes his head.', 16, 1, 100, 274, 0, 0, 24636, 'Warden Nork Bloodfrenzy'),
+(25379, 5, 0, 'No, blood of my blood, they are soldiers of the Alliance. Our sworn enemies.', 12, 1, 100, 1, 0, 0, 24637, 'Warden Nork Bloodfrenzy'),
+(25379, 6, 0, 'They are here because they do not wish to defend their homes... their families...', 12, 1, 100, 1, 0, 0, 24639, 'Warden Nork Bloodfrenzy'),
+(25379, 7, 0, 'They have given up and surrendered - willingly - to us.', 12, 1, 100, 1, 0, 0, 24640, 'Warden Nork Bloodfrenzy'),
+(25379, 8, 0, 'Ug\'thor, they are afraid to die.', 12, 1, 100, 1, 0, 0, 24641, 'Warden Nork Bloodfrenzy'),
+(25379, 9, 0, '%s laughs.', 16, 1, 100, 11, 0, 0, 24646, 'Warden Nork Bloodfrenzy'),
+(25379, 10, 0, 'That\'s right, Ug. Victory or death!', 12, 1, 100, 273, 0, 0, 24647, 'Warden Nork Bloodfrenzy'),
+(25379, 11, 0, '[In Broken Common] Hear boy, cowards? Boy die! Boy die for freedom!', 12, 0, 100, 273, 0, 0, 24648, 'Warden Nork Bloodfrenzy'),
+-- Ug''thor Bloodfrenzy
+(25426, 0, 0, 'No, popo. They look kind of like the pigs. Are they pigs?', 12, 1, 100, 1, 0, 0, 24632, 'Ug''thor Bloodfrenzy'),
+(25426, 1, 0, 'Are they cowardly pigs, popo?', 12, 1, 100, 1, 0, 0, 24635, 'Ug''thor Bloodfrenzy'),
+(25426, 2, 0, 'But popo, what are they afraid of? Why are they here?', 12, 1, 100, 1, 0, 0, 24638, 'Ug''thor Bloodfrenzy'),
+(25426, 3, 0, '%s scratches his head.', 16, 1, 100, 0, 0, 0, 24642, 'Ug''thor Bloodfrenzy'),
+(25426, 4, 0, 'I... I don\'t understand, popo.', 12, 1, 100, 1, 0, 0, 24643, 'Ug''thor Bloodfrenzy'),
+(25426, 5, 0, '%s puffs out his chest and stands on his tip-toes.', 16, 1, 100, 0, 0, 0, 24644, 'Ug''thor Bloodfrenzy'),
+(25426, 6, 0, 'Lok\'tar ogar, popo!', 12, 1, 100, 1, 0, 0, 24645, 'Ug''thor Bloodfrenzy');
diff --git a/sql/updates/world/master/2020_04_10_13_world_2017_01_17_00_world.sql b/sql/updates/world/master/2020_04_10_13_world_2017_01_17_00_world.sql
new file mode 100644
index 00000000000..f8e9d1b95a6
--- /dev/null
+++ b/sql/updates/world/master/2020_04_10_13_world_2017_01_17_00_world.sql
@@ -0,0 +1,279 @@
+-- Instructor Razuvious - Event with Acherus Necromancer and Death Knight Initiate -- http://wow.gamepedia.com/Death_Knight_Initiate
+-- Instructor Razuvious
+SET @NPC := 129307;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `orientation`, `delay`) VALUES
+(@PATH, 1, 2481.1, -5560.54, 420.493, 5.58015, 0),
+(@PATH, 2, 2491.86, -5571.77, 420.459, 5.3508, 0),
+(@PATH, 3, 2497.91, -5588.32, 420.462, 4.9212, 0),
+(@PATH, 4, 2494.03, -5612.09, 420.491, 1.24868, 0),
+(@PATH, 5, 2498.68, -5591.69, 420.494, 1.78118, 0),
+(@PATH, 6, 2492.94, -5573.05, 420.475, 2.14717, 0),
+(@PATH, 7, 2475.93, -5558.57, 420.485, 2.79199, 0),
+(@PATH, 8, 2455.66, -5554.78, 420.508, 0.040735, 0),
+(@PATH, 9, 2472.56, -5558.04, 420.453, 6.06788, 0),
+(@PATH, 10, 2481.1, -5560.54, 420.493, 5.58015, 0),
+(@PATH, 11, 2491.86, -5571.77, 420.459, 5.3508, 0),
+(@PATH, 12, 2497.91, -5588.32, 420.462, 4.9212, 0),
+(@PATH, 13, 2494.03, -5612.09, 420.491, 1.24868, 0),
+(@PATH, 14, 2498.68, -5591.69, 420.494, 1.78118, 0),
+(@PATH, 15, 2492.94, -5573.05, 420.475, 2.14717, 0),
+(@PATH, 16, 2475.93, -5558.57, 420.485, 2.79199, 0),
+(@PATH, 17, 2455.66, -5554.78, 420.508, 0.040735, 0),
+(@PATH, 18, 2472.56, -5558.04, 420.453, 6.06788, 0),
+(@PATH, 19, 2481.1, -5560.54, 420.493, 5.58, 0),
+(@PATH, 20, 2482.32, -5552.39, 420.641, 1.51, 70000),
+(@PATH, 21, 2491.86, -5571.77, 420.459, 5.351, 0),
+(@PATH, 22, 2497.91, -5588.32, 420.462, 4.9212, 0),
+(@PATH, 23, 2494.03, -5612.09, 420.491, 1.24868, 0),
+(@PATH, 24, 2498.68, -5591.69, 420.494, 1.78118, 0),
+(@PATH, 25, 2492.94, -5573.05, 420.475, 2.14717, 0),
+(@PATH, 26, 2475.93, -5558.57, 420.485, 2.79199, 0),
+(@PATH, 27, 2455.66, -5554.78, 420.508, 0.040735, 0),
+(@PATH, 28, 2472.56, -5558.04, 420.453, 6.06788, 0),
+(@PATH, 29, 2481.1, -5560.54, 420.493, 5.58015, 0),
+(@PATH, 30, 2491.86, -5571.77, 420.459, 5.3508, 0),
+(@PATH, 31, 2497.91, -5588.32, 420.462, 4.9212, 0),
+(@PATH, 32, 2494.03, -5612.09, 420.491, 1.24868, 0),
+(@PATH, 33, 2498.68, -5591.69, 420.494, 1.78118, 0),
+(@PATH, 34, 2492.94, -5573.05, 420.475, 2.14717, 0),
+(@PATH, 35, 2475.93, -5558.57, 420.485, 2.79199, 0),
+(@PATH, 36, 2455.66, -5554.78, 420.508, 0.040735, 0),
+(@PATH, 37, 2472.56, -5558.04, 420.453, 6.06788, 0),
+(@PATH, 38, 2481.1, -5560.54, 420.493, 5.58015, 0),
+(@PATH, 39, 2491.86, -5571.77, 420.459, 5.3508, 0),
+(@PATH, 40, 2497.91, -5588.32, 420.462, 4.9212, 0),
+(@PATH, 41, 2494.03, -5612.09, 420.491, 1.24868, 0),
+(@PATH, 42, 2498.68, -5591.69, 420.494, 1.78118, 0),
+(@PATH, 43, 2510.38, -5592.75, 420.643, 6.19, 75000),
+(@PATH, 44, 2492.94, -5573.05, 420.475, 2.147, 0),
+(@PATH, 45, 2475.93, -5558.57, 420.485, 2.79, 0),
+(@PATH, 46, 2455.66, -5554.78, 420.508, 0.040735, 0),
+(@PATH, 47, 2472.56, -5558.04, 420.453, 6.06788, 0);
+
+-- Instructor Razuvious SAI
+SET @ENTRY := 28357;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,34,0,100,0,2,19,0,0,80,@ENTRY*100+00,0,0,0,0,0,1,0,0,0,0,0,0,0,"Instructor Razuvious - On Reached Point 19 - Run Script"),
+(@ENTRY,0,1,0,34,0,100,0,2,42,0,0,80,@ENTRY*100+01,0,0,0,0,0,1,0,0,0,0,0,0,0,"Instructor Razuvious - On Reached Point 42 - Run Script"),
+(@ENTRY,0,2,0,38,0,100,0,1,1,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.78367,"Instructor Razuvious - On Data Set 1 1 - Set Orientation 2.78367"),
+(@ENTRY,0,3,0,38,0,100,0,2,2,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,1.50472,"Instructor Razuvious - On Data Set 2 2 - Set Orientation 1.50472"),
+(@ENTRY,0,4,0,38,0,100,0,3,3,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,1.26755,"Instructor Razuvious - On Data Set 3 3 - Set Orientation 1.26755"),
+(@ENTRY,0,5,0,38,0,100,0,4,4,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,6.19669,"Instructor Razuvious - On Data Set 4 4 - Set Orientation 6,19669");
+
+-- Actionlist SAI
+SET @ENTRY := 2835700;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,48,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Set Active On"),
+(@ENTRY,9,1,0,0,0,100,0,1000,1000,0,0,1,0,5000,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Say Line 0"),
+(@ENTRY,9,2,0,0,0,100,0,1000,1000,0,0,45,1,1,0,0,0,0,10,129391,28383,0,0,0,0,0,"On Script - Set Data 1 1");
+
+-- Actionlist SAI
+SET @ENTRY := 2835701;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,48,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Set Active On"),
+(@ENTRY,9,1,0,0,0,100,0,1000,1000,0,0,1,0,5000,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Say Line 0"),
+(@ENTRY,9,2,0,0,0,100,0,1000,1000,0,0,45,1,1,0,0,0,0,10,129390,28383,0,0,0,0,0,"On Script - Set Data 1 1");
+
+-- Acherus Necromancer SAI
+SET @GUID := -129391;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=28383;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@GUID 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
+(@GUID,0,0,1,38,0,100,0,1,1,0,0,80,12939100,0,0,0,0,0,1,0,0,0,0,0,0,0,"Acherus Necromancer - On Data Set 1 1 - Run Script"),
+(@GUID,0,1,0,61,0,100,0,1,1,0,0,48,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Acherus Necromancer - On Data Set 1 1 - Set Active On");
+
+UPDATE `creature` SET `id`=28391, `spawntimesecs`=1, `modelid`=25361 WHERE `guid` IN (130292);
+UPDATE `creature` SET `position_x`=2477.361328, `position_y`=-5538.785156, `position_z`=420.645264, `orientation`=4.889500 WHERE `guid`=129458;
+DELETE FROM `creature` WHERE `guid`=129452;
+UPDATE `creature` SET `spawntimesecs`=1 WHERE `guid`=129459;
+
+-- Actionlist SAI
+SET @ENTRY := 12939100;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,3000,3000,0,0,11,51516,0,0,0,0,0,1,0,0,0,0,0,0,0,"Acherus Necromancer - On Script - Cast 'Raise Dead'"),
+(@ENTRY,9,1,0,0,0,100,0,4000,4000,0,0,86,51517,0,10,130292,28391,0,1,0,0,0,0,0,0,0,"Acherus Necromancer - On Script - Cross Cast 'Raise Dead'"),
+(@ENTRY,9,2,0,0,0,100,0,1000,1000,0,0,28,29266,0,0,0,0,0,10,130292,28391,0,0,0,0,0,"Acherus Necromancer - On Script - Remove Aura 'Permanent Feign Death'"),
+(@ENTRY,9,3,0,0,0,100,0,0,0,0,0,96,32,0,0,0,0,0,10,130292,28391,0,0,0,0,0,"Acherus Necromancer - On Script - Remove Dynamic Flag Dead"),
+(@ENTRY,9,4,0,0,0,100,0,0,0,0,0,19,537165824,0,0,0,0,0,10,130292,28391,0,0,0,0,0,"Acherus Necromancer - On Script - Remove Flag Stunned"),
+(@ENTRY,9,5,0,0,0,100,0,0,0,0,0,19,1,1,0,0,0,0,10,130292,28391,0,0,0,0,0,"Acherus Necromancer - On Script - Remove Flag Server Controlled"),
+(@ENTRY,9,6,0,0,0,100,0,0,0,0,0,91,7,0,0,0,0,0,10,130292,28391,0,0,0,0,0,"Acherus Necromancer - On Script - Remove Flag Standstate Dead"),
+(@ENTRY,9,7,0,0,0,100,0,0,0,0,0,91,257,0,0,0,0,0,10,130292,28391,0,0,0,0,0,"Acherus Necromancer - On Script - Remove Flag <Unknown bytes1 (UnitStandStateType)>"),
+(@ENTRY,9,8,0,0,0,100,0,2000,2000,0,0,2,1770,0,0,0,0,0,10,130292,28391,0,0,0,0,0,"Acherus Necromancer - On Script - Set Faction 1770"),
+(@ENTRY,9,9,0,0,0,100,0,1000,1000,0,0,45,1,1,0,0,0,0,10,130292,28391,0,0,0,0,0,"Acherus Necromancer - On Script - Set Data 1 1"),
+(@ENTRY,9,10,0,0,0,100,0,0,0,0,0,90,8,0,0,0,0,0,10,130292,28391,0,0,0,0,0,"Acherus Necromancer - On Script - Set Flag Standstate Kneel"),
+(@ENTRY,9,11,0,0,0,100,0,4000,4000,0,0,1,0,5000,0,0,0,0,26,28391,50,0,0,0,0,0,"Acherus Necromancer - On Script - Say Line 0"),
+(@ENTRY,9,12,0,0,0,100,0,5000,5000,0,0,1,1,5000,0,0,0,0,10,129307,28357,0,0,0,0,0,"Acherus Necromancer - On Script - Say Line 1"),
+(@ENTRY,9,13,0,0,0,100,0,5000,5000,0,0,45,1,1,0,0,0,0,10,129307,28357,0,0,0,0,0,"Acherus Necromancer - On Script - Set Data 1 1"),
+(@ENTRY,9,14,0,0,0,100,0,3000,3000,0,0,1,2,5000,0,0,0,0,10,129307,28357,0,0,0,0,0,"Acherus Necromancer - On Script - Say Line 2"),
+(@ENTRY,9,15,0,0,0,100,0,3000,3000,0,0,45,2,2,0,0,0,0,10,129307,28357,0,0,0,0,0,"Acherus Necromancer - On Script - Set Data 2 2"),
+(@ENTRY,9,16,0,0,0,100,0,0,0,0,0,1,0,5000,0,0,0,0,1,0,0,0,0,0,0,0,"Acherus Necromancer - On Script - Say Line 0"),
+(@ENTRY,9,17,0,0,0,100,0,4000,4000,0,0,59,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Acherus Necromancer - On Script - Set Run Off"),
+(@ENTRY,9,18,0,0,0,100,0,0,0,0,0,69,0,0,0,0,0,0,8,0,0,0,2482.23,-5546.44,420.644,0.761266,"Acherus Necromancer - On Script - Move To Position"),
+(@ENTRY,9,19,0,0,0,100,0,4000,4000,0,0,17,133,0,0,0,0,0,1,0,0,0,0,0,0,0,"Acherus Necromancer - On Script - Set Emote State 133"),
+(@ENTRY,9,20,0,0,0,100,0,5000,5000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Acherus Necromancer - On Script - Set Emote State 0"),
+(@ENTRY,9,21,0,0,0,100,0,0,0,0,0,86,51537,0,10,130292,28391,0,1,0,0,0,0,0,0,0,"Acherus Necromancer - On Script - Cross Cast 'Death Knight Initiate (Female, Dwarf)'"),
+(@ENTRY,9,22,0,0,0,100,0,0,0,0,0,3,0,25406,0,0,0,0,10,130292,28391,0,0,0,0,0,"Acherus Necromancer - On Script - Morph To Model 25406"),
+(@ENTRY,9,23,0,0,0,100,0,2000,2000,0,0,86,51519,0,10,130292,28391,0,1,0,0,0,0,0,0,0,"Acherus Necromancer - On Script - Cross Cast 'Death Knight Initiate Visual'"),
+(@ENTRY,9,24,0,0,0,100,0,2000,2000,0,0,91,8,0,0,0,0,0,10,130292,28391,0,0,0,0,0,"Acherus Necromancer - On Script - Remove Flag Standstate Kneel"),
+(@ENTRY,9,25,0,0,0,100,0,2000,2000,0,0,69,0,0,0,0,0,0,8,0,0,0,2477.37,-5551,420.647,0.77,"Acherus Necromancer - On Script - Move To Position"),
+(@ENTRY,9,26,0,0,0,100,0,4000,4000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,0.746414,"Acherus Necromancer - On Script - Set Orientation 0.746414"),
+(@ENTRY,9,27,0,0,0,100,0,1000,1000,0,0,1,3,5000,0,0,0,0,10,129307,28357,0,0,0,0,0,"Acherus Necromancer - On Script - Say Line 3"),
+(@ENTRY,9,28,0,0,0,100,0,5000,5000,0,0,1,1,5000,0,0,0,0,10,130292,28391,0,0,0,0,0,"Acherus Necromancer - On Script - Say Line 1"),
+(@ENTRY,9,29,0,0,0,100,0,1000,1000,0,0,48,1,0,0,0,0,0,10,130292,28391,0,0,0,0,0,"Acherus Necromancer - On Script - Set Active On"),
+(@ENTRY,9,30,0,0,0,100,0,0,0,0,0,45,2,2,0,0,0,0,10,130292,28391,0,0,0,0,0,"Acherus Necromancer - On Script - Set Data 2 2"),
+(@ENTRY,9,31,0,0,0,100,0,1000,1000,0,0,48,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Acherus Necromancer - On Script - Set Active Off");
+
+-- Acherus Necromancer SAI
+SET @GUID := -129390;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=28383;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@GUID 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
+(@GUID,0,0,1,38,0,100,0,1,1,0,0,80,12939000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Acherus Necromancer - On Data Set 1 1 - Run Script"),
+(@GUID,0,1,0,61,0,100,0,1,1,0,0,48,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Acherus Necromancer - On Data Set 1 1 - Set Active On");
+
+-- Actionlist SAI
+SET @ENTRY := 12939000;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,3000,3000,0,0,11,51516,0,1,0,0,0,1,0,0,0,0,0,0,0,"Acherus Necromancer - On Script - Cross Cast 'Raise Dead'"),
+(@ENTRY,9,1,0,0,0,100,0,4000,4000,0,0,86,51517,0,10,129459,28394,0,1,0,0,0,0,0,0,0,"Acherus Necromancer - On Script - Cross Cast 'Raise Dead'"),
+(@ENTRY,9,2,0,0,0,100,0,1000,1000,0,0,28,29266,0,0,0,0,0,10,129459,28394,0,0,0,0,0,"Acherus Necromancer - On Script - Remove Aura 'Permanent Feign Death'"),
+(@ENTRY,9,3,0,0,0,100,0,0,0,0,0,96,32,0,0,0,0,0,10,129459,28394,0,0,0,0,0,"Acherus Necromancer - On Script - Remove Dynamic Flag Dead"),
+(@ENTRY,9,4,0,0,0,100,0,0,0,0,0,19,537165824,0,0,0,0,0,10,129459,28394,0,0,0,0,0,"Acherus Necromancer - On Script - Remove Flag Stunned"),
+(@ENTRY,9,5,0,0,0,100,0,0,0,0,0,19,1,1,0,0,0,0,10,129459,28394,0,0,0,0,0,"Acherus Necromancer - On Script - Remove Flag Server Controlled"),
+(@ENTRY,9,6,0,0,0,100,0,0,0,0,0,91,7,0,0,0,0,0,10,129459,28394,0,0,0,0,0,"Acherus Necromancer - On Script - Remove Flag Standstate Dead"),
+(@ENTRY,9,7,0,0,0,100,0,0,0,0,0,91,257,0,0,0,0,0,10,129459,28394,0,0,0,0,0,"Acherus Necromancer - On Script - Remove Flag Dead"),
+(@ENTRY,9,8,0,0,0,100,0,2000,2000,0,0,2,1770,0,0,0,0,0,10,129459,28394,0,0,0,0,0,"Acherus Necromancer - On Script - Set Faction 1770"),
+(@ENTRY,9,9,0,0,0,100,0,1000,1000,0,0,45,1,1,0,0,0,0,10,129459,28394,0,0,0,0,0,"Acherus Necromancer - On Script - Set Data 1 1"),
+(@ENTRY,9,10,0,0,0,100,0,0,0,0,0,90,8,0,0,0,0,0,10,129459,28394,0,0,0,0,0,"Acherus Necromancer - On Script - Set Flag Standstate Kneel"),
+(@ENTRY,9,11,0,0,0,100,0,4000,4000,0,0,1,0,5000,0,0,0,0,10,129459,28394,0,0,0,0,0,"Acherus Necromancer - On Script - Say Line 0"),
+(@ENTRY,9,12,0,0,0,100,0,5000,5000,0,0,1,4,5000,0,0,0,0,10,129307,28357,0,0,0,0,0,"Acherus Necromancer - On Script - Say Line 4"),
+(@ENTRY,9,13,0,0,0,100,0,6000,6000,0,0,1,5,6000,0,0,0,0,10,129307,28357,0,0,0,0,0,"Acherus Necromancer - On Script - Say Line 5"),
+(@ENTRY,9,14,0,0,0,100,0,5000,5000,0,0,45,3,3,0,0,0,0,10,129307,28357,0,0,0,0,0,"Acherus Necromancer - On Script - Set Data 3 3"),
+(@ENTRY,9,15,0,0,0,100,0,4000,4000,0,0,1,6,6000,0,0,0,0,10,129307,28357,0,0,0,0,0,"Acherus Necromancer - On Script - Say Line 6"),
+(@ENTRY,9,16,0,0,0,100,0,6000,6000,0,0,45,4,4,0,0,0,0,10,129307,28357,0,0,0,0,0,"Acherus Necromancer - On Script - Set Data 4 4"),
+(@ENTRY,9,17,0,0,0,100,0,0,0,0,0,1,0,5000,0,0,0,0,1,0,0,0,0,0,0,0,"Acherus Necromancer - On Script - Say Line 0"),
+(@ENTRY,9,18,0,0,0,100,0,5000,5000,0,0,1,1,5000,0,0,0,0,1,0,0,0,0,0,0,0,"Acherus Necromancer - On Script - Say Line 1"),
+(@ENTRY,9,19,0,0,0,100,0,4000,4000,0,0,12,28405,3,19000,0,0,0,8,0,0,0,2520.44,-5593.01,420.727,3.4383,"Acherus Necromancer - On Script - Summon Creature 'Acherus Ghoul'"),
+(@ENTRY,9,20,0,0,0,100,0,0,0,0,0,12,28405,3,19000,0,0,0,8,0,0,0,2516.65,-5596.68,420.727,1.39626,"Acherus Necromancer - On Script - Summon Creature 'Acherus Ghoul'"),
+(@ENTRY,9,21,0,0,0,100,0,0,0,0,0,12,28405,3,19000,0,0,0,8,0,0,0,2515.93,-5589.89,420.727,4.92183,"Acherus Necromancer - On Script - Summon Creature 'Acherus Ghoul'"),
+(@ENTRY,9,22,0,0,0,100,0,20000,20000,0,0,48,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Acherus Necromancer - On Script - Set Active Off");
+
+DELETE FROM `creature_text` WHERE `CreatureID` IN (28357, 28383, 28391, 28394);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `comment`) VALUES
+-- Instructor Razuvious
+(28357, 0, 0, 'This one...', 12, 0, 100, 25, 0, 0, 27876, 'Instructor Razuvious'),
+(28357, 1, 0, 'The Lich King will be pleased with this initiate.', 12, 0, 100, 5, 0, 0, 27869, 'Instructor Razuvious'),
+(28357, 1, 1, 'Amidst the wretch, a champion has been found.', 12, 0, 100, 5, 0, 0, 27870, 'Instructor Razuvious'),
+(28357, 1, 2, 'CHAOS! DOOM! DESTRUCTION! This one will claim them all!', 12, 0, 100, 5, 0, 0, 27871, 'Instructor Razuvious'),
+(28357, 1, 3, 'Marvel at its tenacity and vigor! A champion has been found!', 12, 0, 100, 5, 0, 0, 27868, 'Instructor Razuvious'),
+(28357, 1, 4, 'A harbinger of death is reborn...', 12, 0, 100, 5, 0, 0, 27872, 'Instructor Razuvious'),
+(28357, 2, 0, 'Place upon it the trappings befitting a herald of Arthas.', 12, 0, 100, 1, 0, 0, 27873, 'Instructor Razuvious'),
+(28357, 3, 0, 'Stand and be measured! Rise, for your master awaits your arrival. Go now!', 12, 0, 100, 5, 0, 0, 27883, 'Instructor Razuvious'),
+(28357, 3, 1, 'Listen, death knight... Listen for the voice of your master. He calls to you now.', 12, 0, 100, 5, 0, 0, 27884, 'Instructor Razuvious'),
+(28357, 4, 0, 'Pathetic...', 12, 0, 100, 1, 0, 0, 27865, 'Instructor Razuvious'),
+(28357, 4, 1, 'Useless...', 12, 0, 100, 1, 0, 0, 27862, 'Instructor Razuvious'),
+(28357, 4, 2, 'Another failure...', 12, 0, 100, 1, 0, 0, 27861, 'Instructor Razuvious'),
+(28357, 4, 3, 'This one has awoken too soon. It retains emotion and memory...', 12, 0, 100, 1, 0, 0, 27864, 'Instructor Razuvious'),
+(28357, 5, 0, 'You have been measured and found wanting...', 12, 0, 100, 25, 0, 0, 27866, 'Instructor Razuvious'),
+(28357, 6, 0, 'Dispose of it...', 12, 0, 100, 1, 0, 0, 27867, 'Instructor Razuvious'),
+-- Acherus Necromancer
+(28383, 0, 0, 'Yes, instructor.', 12, 0, 100, 1, 0, 0, 27874, 'Acherus Necromancer'),
+(28383, 0, 1, 'Right away, instructor.', 12, 0, 100, 1, 0, 0, 27881, 'Acherus Necromancer'),
+(28383, 1, 0, 'Rise, minions. Rise and feast upon the weak!', 12, 0, 100, 22, 0, 0, 27875, 'Acherus Necromancer'),
+-- Death Knight Initiate 1
+(28391, 0, 0, 'I return from the grave to do my master\'s bidding.', 12, 0, 100, 0, 0, 0, 27880, 'Death Knight Initiate'),
+(28391, 0, 1, 'The voice... such splendor... Arthas... My king....', 12, 0, 100, 0, 0, 0, 27879, 'Death Knight Initiate'),
+(28391, 0, 2, 'Reborn, I shall become an instrument of doom...', 12, 0, 100, 0, 0, 0, 27878, 'Death Knight Initiate'),
+(28391, 0, 3, 'Dark energy courses through me... Such power! I hunger for more!', 12, 0, 100, 0, 0, 0, 27877, 'Death Knight Initiate'),
+(28391, 1, 0, 'Death to all that oppose us!', 12, 0, 100, 66, 0, 0, 27888, 'Death Knight Initiate'),
+(28391, 1, 1, 'Victory to the Scourge!', 12, 0, 100, 66, 0, 0, 27887, 'Death Knight Initiate'),
+(28391, 1, 2, 'I live only to serve the Lich King!', 12, 0, 100, 66, 0, 0, 27886, 'Death Knight Initiate'),
+(28391, 1, 3, 'As you command, instructor!', 12, 0, 100, 66, 0, 0, 27885, 'Death Knight Initiate'),
+(28391, 2, 0, 'Woe unto those that dare oppose the Scourge!', 12, 0, 100, 66, 0, 0, 30176, 'Death Knight Initiate'),
+(28391, 2, 1, 'I am reborn, my king, only to serve you.', 12, 0, 100, 66, 0, 0, 30179, 'Death Knight Initiate'),
+(28391, 2, 2, 'I am an instrument of your destruction, my king! Command me!', 12, 0, 100, 66, 0, 0, 30175, 'Death Knight Initiate'),
+(28391, 2, 3, 'Our enemies will be annihilated!', 12, 0, 100, 66, 0, 0, 30177, 'Death Knight Initiate'),
+(28391, 2, 4, 'A thousand-thousand lives I will sacrifice for you, my lord.', 12, 0, 100, 66, 0, 0, 30172, 'Death Knight Initiate'),
+(28391, 2, 5, 'I am yours to command, my king!', 12, 0, 100, 66, 0, 0, 30173, 'Death Knight Initiate'),
+(28391, 2, 6, 'There will be no survivors, my lord.', 12, 0, 100, 66, 0, 0, 30180, 'Death Knight Initiate'),
+(28391, 2, 7, 'My king, the world will tremble in reverence...', 12, 0, 100, 66, 0, 0, 30174, 'Death Knight Initiate'),
+-- Death Knight Initiate 2
+(28394, 0, 0, 'Where am I? What is this place?', 12, 0, 100, 0, 0, 0, 27856, 'Death Knight Initiate'),
+(28394, 0, 1, 'Who... who are you? Who... what am I?', 12, 0, 100, 0, 0, 0, 27858, 'Death Knight Initiate'),
+(28394, 0, 2, 'I hurt... suffering unbearable... end my pain... I beg of you!', 12, 0, 100, 0, 0, 0, 27859, 'Death Knight Initiate'),
+(28394, 0, 3, 'I... I have awoken to a nightmare?', 12, 0, 100, 0, 0, 0, 27857, 'Death Knight Initiate');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry` IN (51516);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13, 1, 51516, 0, 0, 31, 0, 3, 28394, 0, 0, 0, 0, '', 'Rise dead only targets Death Knight Initiate'),
+(13, 1, 51516, 0, 1, 31, 0, 3, 28391, 0, 0, 0, 0, '', 'Rise dead only targets Death Knight Initiate');
+
+-- Death Knight Initiate SAI
+SET @ENTRY := 28391;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,38,0,100,0,1,1,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.16204,"Death Knight Initiate - On Data Set 1 1 - Set Orientation 4.16204"),
+(@ENTRY,0,1,6,38,0,100,0,2,2,0,0,53,1,28391,0,0,0,0,1,0,0,0,0,0,0,0,"Death Knight Initiate - On Data Set 2 2 - Start Waypoint"),
+(@ENTRY,0,2,3,40,0,100,0,7,28391,0,0,54,11000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Death Knight Initiate - On Waypoint 7 Reached - Pause Waypoint"),
+(@ENTRY,0,3,0,61,0,100,0,7,28391,0,0,80,@ENTRY*100+00,0,0,0,0,0,1,0,0,0,0,0,0,0,"Death Knight Initiate - On Waypoint 7 Reached - Run Script"),
+(@ENTRY,0,4,0,40,0,100,0,9,28391,0,0,41,2000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Death Knight Initiate - On Waypoint 9 Reached - Despawn In 2000 ms"),
+(@ENTRY,0,5,0,25,0,100,0,0,0,0,0,18,295170,0,0,0,0,0,1,0,0,0,0,0,0,0,"Death Knight Initiate - On Reset - Set Flags Not Attackable & Immune To Players & Stunned"),
+(@ENTRY,0,6,0,61,0,100,0,2,2,0,0,48,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Death Knight Initiate - On Data Set 2 2 - Set Active On");
+
+-- Actionlist SAI
+SET @ENTRY := 2839100;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,1000,1000,0,0,5,66,0,0,0,0,0,1,0,0,0,0,0,0,0,"Death Knight Initiate - On Script - Play Emote 66"),
+(@ENTRY,9,1,0,0,0,100,0,2000,2000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Death Knight Initiate - On Script - Say Line 2"),
+(@ENTRY,9,2,0,0,0,100,0,6000,6000,0,0,5,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Death Knight Initiate - On Script - Play Emote 2");
+
+DELETE FROM `waypoints` WHERE `entry`=28391;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(28391,1,2453.87,-5545.37,420.643,'Death Knight Initiate'),
+(28391,2,2423.38,-5574.52,420.631,'Death Knight Initiate'),
+(28391,3,2423.38,-5610.59,420.6,'Death Knight Initiate'),
+(28391,4,2410.19,-5626.02,420.654,'Death Knight Initiate'),
+(28391,5,2381.18,-5637.17,420.858,'Death Knight Initiate'),
+(28391,6,2372.68,-5645.34,426.017,'Death Knight Initiate'),
+(28391,7,2348.248,-5666.514,426.029,'Death Knight Initiate'),
+(28391,8,2373.07,-5652.69,426.126,'Death Knight Initiate'),
+(28391,9,2382.63,-5645.56,421.512,'Death Knight Initiate');
+
+-- Death Knight Initiate SAI
+SET @ENTRY := 28394;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,38,0,100,0,1,1,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,3.07005,"Death Knight Initiate - On Data Set 1 1 - Set Orientation 3.07005"),
+(@ENTRY,0,1,0,25,0,100,0,0,0,0,0,18,295170,0,0,0,0,0,1,0,0,0,0,0,0,0,"Death Knight Initiate - On Reset - Set Flags Not Attackable & Immune To Players & Stunned");
+
+-- Acherus Ghoul SAI
+SET @ENTRY := 28405;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,63,0,100,0,0,0,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Acherus Ghoul - On Just Created - Run Script");
+
+-- Actionlist SAI
+SET @ENTRY := 2840500;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,17,373,0,0,0,0,0,1,0,0,0,0,0,0,0,"Acherus Ghoul - On Script - Set Emote State 373"),
+(@ENTRY,9,1,0,0,0,100,0,1000,1000,0,0,11,26047,0,0,0,0,0,1,0,0,0,0,0,0,0,"Acherus Ghoul - On Script - Cast 'Birth'"),
+(@ENTRY,9,2,0,0,0,100,0,2000,2000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Acherus Ghoul - On Script - Set Emote State 0"),
+(@ENTRY,9,3,0,0,0,100,0,1000,1000,0,0,2,2093,0,0,0,0,0,1,0,0,0,0,0,0,0,"Acherus Ghoul - On Script - Set Faction 2093"),
+(@ENTRY,9,4,0,0,0,100,0,0,0,0,0,19,514,0,0,0,0,0,10,129459,28394,0,0,0,0,0,"Acherus Ghoul - On Script - Remove Flags Not Attackable & Immune To NPC's"),
+(@ENTRY,9,5,0,0,0,100,0,0,0,0,0,49,0,0,0,0,0,0,10,129459,28394,0,0,0,0,0,"Acherus Ghoul - On Script - Start Attacking");
diff --git a/sql/updates/world/master/2020_04_10_14_world_2017_01_20_02_world.sql b/sql/updates/world/master/2020_04_10_14_world_2017_01_20_02_world.sql
new file mode 100644
index 00000000000..a5cde613775
--- /dev/null
+++ b/sql/updates/world/master/2020_04_10_14_world_2017_01_20_02_world.sql
@@ -0,0 +1,91 @@
+-- Lord Thorval - Rework Textevent
+SET @NPC := 128506;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `orientation`, `delay`) VALUES
+(@PATH, 1, 2527.73, -5549.21, 377.036, 3.735, 30000),
+(@PATH, 2, 2524.61, -5545.03, 377.027, 2.21325, 0),
+(@PATH, 3, 2524.61, -5545.03, 377.027, 4.06051, 15000),
+(@PATH, 4, 2530.44, -5554.25, 377.056, 5.26204, 0),
+(@PATH, 5, 2530.44, -5554.25, 377.056, 3.50275, 15000),
+(@PATH, 6, 2524.61, -5545.03, 377.027, 2.21325, 0),
+(@PATH, 7, 2524.61, -5545.03, 377.027, 4.06051, 15000),
+(@PATH, 8, 2530.44, -5554.25, 377.056, 5.26204, 1000),
+(@PATH, 9, 2524.61, -5545.03, 377.027, 2.21325, 1000),
+(@PATH, 10, 2530.44, -5554.25, 377.056, 5.26204, 1000),
+(@PATH, 11, 2524.61, -5545.03, 377.027, 2.21325, 0),
+(@PATH, 12, 2524.61, -5545.03, 377.027, 4.06051, 15000),
+(@PATH, 13, 2527.73, -5549.21, 377.036, 2.18866, 0),
+(@PATH, 14, 2527.73, -5549.21, 377.036, 3.735, 330000);
+
+-- Lord Thorval SAI
+SET @ENTRY := 28472;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,34,0,100,0,2,2,0,0,80,@ENTRY*100+00,0,0,0,0,0,1,0,0,0,0,0,0,0,"Lord Thorval - On Reached Point 2 - Run Script"),
+(@ENTRY,0,1,0,34,0,100,0,2,4,0,0,80,@ENTRY*100+01,0,0,0,0,0,1,0,0,0,0,0,0,0,"Lord Thorval - On Reached Point 4 - Run Script"),
+(@ENTRY,0,2,0,34,0,100,0,2,6,0,0,80,@ENTRY*100+02,0,0,0,0,0,1,0,0,0,0,0,0,0,"Lord Thorval - On Reached Point 6 - Run Script"),
+(@ENTRY,0,3,0,34,0,100,0,2,7,0,0,80,@ENTRY*100+03,0,0,0,0,0,1,0,0,0,0,0,0,0,"Lord Thorval - On Reached Point 7 - Run Script"),
+(@ENTRY,0,4,0,34,0,100,0,2,8,0,0,80,@ENTRY*100+04,0,0,0,0,0,1,0,0,0,0,0,0,0,"Lord Thorval - On Reached Point 8 - Run Script"),
+(@ENTRY,0,5,0,34,0,100,0,2,9,0,0,80,@ENTRY*100+05,0,0,0,0,0,1,0,0,0,0,0,0,0,"Lord Thorval - On Reached Point 9 - Run Script"),
+(@ENTRY,0,6,0,34,0,100,0,2,11,0,0,80,@ENTRY*100+06,0,0,0,0,0,1,0,0,0,0,0,0,0,"Lord Thorval - On Reached Point 11 - Run Script");
+
+-- Actionlist SAI
+SET @ENTRY := 2847200;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,1000,1000,0,0,1,0,5000,0,0,0,0,1,0,0,0,0,0,0,0,"Lord Thorval - On Script - Say Line 0");
+
+-- Actionlist SAI
+SET @ENTRY := 2847201;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,1000,1000,0,0,1,1,5000,0,0,0,0,1,0,0,0,0,0,0,0,"Lord Thorval - On Script - Say Line 1"),
+(@ENTRY,9,1,0,0,0,100,0,9000,9000,0,0,1,2,5000,0,0,0,0,1,0,0,0,0,0,0,0,"Lord Thorval - On Script - Say Line 2");
+
+-- Actionlist SAI
+SET @ENTRY := 2847202;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,1000,1000,0,0,1,3,9000,0,0,0,0,1,0,0,0,0,0,0,0,"Lord Thorval - On Script - Say Line 3"),
+(@ENTRY,9,1,0,0,0,100,0,9000,9000,0,0,1,4,5000,0,0,0,0,1,0,0,0,0,0,0,0,"Lord Thorval - On Script - Say Line 4");
+
+-- Actionlist SAI
+SET @ENTRY := 2847203;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,1000,1000,0,0,1,5,5000,0,0,0,0,1,0,0,0,0,0,0,0,"Lord Thorval - On Script - Say Line 5");
+
+-- Actionlist SAI
+SET @ENTRY := 2847204;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,1000,1000,0,0,1,6,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Lord Thorval - On Script - Say Line 6");
+
+-- Actionlist SAI
+SET @ENTRY := 2847205;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,1000,1000,0,0,1,7,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Lord Thorval - On Script - Say Line 7");
+
+-- Actionlist SAI
+SET @ENTRY := 2847206;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,1000,1000,0,0,1,8,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Lord Thorval - On Script - Say Line 8");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=@ENTRY;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `comment`, `BroadcastTextId`) VALUES
+(@ENTRY, 0, 0, 'As disciples of blood, you strive to master the very lifeforce of your enemies.', 12, 0, 100, 1, 0, 0, 'Lord Thorval', 29867),
+(@ENTRY, 1, 0, 'Be it by blade or incantation, blood feeds our attacks and weakens our foes.', 12, 0, 100, 1, 0, 0, 'Lord Thorval', 29868),
+(@ENTRY, 2, 0, 'True masters learn to make blood serve more than just their strength in battle.', 12, 0, 100, 1, 0, 0, 'Lord Thorval', 29869),
+(@ENTRY, 3, 0, 'Stripping energy from our foes, both fighting and fallen, allows us to persevere where lesser beigns falls exhausted.', 12, 0, 100, 1, 0, 0, 'Lord Thorval', 29870),
+(@ENTRY, 4, 0, 'And every foe that falls, energy sapped and stolen, only further fuels our assault.', 12, 0, 100, 1, 0, 0, 'Lord Thorval', 29871),
+(@ENTRY, 5, 0, 'As masters of blood, we know battle without end...', 12, 0, 100, 1, 0, 0, 'Lord Thorval', 29872),
+(@ENTRY, 6, 0, 'We know hunger never to be quenched...', 12, 0, 100, 1, 0, 0, 'Lord Thorval', 29873),
+(@ENTRY, 7, 0, 'We know power never to be overcome...', 12, 0, 100, 1, 0, 0, 'Lord Thorval', 29874),
+(@ENTRY, 8, 0, 'As masters of blood, we are masters of life and death itself. Agains us, even hope falls drained and lifeless.', 12, 0, 100, 1, 0, 0, 'Lord Thorval', 29875);
diff --git a/sql/updates/world/master/2020_04_10_15_world_2017_01_20_03_world.sql b/sql/updates/world/master/2020_04_10_15_world_2017_01_20_03_world.sql
new file mode 100644
index 00000000000..8c668e9ec4b
--- /dev/null
+++ b/sql/updates/world/master/2020_04_10_15_world_2017_01_20_03_world.sql
@@ -0,0 +1,168 @@
+-- Gothik the Harvester
+UPDATE `creature_template` SET `Speed_Walk` = 1.6, `Speed_Run` = 1.714286 WHERE `entry` = 28890;
+UPDATE `creature` SET `position_x` = 2107.563721, `position_y` = -5742.198730, `position_z` = 99.855499, `orientation` = 1.374185 WHERE `guid` = 130121;
+SET @NPC := 130121;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `orientation`, `delay`) VALUES
+(@PATH, 1, 2109.85, -5727.25, 100.257, 0.413397, 0),
+(@PATH, 2, 2156.03, -5712.91, 102.291, 6.15937, 0),
+(@PATH, 3, 2177.85, -5738.68, 101.921, 5.56012, 0),
+(@PATH, 4, 2188.7, -5759.94, 101.649, 5.14936, 10000),
+(@PATH, 5, 2225.29, -5781.82, 101.775, 5.67557, 0),
+(@PATH, 6, 2252.21, -5806.7, 100.959, 5.36848, 0),
+(@PATH, 7, 2265.43, -5827.23, 100.945, 5.03548, 0),
+(@PATH, 8, 2267.51, -5839.93, 100.944, 5.03941, 0),
+(@PATH, 9, 2284.81, -5845.79, 100.935, 5.98189, 10000),
+(@PATH, 10, 2259.68, -5866.16, 101.605, 3.82989, 0),
+(@PATH, 11, 2241.44, -5886.94, 100.764, 4.04195, 0),
+(@PATH, 12, 2228.81, -5899.27, 100.89, 3.64925, 0),
+(@PATH, 13, 2201.1, -5902.2, 100.88, 3.12696, 0),
+(@PATH, 14, 2179.59, -5890.74, 101.109, 2.15307, 0),
+(@PATH, 15, 2181.51, -5888.24, 100.93, 0.693798, 10000),
+(@PATH, 16, 2165.13, -5866.72, 101.331, 2.28265, 0),
+(@PATH, 17, 2143.17, -5825.25, 101.125, 1.94886, 0),
+(@PATH, 18, 2130.2, -5789.78, 98.9462, 1.48547, 10000),
+(@PATH, 19, 2115.31, -5769.12, 98.1968, 1.93551, 0),
+(@PATH, 20, 2107.57, -5742.3, 99.8496, 1.70931, 0);
+
+DELETE FROM `creature_text` WHERE `CreatureID`=28890;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `comment`) VALUES
+(28890, 0, 0, 'Rise, minion. Rise and fly for the Scourge!', 12, 0, 100, 5, 0, 0, 29045, 'Gothik the Harvester'),
+(28890, 0, 1, 'You will fly again, beast...', 12, 0, 100, 5, 0, 0, 29043, 'Gothik the Harvester'),
+(28890, 1, 0, 'Surprise, surprise! Another ghoul!', 12, 0, 100, 5, 0, 0, 29038, 'Gothik the Harvester'),
+(28890, 1, 1, 'Is Gothik the Harvester going to have to choke a geist?', 12, 0, 100, 5, 0, 0, 29037, 'Gothik the Harvester'),
+(28890, 2, 0, 'Death is the only escape!', 12, 0, 100, 5, 0, 0, 29039, 'Gothik the Harvester');
+
+-- Gothik the Harvester SAI
+SET @ENTRY := 28890;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,34,0,100,0,2,3,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Gothik the Harvester - On Reached Point 3 - Run Script"),
+(@ENTRY,0,1,0,34,0,100,0,2,8,0,0,80,@ENTRY*100+01,2,0,0,0,0,1,0,0,0,0,0,0,0,"Gothik the Harvester - On Reached Point 8 - Run Script"),
+(@ENTRY,0,2,0,34,0,100,0,2,14,0,0,80,@ENTRY*100+02,2,0,0,0,0,1,0,0,0,0,0,0,0,"Gothik the Harvester - On Reached Point 14 - Run Script"),
+(@ENTRY,0,3,0,34,0,100,0,2,17,0,0,80,@ENTRY*100+03,2,0,0,0,0,1,0,0,0,0,0,0,0,"Gothik the Harvester - On Reached Point 17 - Run Script"),
+(@ENTRY,0,4,0,25,0,100,1,0,0,0,0,48,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Gothik the Harvester - On Reset - Set Active On (No Repeat)");
+
+-- Actionlist SAI
+SET @ENTRY := 2889000;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,2000,2000,0,0,1,0,6000,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Say Line 0"),
+(@ENTRY,9,1,0,0,0,100,0,2000,2000,0,0,11,52685,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Cast 'Scourge Gryphon'"),
+(@ENTRY,9,2,0,0,0,100,0,0,0,0,0,41,1,0,0,0,0,0,19,28893,10,0,0,0,0,0,"Gothik the Harvester - On Script - Despawn Instant"),
+(@ENTRY,9,3,0,0,0,100,0,3000,3000,0,0,45,1,1,0,0,0,0,19,28906,20,0,0,0,0,0,"On Script - Set Data 1 1");
+
+-- Actionlist SAI
+SET @ENTRY := 2889001;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,2000,2000,0,0,1,0,6000,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Say Line 0"),
+(@ENTRY,9,1,0,0,0,100,0,2000,2000,0,0,11,52685,0,0,0,0,0,1,0,0,0,0,0,0,0,"On Script - Cast 'Scourge Gryphon'"),
+(@ENTRY,9,2,0,0,0,100,0,0,0,0,0,41,1,0,0,0,0,0,19,28893,10,0,0,0,0,0,"Gothik the Harvester - On Script - Despawn Instant"),
+(@ENTRY,9,3,0,0,0,100,0,3000,3000,0,0,45,2,2,0,0,0,0,19,28906,20,0,0,0,0,0,"On Script - Set Data 2 2");
+
+-- Actionlist SAI
+SET @ENTRY := 2889002;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,2000,2000,0,0,1,1,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Gothik the Harvester - On Script - Say Line 1"),
+(@ENTRY,9,1,0,0,0,100,0,2000,2000,0,0,11,52683,0,0,0,0,0,1,0,0,0,0,0,0,0,"Gothik the Harvester - On Script - Cast 'Scarlet Ghoul'"),
+(@ENTRY,9,2,0,0,0,100,0,0,0,0,0,41,1,0,0,0,0,0,19,28896,10,0,0,0,0,0,"Gothik the Harvester - On Script - Despawn Instant"),
+(@ENTRY,9,3,0,0,0,100,0,3000,3000,0,0,45,1,1,0,0,0,0,19,28897,20,0,0,0,0,0,"Gothik the Harvester - On Script - Set Data 1 1");
+
+-- Actionlist SAI
+SET @ENTRY := 2889003;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,2000,2000,0,0,1,1,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Gothik the Harvester - On Script - Say Line 1"),
+(@ENTRY,9,1,0,0,0,100,0,2000,2000,0,0,11,52683,0,0,0,0,0,1,0,0,0,0,0,0,0,"Gothik the Harvester - On Script - Cast 'Scarlet Ghoul'"),
+(@ENTRY,9,2,0,0,0,100,0,1000,1000,0,0,41,0,0,0,0,0,0,19,28898,10,0,0,0,0,0,"Gothik the Harvester - On Script - Despawn Instant"),
+(@ENTRY,9,3,0,0,0,100,0,0,0,0,0,11,52672,0,0,0,0,0,10,130312,28905,0,0,0,0,0,"Gothik the Harvester - On Script - Cast 'Ghoulplosion'"),
+(@ENTRY,9,4,0,0,0,100,0,0,0,0,0,1,2,3000,0,0,0,0,1,0,0,0,0,0,0,0,"Gothik the Harvester - On Script - Say Line 2"),
+(@ENTRY,9,5,0,0,0,100,0,3000,3000,0,0,45,1,1,0,0,0,0,19,28897,20,0,0,0,0,0,"Gothik the Harvester - On Script - Set Data 1 1");
+
+
+-- Scourge Gryphon
+UPDATE `creature_template` SET `MovementType` = 0, `InhabitType` = 4, `Speed_Walk` = 2.4, `Speed_Run` = 2.57143 WHERE `entry` = 28906;
+
+-- Scarlet Gryphon SAI
+SET @ENTRY := 28893;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,8,0,100,0,52685,0,0,0,41,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Scarlet Gryphon - On Spellhit 'Scourge Gryphon' - Despawn Instant");
+
+-- Scourge Gryphon SAI
+SET @ENTRY := 28906;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,1,38,0,100,0,1,1,0,0,48,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Scourge Gryphon - On Data Set 1 1 - Set Active On"),
+(@ENTRY,0,1,0,61,0,100,0,1,1,0,0,69,1,0,0,0,0,0,8,0,0,0,1781.18,-5818.34,114.383,0,"Scourge Gryphon - On Data Set 1 1 - Move To Position"),
+(@ENTRY,0,2,0,34,0,100,0,8,1,0,0,49,0,0,0,0,0,0,19,28610,100,0,0,0,0,0,"Scourge Gryphon - On Reached Point 1 - Start Attacking"),
+(@ENTRY,0,3,4,38,0,100,0,2,2,0,0,48,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Scourge Gryphon - On Data Set 2 2 - Set Active On"),
+(@ENTRY,0,4,0,61,0,100,0,2,2,0,0,69,2,0,0,0,0,0,8,0,0,0,1818.18,-5930.02,113.669,0,"Scourge Gryphon - On Data Set 2 2 - Move To Position"),
+(@ENTRY,0,5,0,34,0,100,0,8,2,0,0,49,0,0,0,0,0,0,19,28610,100,0,0,0,0,0,"Scourge Gryphon - On Reached Point 2 - Start Attacking"),
+(@ENTRY,0,6,0,63,0,100,0,0,0,0,0,41,300000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Scourge Gryphon - On Just Created - Despawn In 300000 ms");
+
+-- Scarlet Infantryman SAI
+SET @ENTRY := 28896;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,8,0,100,0,52683,0,0,0,41,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Scarlet Infantryman - On Spellhit 'Scarlet Ghoul' - Despawn Instant");
+
+-- Scarlet Captain SAI
+SET @ENTRY := 28898;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,8,0,100,0,52683,0,0,0,41,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Scarlet Captain - On Spellhit 'Scarlet Ghoul' - Despawn Instant");
+
+-- Scarlet Ghoul SAI
+SET @ENTRY := 28897;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,1,38,0,100,0,1,1,0,0,48,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Scarlet Ghoul - On Data Set 1 1 - Set Active On"),
+(@ENTRY,0,1,0,61,0,100,0,1,1,0,0,53,1,28897,0,0,0,2,8,0,0,0,1783.51,-5818.18,113.877,3.19587,"Scarlet Ghoul - On Data Set 1 1 - Start Waypoint"),
+(@ENTRY,0,2,3,63,0,100,0,0,0,0,0,41,300000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Scarlet Ghoul - On Just Created - Despawn In 300000 ms"),
+(@ENTRY,0,3,0,61,0,100,0,0,0,0,0,1,0,5000,0,0,0,0,1,0,0,0,0,0,0,0,"Scarlet Ghoul - On Just Created - Say Line 0");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=28897;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `comment`) VALUES
+(28897, 0, 0, 'So hungry...', 12, 0, 100, 0, 0, 0, 28955, 'Scarlet Ghoul'),
+(28897, 0, 1, 'Must feed...', 12, 0, 100, 0, 0, 0, 28956, 'Scarlet Ghoul'),
+(28897, 0, 2, 'Smell flesh... close...', 12, 0, 100, 0, 0, 0, 28958, 'Scarlet Ghoul');
+
+UPDATE `creature_template` SET `MovementType` = 0, `InhabitType` = 3 WHERE `entry` = 28897;
+DELETE FROM `waypoints` WHERE `entry`=28897;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(28897, 1, 2143.13, -5845.46, 101.335, 'Scarlet Ghoul'),
+(28897, 2, 2112.23, -5869.67, 102.671, 'Scarlet Ghoul'),
+(28897, 3, 2075.06, -5888.31, 104.169, 'Scarlet Ghoul'),
+(28897, 4, 2047.48, -5901.68, 105.289, 'Scarlet Ghoul'),
+(28897, 5, 2017.32, -5907.23, 104.617, 'Scarlet Ghoul'),
+(28897, 6, 1962.61, -5905.59, 102.366, 'Scarlet Ghoul'),
+(28897, 7, 1925.94, -5911, 101.514, 'Scarlet Ghoul'),
+(28897, 8, 1884.37, -5910.29, 103.345, 'Scarlet Ghoul'),
+(28897, 9, 1858.9, -5916.94, 104.525, 'Scarlet Ghoul'),
+(28897, 10, 1840.21, -5923.29, 107.843, 'Scarlet Ghoul'),
+(28897, 11, 1819.53, -5930.31, 113.439, 'Scarlet Ghoul'),
+(28897, 12, 1800.91, -5936.87, 115.947, 'Scarlet Ghoul');
+
+UPDATE `creature` SET `spawntimesecs`=30 WHERE `id` IN (28893, 28896, 28898);
+UPDATE `creature` SET `spawntimesecs`=30 WHERE `guid`=130312;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceGroup`=1 AND `SourceEntry` IN (52685, 52683);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13, 1, 52685, 0, 0, 31, 0, 3, 28893, 0, 0, 0, 0, '', 'Scourge Gryphon only targets Scarlet Gryphon'),
+(13, 1, 52683, 0, 0, 31, 0, 3, 28896, 0, 0, 0, 0, '', 'Scarlet Ghoul only targets Scarlet Infantryman'),
+(13, 1, 52683, 0, 1, 31, 0, 3, 28898, 0, 0, 0, 0, '', 'Scarlet Ghoul only targets Scarlet Captain'),
+(13, 1, 52683, 0, 2, 31, 0, 3, 28892, 0, 0, 0, 0, '', 'Scarlet Ghoul only targets Scarlet Peasant'),
+(13, 1, 52683, 0, 3, 31, 0, 3, 28897, 0, 0, 0, 0, '', 'Scarlet Ghoul only targets Scarlet Ghoul'),
+(13, 1, 52683, 0, 4, 31, 0, 3, 28886, 0, 0, 0, 0, '', 'Scarlet Ghoul only targets Scarlet Fleet Defender');
diff --git a/sql/updates/world/master/2020_04_10_16_world_2017_01_20_04_world.sql b/sql/updates/world/master/2020_04_10_16_world_2017_01_20_04_world.sql
new file mode 100644
index 00000000000..fedd7e5c7c9
--- /dev/null
+++ b/sql/updates/world/master/2020_04_10_16_world_2017_01_20_04_world.sql
@@ -0,0 +1,224 @@
+-- Gothik the Harvester Entry 2 event
+-- Scarlet Deserter
+UPDATE `creature` SET `spawndist` = 0, `MovementType` = 0 WHERE `guid` IN (130402,130403,130404,130405);
+UPDATE `creature` SET `position_x` = 2817.77, `position_y` = -5453.906, `position_z` = 159.4021, `orientation` = 1.937315 WHERE `guid` = 130405;
+
+-- Scarlet Deserter SAI
+SET @GUID := -130405;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=29193;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@GUID 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
+(@GUID,0,0,0,25,0,100,0,0,0,0,0,60,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Scarlet Deserter - On Reset - Set Fly On");
+
+-- Gothik the Harvester SAI
+SET @ENTRY := 29112;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,1,0,100,0,2000,2000,640000,640000,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Gothik the Harvester - Out of Combat - Run Script");
+
+-- Actionlist SAI
+SET @ENTRY := 2911200;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,48,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Gothik the Harvester - On Script - Set Active On"),
+(@ENTRY,9,1,0,0,0,100,0,3000,3000,0,0,1,0,4000,0,0,0,0,10,130405,29193,0,0,0,0,0,"Gothik the Harvester - On Script - Say Line 0"),
+(@ENTRY,9,2,0,0,0,100,0,4000,4000,0,0,1,0,30000,0,0,0,0,1,0,0,0,0,0,0,0,"Gothik the Harvester - On Script - Say Line 0"),
+(@ENTRY,9,3,0,0,0,100,0,63000,63000,0,0,1,1,4000,0,0,0,0,10,130405,29193,0,0,0,0,0,"Gothik the Harvester - On Script - Say Line 1"),
+(@ENTRY,9,4,0,0,0,100,0,4000,4000,0,0,1,1,30000,0,0,0,0,1,0,0,0,0,0,0,0,"Gothik the Harvester - On Script - Say Line 1"),
+(@ENTRY,9,5,0,0,0,100,0,73000,73000,0,0,1,2,4000,0,0,0,0,10,130405,29193,0,0,0,0,0,"Gothik the Harvester - On Script - Say Line 2"),
+(@ENTRY,9,6,0,0,0,100,0,4000,4000,0,0,1,2,30000,0,0,0,0,1,0,0,0,0,0,0,0,"Gothik the Harvester - On Script - Say Line 2"),
+(@ENTRY,9,7,0,0,0,100,0,68000,68000,0,0,1,3,4000,0,0,0,0,10,130405,29193,0,0,0,0,0,"Gothik the Harvester - On Script - Say Line 3"),
+(@ENTRY,9,8,0,0,0,100,0,4000,4000,0,0,1,3,30000,0,0,0,0,1,0,0,0,0,0,0,0,"Gothik the Harvester - On Script - Say Line 3"),
+(@ENTRY,9,9,0,0,0,100,0,78000,78000,0,0,1,4,4000,0,0,0,0,10,130405,29193,0,0,0,0,0,"Gothik the Harvester - On Script - Say Line 4"),
+(@ENTRY,9,10,0,0,0,100,0,4000,4000,0,0,1,4,30000,0,0,0,0,1,0,0,0,0,0,0,0,"Gothik the Harvester - On Script - Say Line 4"),
+(@ENTRY,9,11,0,0,0,100,0,73000,73000,0,0,1,5,4000,0,0,0,0,10,130405,29193,0,0,0,0,0,"Gothik the Harvester - On Script - Say Line 5"),
+(@ENTRY,9,12,0,0,0,100,0,4000,4000,0,0,1,5,30000,0,0,0,0,1,0,0,0,0,0,0,0,"Gothik the Harvester - On Script - Say Line 5"),
+(@ENTRY,9,13,0,0,0,100,0,53000,53000,0,0,1,6,30000,0,0,0,0,10,130405,29193,0,0,0,0,0,"Gothik the Harvester - On Script - Say Line 6"),
+(@ENTRY,9,14,0,0,0,100,0,0,0,0,0,48,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Gothik the Harvester - On Script - Set Active Off");
+
+DELETE FROM `creature_text` WHERE `CreatureID` IN (29193, 29112);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `comment`) VALUES
+-- Scarlet Deserter
+(29193, 0, 0, 'You\'re a monster!', 12, 0, 100, 0, 0, 0, 29644, 'Scarlet Deserter'),
+(29193, 1, 0, 'Please! Spare me! I...', 12, 0, 100, 0, 0, 0, 29645, 'Scarlet Deserter'),
+(29193, 2, 0, 'Wi... Will it hurt?', 12, 0, 100, 0, 0, 0, 29641, 'Scarlet Deserter'),
+(29193, 3, 0, 'It tingles...', 12, 0, 100, 0, 0, 0, 29642, 'Scarlet Deserter'),
+(29193, 4, 0, 'Why don\'t you Just Kill me Already', 12, 0, 100, 0, 0, 0, 0, 'Scarlet Deserter'),
+(29193, 5, 0, 'Is it too late to change my mind? How about you just kill me instead?', 12, 0, 100, 0, 0, 0, 29643, 'Scarlet Deserter'),
+(29193, 6, 0, 'The horror! THE HORROR!', 12, 0, 100, 0, 0, 0, 29646, 'Scarlet Deserter'),
+-- Gothik the Harvester
+(29112, 0, 0, 'Flattery will get you nowhere.', 12, 0, 100, 1, 0, 0, 29650, 'Gothik the Harvester'),
+(29112, 1, 0, 'Don\'t be ridiculous. Where would you even go if I did spare you? We just finished eradicating your civilization, remember?', 12, 0, 100, 1, 0, 0, 29651, 'Gothik the Harvester'),
+(29112, 2, 0, 'Oh yes. Immensely. The pain will propably render you unconcious - hence the vat of slime you\'re floating in!', 12, 0, 100, 1, 0, 0, 0, 'Gothik the Harvester'),
+(29112, 3, 0, 'That\'s how you know it\'s working.', 12, 0, 100, 1, 0, 0, 29648, 'Gothik the Harvester'),
+(29112, 4, 0, 'You idiot! That\'s What I\'m Doing Right Now!', 12, 0, 100, 5, 0, 0, 0, 'Gothik the Harvester'),
+(29112, 5, 0, 'I AM going to kill you. What\'s the rush?', 12, 0, 100, 6, 0, 0, 29649, 'Gothik the Harvester');
+
+-- The Noxious Glade
+-- Noth the Plaguebringer SAI
+SET @ENTRY := 29113;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,1,0,100,0,60000,60000,60000,60000,1,0,20000,0,0,0,0,1,0,0,0,0,0,0,0,"Noth the Plaguebringer - Out of Combat - Say Line 0");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=29113;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `comment`) VALUES
+(29113, 0, 0, 'We need more flesh!', 14, 0, 100, 5, 0, 0, 29634, 'Noth the Plaguebringer'),
+(29113, 0, 1, 'Double your efforts! The final assault draws near!', 14, 0, 100, 5, 0, 0, 29639, 'Noth the Plaguebringer');
+
+-- Howling Geist
+UPDATE `creature` SET `position_x` = 2597.903076, `position_y` = -5549.420410, `position_z` = 159.772934, `spawndist` = 20, `MovementType` = 1 WHERE `guid` = 130387;
+UPDATE `creature` SET `position_x` = 2622.867432, `position_y` = -5481.481934, `position_z` = 156.948212, `spawndist` = 20, `MovementType` = 1 WHERE `guid` = 130386;
+UPDATE `creature` SET `position_x` = 2659.806885, `position_y` = -5537.375000, `position_z` = 163.303589, `spawndist` = 20, `MovementType` = 1 WHERE `guid` = 130385;
+UPDATE `creature` SET `position_x` = 2697.650391, `position_y` = -5469.664063, `position_z` = 156.943970, `spawndist` = 20, `MovementType` = 1 WHERE `guid` = 130383;
+UPDATE `creature` SET `position_x` = 2735.920410, `position_y` = -5363.948730, `position_z` = 157.715302, `spawndist` = 20, `MovementType` = 1 WHERE `guid` = 130381;
+
+-- Rampaging Abomination
+UPDATE `creature` SET `position_x` = 2770.925049, `position_y` = -5536.027344, `position_z` = 161.735718, `orientation` = 2.301208, `spawndist` = 10, `MovementType` = 1 WHERE guid = 130378;
+UPDATE `creature` SET `spawndist` = 0, `MovementType` = 2, `spawntimesecs` = 10 WHERE `guid` IN (130376,130379);
+
+SET @NPC := 130376;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '53624');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`) VALUES
+(@PATH, 1, 2723.56, -5356.07, 159.613,0),
+(@PATH, 2, 2704.62, -5360.77, 159.398,0),
+(@PATH, 3, 2691.18, -5349.93, 158.621,0),
+(@PATH, 4, 2683.39, -5323.99, 155.334,0),
+(@PATH, 5, 2675.71, -5304.56, 153.114,0),
+(@PATH, 6, 2663.78, -5284.98, 148.258,0),
+(@PATH, 7, 2658.59, -5275.23, 142.105,0),
+(@PATH, 8, 2644.61, -5255.16, 121.631,0),
+(@PATH, 9, 2631.96, -5238.4, 107.608,0),
+(@PATH, 10, 2613.31, -5216.83, 93.161,0),
+(@PATH, 11, 2598.7, -5201.75, 82.8146,0),
+(@PATH, 12, 2582.36, -5187.09, 75.8517,0),
+(@PATH, 13, 2569.27, -5176.85, 73.7495,0),
+(@PATH, 14, 2558.21, -5168.27, 74.6465,0),
+(@PATH, 15, 2538.28, -5155.75, 74.2881,0),
+(@PATH, 16, 2521.03, -5147.47, 73.6583,0),
+(@PATH, 17, 2502.8, -5138.25, 75.7383,0),
+(@PATH, 18, 2483.53, -5131.73, 75.9083, 2000);
+
+UPDATE `waypoint_data` SET `move_type`=1 WHERE `id`=@PATH;
+UPDATE `waypoint_data` SET `action`=1188, `action_chance`=100 WHERE `id`=@PATH AND `point`=18;
+
+SET @NPC := 130379;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '53624');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`) VALUES
+(@PATH, 1, 2726.07, -5498.8, 162.02,0),
+(@PATH, 2, 2727.57, -5481.48, 161.561,0),
+(@PATH, 3, 2732.97, -5468.64, 157.569,0),
+(@PATH, 4, 2750.98, -5458.35, 156.968,0),
+(@PATH, 5, 2772.88, -5441.7, 159.903,0),
+(@PATH, 6, 2774.75, -5416.45, 160.25,0),
+(@PATH, 7, 2771.21, -5396.04, 158.102,0),
+(@PATH, 8, 2750.66, -5381.1, 156.956,0),
+(@PATH, 9, 2727.84, -5372.87, 157.819,0),
+(@PATH, 10, 2707.88, -5366.33, 158.707,0),
+(@PATH, 11, 2693.81, -5354.31, 158.877,0),
+(@PATH, 12, 2687.94, -5338.24, 156.999,0),
+(@PATH, 13, 2681.92, -5317.73, 154.846,0),
+(@PATH, 14, 2675.34, -5305.38, 153.191,0),
+(@PATH, 15, 2659.58, -5278.96, 144.64,0),
+(@PATH, 16, 2651.18, -5266.35, 132.35,0),
+(@PATH, 17, 2636.53, -5246.73, 112.628,0),
+(@PATH, 18, 2619.36, -5225.24, 97.7497,0),
+(@PATH, 19, 2605.23, -5209.7, 86.9899,0),
+(@PATH, 20, 2591.1, -5194.16, 79.6859,0),
+(@PATH, 21, 2573.87, -5176.1, 73.9424,0),
+(@PATH, 22, 2558.81, -5161.48, 74.598,0),
+(@PATH, 23, 2540.44, -5148.6, 74.2861,0),
+(@PATH, 24, 2525.34, -5139.75, 73.6435,0),
+(@PATH, 25, 2505.64, -5127.77, 74.8511,0),
+(@PATH, 26, 2480.14, -5116.4, 79.0267, 2000);
+
+UPDATE `waypoint_data` SET `move_type`=1 WHERE `id`=@PATH;
+UPDATE `waypoint_data` SET `action`=1188, `action_chance`=100 WHERE `id`=@PATH AND `point`=26;
+
+-- Volatile Ghoul
+UPDATE `creature` SET `spawntimesecs` = 10 WHERE `guid` IN (130363,130373,130362);
+
+SET @MAXGUID := 917;
+SET @SCRIPTID := 13036300;
+DELETE FROM `waypoint_scripts` WHERE `id` IN (@SCRIPTID+0);
+INSERT INTO `waypoint_scripts` (`id`, `delay`, `command`, `datalong`, `datalong2`, `dataint`, `x`, `y`, `z`, `o`, `guid`) VALUES
+(@SCRIPTID+0, 1, 15, 26047, 1, 0, 0, 0, 0, 0, (@MAXGUID := @MAXGUID + 1)),
+(@SCRIPTID+0, 4, 1, 0, 1, 0, 0, 0, 0, 0, (@MAXGUID := @MAXGUID + 1));
+
+SET @NPC := 130363;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,67108864,1,0, '53624');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`, `action`, `action_chance`) VALUES
+(@PATH, 1, 2676.73, -5314.65, 154.792, 5000, @SCRIPTID, 100),
+(@PATH, 2, 2684.4, -5306.35, 154.941, 0, 0, 0),
+(@PATH, 3, 2670.25, -5284.02, 150.153, 0, 0, 0),
+(@PATH, 4, 2662.09, -5274.22, 142.412, 0, 0, 0),
+(@PATH, 5, 2644.94, -5255.23, 121.88, 0, 0, 0),
+(@PATH, 6, 2620.75, -5225.3, 98.1054, 0, 0, 0),
+(@PATH, 7, 2592.76, -5198.52, 80.7613, 0, 0, 0),
+(@PATH, 8, 2574.95, -5181.7, 74.3096, 0, 0, 0),
+(@PATH, 9, 2522.32, -5148.41, 73.6604, 0, 0, 0),
+(@PATH, 10, 2475.21, -5122.23, 77.9418, 2000, 1188, 100);
+
+UPDATE `waypoint_data` SET `move_type`=1 WHERE `id`=@PATH;
+
+SET @NPC := 130373;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,67108864,1,0, '53624');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`, `action`, `action_chance`) VALUES
+(@PATH, 1, 2632.02, -5394.72, 168.397, 5000, @SCRIPTID, 100),
+(@PATH, 2, 2651.32, -5405.91, 159.224, 0, 0, 0),
+(@PATH, 3, 2684.38, -5384.49, 157.184, 0, 0, 0),
+(@PATH, 4, 2687.79, -5330.18, 156.083, 0, 0, 0),
+(@PATH, 5, 2684.96, -5314.39, 154.96, 0, 0, 0),
+(@PATH, 6, 2679.3, -5303.38, 153.638, 0, 0, 0),
+(@PATH, 7, 2672.93, -5295.8, 151.813, 0, 0, 0),
+(@PATH, 8, 2664.86, -5285.81, 148.772, 0, 0, 0),
+(@PATH, 9, 2655.93, -5274.74, 141.215, 0, 0, 0),
+(@PATH, 10, 2639.53, -5252.05, 116.733, 0, 0, 0),
+(@PATH, 11, 2621.55, -5230.63, 100.908, 0, 0, 0),
+(@PATH, 12, 2606.08, -5211.66, 88.0324, 0, 0, 0),
+(@PATH, 13, 2582.86, -5185.51, 75.8192, 0, 0, 0),
+(@PATH, 14, 2564.62, -5169.25, 74.5214, 0, 0, 0),
+(@PATH, 15, 2536.72, -5149.97, 74.2893, 0, 0, 0),
+(@PATH, 16, 2516.32, -5145.46, 74.148, 0, 0, 0),
+(@PATH, 17, 2491.97, -5142.91, 76.1721, 0, 0, 0),
+(@PATH, 18, 2467.02, -5137.46, 77.5501, 2000, 1188, 100);
+
+UPDATE `waypoint_data` SET `move_type`=1 WHERE `id`=@PATH;
+
+SET @NPC := 130362;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,67108864,1,0, '53624');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `delay`, `action`, `action_chance`) VALUES
+(@PATH, 1, 2567.76, -5185.66, 74.8526, 5000, @SCRIPTID, 100),
+(@PATH, 2, 2521.28, -5146.41, 73.6638, 0, 0, 0),
+(@PATH, 3, 2483.25, -5139.37, 76.3581, 0, 0, 0),
+(@PATH, 4, 2464.89, -5154.73, 78.0666, 2000, 1188, 100);
+
+UPDATE `waypoint_data` SET `move_type`=1 WHERE `id`=@PATH;
+
+-- Volatile Ghoul
+UPDATE `creature` SET `spawndist` = 0, `MovementType` = 2, `spawntimesecs` = 10 WHERE `guid` IN (130363,130373,130362);
+
+-- Scourge Commander Thalanor
+UPDATE `creature` SET `spawndist` = 10, `MovementType` = 1 WHERE `guid` = 130467;
diff --git a/sql/updates/world/master/2020_04_10_17_world_2017_01_20_05_world.sql b/sql/updates/world/master/2020_04_10_17_world_2017_01_20_05_world.sql
new file mode 100644
index 00000000000..d6fca0ef35c
--- /dev/null
+++ b/sql/updates/world/master/2020_04_10_17_world_2017_01_20_05_world.sql
@@ -0,0 +1,142 @@
+-- Zalduun <Priest Trainer>
+SET @NPC := 57213;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`, `orientation`, `delay`) VALUES
+(@PATH, 1, -4113.68, -13762, 73.5694, 5.80705, 0),
+(@PATH, 2, -4110.51, -13765.2, 73.6102, 5.19209, 0),
+(@PATH, 3, -4107.71, -13772.5, 74.6982, 5.80705, 0),
+(@PATH, 4, -4102.51, -13772.3, 74.7185, 0.511104, 0),
+(@PATH, 5, -4099.89, -13768, 74.7256, 1.36954, 0),
+(@PATH, 6, -4102.44, -13763.8, 74.5717, 2.63796, 0),
+(@PATH, 7, -4125.6, -13762, 74.1406, 3.4807, 0),
+(@PATH, 8, -4129.88, -13764.2, 74.5865, 3.28513, 0),
+(@PATH, 9, -4135.57, -13762.7, 74.657, 2.14081, 0),
+(@PATH, 10, -4137.16, -13760, 74.6108, 1.35698, 0),
+(@PATH, 11, -4135.66, -13756.6, 74.5907, 0.545662, 0),
+(@PATH, 12, -4131.3, -13754.6, 74.6109, 6.14319, 0),
+(@PATH, 13, -4127.9, -13756.6, 74.2825, 5.30675, 0),
+(@PATH, 14, -4127.08, -13760.8, 74.2562, 5.74265, 0),
+(@PATH, 15, -4121.58, -13761.4, 73.5881, 0.0354084, 0),
+(@PATH, 16, -4113.68, -13762, 73.5694, 5.80705, 0),
+(@PATH, 17, -4110.51, -13765.2, 73.6102, 5.19209, 0),
+(@PATH, 18, -4107.71, -13772.5, 74.6982, 5.80705, 0),
+(@PATH, 19, -4102.51, -13772.3, 74.7185, 0.511104, 0),
+(@PATH, 20, -4099.89, -13768, 74.7256, 1.36954, 0),
+(@PATH, 21, -4102.44, -13763.8, 74.5717, 2.63796, 12000),
+(@PATH, 22, -4125.6, -13762, 74.1406, 3.4807, 0),
+(@PATH, 23, -4129.88, -13764.2, 74.5865, 3.28513, 0),
+(@PATH, 24, -4135.57, -13762.7, 74.657, 2.14081, 0),
+(@PATH, 25, -4137.16, -13760, 74.6108, 1.35698, 0),
+(@PATH, 26, -4135.66, -13756.6, 74.5907, 0.545662, 0),
+(@PATH, 27, -4131.3, -13754.6, 74.6109, 6.14319, 0),
+(@PATH, 28, -4127.9, -13756.6, 74.2825, 5.30675, 0),
+(@PATH, 29, -4127.08, -13760.8, 74.2562, 5.74265, 0),
+(@PATH, 30, -4121.58, -13761.4, 73.5881, 0.0354084, 0),
+(@PATH, 31, -4113.68, -13762, 73.5694, 5.80705, 0),
+(@PATH, 32, -4110.51, -13765.2, 73.6102, 5.19209, 0),
+(@PATH, 33, -4107.71, -13772.5, 74.6982, 5.80705, 0),
+(@PATH, 34, -4102.51, -13772.3, 74.7185, 0.511104, 0),
+(@PATH, 35, -4099.89, -13768, 74.7256, 1.36954, 0),
+(@PATH, 36, -4102.44, -13763.8, 74.5717, 2.63796, 0),
+(@PATH, 37, -4125.6, -13762, 74.1406, 3.4807, 0),
+(@PATH, 38, -4129.88, -13764.2, 74.5865, 3.28513, 0),
+(@PATH, 39, -4135.57, -13762.7, 74.657, 2.14081, 0),
+(@PATH, 40, -4137.16, -13760, 74.6108, 1.35698, 0),
+(@PATH, 41, -4135.66, -13756.6, 74.5907, 0.545662, 0),
+(@PATH, 42, -4131.3, -13754.6, 74.6109, 6.14319, 0),
+(@PATH, 43, -4127.9, -13756.6, 74.2825, 5.30675, 0),
+(@PATH, 44, -4127.08, -13760.8, 74.2562, 5.74265, 0),
+(@PATH, 45, -4121.58, -13761.4, 73.5881, 0.0354084, 0),
+(@PATH, 46, -4113.68, -13762, 73.5694, 5.80705, 0),
+(@PATH, 47, -4110.51, -13765.2, 73.6102, 5.19209, 0),
+(@PATH, 48, -4107.71, -13772.5, 74.6982, 5.80705, 0),
+(@PATH, 49, -4102.51, -13772.3, 74.7185, 0.511104, 0),
+(@PATH, 50, -4099.89, -13768, 74.7256, 1.36954, 0),
+(@PATH, 51, -4102.44, -13763.8, 74.5717, 2.63796, 0),
+(@PATH, 52, -4125.6, -13762, 74.1406, 3.4807, 0),
+(@PATH, 53, -4129.88, -13764.2, 74.5865, 3.28513, 0),
+(@PATH, 54, -4135.57, -13762.7, 74.657, 2.14081, 0),
+(@PATH, 55, -4137.16, -13760, 74.6108, 1.35698, 0),
+(@PATH, 56, -4135.66, -13756.6, 74.5907, 0.545662, 0),
+(@PATH, 57, -4131.3, -13754.6, 74.6109, 6.14319, 0),
+(@PATH, 58, -4127.9, -13756.6, 74.2825, 5.30675, 0),
+(@PATH, 59, -4127.08, -13760.8, 74.2562, 5.74265, 0),
+(@PATH, 60, -4121.58, -13761.4, 73.5881, 0.0354084, 0),
+(@PATH, 61, -4113.68, -13762, 73.5694, 5.80705, 0),
+(@PATH, 62, -4110.51, -13765.2, 73.6102, 5.19209, 0),
+(@PATH, 63, -4107.71, -13772.5, 74.6982, 5.80705, 0),
+(@PATH, 64, -4102.51, -13772.3, 74.7185, 0.511104, 0),
+(@PATH, 65, -4099.89, -13768, 74.7256, 1.36954, 0),
+(@PATH, 66, -4102.44, -13763.8, 74.5717, 2.63796, 0),
+(@PATH, 67, -4125.6, -13762, 74.1406, 3.4807, 0),
+(@PATH, 68, -4129.88, -13764.2, 74.5865, 3.28513, 12000),
+(@PATH, 69, -4135.57, -13762.7, 74.657, 2.14081, 0),
+(@PATH, 70, -4137.16, -13760, 74.6108, 1.35698, 0),
+(@PATH, 71, -4135.66, -13756.6, 74.5907, 0.545662, 0),
+(@PATH, 72, -4131.3, -13754.6, 74.6109, 6.14319, 0),
+(@PATH, 73, -4127.9, -13756.6, 74.2825, 5.30675, 0),
+(@PATH, 74, -4127.08, -13760.8, 74.2562, 5.74265, 0),
+(@PATH, 75, -4121.58, -13761.4, 73.5881, 0.0354084, 0),
+(@PATH, 76, -4113.68, -13762, 73.5694, 5.80705, 0),
+(@PATH, 77, -4110.51, -13765.2, 73.6102, 5.19209, 0),
+(@PATH, 78, -4107.71, -13772.5, 74.6982, 5.80705, 0),
+(@PATH, 79, -4102.51, -13772.3, 74.7185, 0.511104, 0),
+(@PATH, 80, -4099.89, -13768, 74.7256, 1.36954, 0),
+(@PATH, 81, -4102.44, -13763.8, 74.5717, 2.63796, 0),
+(@PATH, 82, -4125.6, -13762, 74.1406, 3.4807, 0),
+(@PATH, 83, -4129.88, -13764.2, 74.5865, 3.28513, 0),
+(@PATH, 84, -4135.57, -13762.7, 74.657, 2.14081, 0),
+(@PATH, 85, -4137.16, -13760, 74.6108, 1.35698, 0),
+(@PATH, 86, -4135.66, -13756.6, 74.5907, 0.545662, 0),
+(@PATH, 87, -4131.3, -13754.6, 74.6109, 6.14319, 0),
+(@PATH, 88, -4127.9, -13756.6, 74.2825, 5.30675, 0),
+(@PATH, 89, -4127.08, -13760.8, 74.2562, 5.74265, 0),
+(@PATH, 90, -4121.58, -13761.4, 73.5881, 0.0354084, 0),
+(@PATH, 91, -4113.68, -13762, 73.5694, 5.80705, 0),
+(@PATH, 92, -4110.51, -13765.2, 73.6102, 5.19209, 0),
+(@PATH, 93, -4107.71, -13772.5, 74.6982, 5.80705, 0),
+(@PATH, 94, -4102.51, -13772.3, 74.7185, 0.511104, 0),
+(@PATH, 95, -4099.89, -13768, 74.7256, 1.36954, 0),
+(@PATH, 96, -4102.44, -13763.8, 74.5717, 2.63796, 0),
+(@PATH, 97, -4125.6, -13762, 74.1406, 3.4807, 0),
+(@PATH, 98, -4129.88, -13764.2, 74.5865, 3.28513, 0),
+(@PATH, 99, -4135.57, -13762.7, 74.657, 2.14081, 0),
+(@PATH, 100, -4137.16, -13760, 74.6108, 1.35698, 0),
+(@PATH, 101, -4135.66, -13756.6, 74.5907, 0.545662, 0),
+(@PATH, 102, -4131.3, -13754.6, 74.6109, 6.14319, 0),
+(@PATH, 103, -4127.9, -13756.6, 74.2825, 5.30675, 0),
+(@PATH, 104, -4127.08, -13760.8, 74.2562, 5.74265, 0),
+(@PATH, 105, -4121.58, -13761.4, 73.5881, 0.0354084, 0);
+
+-- Zalduun SAI
+SET @ENTRY := 16502;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,74,0,100,0,0,40,120000,120000,11,29170,0,0,0,0,0,9,0,0,0,0,0,0,0,"Zalduun - On Friendly Between 0-40% Health - Cast 'Lesser Heal'"),
+(@ENTRY,0,1,0,34,0,100,0,2,20,0,0,80,@ENTRY*100+00,0,0,0,0,0,1,0,0,0,0,0,0,0,"Zalduun - On Reached Point 20 - Run Script"),
+(@ENTRY,0,2,0,34,0,100,0,2,67,0,0,80,@ENTRY*100+01,0,0,0,0,0,1,0,0,0,0,0,0,0,"Zalduun - On Reached Point 67 - Run Script");
+
+-- Actionlist SAI
+SET @ENTRY := 1650200;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,1,0,5000,0,0,0,0,1,0,0,0,0,0,0,0,"Zalduun - On Script - Say Line 0"),
+(@ENTRY,9,1,0,0,0,100,0,2000,2000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.31173,"Zalduun - On Script - Set Orientation 4.31173"),
+(@ENTRY,9,2,0,0,0,100,0,2000,2000,0,0,11,29170,0,0,0,0,0,10,59238,16971,0,0,0,0,0,"Zalduun - On Script - Cast 'Lesser Heal'");
+
+-- Actionlist SAI
+SET @ENTRY := 1650201;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,1,0,5000,0,0,0,0,1,0,0,0,0,0,0,0,"Zalduun - On Script - Say Line 0"),
+(@ENTRY,9,1,0,0,0,100,0,2000,2000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,0.157151,"Zalduun - On Script - Set Orientation 0.157151"),
+(@ENTRY,9,2,0,0,0,100,0,2000,2000,0,0,11,29170,0,0,0,0,0,10,59240,16971,0,0,0,0,0,"Zalduun - On Script - Cast 'Lesser Heal'");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=16502;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `comment`) VALUES
+(16502, 0, 0, 'Oh no! I\'m losing this one!', 12, 7, 100, 0, 0, 0, 13113, 'Zalduun');
diff --git a/sql/updates/world/master/2020_04_10_18_world_2017_01_22_07_world.sql b/sql/updates/world/master/2020_04_10_18_world_2017_01_22_07_world.sql
new file mode 100644
index 00000000000..bf0072004e7
--- /dev/null
+++ b/sql/updates/world/master/2020_04_10_18_world_2017_01_22_07_world.sql
@@ -0,0 +1,6 @@
+-- Torseg the Exiled SAI
+SET @ENTRY := 29350;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0 AND `id`>=2;
+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
+(@ENTRY,0,2,0,25,0,100,0,0,0,0,0,90,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Torseg the Exiled - On Reset - Set Flag Standstate Sleep"),
+(@ENTRY,0,3,0,4,0,100,0,0,0,0,0,91,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Torseg the Exiled - On Aggro - Remove Flag Standstate Sleep");
diff --git a/sql/updates/world/master/2020_04_10_19_world_2017_01_22_08_world.sql b/sql/updates/world/master/2020_04_10_19_world_2017_01_22_08_world.sql
new file mode 100644
index 00000000000..d8751725a89
--- /dev/null
+++ b/sql/updates/world/master/2020_04_10_19_world_2017_01_22_08_world.sql
@@ -0,0 +1,40 @@
+-- Reduce respawntime for landmine
+UPDATE `gameobject` SET `spawntimesecs`=10 WHERE `id`=191502;
+
+-- add fake death emote for Savage Hill Scavengers
+UPDATE `creature` SET `spawndist`=0, `MovementType`=0, `unit_flags`=`unit_flags`|536870912|33554432|32770, `dynamicflags`=32 WHERE `guid` IN (116957, 116956, 116958, 116959);
+DELETE FROM `creature_addon` WHERE `guid` IN (116957, 116956, 116958, 116959);
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(116957,0,0,7,1,0, '29266'),
+(116956,0,0,7,1,0, '29266'),
+(116958,0,0,7,1,0, '29266'),
+(116959,0,0,7,1,0, '29266');
+
+-- add textevent for Janks
+-- Janks SAI
+SET @ENTRY := 29429;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,25,0,100,0,0,0,0,0,90,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Janks - On Reset - Set Flag Standstate Sit Down"),
+(@ENTRY,0,1,0,10,0,100,0,1,10,55000,55000,80,@ENTRY*100+00,0,0,0,0,0,1,0,0,0,0,0,0,0,"Janks - Within 0-10 Range Out of Combat LoS - Run Script");
+
+-- Actionlist SAI
+SET @ENTRY := 2942900;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,48,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Janks - On Script - Set Active On"),
+(@ENTRY,9,1,0,0,0,100,0,0,0,0,0,91,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Janks - On Script - Remove Flag Standstate Sit Down"),
+(@ENTRY,9,2,0,0,0,100,0,0,0,0,0,1,0,5000,0,0,0,0,1,0,0,0,0,0,0,0,"Janks - On Script - Say Line 0"),
+(@ENTRY,9,3,0,0,0,100,0,5000,5000,0,0,1,1,5000,0,0,0,0,1,0,0,0,0,0,0,0,"Janks - On Script - Say Line 1"),
+(@ENTRY,9,4,0,0,0,100,0,5000,5000,0,0,1,2,5000,0,0,0,0,1,0,0,0,0,0,0,0,"Janks - On Script - Say Line 2"),
+(@ENTRY,9,5,0,0,0,100,0,5000,5000,0,0,1,3,5000,0,0,0,0,1,0,0,0,0,0,0,0,"Janks - On Script - Say Line 3"),
+(@ENTRY,9,6,0,0,0,100,0,3000,3000,0,0,90,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Janks - On Script - Set Flag Standstate Sit Down"),
+(@ENTRY,9,7,0,0,0,100,0,0,0,0,0,48,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Janks - On Script - Set Active Off");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=29429;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `comment`) VALUES
+(29429, 0, 0, 'Is it true?! Has someone finally come to get me out of this place?', 12, 0, 100, 0, 0, 0, 30198, 'Janks'),
+(29429, 1, 0, 'No... no... that''s not it, is it? That heartless lout probably sent you after the tools, didn''t he?', 12, 0, 100, 0, 0, 0, 30199, 'Janks'),
+(29429, 2, 0, 'Well... I guess I''ll just keep an eye on the turrets... or something.', 12, 0, 100, 0, 0, 0, 30200, 'Janks'),
+(29429, 3, 0, '%s sighs.', 16, 0, 100, 0, 0, 0, 30201, 'Janks');
diff --git a/sql/updates/world/master/2020_04_10_20_world_2017_01_22_09_world.sql b/sql/updates/world/master/2020_04_10_20_world_2017_01_22_09_world.sql
new file mode 100644
index 00000000000..01f6f5787fa
--- /dev/null
+++ b/sql/updates/world/master/2020_04_10_20_world_2017_01_22_09_world.sql
@@ -0,0 +1,131 @@
+-- Bailey + Bellinger Event
+UPDATE `creature` SET `spawndist`=0, `MovementType`=0 WHERE `guid` IN (114937, 114958);
+DELETE FROM `creature_formations` WHERE `leaderGUID`=114937;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES
+(114937, 114937, 0, 0, 4, 0, 0),
+(114937, 114958, 2, 270, 4, 0, 0);
+
+-- Bailey SAI
+SET @ENTRY := 29643;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,1,0,100,0,1000,1000,900000,900000,80,@ENTRY*100+00,0,0,0,0,0,1,0,0,0,0,0,0,0,"Bailey - Out of Combat - Run Script"),
+(@ENTRY,0,1,0,40,0,100,0,4,29643,0,0,80,@ENTRY*100+01,0,0,0,0,0,1,0,0,0,0,0,0,0,"Bailey - On Waypoint 4 Reached - Run Script"),
+(@ENTRY,0,2,0,40,0,100,0,8,29643,0,0,80,@ENTRY*100+02,0,0,0,0,0,1,0,0,0,0,0,0,0,"Bailey - On Waypoint 8 Reached - Run Script"),
+(@ENTRY,0,3,0,40,0,100,0,15,29643,0,0,80,@ENTRY*100+03,0,0,0,0,0,1,0,0,0,0,0,0,0,"Bailey - On Waypoint 15 Reached - Run Script");
+
+-- Actionlist SAI
+SET @ENTRY := 2964300;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,1,0,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Bailey - On Script - Say Line 0"),
+(@ENTRY,9,1,0,0,0,100,0,6000,6000,0,0,1,0,6000,0,0,0,0,10,114958,29644,0,0,0,0,0,"Bailey - On Script - Say Line 0"),
+(@ENTRY,9,2,0,0,0,100,0,6000,6000,0,0,1,1,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Bailey - On Script - Say Line 1"),
+(@ENTRY,9,3,0,0,0,100,0,6000,6000,0,0,1,1,6000,0,0,0,0,10,114958,29644,0,0,0,0,0,"Bailey - On Script - Say Line 1"),
+(@ENTRY,9,4,0,0,0,100,0,6000,6000,0,0,1,2,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Bailey - On Script - Say Line 2"),
+(@ENTRY,9,5,0,0,0,100,0,6000,6000,0,0,1,2,0,0,0,0,0,10,114958,29644,0,0,0,0,0,"Bailey - On Script - Say Line 2"),
+(@ENTRY,9,6,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,10,114958,29644,0,0,0,0,0,"Bailey - On Script - Set Orientation Closest Creature 'Bellinger'"),
+(@ENTRY,9,7,0,0,0,100,0,6000,6000,0,0,1,3,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Bailey - On Script - Say Line 3"),
+(@ENTRY,9,8,0,0,0,100,0,3000,3000,0,0,5,60,0,0,0,0,0,1,0,0,0,0,0,0,0,"Bailey - On Script - Play Emote 60"),
+(@ENTRY,9,9,0,0,0,100,0,0,0,0,0,86,54899,0,10,114958,29644,0,1,0,0,0,0,0,0,0,"Bailey - On Script - Cross Cast 'Knockback 15'"),
+(@ENTRY,9,10,0,0,0,100,0,5000,5000,0,0,1,3,5000,0,0,0,0,10,114958,29644,0,0,0,0,0,"Bailey - On Script - Say Line 3"),
+(@ENTRY,9,11,0,0,0,100,0,0,0,0,0,45,4,4,0,0,0,0,10,114958,29644,0,0,0,0,0,"Bailey - On Script - Set Data 4 4"),
+(@ENTRY,9,12,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,1.58825,"Bailey - On Script - Set Orientation 1.58825"),
+(@ENTRY,9,13,0,0,0,100,0,3000,3000,0,0,1,4,3000,0,0,0,0,10,114958,29644,0,0,0,0,0,"Bailey - On Script - Say Line 4"),
+(@ENTRY,9,14,0,0,0,100,0,5000,5000,0,0,45,1,1,0,0,0,0,10,114958,29644,0,0,0,0,0,"Bailey - On Script - Set Data 1 1"),
+(@ENTRY,9,15,0,0,0,100,0,300000,300000,0,0,1,5,6000,0,0,0,0,10,114958,29644,0,0,0,0,0,"Bailey - On Script - Say Line 5"), -- 5min
+(@ENTRY,9,16,0,0,0,100,0,6000,6000,0,0,1,4,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Bailey - On Script - Say Line 4"),
+(@ENTRY,9,17,0,0,0,100,0,6000,6000,0,0,1,6,6000,0,0,0,0,10,114958,29644,0,0,0,0,0,"Bailey - On Script - Say Line 6"),
+(@ENTRY,9,18,0,0,0,100,0,6000,6000,0,0,1,7,6000,0,0,0,0,10,114958,29644,0,0,0,0,0,"Bailey - On Script - Say Line 7"),
+(@ENTRY,9,19,0,0,0,100,0,6000,6000,0,0,1,8,6000,0,0,0,0,10,114958,29644,0,0,0,0,0,"Bailey - On Script - Say Line 8"),
+(@ENTRY,9,20,0,0,0,100,0,6000,6000,0,0,1,5,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Bailey - On Script - Say Line 5"),
+(@ENTRY,9,21,0,0,0,100,0,6000,6000,0,0,1,6,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Bailey - On Script - Say Line 6"),
+(@ENTRY,9,22,0,0,0,100,0,300000,300000,0,0,53,0,29643,0,0,0,1,1,0,0,0,0,0,0,0,"Bailey - On Script - Start Waypoint"); -- 5min 300000
+
+-- Actionlist SAI
+SET @ENTRY := 2964301;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,54,13000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Bailey - On Script - Pause Waypoint"),
+(@ENTRY,9,1,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.085985,"Bailey - On Script - Set Orientation 2,085985"),
+(@ENTRY,9,2,0,0,0,100,0,1000,1000,0,0,45,2,2,0,0,0,0,10,114958,29644,0,0,0,0,0,"Bailey - On Script - Set Data 2 2"),
+(@ENTRY,9,3,0,0,0,100,0,1000,1000,0,0,1,7,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Bailey - On Script - Say Line 7"),
+(@ENTRY,9,4,0,0,0,100,0,6000,6000,0,0,1,9,5000,0,0,0,0,10,114958,29644,0,0,0,0,0,"Bailey - On Script - Say Line 9");
+
+-- Actionlist SAI
+SET @ENTRY := 2964302;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,54,33000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Bailey - On Script - Pause Waypoint"),
+(@ENTRY,9,1,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.50084,"Bailey - On Script - Set Orientation 2.50084"),
+(@ENTRY,9,2,0,0,0,100,0,1000,1000,0,0,45,3,3,0,0,0,0,10,114958,29644,0,0,0,0,0,"Bailey - On Script - Set Data 3 3"),
+(@ENTRY,9,3,0,0,0,100,0,3000,3000,0,0,1,8,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Bailey - On Script - Say Line 8"),
+(@ENTRY,9,4,0,0,0,100,0,6000,6000,0,0,1,10,6000,0,0,0,0,10,114958,29644,0,0,0,0,0,"Bailey - On Script - Say Line 10"),
+(@ENTRY,9,5,0,0,0,100,0,6000,6000,0,0,1,9,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Bailey - On Script - Say Line 9"),
+(@ENTRY,9,6,0,0,0,100,0,6000,6000,0,0,1,11,6000,0,0,0,0,10,114958,29644,0,0,0,0,0,"Bailey - On Script - Say Line 11"),
+(@ENTRY,9,7,0,0,0,100,0,6000,6000,0,0,1,10,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Bailey - On Script - Say Line 10");
+
+-- Actionlist SAI
+SET @ENTRY := 2964303;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,4000,4000,0,0,45,5,5,0,0,0,0,10,114958,29644,0,0,0,0,0,"Bailey - On Script - Set Data 5 5"),
+(@ENTRY,9,1,0,0,0,100,0,1000,1000,0,0,48,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Bailey - On Script - Set Active Off");
+
+-- Bellinger SAI
+SET @ENTRY := 29644;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,38,0,100,0,1,1,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,1.50098,"Bellinger - On Data Set 1 1 - Set Orientation 1.50098"),
+(@ENTRY,0,1,0,38,0,100,0,2,2,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.08598,"Bellinger - On Data Set 2 2 - Set Orientation 2.08598"),
+(@ENTRY,0,2,0,38,0,100,0,3,3,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.50084,"Bellinger - On Data Set 3 3 - Set Orientation 2.50084"),
+(@ENTRY,0,3,0,38,0,100,0,4,4,0,0,69,0,0,0,0,0,0,8,0,0,0,6034.820,-750.8344,369.8008,1.4146,"Bellinger - On Data Set 4 4 - Move To Position"),
+(@ENTRY,0,4,0,38,0,100,0,5,5,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,1.269333,"Bellinger - On Data Set 3 3 - Set Orientation 1.269333");
+
+DELETE FROM `creature_text` WHERE `CreatureID` IN (29643, 29644);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `comment`) VALUES
+-- Bailey
+(29643, 0, 0, 'This doesn''t look pretty, lad.', 12, 0, 100, 1, 0, 0, 30286, 'Bailey'),
+(29643, 1, 0, 'That right? Well why don''t you go prance your merry little self over and grab them, eh?', 12, 0, 100, 6, 0, 0, 30289, 'Bailey'),
+(29643, 2, 0, 'That''s strange... for a moment there, I could have swore you called me short.', 12, 0, 100, 1, 0, 0, 30288, 'Bailey'),
+(29643, 3, 0, 'Toss me?! Okay, that''s it punk.', 12, 0, 100, 5, 0, 0, 30290, 'Bailey'),
+(29643, 4, 0, 'Keep it to yourself.', 12, 0, 100, 1, 0, 0, 30291, 'Bailey'),
+(29643, 5, 0, 'You better hope they don''t survive it, lad.', 12, 0, 100, 1, 0, 0, 30292, 'Bailey'),
+(29643, 6, 0, 'Cause I''m just going to watch and laugh as they toss you in.', 12, 0, 100, 1, 0, 0, 30293, 'Bailey'),
+(29643, 7, 0, 'There''s got to be a way in somewhere.', 12, 0, 100, 1, 0, 0, 30294, 'Bailey'),
+(29643, 8, 0, 'How''d the goblin leave his tools there then?', 12, 0, 100, 1, 0, 0, 30295, 'Bailey'),
+(29643, 9, 0, 'That''s it, lad! It looks totally safe. Go for it, I''ll be right behind ya!', 12, 0, 100, 5, 0, 0, 30296, 'Bailey'),
+(29643, 10, 0, 'Pansy.', 12, 0, 100, 5, 0, 0, 30312, 'Bailey'),
+-- Bellinger
+(29644, 0, 0, 'I don''t know, Bailey... it''s not so bad. We could throw a rock at the tools from here.', 12, 0, 100, 1, 0, 0, 30287, 'Bellinger'),
+(29644, 1, 0, 'Well... I was just thinking... you''re a bit smaller, so you''re less likely to set off any of those mines.', 12, 0, 100, 1, 0, 0, 30297, 'Bellinger'),
+(29644, 2, 0, 'No, no, no! Not short... it''s just... well... maybe I could toss you across most of it?', 12, 0, 100, 1, 0, 0, 30298, 'Bellinger'),
+(29644, 3, 0, 'Ahhh!', 12, 0, 100, 0, 0, 0, 30306, 'Bellinger'),
+(29644, 4, 0, 'That was close! You scared me.', 12, 0, 100, 5, 0, 0, 30311, 'Bellinger'),
+(29644, 5, 0, 'I''ve got an idea, Bailey...', 12, 0, 100, 5, 0, 0, 30299, 'Bellinger'),
+(29644, 6, 0, 'No, no - this might work!', 12, 0, 100, 5, 0, 0, 30300, 'Bellinger'),
+(29644, 7, 0, 'There''s a path right there... only a few mines at the end in between us and the tools.', 12, 0, 100, 1, 0, 0, 30301, 'Bellinger'),
+(29644, 8, 0, 'We wait for the next adventurer to come through and we tell him that''s the way to go... then after they set off the mines, we just walk in and grab the tools!', 12, 0, 100, 1, 0, 0, 30302, 'Bellinger'),
+(29644, 9, 0, 'It really doesn''t look like it, Bailey.', 12, 0, 100, 1, 0, 0, 30303, 'Bellinger'),
+(29644, 10, 0, 'Oh... good point. How about right there? That looks clear... kind of.', 12, 0, 100, 1, 0, 0, 30304, 'Bellinger'),
+(29644, 11, 0, 'Uh... that''s okay. It still kind of hurts from last time.', 12, 0, 100, 1, 0, 0, 30305, 'Bellinger');
+
+DELETE FROM `waypoints` WHERE `entry`=29643;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(29643, 1, 6043.27, -752.358, 371.289, 'Bailey'),
+(29643, 2, 6057.13, -750.684, 374.297, 'Bailey'),
+(29643, 3, 6075.11, -746.512, 378.785, 'Bailey'),
+(29643, 4, 6074.88, -746.098, 378.744, 'Bailey'),
+(29643, 5, 6082.66, -744.527, 380.612, 'Bailey'),
+(29643, 6, 6094.52, -739.821, 383.156, 'Bailey'),
+(29643, 7, 6108.06, -728.91, 385.165, 'Bailey'),
+(29643, 8, 6106.12, -727.415, 384.716, 'Bailey'),
+(29643, 9, 6103.38, -731.758, 384.439, 'Bailey'),
+(29643, 10, 6094.78, -740.08, 383.232, 'Bailey'),
+(29643, 11, 6081.35, -743.988, 380.304, 'Bailey'),
+(29643, 12, 6064.46, -748.543, 376.139, 'Bailey'),
+(29643, 13, 6047.42, -752.5, 372.131, 'Bailey'),
+(29643, 14, 6036.15, -753.071, 369.981, 'Bailey'),
+(29643, 15, 6036.69, -751.232, 370.083, 'Bailey');
diff --git a/sql/updates/world/master/2020_04_10_21_world_2017_01_22_12_world.sql b/sql/updates/world/master/2020_04_10_21_world_2017_01_22_12_world.sql
new file mode 100644
index 00000000000..cf5e82f626e
--- /dev/null
+++ b/sql/updates/world/master/2020_04_10_21_world_2017_01_22_12_world.sql
@@ -0,0 +1,148 @@
+-- Footman Rob + Footman Chuck + Footman George + Footman Mitch - Path and Textevent
+
+-- Footman Rob SAI
+SET @ENTRY := 25258;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,34,0,100,1,2,5,0,0,80,@ENTRY*100+00,0,0,0,0,0,1,0,0,0,0,0,0,0,"Footman Rob - On Reached Point 5 - Run Script (No Repeat)"),
+(@ENTRY,0,1,0,34,0,100,0,2,9,0,0,80,@ENTRY*100+01,0,0,0,0,0,1,0,0,0,0,0,0,0,"Footman Rob - On Reached Point 9 - Run Script"),
+(@ENTRY,0,2,0,34,0,100,0,2,10,0,0,80,@ENTRY*100+02,0,0,0,0,0,1,0,0,0,0,0,0,0,"Footman Rob - On Reached Point 10 - Run Script"),
+(@ENTRY,0,3,0,34,0,100,1,2,15,0,0,12,25260,3,180000,0,0,0,8,0,0,0,2255.77,5186.26,11.4391,1.47479,"Footman Rob - On Reached Point 15 - Summon Creature 'Footman Mitch' (No Repeat)"),
+(@ENTRY,0,4,0,34,0,100,0,2,17,0,0,80,@ENTRY*100+03,0,0,0,0,0,1,0,0,0,0,0,0,0,"Footman Rob - On Reached Point 17 - Run Script"),
+(@ENTRY,0,5,0,17,0,100,0,25260,0,0,0,64,1,0,0,0,0,0,7,0,0,0,0,0,0,0,"Footman Rob - On Summoned Unit - Store Targetlist"),
+(@ENTRY,0,6,0,1,0,100,1,100,100,0,0,71,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Footman Rob - Out of Combat - Change Equipment (No Repeat)"),
+(@ENTRY,0,7,0,1,0,100,1,100,100,0,0,71,0,0,0,0,0,0,10,85222,25259,0,0,0,0,0,"Footman Rob - Out of Combat - Change Equipment (No Repeat)"),
+(@ENTRY,0,8,0,1,0,100,1,100,100,0,0,71,0,0,0,0,0,0,10,85226,25261,0,0,0,0,0,"Footman Rob - Out of Combat - Change Equipment (No Repeat)");
+
+-- Actionlist SAI -- Stop in Front of house
+SET @ENTRY := 2525800;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,3000,3000,0,0,1,0,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Footman Rob - On Script - Say Line 0"),
+(@ENTRY,9,1,0,0,0,100,0,6000,6000,0,0,1,0,0,0,0,0,0,10,85222,25259,0,0,0,0,0,"Footman Rob - On Script - Say Line 0");
+
+-- Actionlist SAI - stop in front of barkeeper
+SET @ENTRY := 2525801;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,4000,4000,0,0,1,1,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Footman Rob - On Script - Say Line 1"),
+(@ENTRY,9,1,0,0,0,100,0,6000,6000,0,0,1,0,6000,0,0,0,0,10,110613,25245,0,0,0,0,0,"Footman Rob - On Script - Say Line 0"),
+(@ENTRY,9,2,0,0,0,100,0,6000,6000,0,0,1,2,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Footman Rob - On Script - Say Line 2"),
+(@ENTRY,9,3,0,0,0,100,0,6000,6000,0,0,1,1,6000,0,0,0,0,10,110613,25245,0,0,0,0,0,"Footman Rob - On Script - Say Line 1"),
+(@ENTRY,9,4,0,0,0,100,0,3000,3000,0,0,5,397,0,0,0,0,0,10,110613,25245,0,0,0,0,0,"Footman Rob - On Script - Play Emote 397"),
+(@ENTRY,9,5,0,0,0,100,0,7000,7000,0,0,17,423,0,0,0,0,0,1,0,0,0,0,0,0,0,"Footman Rob - On Script - Set Emote State 423"),
+(@ENTRY,9,6,0,0,0,100,0,0,0,0,0,71,1,0,2703,0,0,0,1,0,0,0,0,0,0,0,"Footman Rob - On Script - Change Equipment"),
+(@ENTRY,9,7,0,0,0,100,0,0,0,0,0,71,1,0,2703,0,0,0,10,85222,25259,0,0,0,0,0,"Footman Rob - On Script - Change Equipment"),
+(@ENTRY,9,8,0,0,0,100,0,0,0,0,0,71,1,0,2703,0,0,0,10,85226,25261,0,0,0,0,0,"Footman Rob - On Script - Change Equipment"),
+(@ENTRY,9,9,0,0,0,100,0,5000,5000,0,0,17,423,0,0,0,0,0,10,85222,25259,0,0,0,0,0,"Footman Rob - On Script - Set Emote State 423"),
+(@ENTRY,9,10,0,0,0,100,0,0,0,0,0,17,423,0,0,0,0,0,10,85226,25261,0,0,0,0,0,"Footman Rob - On Script - Set Emote State 423"),
+(@ENTRY,9,11,0,0,0,100,0,22000,22000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Footman Rob - On Script - Set Emote State 0"),
+(@ENTRY,9,12,0,0,0,100,0,0,0,0,0,17,0,0,0,0,0,0,10,85222,25259,0,0,0,0,0,"Footman Rob - On Script - Set Emote State 0"),
+(@ENTRY,9,13,0,0,0,100,0,0,0,0,0,17,0,0,0,0,0,0,10,85226,25261,0,0,0,0,0,"Footman Rob - On Script - Set Emote State 0"),
+(@ENTRY,9,14,0,0,0,100,0,0,0,0,0,71,1,0,2703,0,0,0,1,0,0,0,0,0,0,0,"Footman Rob - On Script - Change Equipment"),
+(@ENTRY,9,15,0,0,0,100,0,0,0,0,0,71,1,0,2703,0,0,0,10,85222,25259,0,0,0,0,0,"Footman Rob - On Script - Change Equipment"),
+(@ENTRY,9,16,0,0,0,100,0,0,0,0,0,71,1,0,2703,0,0,0,10,85226,25261,0,0,0,0,0,"Footman Rob - On Script - Change Equipment"),
+(@ENTRY,9,17,0,0,0,100,0,0,0,0,0,71,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Footman Rob - On Script - Change Equipment"),
+(@ENTRY,9,18,0,0,0,100,0,0,0,0,0,71,0,0,0,0,0,0,10,85222,25259,0,0,0,0,0,"Footman Rob - On Script - Change Equipment"),
+(@ENTRY,9,19,0,0,0,100,0,0,0,0,0,71,0,0,0,0,0,0,10,85226,25261,0,0,0,0,0,"Footman Rob - On Script - Change Equipment");
+
+-- Actionlist SAI - prepare leave building
+SET @ENTRY := 2525802;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,1000,1000,0,0,1,3,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Footman Rob - On Script - Say Line 3"),
+(@ENTRY,9,1,0,0,0,100,0,3000,3000,0,0,45,1,1,0,0,0,0,10,85222,25259,0,0,0,0,0,"Footman Rob - On Script - Set Data 1 1"),
+(@ENTRY,9,2,0,0,0,100,0,0,0,0,0,45,1,1,0,0,0,0,10,85226,25261,0,0,0,0,0,"Footman Rob - On Script - Set Data 1 1"),
+(@ENTRY,9,3,0,0,0,100,0,3000,3000,0,0,1,0,6000,0,0,0,0,10,85226,25261,0,0,0,0,0,"Footman Rob - On Script - Say Line 0"),
+(@ENTRY,9,4,0,0,0,100,0,6000,6000,0,0,5,11,0,0,0,0,0,1,0,0,0,0,0,0,0,"Footman Rob - On Script - Play Emote 11"),
+(@ENTRY,9,5,0,0,0,100,0,0,0,0,0,5,11,0,0,0,0,0,10,85222,25259,0,0,0,0,0,"Footman Rob - On Script - Play Emote 11"),
+(@ENTRY,9,6,0,0,0,100,0,0,0,0,0,5,11,0,0,0,0,0,10,85226,25261,0,0,0,0,0,"Footman Rob - On Script - Play Emote 11"),
+(@ENTRY,9,7,0,0,0,100,0,1000,1000,0,0,5,274,0,0,0,0,0,1,0,0,0,0,0,0,0,"Footman Rob - On Script - Play Emote 274"),
+(@ENTRY,9,8,0,0,0,100,0,0,0,0,0,5,274,0,0,0,0,0,10,85222,25259,0,0,0,0,0,"Footman Rob - On Script - Play Emote 274"),
+(@ENTRY,9,9,0,0,0,100,0,0,0,0,0,5,274,0,0,0,0,0,10,85226,25261,0,0,0,0,0,"Footman Rob - On Script - Play Emote 274");
+
+-- Actionlist SAI - despawn all member
+SET @ENTRY := 2525803;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,9,0,0,0,0,100,0,0,0,0,0,41,1,0,0,0,0,0,10,85222,25259,0,0,0,0,0,"Footman Rob - On Script - Despawn Instant"),
+(@ENTRY,9,1,0,0,0,100,0,0,0,0,0,41,1,0,0,0,0,0,10,85226,25261,0,0,0,0,0,"Footman Rob - On Script - Despawn Instant"),
+(@ENTRY,9,2,0,0,0,100,0,0,0,0,0,41,1,0,0,0,0,0,12,1,0,0,0,0,0,0,"Footman Rob - On Script - Despawn Instant"),
+(@ENTRY,9,3,0,0,0,100,0,100,100,0,0,41,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Footman Rob - On Script - Despawn Instant");
+UPDATE `creature_template` SET `flags_extra`=2, `InhabitType`=3 WHERE `entry` IN (25259, 25258, 25261);
+
+-- Footman George SAI
+SET @ENTRY := 25259;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,38,0,100,0,1,1,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.282578,"Footman George - On Data Set 1 1 - Set Orientation 4,282578");
+
+-- Footman Chuck SAI
+SET @ENTRY := 25261;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,38,0,100,0,1,1,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,4.28258,"Footman Chuck - On Data Set 1 1 - Set Orientation 4.28258");
+
+-- Footman Mitch SAI
+SET @ENTRY := 25260;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,1,63,0,100,0,0,0,0,0,1,0,6000,0,0,0,0,1,0,0,0,0,0,0,0,"Footman Mitch - On Just Created - Say Line 0"),
+(@ENTRY,0,1,2,61,0,100,0,0,0,0,0,59,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Footman Mitch - On Just Created - Set Run Off"),
+(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,69,0,0,0,0,0,0,8,0,0,0,2264.93652,5221.9863,11.2882,4.3713,"Footman Mitch - On Just Created - Move To Position");
+
+-- texts
+DELETE FROM `creature_text` WHERE `CreatureID` IN (25259, 25258, 25261, 25260, 25245);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `comment`) VALUES
+-- Footman Rob
+(25258, 0, 0, 'One last drink before we head to the front?', 12, 7, 100, 1, 0, 0, 24475, 'Footman Rob'),
+(25258, 1, 0, 'Barkeep! Bring out your strongest ale. We''re off to the front.', 12, 7, 100, 1, 0, 0, 24478, 'Footman Rob'),
+(25258, 2, 0, 'You''ll surely make an exception for us, eh? We might not come back.', 12, 7, 100, 1, 0, 0, 24479, 'Footman Rob'),
+(25258, 3, 0, 'I guess that''s it then. Off we go.', 12, 7, 100, 1, 0, 0, 24482, 'Footman Rob'),
+-- Footman George
+(25259, 0, 0, 'Sure, why not?', 12, 7, 100, 6, 0, 0, 24476, 'Footman George'),
+-- Footman Chuck
+(25261, 0, 0, 'That was the worst beer I''ve ever had.', 12, 7, 100, 0, 0, 0, 24483, 'Footman Chuck'),
+-- Footman Mitch
+(25260, 0, 0, 'Hey, guys! Wait up!', 12, 7, 100, 0, 0, 0, 24761, 'Footman Mitch'),
+-- James Deacon
+(25245, 0, 0, 'You lads know the drill. No alcohol to servicemen on duty. You want the general to kill me himself?', 12, 7, 100, 274, 0, 0, 24744, 'James Deacon'),
+(25245, 1, 0, 'All right, all right... but you didn''t get these from me!', 12, 7, 100, 6, 0, 0, 24745, 'James Deacon');
+
+-- Formation
+DELETE FROM `creature_formations` WHERE `leaderGUID`= 85221;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES
+(85221, 85221, 0, 0, 4, 0, 0), -- Rob
+(85221, 85222, 2, 305, 4, 0, 0), -- George
+(85221, 85226, 2, 55, 4, 0, 0); -- Chuck
+
+-- Waypoints for Rob
+SET @NPC := 85221;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(@PATH, 1, 2277.23, 5177.21, 11.34, 0, 0, 0, 0, 100, 0),
+(@PATH, 2, 2268.97, 5175.55, 11.1665, 0, 0, 0, 0, 100, 0),
+(@PATH, 3, 2254.59, 5188.89, 11.384, 0, 0, 0, 0, 100, 0),
+(@PATH, 4, 2254.27, 5196.42, 11.3837, 0, 0, 0, 0, 100, 0),
+(@PATH, 5, 2260.67, 5200.36, 11.3711, 0, 0, 0, 0, 100, 0),
+(@PATH, 6, 2264.38, 5199.09, 11.3676, 0, 13000, 0, 0, 100, 0), -- stop in front
+(@PATH, 7, 2270.18, 5196.94, 12.4959, 0, 0, 0, 0, 100, 0),
+(@PATH, 8, 2275.23, 5194.94, 12.49, 0, 0, 0, 0, 100, 0),
+(@PATH, 9, 2276.23, 5197.58, 12.4896, 0, 0, 0, 0, 100, 0),
+(@PATH, 10, 2279.08, 5206.5, 12.494, 0, 60000, 0, 0, 100, 0), -- stop beer
+(@PATH, 11, 2278.6, 5205.3, 12.4926, 0, 16000, 0, 0, 100, 0), -- stop go
+(@PATH, 12, 2275.55, 5197.84, 12.4897, 0, 0, 0, 0, 100, 0),
+(@PATH, 13, 2275.60, 5194.96, 12.489, 0, 0, 0, 0, 100, 0),
+(@PATH, 14, 2265.21, 5198.54, 11.3533, 0, 0, 0, 0, 100, 0),
+(@PATH, 15, 2258.23, 5201.82, 11.3182, 0, 0, 0, 0, 100, 0),
+(@PATH, 16, 2258.98, 5205.83, 11.322, 0, 0, 0, 0, 100, 0), -- summon friend
+(@PATH, 17, 2261, 5212.02, 11.2373, 0, 0, 0, 0, 100, 0),
+(@PATH, 18, 2268.17, 5226.07, 11.2421, 0, 5000, 0, 0, 100, 0); -- despawn
diff --git a/sql/updates/world/master/2020_04_10_22_world_2017_01_23_03_world.sql b/sql/updates/world/master/2020_04_10_22_world_2017_01_23_03_world.sql
new file mode 100644
index 00000000000..32eac33787a
--- /dev/null
+++ b/sql/updates/world/master/2020_04_10_22_world_2017_01_23_03_world.sql
@@ -0,0 +1,7 @@
+DELETE FROM `spell_proc` WHERE `SpellId`=13234;
+INSERT INTO `spell_proc` (`SpellId`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `ProcFlags`, `SpellTypeMask`, `SpellPhaseMask`, `HitMask`, `AttributesMask`, `ProcsPerMinute`, `Chance`, `Cooldown`, `Charges`) VALUES
+(13234, 0, 0, 0x00000000, 0x00000000, 0x00000000, 0, 0x1, 0x0, 0x403, 0x2, 0, 0, 0, 0);
+
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_item_harm_prevention_belt';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(13234, 'spell_item_harm_prevention_belt');
diff --git a/sql/updates/world/master/2020_04_10_22_world_2017_01_24_01_world.sql b/sql/updates/world/master/2020_04_10_22_world_2017_01_24_01_world.sql
new file mode 100644
index 00000000000..a06b67e94e1
--- /dev/null
+++ b/sql/updates/world/master/2020_04_10_22_world_2017_01_24_01_world.sql
@@ -0,0 +1,77 @@
+-- [NPC][WotlK] Savage Hill Brute/Mystic/Scavenger, missing spawn loc and emote
+SET @CGUID := 73938; -- SET BY TC TEAM
+DELETE FROM `creature` WHERE `guid` BETWEEN @CGUID+0 AND @CGUID+7;
+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`, `VerifiedBuild`) VALUES
+(@CGUID+0, 29404, 571, 0, 0, '0', 0, 0, 1, 6089.3, -359.966, 455.223, 2.41823, 300, 6, 0, 11379, 0, 1, 0, 0, 0, 0),
+(@CGUID+1, 29404, 571, 0, 0, '0', 0, 0, 1, 6104.57, -380.103, 431.085, 1.31082, 300, 6, 0, 11379, 0, 1, 0, 0, 0, 0),
+(@CGUID+2, 29622, 571, 0, 0, '0', 0, 0, 1, 6106.41, -307.385, 445.287, 5.63439, 300, 0, 0, 9416, 8459, 0, 0, 0, 0, 0),
+(@CGUID+3, 29622, 571, 0, 0, '0', 0, 0, 1, 6151.58, -333.755, 436.37, 4.16491, 300, 0, 0, 9103, 8313, 0, 0, 0, 0, 0),
+(@CGUID+4, 29622, 571, 0, 0, '0', 0, 0, 1, 6131.09, -340.995, 436.336, 5.1412, 300, 0, 0, 9416, 8459, 0, 0, 0, 0, 0),
+(@CGUID+5, 29622, 571, 0, 0, '0', 0, 0, 1, 6119.04, -350.294, 436.988, 5.33912, 300, 0, 0, 9103, 8313, 0, 0, 0, 0, 0),
+(@CGUID+6, 29622, 571, 0, 0, '0', 0, 0, 1, 6158.21, -359.72, 435.302, 3.23503, 300, 0, 0, 9416, 8459, 0, 0, 0, 0, 0),
+(@CGUID+7, 29623, 571, 0, 0, '0', 0, 0, 1, 6135.28, -362.313, 433.083, 2.42607, 300, 6, 0, 11770, 0, 1, 0, 0, 0, 0);
+
+DELETE FROM `creature_addon` WHERE `guid` IN (117085, 113242, 113314, 113327);
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(117085,0,0,3,1,0, ''),
+(113242,0,0,3,1,0, ''),
+(113314,0,0,3,1,0, ''),
+(113327,0,0,3,1,0, '');
+
+-- Savage Hill Scavenger SAI
+SET @ENTRY := 29404;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0 AND `id`=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
+(@ENTRY,0,1,0,4,0,100,0,0,0,0,0,91,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Savage Hill Scavenger - On Aggro - Remove Flag Standstate Sleep");
+
+-- Savage Hill Mystic SAI
+SET @ENTRY := 29622;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0 AND `id`=2;
+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
+(@ENTRY,0,2,0,4,0,100,0,0,0,0,0,91,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Savage Hill Mystic - On Aggro - Remove Flag Standstate Sleep");
+
+-- Savage Hill Brute SAI
+SET @ENTRY := 29623;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0 AND `id`= 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
+(@ENTRY,0,1,0,4,0,100,0,0,0,0,0,91,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Savage Hill Brute - On Aggro - Remove Flag Standstate Sleep");
+
+SET @NPC := 113241;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(@PATH, 1, 6276.32, -648.906, 418.674, 0, 0, 0, 0, 100, 0),
+(@PATH, 2, 6269.54, -647.148, 418.458, 0, 10000, 0, 0, 100, 0),
+(@PATH, 3, 6259.28, -644.926, 417.527, 0, 0, 0, 0, 100, 0),
+(@PATH, 4, 6249.04, -642.598, 416.282, 0, 0, 0, 0, 100, 0),
+(@PATH, 5, 6235.14, -639.409, 414.451, 0, 10000, 0, 0, 100, 0),
+(@PATH, 6, 6238.54, -640.251, 414.906, 0, 0, 0, 0, 100, 0),
+(@PATH, 7, 6252.14, -643.517, 416.649, 0, 0, 0, 0, 100, 0),
+(@PATH, 8, 6262.42, -645.655, 417.845, 0, 0, 0, 0, 100, 0);
+
+SET @NPC := 113325;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(@PATH, 1, 6133.69, -454.762, 410.059, 0, 0, 0, 0, 100, 0),
+(@PATH, 2, 6123.02, -443.385, 411.551, 0, 0, 0, 0, 100, 0),
+(@PATH, 3, 6107.9, -429.985, 414.557, 0, 0, 0, 0, 100, 0),
+(@PATH, 4, 6121.41, -441.725, 411.852, 0, 0, 0, 0, 100, 0);
+
+SET @NPC := 113326;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(@PATH, 1, 6161.12, -428.764, 414.44, 0, 0, 0, 0, 100, 0),
+(@PATH, 2, 6143.3, -443.667, 412.639, 0, 0, 0, 0, 100, 0),
+(@PATH, 3, 6155.79, -433.246, 414.151, 0, 0, 0, 0, 100, 0),
+(@PATH, 4, 6177.02, -412.869, 415.473, 0, 0, 0, 0, 100, 0);
diff --git a/sql/updates/world/master/2020_04_10_23_world_2017_01_25_01_world.sql b/sql/updates/world/master/2020_04_10_23_world_2017_01_25_01_world.sql
new file mode 100644
index 00000000000..7af38f38e91
--- /dev/null
+++ b/sql/updates/world/master/2020_04_10_23_world_2017_01_25_01_world.sql
@@ -0,0 +1,4 @@
+-- Recently Bandaged
+DELETE FROM `spell_custom_attr` WHERE `entry` = 11196;
+INSERT INTO `spell_custom_attr` (`entry`, `attributes`) VALUES
+(11196, 0x40);
diff --git a/sql/updates/world/master/2020_04_14_00_world_2017_03_03_00_world.sql b/sql/updates/world/master/2020_04_14_00_world_2017_03_03_00_world.sql
new file mode 100644
index 00000000000..c4f9cacf76d
--- /dev/null
+++ b/sql/updates/world/master/2020_04_14_00_world_2017_03_03_00_world.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature_text`SET `CreatureID`=28472 WHERE `CreatureID` IN(2847206);
diff --git a/sql/updates/world/master/2020_04_14_01_world_2017_03_16_02_world.sql b/sql/updates/world/master/2020_04_14_01_world_2017_03_16_02_world.sql
new file mode 100644
index 00000000000..08df52bf003
--- /dev/null
+++ b/sql/updates/world/master/2020_04_14_01_world_2017_03_16_02_world.sql
@@ -0,0 +1,5 @@
+UPDATE `quest_template_addon` SET `NextQuestID`='12225' WHERE `ID` IN (12222, 12223);
+UPDATE `quest_template_addon` SET `NextQuestID`='0' WHERE `ID`=8554;
+UPDATE `quest_template_addon` SET `NextQuestID`='0' WHERE `ID`=618;
+UPDATE `quest_template_addon` SET `NextQuestID`='0' WHERE `ID`=415;
+ALTER TABLE `quest_template_addon` CHANGE `NextQuestID` `NextQuestID` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT 0;
diff --git a/sql/updates/world/master/2020_04_14_02_world_2017_03_17_02_world.sql b/sql/updates/world/master/2020_04_14_02_world_2017_03_17_02_world.sql
new file mode 100644
index 00000000000..c026bbfe6da
--- /dev/null
+++ b/sql/updates/world/master/2020_04_14_02_world_2017_03_17_02_world.sql
@@ -0,0 +1,12 @@
+--
+SET @CGUID := 146562;
+SET @OGUID := 9743;
+
+
+DELETE FROM `game_event_creature` WHERE `guid` BETWEEN @CGUID+0 AND @CGUID+62 AND `eventEntry`=8;
+INSERT INTO `game_event_creature` SELECT 8, creature.guid FROM `creature` WHERE creature.guid BETWEEN @CGUID+0 AND @CGUID+62;
+
+DELETE FROM `game_event_gameobject` WHERE `guid` BETWEEN @CGUID+0 AND @CGUID+94 AND `eventEntry`=8;
+DELETE FROM `game_event_gameobject` WHERE `guid` BETWEEN @OGUID+0 AND @OGUID+94 AND `eventEntry`=8;
+INSERT INTO `game_event_gameobject` SELECT 8, gameobject.guid FROM `gameobject` WHERE gameobject.guid BETWEEN @OGUID+0 AND @OGUID+94;
+--
diff --git a/sql/updates/world/master/2020_04_14_03_world_2017_03_17_03_world.sql b/sql/updates/world/master/2020_04_14_03_world_2017_03_17_03_world.sql
new file mode 100644
index 00000000000..eaf7db21608
--- /dev/null
+++ b/sql/updates/world/master/2020_04_14_03_world_2017_03_17_03_world.sql
@@ -0,0 +1,23 @@
+--
+DELETE FROM conditions WHERE SourceTypeOrReferenceId=13 AND SourceEntry=45872;
+INSERT INTO conditions (SourceTypeOrReferenceId, SourceGroup, SourceEntry, SourceId, ElseGroup, ConditionTypeOrReference, ConditionTarget, ConditionValue1, ConditionValue2, ConditionValue3, NegativeCondition, ErrorType, ErrorTextId, ScriptName, COMMENT) VALUES
+(13, 1, 45872, 0, 0, 31, 0, 3, 23837, 0, 0, 0, 0, '', 'Defibrillate');
+
+SET @ENTRY := 25678;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY;
+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
+(@ENTRY,0,0,0,4,0,100,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Doctor Razorgin - On Aggro - Say Line 0 (random)'),
+(@ENTRY,0,1,2,1,0,100,0,3000,3000,30000,30000,11,45872,0,0,0,0,0,1,0,0,0,0,0,0,0,'Doctor Razorgin - OOC - Cast Defibrillate'),
+(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Doctor Razorgin - Ooc - Say Line 1 (random)');
+
+DELETE FROM `creature_text` WHERE `CreatureID`=@ENTRY;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`comment`,`BroadcastTextId`) VALUES
+(@ENTRY,0,0,'Ah, good... more parts!',14,0,100,0,0,0,'Part of the Doctor Razorgin on aggro lines',24872),
+(@ENTRY,0,1,'Fresh meat!',14,0,100,0,0,0,'Part of the Doctor Razorgin on aggro lines',24871),
+(@ENTRY,0,2,'The doctor is in!',14,0,100,0,0,0,'Part of the Doctor Razorgin on aggro lines',24870),
+(@ENTRY,0,3,'I recommened evisceration!',14,0,100,0,0,0,'Part of the Doctor Razorgin on aggro lines',24873),
+(@ENTRY,1,0,'Clear!',14,0,100,0,0,0,'Part of the Doctor Razorgin ooc lines',24867),
+(@ENTRY,1,1,'It''s no good... you need more work first.',14,0,100,0,0,0,'Part of the Doctor Razorgin ooc lines',24869),
+(@ENTRY,1,2,'Live, damn you!',14,0,100,0,0,0,'Part of the Doctor Razorgin ooc lines',24868);
+
+UPDATE `creature` SET `position_x`=4402.431152, `position_y`=4554.557129, `position_z`=88.743332, `orientation`=0.395920, `MovementType`=0, `spawndist`=0 WHERE `id`=@ENTRY;
diff --git a/sql/updates/world/master/2020_04_16_00_world_2017_03_24_00_world.sql b/sql/updates/world/master/2020_04_16_00_world_2017_03_24_00_world.sql
new file mode 100644
index 00000000000..84277ee86c2
--- /dev/null
+++ b/sql/updates/world/master/2020_04_16_00_world_2017_03_24_00_world.sql
@@ -0,0 +1,14 @@
+-- Correct speed for Wicked Spirits and Spirit Bombs
+UPDATE `creature_template` SET `speed_walk`=1.2, `speed_run`=0.428571 WHERE `entry` IN(39189,39190,39287,39288,39289);
+UPDATE `creature_template` SET `InhabitType`=4, `HoverHeight`=4 WHERE `entry` IN(36609,39120,39121,39122);
+
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_the_lich_king_harvest_souls_teleport';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(73655,'spell_the_lich_king_harvest_souls_teleport');
+
+DELETE FROM `spell_custom_attr` WHERE `entry` IN(69409,73797,73798,73799);
+INSERT INTO `spell_custom_attr` (`entry`,`attributes`) VALUES
+(69409,32768),
+(73797,32768),
+(73798,32768),
+(73799,32768);
diff --git a/sql/updates/world/master/2020_04_16_01_world_2017_03_25_01_world.sql b/sql/updates/world/master/2020_04_16_01_world_2017_03_25_01_world.sql
new file mode 100644
index 00000000000..1e678704466
--- /dev/null
+++ b/sql/updates/world/master/2020_04_16_01_world_2017_03_25_01_world.sql
@@ -0,0 +1 @@
+DELETE FROM `trinity_string` WHERE `entry`=530;
diff --git a/sql/updates/world/master/2020_04_16_02_world_2017_03_26_00_world.sql b/sql/updates/world/master/2020_04_16_02_world_2017_03_26_00_world.sql
new file mode 100644
index 00000000000..b8cae8584ea
--- /dev/null
+++ b/sql/updates/world/master/2020_04_16_02_world_2017_03_26_00_world.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature_text` SET `Text`= "%s flees after seeing Kel'Thuzad fall!" WHERE `CreatureID`= 16441 AND `GroupID`= 0;
diff --git a/sql/updates/world/master/2020_04_16_03_world_2017_03_26_01_world_335.sql b/sql/updates/world/master/2020_04_16_03_world_2017_03_26_01_world_335.sql
new file mode 100644
index 00000000000..106556ff7e2
--- /dev/null
+++ b/sql/updates/world/master/2020_04_16_03_world_2017_03_26_01_world_335.sql
@@ -0,0 +1,6 @@
+-- Verifonix <The Surveyor>
+UPDATE `creature_template` SET `faction`=47 WHERE `entry`=14492;
+
+DELETE FROM `creature_onkill_reputation` WHERE `creature_id`=14492;
+INSERT INTO `creature_onkill_reputation` (`creature_id`,`RewOnKillRepFaction1`,`RewOnKillRepFaction2`,`MaxStanding1`,`IsTeamAward1`,`RewOnKillRepValue1`,`MaxStanding2`,`IsTeamAward2`,`RewOnKillRepValue2`,`TeamDependent`) VALUES
+(14492, 21, 0, 5, 0, 5, 0, 0, 0, 0);
diff --git a/sql/updates/world/master/2020_04_16_04_world_2017_03_26_02_world.sql b/sql/updates/world/master/2020_04_16_04_world_2017_03_26_02_world.sql
new file mode 100644
index 00000000000..6795f016af9
--- /dev/null
+++ b/sql/updates/world/master/2020_04_16_04_world_2017_03_26_02_world.sql
@@ -0,0 +1,11 @@
+-- Improved Land Mine SAI
+SET @ENTRY := 29475;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,25,0,100,0,0,0,0,0,89,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Improved Land Mine - On Reset - Start Random Movement"),
+(@ENTRY,0,1,2,60,0,100,0,0,0,1000,1000,11,54537,0,0,0,0,0,1,0,0,0,0,0,0,0,"Improved Land Mine - On Update - Cast 'Detonation'"),
+(@ENTRY,0,2,0,61,0,100,0,0,0,1000,1000,41,500,0,0,0,0,0,1,0,0,0,0,0,0,0,"Improved Land Mine - On Update - Despawn In 500 ms"),
+(@ENTRY,0,3,0,5,0,100,0,0,0,0,29618,33,29618,0,0,0,0,0,21,50,0,0,0,0,0,0,"Improved Land Mine - On Killed Unit - Update Quest Kill Credit for 'A Delicate Touch' or 'Overstock'"),
+(@ENTRY,0,4,0,5,0,100,0,0,0,0,29619,33,29618,0,0,0,0,0,21,50,0,0,0,0,0,0,"Improved Land Mine - On Killed Unit - Update Quest Kill Credit for 'A Delicate Touch' or 'Overstock'");
+--
diff --git a/sql/updates/world/master/2020_04_16_05_world_2017_03_26_03_world.sql b/sql/updates/world/master/2020_04_16_05_world_2017_03_26_03_world.sql
new file mode 100644
index 00000000000..ce76a657cd4
--- /dev/null
+++ b/sql/updates/world/master/2020_04_16_05_world_2017_03_26_03_world.sql
@@ -0,0 +1,43 @@
+-- Quest 27418, Challenge Overlord Mok'Morokk
+
+SET @OMM := 4500; -- Overlord Mok'Morokk
+
+UPDATE `quest_template_addon` SET `SpecialFlags`=2 WHERE `ID`=1173;
+
+DELETE FROM `creature_text` WHERE `CreatureID`= @OMM;
+INSERT INTO `creature_text` (`CreatureID`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@OMM, 0,0,'Puny $r wanna fight Overlord Mok''Morokk? Me beat you! Me boss here!',12,0,100,0,0,0,1515,0,'Overlord Mok''Morokk - on Quest Accept'),
+(@OMM, 1,0,'Me scared! Me run now!', 14,0,100,0,0,0,1523,0,'Overlord Mok''Morokk - on Health 0%-25%');
+
+DELETE FROM `waypoints` WHERE `entry` = @OMM;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(@OMM, 1, -3138.49, -2864.64, 34.76, 'Overlord Mok''Morokk'),
+(@OMM, 2, -3128.08, -2847.37, 34.72, 'Overlord Mok''Morokk'),
+(@OMM, 3, -3108.94, -2839.60, 34.28, 'Overlord Mok''Morokk');
+
+UPDATE `creature_template` SET `AIName` = "SmartAI", `ScriptName` = '' WHERE `entry` = @OMM;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (@OMM, @OMM*100, @OMM*100+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
+(@OMM, 0, 0,0, 0,0,100,0, 1000,3000,7000,10000, 11, 6749, 2, 0,0,0,0, 2, 0,0,0,0,0,0,0,'Overlord Mok''Morokk - In Combat Update - cast ''Wide Swipe'''),
+(@OMM, 0, 1,2, 19,0,100,1, 1173, 0, 0, 0, 64, 1, 0, 0,0,0,0, 16, 0,0,0,0,0,0,0,'Overlord Mok''Morokk - on Quest Accept - Store players (No repeat)'),
+(@OMM, 0, 2,0, 61,0,100,0, 0, 0, 0, 0, 80, @OMM*100, 0, 0,0,0,0, 1, 0,0,0,0,0,0,0,'Overlord Mok''Morokk - on Quest Accept - Run Actionlist 450000'),
+(@OMM*100, 9, 0,0, 0,0,100,0, 3000,3000, 0, 0, 1, 0, 0, 0,0,0,0, 12, 1,0,0,0,0,0,0,'Overlord Mok''Morokk - Actionlist - Say text 0'),
+(@OMM*100, 9, 1,0, 0,0,100,0, 0, 0, 0, 0, 2, 16, 0, 0,0,0,0, 1, 0,0,0,0,0,0,0,'Overlord Mok''Morokk - Actionlist - Set faction (Monster)'),
+(@OMM*100, 9, 2,0, 0,0,100,0, 0, 0, 0, 0, 83, 2, 0, 0,0,0,0, 1, 0,0,0,0,0,0,0,'Overlord Mok''Morokk - Actionlist - Remove npcflag Quest Giver'),
+(@OMM*100, 9, 3,0, 0,0,100,0, 0, 0, 0, 0, 19, 768, 0, 0,0,0,0, 1, 0,0,0,0,0,0,0,'Overlord Mok''Morokk - Actionlist - Remove Unit Flags immune to NPC & immune to PC'),
+(@OMM*100, 9, 4,0, 0,0,100,0, 0, 0, 0, 0, 49, 0, 0, 0,0,0,0, 12, 1,0,0,0,0,0,0,'Overlord Mok''Morokk - Actionlist - Attack stored player'),
+(@OMM, 0, 3,0, 2,0,100,1, 0, 25, 0, 0, 80,@OMM*100+1, 2, 0,0,0,0, 1, 0,0,0,0,0,0,0,'Overlord Mok''Morokk - on Health 0%-25% - Run Actionlist 450001 (No repeat)'),
+(@OMM, 0, 4,0, 0,0,100,1, 0, 0, 0, 0, 42, 0, 1, 0,0,0,0, 1, 0,0,0,0,0,0,0,'Overlord Mok''Morokk - In Combat - Set invincibility hp level (No repeat)'),
+(@OMM*100+1,9, 0,0, 0,0,100,0, 0, 0, 0, 0, 18, 768, 0, 0,0,0,0, 1, 0,0,0,0,0,0,0,'Overlord Mok''Morokk - Actionlist - Set Unit Flags immune to NPC & immune to PC'),
+(@OMM*100+1,9, 1,0, 0,0,100,0, 0, 0, 0, 0, 28, 0, 0, 0,0,0,0, 1, 0,0,0,0,0,0,0,'Overlord Mok''Morokk - Actionlist - Remove all auras'),
+(@OMM*100+1,9, 2,0, 0,0,100,0, 0, 0, 0, 0, 2, 29, 0, 0,0,0,0, 1, 0,0,0,0,0,0,0,'Overlord Mok''Morokk - Actionlist - Set faction (Orgrimmar)'),
+(@OMM*100+1,9, 3,0, 0,0,100,0, 0, 0, 0, 0, 24, 0, 0, 0,0,0,0, 1, 0,0,0,0,0,0,0,'Overlord Mok''Morokk - Actionlist - Evade'),
+(@OMM*100+1,9, 4,0, 0,0,100,0, 0, 0, 0, 0, 15, 1173, 0, 0,0,0,0, 12, 1,0,0,0,0,0,0,'Overlord Mok''Morokk - Actionlist - Credit Quest ''Challenge Overlord Mok''Morokk'''),
+(@OMM*100+1,9, 5,0, 0,0,100,0, 500, 500, 0, 0, 1, 1, 0, 0,0,0,0, 12, 1,0,0,0,0,0,0,'Overlord Mok''Morokk - Actionlist - Say text 1'),
+(@OMM*100+1,9, 6,0, 0,0,100,0, 0, 0, 0, 0, 53, 1,@OMM, 0,0,0,0, 1, 0,0,0,0,0,0,0,'Overlord Mok''Morokk - Actionlist - Start Waypoint'),
+(@OMM, 0, 5,0, 58,0,100,0, 0,@OMM, 0, 0, 41, 0, 0, 0,0,0,0, 1, 0,0,0,0,0,0,0,'Overlord Mok''Morokk - on WP End - Despawn'),
+(@OMM, 0, 6,7, 25,0,100,0, 0, 0, 0, 0, 18, 768, 0, 0,0,0,0, 1, 0,0,0,0,0,0,0,'Overlord Mok''Morokk - on Reset - Set Unit Flags immune to NPC & immune to PC'),
+(@OMM, 0, 7,8, 61,0,100,0, 0, 0, 0, 0, 82, 2, 0, 0,0,0,0, 1, 0,0,0,0,0,0,0,'Overlord Mok''Morokk - on Reset - Remove all auras'),
+(@OMM, 0, 8,0, 61,0,100,0, 0, 0, 0, 0, 2, 29, 0, 0,0,0,0, 1, 0,0,0,0,0,0,0,'Overlord Mok''Morokk - on Reset - Set faction (Orgrimmar)'),
+(@OMM, 0, 9,0, 11,0,100,0, 0, 0, 0, 0, 42, 1, 0, 0,0,0,0, 1, 0,0,0,0,0,0,0,'Overlord Mok''Morokk - on Spawn - Set Invincibility at 1 HP');
+--
diff --git a/sql/updates/world/master/2020_04_16_06_world_2017_03_27_00_world_335.sql b/sql/updates/world/master/2020_04_16_06_world_2017_03_27_00_world_335.sql
new file mode 100644
index 00000000000..ebcafe18e14
--- /dev/null
+++ b/sql/updates/world/master/2020_04_16_06_world_2017_03_27_00_world_335.sql
@@ -0,0 +1,11 @@
+
+-- Franclorn Forgewright
+-- SET @ENTRY := 8888;
+-- UPDATE `creature_template` SET `flags_extra`=`flags_extra`|0x400 WHERE `entry`=@ENTRY;
+
+-- Gaeriyan
+-- SET @ENTRY := 9299;
+-- UPDATE `creature_template` SET `flags_extra`=`flags_extra`|0x400 WHERE `entry`=@ENTRY;
+
+-- Shroud of Death Spell
+DELETE FROM `spell_script_names` WHERE spell_id=10848;
diff --git a/sql/updates/world/master/2020_04_17_00_world_2017_03_27_01_world.sql b/sql/updates/world/master/2020_04_17_00_world_2017_03_27_01_world.sql
new file mode 100644
index 00000000000..fe640c4da90
--- /dev/null
+++ b/sql/updates/world/master/2020_04_17_00_world_2017_03_27_01_world.sql
@@ -0,0 +1,23 @@
+--
+UPDATE `smart_scripts` SET `action_type`=11, `action_param1`=54693, `action_param2`=1 WHERE `entryorguid` IN(29475) AND `id` IN (3,4) AND `source_type`=0;
+-- UPDATE `smart_scripts` SET `event_flags`=1 WHERE `entryorguid` IN (15069) AND `source_type`=0 AND `id`=1;
+UPDATE `smart_scripts` SET `event_flags`=1 WHERE `entryorguid` IN (15146) AND `source_type`=0 AND `id`=3;
+UPDATE `smart_scripts` SET `event_flags`=1 WHERE `entryorguid` IN (15281) AND `source_type`=0 AND `id` IN (0,5);
+UPDATE `smart_scripts` SET `event_flags`=1 WHERE `entryorguid` IN (15401) AND `source_type`=0 AND `id` IN (0,5);
+UPDATE `smart_scripts` SET `event_flags`=1 WHERE `entryorguid` IN (15405) AND `source_type`=0 AND `id` IN (0,5,12);
+-- UPDATE `smart_scripts` SET `event_flags`=1 WHERE `entryorguid` IN (15416) AND `source_type`=0 AND `id` IN (4);
+UPDATE `smart_scripts` SET `event_flags`=1 WHERE `entryorguid` IN (15417) AND `source_type`=0 AND `id` IN (0,5);
+UPDATE `smart_scripts` SET `event_flags`=1 WHERE `entryorguid` IN (15418) AND `source_type`=0 AND `id` IN (0,5,12);
+UPDATE `smart_scripts` SET `event_flags`=1 WHERE `entryorguid` IN (15641) AND `source_type`=0 AND `id`=0;
+UPDATE `smart_scripts` SET `event_param3`=2000, `event_param4`=2000 WHERE `entryorguid`=15641 AND `source_type`=0 AND `id` IN (6,8,11);
+UPDATE `smart_scripts` SET `event_param3`=2000, `event_param4`=2000 WHERE `entryorguid` IN (15970,15971) AND `source_type`=0 AND `id` IN (0,5);
+UPDATE `smart_scripts` SET `event_type`=25 WHERE `entryorguid` IN (16017) AND `source_type`=0 AND `id`=0;
+UPDATE `smart_scripts` SET `event_param3`=1000, `event_param4`=1000 WHERE `entryorguid`=16024 AND `source_type`=0 AND `id` IN (0);
+UPDATE `smart_scripts` SET `event_flags`=1 WHERE `entryorguid` IN (16204) AND `source_type`=0 AND `id` IN (0,5);
+UPDATE `smart_scripts` SET `event_flags`=1 WHERE `entryorguid` IN (16249) AND `source_type`=0 AND `id` IN (0,5);
+UPDATE `smart_scripts` SET `event_param3`=2000, `event_param4`=2000 WHERE `entryorguid` IN (16294) AND `source_type`=0 AND `id` IN (4,11);
+UPDATE `smart_scripts` SET `event_param3`=2000, `event_param4`=2000 WHERE `entryorguid` IN (16307) AND `source_type`=0 AND `id` IN (0,5);
+UPDATE `smart_scripts` SET `event_param3`=2000, `event_param4`=2000 WHERE `entryorguid` IN (16308) AND `source_type`=0 AND `id` IN (0,5);
+UPDATE `smart_scripts` SET `event_param3`=2000, `event_param4`=2000 WHERE `entryorguid` IN (16311) AND `source_type`=0 AND `id` IN (0,5);
+UPDATE `smart_scripts` SET `event_param3`=2000, `event_param4`=2000 WHERE `entryorguid` IN (16318) AND `source_type`=0 AND `id` IN (0,5);
+UPDATE `smart_scripts` SET `event_param3`=2000, `event_param4`=2000 WHERE `entryorguid` IN (16329) AND `source_type`=0 AND `id` IN (0,5);
diff --git a/sql/updates/world/master/2020_04_17_01_world_2017_03_30_01_world.sql b/sql/updates/world/master/2020_04_17_01_world_2017_03_30_01_world.sql
new file mode 100644
index 00000000000..2be7fb71ab0
--- /dev/null
+++ b/sql/updates/world/master/2020_04_17_01_world_2017_03_30_01_world.sql
@@ -0,0 +1,19 @@
+--
+DELETE FROM `smart_scripts` WHERE `entryorguid`=17101 AND `source_type`=0 AND `id`=2;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=17215 AND `source_type`=0 AND `id` IN (2, 3, 4);
+DELETE FROM `smart_scripts` WHERE `entryorguid`=17214 AND `source_type`=0 AND `id`=1;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=17242 AND `source_type`=0 AND `id` IN (1, 2, 3);
+DELETE FROM `smart_scripts` WHERE `entryorguid`=17117 AND `source_type`=0 AND `id` IN (2, 3);
+DELETE FROM `smart_scripts` WHERE `entryorguid`=17241 AND `source_type`=0 AND `id`=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
+(17101, 0, 2, 0, 20, 0, 100, 0, 9452, 0, 0, 0, 5, 24, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Diktynna - On Quest 'Red Snapper - Very Tasty!' Rewarded - Play Emote 24"),
+(17215, 0, 2, 0, 38, 0, 100, 512, 1, 1, 0, 0, 81, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Daedal - On Data Set 1 1- Set NPC Flags"),
+(17215, 0, 3, 0, 38, 0, 100, 512, 2, 2, 0, 0, 81, 83, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Daedal - On Data Set 2 2- Set NPC Flags"),
+(17215, 0, 4, 0, 20, 0, 100, 512, 9473, 2, 0, 0, 80, 1721500, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Daedal - On Quest 'An Alternative Alternative' Rewarded - Run Script"),
+(17214, 0, 1, 0, 20, 0, 100, 512, 9463, 2, 0, 0, 80, 1721400, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Anchorite Fateema - On Quest 'Medicinal Purposes' Rewarded - Run Script"),
+(17242, 0, 1, 0, 38, 0, 100, 512, 1, 1, 0, 0, 53, 0, 1724200, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Archaeologist Adamant Ironheart - On Data Set 1 1- Start WP (Path 1)"),
+(17242, 0, 2, 0, 38, 0, 100, 512, 2, 2, 0, 0, 53, 0, 1724201, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Archaeologist Adamant Ironheart - On Data Set 2 2- Start WP (Path 2)"),
+(17242, 0, 3, 0, 40, 0, 100, 512, 1, 1724201, 0, 0, 66, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 6.26573, "Archaeologist Adamant Ironheart - On Reached WP1 (Path 2) - Set Orientation"),
+(17117, 0, 2, 0, 38, 0, 100, 512, 1, 1, 0, 0, 91, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Injured Night Elf Priestess - On Data Set 1 1 - Set Bytes 1"),
+(17117, 0, 3, 0, 38, 0, 100, 512, 2, 2, 0, 0, 90, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Injured Night Elf Priestess - On Data Set 2 2 - Set Bytes 1"),
+(17241, 0, 1, 0, 20, 0, 100, 512, 9514, 0, 0, 0, 80, 1724100, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Priestess Kyleen Il'dinare - On Quest 'Rune Covered Tablet' Rewarded - Run Script");
diff --git a/sql/updates/world/master/2020_04_17_02_world_2017_03_31_00_world.sql b/sql/updates/world/master/2020_04_17_02_world_2017_03_31_00_world.sql
new file mode 100644
index 00000000000..52ae3f95909
--- /dev/null
+++ b/sql/updates/world/master/2020_04_17_02_world_2017_03_31_00_world.sql
@@ -0,0 +1,23 @@
+UPDATE `creature_template` SET `RegenHealth`=0 WHERE `entry` IN (
+/* Wintergrasp */
+27881, -- Wintergrasp Catapult
+28094, -- Wintergrasp Demolisher
+28312, -- Wintergrasp Siege Engine
+28366, -- Wintergrasp Tower Cannon
+32627, -- Wintergrasp Siege Engine
+
+/* Strand of the Ancients */
+27894, 32795, -- Antipersonnel Cannon
+28781, 32796, -- Battleground Demolisher
+
+/* Isle of Conquest*/
+34775, 35415, -- Demolisher
+34776, 35431, -- Siege Engine
+34793, 35413, -- Catapult
+34802, 35419, -- Glaive Thrower
+34929, 35410, -- Alliance Gunship Cannon
+34935, 35427, -- Horde Gunship Cannon
+34944, 35429, -- Keep Cannon
+35069, 35433, -- Siege Engine
+35273, 35421 -- Glaive Thrower
+);