From d3c4ee04dccb2de19613801e9605f896946a39cc Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Sun, 17 Oct 2021 18:49:36 -0400
Subject: [PATCH] DB Update

---
 ...10_17_16_world_2018_08_06_00_world_335.sql | 16 +++++
 ...021_10_17_17_world_2018_08_11_00_world.sql |  4 ++
 ...021_10_17_18_world_2018_08_11_01_world.sql |  5 ++
 ...021_10_17_19_world_2018_08_11_02_world.sql |  2 +
 ...021_10_17_20_world_2018_08_11_03_world.sql |  2 +
 ...10_17_21_world_2018_08_11_04_world_335.sql |  5 ++
 ...10_17_22_world_2018_08_11_05_world_335.sql | 10 ++++
 ...10_17_23_world_2018_08_11_06_world_335.sql | 17 ++++++
 ...10_17_24_world_2018_08_11_07_world_335.sql | 35 +++++++++++
 ...10_17_25_world_2018_08_11_08_world_335.sql | 59 +++++++++++++++++++
 ...10_17_26_world_2018_08_11_09_world_335.sql | 30 ++++++++++
 11 files changed, 185 insertions(+)
 create mode 100644 sql/updates/world/master/2021_10_17_16_world_2018_08_06_00_world_335.sql
 create mode 100644 sql/updates/world/master/2021_10_17_17_world_2018_08_11_00_world.sql
 create mode 100644 sql/updates/world/master/2021_10_17_18_world_2018_08_11_01_world.sql
 create mode 100644 sql/updates/world/master/2021_10_17_19_world_2018_08_11_02_world.sql
 create mode 100644 sql/updates/world/master/2021_10_17_20_world_2018_08_11_03_world.sql
 create mode 100644 sql/updates/world/master/2021_10_17_21_world_2018_08_11_04_world_335.sql
 create mode 100644 sql/updates/world/master/2021_10_17_22_world_2018_08_11_05_world_335.sql
 create mode 100644 sql/updates/world/master/2021_10_17_23_world_2018_08_11_06_world_335.sql
 create mode 100644 sql/updates/world/master/2021_10_17_24_world_2018_08_11_07_world_335.sql
 create mode 100644 sql/updates/world/master/2021_10_17_25_world_2018_08_11_08_world_335.sql
 create mode 100644 sql/updates/world/master/2021_10_17_26_world_2018_08_11_09_world_335.sql

diff --git a/sql/updates/world/master/2021_10_17_16_world_2018_08_06_00_world_335.sql b/sql/updates/world/master/2021_10_17_16_world_2018_08_06_00_world_335.sql
new file mode 100644
index 000000000..4d4fa32da
--- /dev/null
+++ b/sql/updates/world/master/2021_10_17_16_world_2018_08_06_00_world_335.sql
@@ -0,0 +1,16 @@
+DELETE FROM  `smart_scripts` WHERE `entryorguid`=7665 AND `source_type`=0 AND `id`=2;
+DELETE FROM  `smart_scripts` WHERE `entryorguid`=7666 AND `source_type`=0 AND `id`=6;
+DELETE FROM  `smart_scripts` WHERE `entryorguid`=7667 AND `source_type`=0 AND `id`=5;
+
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES 
+(7665, 0, 2, 0, 8, 0, 100, 0, 12938, 0, 0, 0, 0, 11, 12941, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Grol the Destroyer - On Spellhit Fel Curse - Cast Fel Curse Effect'),
+(7666, 0, 6, 0, 8, 0, 100, 0, 12938, 0, 0, 0, 0, 11, 12942, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Archmage Allistarj - On Spellhit Fel Curse - Cast Fel Curse Effect'),
+(7667, 0, 5, 0, 8, 0, 100, 0, 12938, 0, 0, 0, 0, 11, 12943, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Lady Sevine - On Spellhit Fel Curse - Cast Fel Curse Effect');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=12938;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES 
+(13, 1, 12938, 0, 0, 31, 0, 3, 7665, 0, 0, 0, 0, '', 'Fel Curse Targets Grol the Destroyer'),
+(13, 1, 12938, 0, 1, 31, 0, 3, 7666, 0, 0, 0, 0, '', 'Fel Curse Targets Archmage Allistarj'),
+(13, 1, 12938, 0, 2, 31, 0, 3, 7667, 0, 0, 0, 0, '', 'Fel Curse Targets Lady Sevine'),
+(13, 1, 12938, 0, 3, 31, 0, 3, 7664, 0, 0, 0, 0, '', 'Fel Curse Targets Razelikh the Defiler'),
+(13, 1, 12938, 0, 4, 31, 0, 3, 7668, 0, 0, 0, 0, '', 'Fel Curse Targets Servent of Razelikh');
diff --git a/sql/updates/world/master/2021_10_17_17_world_2018_08_11_00_world.sql b/sql/updates/world/master/2021_10_17_17_world_2018_08_11_00_world.sql
new file mode 100644
index 000000000..20ebe13a5
--- /dev/null
+++ b/sql/updates/world/master/2021_10_17_17_world_2018_08_11_00_world.sql
@@ -0,0 +1,4 @@
+-- 
+UPDATE `smart_scripts` SET `action_type`=134 WHERE  `action_type` IN (85) AND `target_type` =1;
+UPDATE `smart_scripts` SET `event_flags`=1 WHERE  `entryorguid` IN (27202) AND `source_type`=0 AND `id` IN (4,10);
+UPDATE `smart_scripts` SET `action_param2`=2 WHERE  `entryorguid` IN (27202) AND `source_type`=0 AND `id` IN (7);
diff --git a/sql/updates/world/master/2021_10_17_18_world_2018_08_11_01_world.sql b/sql/updates/world/master/2021_10_17_18_world_2018_08_11_01_world.sql
new file mode 100644
index 000000000..6271ce59a
--- /dev/null
+++ b/sql/updates/world/master/2021_10_17_18_world_2018_08_11_01_world.sql
@@ -0,0 +1,5 @@
+-- 
+UPDATE `smart_scripts` SET `target_type`=7 WHERE  `entryorguid` IN (25416, 25418) AND `source_type`=0 AND `id` IN (4); 
+UPDATE `smart_scripts` SET `target_type`=7 WHERE  `entryorguid` IN (20749) AND `source_type`=0 AND `id` IN (1); 
+UPDATE `smart_scripts` SET `target_type`=7 WHERE  `entryorguid` IN (27229) AND `source_type`=0 AND `id` IN (0); 
+UPDATE `smart_scripts` SET `target_type`=7 WHERE  `entryorguid` IN (18955) AND `source_type`=0 AND `id` IN (1); 
diff --git a/sql/updates/world/master/2021_10_17_19_world_2018_08_11_02_world.sql b/sql/updates/world/master/2021_10_17_19_world_2018_08_11_02_world.sql
new file mode 100644
index 000000000..300cdb862
--- /dev/null
+++ b/sql/updates/world/master/2021_10_17_19_world_2018_08_11_02_world.sql
@@ -0,0 +1,2 @@
+-- 
+UPDATE `smart_scripts` SET `target_type`=23, target_param1=0 WHERE  `entryorguid` IN (27899, 32331, 28665, 27959) AND `source_type`=0 AND `action_type` IN (1); 
diff --git a/sql/updates/world/master/2021_10_17_20_world_2018_08_11_03_world.sql b/sql/updates/world/master/2021_10_17_20_world_2018_08_11_03_world.sql
new file mode 100644
index 000000000..b088f3565
--- /dev/null
+++ b/sql/updates/world/master/2021_10_17_20_world_2018_08_11_03_world.sql
@@ -0,0 +1,2 @@
+-- 
+UPDATE `smart_scripts` SET `target_type`=24 WHERE  `entryorguid` IN (25416,25418) AND `source_type`=0 AND `id` IN (4);
diff --git a/sql/updates/world/master/2021_10_17_21_world_2018_08_11_04_world_335.sql b/sql/updates/world/master/2021_10_17_21_world_2018_08_11_04_world_335.sql
new file mode 100644
index 000000000..2113c094a
--- /dev/null
+++ b/sql/updates/world/master/2021_10_17_21_world_2018_08_11_04_world_335.sql
@@ -0,0 +1,5 @@
+-- Apprentice Kryten
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=2601;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(14,2601,3294,0,0,8,0,690,0,0,0,0,0,"","Show gossip text 3294 if quest 'Malin's Request' is rewarded"),
+(14,2601,3294,0,0,14,0,691,0,0,0,0,0,"","Show gossip text 3294 if quest 'Worth Its Weight in Gold' is not taken");
diff --git a/sql/updates/world/master/2021_10_17_22_world_2018_08_11_05_world_335.sql b/sql/updates/world/master/2021_10_17_22_world_2018_08_11_05_world_335.sql
new file mode 100644
index 000000000..2288df87c
--- /dev/null
+++ b/sql/updates/world/master/2021_10_17_22_world_2018_08_11_05_world_335.sql
@@ -0,0 +1,10 @@
+-- 
+DELETE FROM `quest_template_addon` WHERE `ID`=1268;
+INSERT INTO `quest_template_addon` (`ID`, `MaxLevel`, `AllowableClasses`, `SourceSpellID`, `PrevQuestID`, `NextQuestID`, `ExclusiveGroup`, `RewardMailTemplateID`, `RewardMailDelay`, `RequiredSkillID`, `RequiredSkillPoints`, `RequiredMinRepFaction`, `RequiredMaxRepFaction`, `RequiredMinRepValue`, `RequiredMaxRepValue`, `ProvidedItemCount`, `SpecialFlags`) VALUES
+(1268,0,0,0,0,1276,-1323,0,0,0,0,0,0,0,0,0,0); -- Quest "Suspicious Hoofprints"
+
+UPDATE `quest_template_addon` SET `ExclusiveGroup`=-1323, `NextQuestID`=1276 WHERE `ID` IN (1323,1273); -- Quests "The Black Shield (Part 4)" / "Questioning Reethe"
+UPDATE `quest_template_addon` SET `PrevQuestID`=0 WHERE `ID`=1276; -- Quest "The Black Shield (Part 5)"
+UPDATE `quest_template_addon` SET `PrevQuestID`=1276 WHERE `ID`=11204; -- Quest "Return to Krog"
+UPDATE `quest_template_addon` SET `ExclusiveGroup`=-11201, `NextQuestID`=11203 WHERE `ID` IN (11201,11200); -- Quests "The Grimtotem Plot" / "More than Coincidence"
+UPDATE `quest_template_addon` SET `PrevQuestID`=0 WHERE `ID`=11203; -- Quest "Seek Out Tabetha"
diff --git a/sql/updates/world/master/2021_10_17_23_world_2018_08_11_06_world_335.sql b/sql/updates/world/master/2021_10_17_23_world_2018_08_11_06_world_335.sql
new file mode 100644
index 000000000..e5ed0001e
--- /dev/null
+++ b/sql/updates/world/master/2021_10_17_23_world_2018_08_11_06_world_335.sql
@@ -0,0 +1,17 @@
+-- Smiling Jim
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=4895;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=4895 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=489500 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
+(4895,0,0,0,1,0,100,0,45000,60000,150000,180000,80,489500,0,0,0,0,0,1,0,0,0,0,0,0,0,"Smiling Jim - Out of Combat - Run Script"),
+(489500,9,0,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Smiling Jim - On Script - Say Line 0"),
+(489500,9,1,0,0,0,100,0,5000,5000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Smiling Jim - On Script - Say Line 1"),
+(489500,9,2,0,0,0,100,0,5000,5000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Smiling Jim - On Script - Say Line 2"),
+(489500,9,3,0,0,0,100,0,5000,5000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Smiling Jim - On Script - Say Line 3");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=4895;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(4895,0,0,"He'll bring you mead, he'll bring you beer...",12,7,100,0,0,0,1632,0,"Smiling Jim"),
+(4895,1,0,"A grinning face from ear to ear...",12,7,100,0,0,0,1633,0,"Smiling Jim"),
+(4895,2,0,"He's served us all from year to year...",12,7,100,0,0,0,1634,0,"Smiling Jim"),
+(4895,3,0,"We call him Smiling Jim...",12,7,100,11,0,0,1635,0,"Smiling Jim");
diff --git a/sql/updates/world/master/2021_10_17_24_world_2018_08_11_07_world_335.sql b/sql/updates/world/master/2021_10_17_24_world_2018_08_11_07_world_335.sql
new file mode 100644
index 000000000..392d215b8
--- /dev/null
+++ b/sql/updates/world/master/2021_10_17_24_world_2018_08_11_07_world_335.sql
@@ -0,0 +1,35 @@
+-- Calia Hastings
+-- UPDATE `creature_template` SET `npcflag`=2, `gossip_menu_id`=0 WHERE `entry`=23566; -- She didn't have a gossip text in WotLK. Current text was added in Cata when she became a rogue trainer.
+
+DELETE FROM `creature_text` WHERE `CreatureID`=23566;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(23566,0,0,"It would be a shame to let these leaflets go to waste, wouldn't it?",12,7,100,0,0,0,22105,0,"Calia Hastings"),
+(23566,1,0,"With just a little creative editing, these are much more useful...",12,7,100,0,0,0,22107,0,"Calia Hastings");
+
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=23566;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=23566 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (2356600,2356601,2356602) 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
+(23566,0,0,0,20,0,100,0,11128,0,0,0,80,2356600,0,0,0,0,0,1,0,0,0,0,0,0,0,"Calia Hastings - On Quest 'Propaganda War' Finished - Run Script"),
+(23566,0,1,0,40,0,100,0,3,23566,0,0,80,2356601,0,0,0,0,0,1,0,0,0,0,0,0,0,"Calia Hastings - On Waypoint 3 Reached - Run Script"),
+(23566,0,2,0,40,0,100,0,7,23566,0,0,80,2356602,0,0,0,0,0,1,0,0,0,0,0,0,0,"Calia Hastings - On Waypoint 7 Reached - Run Script"),
+(2356600,9,0,0,0,0,100,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Calia Hastings - On Script - Remove Npc Flag Questgiver"),
+(2356600,9,1,0,0,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Calia Hastings - On Script - Say Line 0"),
+(2356600,9,2,0,0,0,100,0,5000,5000,0,0,53,0,23566,0,0,0,0,1,0,0,0,0,0,0,0,"Calia Hastings - On Script - Start Waypoint"),
+(2356601,9,0,0,0,0,100,0,0,0,0,0,54,8000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Calia Hastings - On Script - Pause Waypoint"),
+(2356601,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,1.27885,"Calia Hastings - On Script - Set Orientation"),
+(2356601,9,2,0,0,0,100,0,1000,1000,0,0,17,69,0,0,0,0,0,1,0,0,0,0,0,0,0,"Calia Hastings - On Script - Set Emote State 69"),
+(2356601,9,3,0,0,0,100,0,6000,6000,0,0,17,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Calia Hastings - On Script - Set Emote State 0"),
+(2356602,9,0,0,0,0,100,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.40855,"Calia Hastings - On Script - Set Orientation"),
+(2356602,9,1,0,0,0,100,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Calia Hastings - On Script - Say Line 1"),
+(2356602,9,2,0,0,0,100,0,3000,3000,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Calia Hastings - On Script - Add Npc Flag Questgiver");
+
+DELETE FROM `waypoints` WHERE `entry`=23566;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(23566,1,-3818.89,-4564.21,8.92453,""),
+(23566,2,-3817,-4566.21,8.84672,""),
+(23566,3,-3816.71,-4564.26,8.97426,""),
+(23566,4,-3817,-4566.21,8.84672,""),
+(23566,5,-3818.89,-4564.21,8.92453,""),
+(23566,6,-3817.87,-4561.44,9.11807,""),
+(23566,7,-3819.74,-4562.35,9.14216,"");
diff --git a/sql/updates/world/master/2021_10_17_25_world_2018_08_11_08_world_335.sql b/sql/updates/world/master/2021_10_17_25_world_2018_08_11_08_world_335.sql
new file mode 100644
index 000000000..4268c955f
--- /dev/null
+++ b/sql/updates/world/master/2021_10_17_25_world_2018_08_11_08_world_335.sql
@@ -0,0 +1,59 @@
+-- World Invisible Trigger
+SET @GUID1 := 3828;
+SET @GUID2 := 37624;
+SET @GUID3 := 38824;
+SET @GUID4 := 30458;
+DELETE FROM `creature` WHERE `guid` IN (@GUID1,@GUID2,@GUID3,@GUID4,296493);
+INSERT INTO `creature` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnDifficulties`, `phaseId`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`) VALUES
+(@GUID1,12999,1,0,0,'',0,0,0,-3759.97,-4557.44,9.0761,5.34286,300,0,0,7212,0,0,0,0,0,"",0),
+(@GUID2,12999,1,0,0,'',0,0,0,-3758.24,-4556.73,11.3539,2.10228,300,0,0,7212,0,0,0,0,0,"",0),
+(@GUID3,12999,1,0,0,'',0,0,0,-3758.42,-4551.63,10.8395,2.1337,300,0,0,7212,0,0,0,0,0,"",0),
+(@GUID4,4973, 1,0,0,'',0,0,1,-3772.62,-4533.36,11.5873,5.28602,300,0,0,2769,0,0,0,0,0,"",0);
+
+-- Guard Lasiter
+DELETE FROM `creature_addon` WHERE `guid` IN (@GUID4,296493);
+INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES
+(@GUID4,0,0,0,2,0,0,'');
+
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=4973;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=4973 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (497300,497301,497302,497303) AND `source_type`=9;
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(4973,0,0,0,25,0,100,0,0,0,0,0,0,53,0,4973,1,0,0,2,1,0,0,0,0,0,0,0,"Guard Lasiter - On Reset - Start Waypoint"),
+(4973,0,1,0,40,0,100,0,1,4973,0,0,0,80,497300,0,0,0,0,0,1,0,0,0,0,0,0,0,"Guard Lasiter - On Waypoint 1 Reached - Run Script"),
+(4973,0,2,0,40,0,100,0,2,4973,0,0,0,80,497301,0,0,0,0,0,1,0,0,0,0,0,0,0,"Guard Lasiter - On Waypoint 2 Reached - Run Script"),
+(4973,0,3,0,40,0,100,0,3,4973,0,0,0,80,497302,0,0,0,0,0,1,0,0,0,0,0,0,0,"Guard Lasiter - On Waypoint 3 Reached - Run Script"),
+(4973,0,4,0,40,0,100,0,4,4973,0,0,0,80,497303,0,0,0,0,0,1,0,0,0,0,0,0,0,"Guard Lasiter - On Waypoint 4 Reached - Run Script"),
+(4973,0,5,0,0,0,100,0,0,0,2000,4000,0,11,6660,64,0,0,0,0,2,0,0,0,0,0,0,0,"Guard Lasiter - In Combat - Cast Shoot"),
+(4973,0,6,0,2,0,100,1,0,15,0,0,0,25,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Guard Lasiter - Between 0-15% Health - Flee For Assist (No Repeat)"),
+(497300,9,0,0,0,0,100,0,0,0,0,0,0,54,18000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Guard Lasiter - On Script - Pause Waypoint"),
+(497300,9,1,0,0,0,100,0,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.36274,"Guard Lasiter - On Script - Set Orientation"),
+(497300,9,2,0,0,0,100,0,2000,2000,0,0,0,11,45425,0,0,0,0,0,10,@GUID1,0,0,0,0,0,0,"Guard Lasiter - On Script - Cast 'Shoot'"),
+(497300,9,3,0,0,0,100,0,6000,6000,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Guard Lasiter - On Script - Say Line 0"),
+(497301,9,0,0,0,0,100,0,0,0,0,0,0,54,18000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Guard Lasiter - On Script - Pause Waypoint"),
+(497301,9,1,0,0,0,100,0,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.36274,"Guard Lasiter - On Script - Set Orientation"),
+(497301,9,2,0,0,0,100,0,2000,2000,0,0,0,11,45425,0,0,0,0,0,10,@GUID2,0,0,0,0,0,0,"Guard Lasiter - On Script - Cast 'Shoot'"),
+(497301,9,3,0,0,0,100,0,6000,6000,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Guard Lasiter - On Script - Say Line 1"),
+(497302,9,0,0,0,0,100,0,0,0,0,0,0,54,18000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Guard Lasiter - On Script - Pause Waypoint"),
+(497302,9,1,0,0,0,100,0,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.36274,"Guard Lasiter - On Script - Set Orientation"),
+(497302,9,2,0,0,0,100,0,2000,2000,0,0,0,11,45425,0,0,0,0,0,10,@GUID3,0,0,0,0,0,0,"Guard Lasiter - On Script - Cast 'Shoot'"),
+(497302,9,3,0,0,0,100,0,6000,6000,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Guard Lasiter - On Script - Say Line 2"),
+(497303,9,0,0,0,0,100,0,0,0,0,0,0,54,18000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Guard Lasiter - On Script - Pause Waypoint"),
+(497303,9,1,0,0,0,100,0,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,5.36274,"Guard Lasiter - On Script - Set Orientation"),
+(497303,9,2,0,0,0,100,0,2000,2000,0,0,0,11,45425,0,0,0,0,0,10,30524,0,0,0,0,0,0,"Guard Lasiter - On Script - Cast 'Shoot'"),
+(497303,9,3,0,0,0,100,0,6000,6000,0,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Guard Lasiter - On Script - Say Line 3");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=4973;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(4973,0,0,"Oops! That was a bit off. I didn't even hit the target!",12,7,100,0,0,0,1792,0,"Guard Lasiter"),
+(4973,1,0,"That was a nice shot... but not perfect. Maybe a bit more to the left.",12,7,100,0,0,0,1789,0,"Guard Lasiter"),
+(4973,2,0,"Barely hit the target that time. Hmmm,... maybe I need to adjust back to the right.",12,7,100,0,0,0,1790,0,"Guard Lasiter"),
+(4973,3,0,"Whoa! Look at that bullseye!",12,7,100,0,0,0,1791,0,"Guard Lasiter");
+
+DELETE FROM `waypoint_data` WHERE `id`=304580;
+DELETE FROM `waypoints` WHERE `entry`=4973;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(4973,1,-3775.88,-4535.66,11.7979,""),
+(4973,2,-3772.62,-4533.36,11.5873,""),
+(4973,3,-3770.08,-4531.74,11.5426,""),
+(4973,4,-3772.62,-4533.36,11.5873,"");
diff --git a/sql/updates/world/master/2021_10_17_26_world_2018_08_11_09_world_335.sql b/sql/updates/world/master/2021_10_17_26_world_2018_08_11_09_world_335.sql
new file mode 100644
index 000000000..42a7c8858
--- /dev/null
+++ b/sql/updates/world/master/2021_10_17_26_world_2018_08_11_09_world_335.sql
@@ -0,0 +1,30 @@
+-- Evidence Marker --> Add missing spawns
+-- SET @GUID1 := 38851;
+-- SET @GUID2 := 42847;
+-- SET @GUID3 := 42850;
+-- DELETE FROM `creature` WHERE `guid` IN (@GUID1,@GUID2,@GUID3);
+-- INSERT INTO `creature` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`) VALUES
+-- (@GUID1,23583,1,0,0,1,1,0,0,-3700.58,-2534.09,68.7248,3.05433,300,0,0,41,0,0,0,0,0,"",0),
+-- (@GUID2,23583,1,0,0,1,1,0,0,-3721.85,-2541.17,69.7589,3.05433,300,0,0,41,0,0,0,0,0,"",0),
+-- (@GUID3,23583,1,0,0,1,1,0,0,-3734.45,-2530.79,73.2862,3.30957,300,0,0,41,0,0,0,0,0,"",0);
+
+DELETE FROM `creature_template_movement` WHERE `CreatureId`=23567;
+INSERT INTO `creature_template_movement` (`CreatureId`, `Ground`, `Swim`, `Flight`, `Rooted`) VALUES
+(23567,1,1,2,0);
+
+-- Fix "Reflective Dust"
+UPDATE `creature_template_addon` SET `auras`="42171 42175" WHERE `entry`=23583;
+
+-- Fix rotation for some objects
+-- restore 3.3.5 guids
+DELETE FROM `gameobject` WHERE `id` IN (21042,20992);
+DELETE FROM `gameobject` WHERE `guid` IN (6376,6821);
+INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnDifficulties`, `PhaseId`, `PhaseGroup`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `VerifiedBuild`) VALUES
+(6376,21042,1,15,403,'0',0,0,-3721.850341796875,-2541.166259765625,69.7589111328125,0,0.556656837463378906,-0.43478775024414062,0.431009292602539062,0.561536967754364013,120,255,1,40593), -- Theramore Guard Badge
+(6821,20992,1,15,403,'0',0,0,-3734.911376953125,-2530.625,73.28624725341796875,5.480335712432861328,-0.10538148880004882,0.677423477172851562,0.042206764221191406,0.726781070232391357,120,255,1,40593); -- Black Shield
+
+-- Add condition for Inspector Tarem's gossip option
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=8761;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(15,8761,0,0,0,8,0,11123,0,0,0,0,0,"","Show gossip option if quest 'Inspecting the Ruins' is rewarded"),
+(15,8761,0,0,1,8,0,11124,0,0,0,0,0,"","Show gossip option if quest 'Inspecting the Ruins' is rewarded");