aboutsummaryrefslogtreecommitdiff
path: root/sql/old/3.3.5a
diff options
context:
space:
mode:
Diffstat (limited to 'sql/old/3.3.5a')
-rw-r--r--sql/old/3.3.5a/auth/20061_2020_07_15/2020_06_15_00_auth.sql2
-rw-r--r--sql/old/3.3.5a/auth/20061_2020_07_15/2020_06_20_00_auth.sql6
-rw-r--r--sql/old/3.3.5a/characters/20061_2020_07_15/2020_06_15_00_characters.sql2
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_15_00_world.sql3
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_00_world.sql38
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_01_world.sql70
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_02_world.sql182
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_03_world.sql20
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_04_world.sql5
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_05_world.sql13
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_06_world.sql3
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_07_world.sql7
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_08_world.sql17
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_09_world.sql317
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_10_world.sql29
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_00_world.sql8
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_01_world.sql32
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_02_world.sql20
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_03_world_335.sql44
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_04_world.sql27
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_05_world.sql12
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_19_00_world.sql21
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_00_world.sql250
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_01_world.sql2
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_02_world.sql379
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_03_world.sql15
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_04_world.sql13
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_05_world.sql18
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_06_world.sql19
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_22_00_world.sql5
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_24_00_world.sql8
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_24_01_world.sql6
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_24_02_world.sql112
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_00_world.sql217
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_01_world.sql384
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_02_world.sql65
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_03_world_335.sql80
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_04_world.sql155
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_05_world.sql137
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_06_world.sql5
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_07_world.sql8
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_08_world.sql34
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_09_world.sql5
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_10_world.sql2
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_11_world.sql9
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_12_world.sql2
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_28_00_world.sql2
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_28_01_world.sql5
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_00_world.sql53
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_01_world.sql88
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_02_world.sql53
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_03_world.sql89
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_04_world.sql23
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_05_world.sql8
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_30_00_world.sql148
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_30_01_world.sql24
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_06_30_02_world.sql4
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_00_world.sql4
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_02_world.sql24
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_03_world.sql9
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_04_world.sql20
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_05_world.sql15
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_06_world_335.sql5
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_07_world.sql6
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_00_world.sql84
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_01_world.sql25
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_02_world.sql16
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_03_world.sql120
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_04_world.sql20
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_05_world.sql36
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_06_world.sql13
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_07_world.sql6
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_08_world.sql41
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_09_world.sql116
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_04_00_world.sql8
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_04_01_world.sql2
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_04_02_world_335.sql15
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_04_03_world.sql40
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_00_world.sql22
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_01_world.sql22
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_02_world.sql82
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_03_world.sql2
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_04_world.sql3
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_05_world.sql72
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_06_world.sql68
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_07_world.sql181
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_08_world.sql97
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_09_world.sql2
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_10_world.sql2
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_07_00_world.sql12
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_00_world.sql4
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_01_world.sql4
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_02_world.sql30
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_03_world.sql35
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_04_world.sql3
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_05_world.sql11
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_06_world.sql141
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_07_world.sql2
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_08_world.sql7
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_09_world.sql34
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_10_world.sql89
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_11_world.sql117
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_12_world.sql18
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_13_world.sql20
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_14_world.sql70
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_15_world.sql334
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_16_world.sql11
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_17_world.sql31
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_18_world.sql9
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_19_world.sql22
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_20_world.sql2
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_00_world_335.sql9
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_01_world.sql38
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_02_world.sql18
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_03_world.sql5
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_04_world.sql5
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_05_world.sql5
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_14_00_world.sql6
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_14_01_world.sql35
-rw-r--r--sql/old/3.3.5a/world/20061_2020_07_15/2020_07_14_02_world.sql1
120 files changed, 5611 insertions, 0 deletions
diff --git a/sql/old/3.3.5a/auth/20061_2020_07_15/2020_06_15_00_auth.sql b/sql/old/3.3.5a/auth/20061_2020_07_15/2020_06_15_00_auth.sql
new file mode 100644
index 00000000000..1027a32ee5e
--- /dev/null
+++ b/sql/old/3.3.5a/auth/20061_2020_07_15/2020_06_15_00_auth.sql
@@ -0,0 +1,2 @@
+-- TDB 335.20061 auth
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/old/3.3.5a/auth/20061_2020_07_15/2020_06_20_00_auth.sql b/sql/old/3.3.5a/auth/20061_2020_07_15/2020_06_20_00_auth.sql
new file mode 100644
index 00000000000..fdb95bfe335
--- /dev/null
+++ b/sql/old/3.3.5a/auth/20061_2020_07_15/2020_06_20_00_auth.sql
@@ -0,0 +1,6 @@
+ALTER TABLE `account_access`
+ CHANGE COLUMN `id` `AccountID` INT(10) UNSIGNED NOT NULL,
+ CHANGE COLUMN `gmlevel` `SecurityLevel` TINYINT(3) UNSIGNED NOT NULL,
+ ADD COLUMN `Comment` VARCHAR(255) DEFAULT NULL AFTER `RealmID`;
+
+UPDATE `rbac_permissions` SET `name` = 'Command: account set seclevel' WHERE `id` = 228;
diff --git a/sql/old/3.3.5a/characters/20061_2020_07_15/2020_06_15_00_characters.sql b/sql/old/3.3.5a/characters/20061_2020_07_15/2020_06_15_00_characters.sql
new file mode 100644
index 00000000000..fa2e24fcc4c
--- /dev/null
+++ b/sql/old/3.3.5a/characters/20061_2020_07_15/2020_06_15_00_characters.sql
@@ -0,0 +1,2 @@
+-- TDB 335.20061 characters
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_15_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_15_00_world.sql
new file mode 100644
index 00000000000..f0bd64d7c04
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_15_00_world.sql
@@ -0,0 +1,3 @@
+-- TDB 335.20061 world
+UPDATE `version` SET `db_version`='TDB 335.20061', `cache_id`=20061 LIMIT 1;
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_00_world.sql
new file mode 100644
index 00000000000..922c2c8161a
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_00_world.sql
@@ -0,0 +1,38 @@
+--
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 22 AND `SourceEntry` = 17658 AND `SourceId` = 0;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+-- Stop if one of them was already summoned
+(22,1,17658,0,0,29,0,17116,100,0,1,0,0,"","Group 0: Execute SAI (Action 0) if creature 'Exarch Menelaous' is not near");
+UPDATE `smart_scripts` SET `event_flags` = 0, `comment` = "Exarch Admetius - On Quest 'Ending Their World' Finished - Say Line 0" WHERE `entryorguid` = 17658 AND `source_type` = 0 AND `id` = 0;
+UPDATE `smart_scripts` SET `action_type` = 107, `action_param1` = 0, `action_param2` = 0, `action_param3` = 0, `target_type` = 0, `target_x` = 0, `target_y` = 0, `target_z` = 0, `target_o` = 0, `comment` = "Exarch Admetius - On Link - Summon Group 0" WHERE `entryorguid` = 17658 AND `source_type` = 0 AND `id` = 1;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 1765800 AND `source_type` = 9;
+
+DELETE FROM `creature_summon_groups` WHERE `summonerId` = 17658 AND `summonerType` = 0;
+INSERT INTO `creature_summon_groups` (`summonerId`,`summonerType`,`groupId`,`entry`,`position_x`,`position_y`,`position_z`,`orientation`,`summonType`,`summonTime`,`Comment`) VALUES
+(17658,0,0,17659,-1930.46,-11812.6,62.6309,2.30995,2,300000,"Exarch Admetius - Group 0 - Blade of Argus"),
+(17658,0,0,17659,-1937.49,-11805.7,63.7985,5.53597,2,300000,"Exarch Admetius - Group 0 - Blade of Argus"),
+(17658,0,0,17659,-1933.49,-11814.8,62.108,2.22748,2,300000,"Exarch Admetius - Group 0 - Blade of Argus"),
+(17658,0,0,17659,-1939.96,-11808.2,62.6752,5.49985,2,300000,"Exarch Admetius - Group 0 - Blade of Argus"),
+(17658,0,0,17659,-1936.87,-11817,61.1348,2.24899,2,300000,"Exarch Admetius - Group 0 - Blade of Argus"),
+(17658,0,0,17659,-1942.61,-11810.6,61.8243,5.24734,2,300000,"Exarch Admetius - Group 0 - Blade of Argus"),
+(17658,0,0,17659,-1940.21,-11819.8,60.3075,2.36209,2,300000,"Exarch Admetius - Group 0 - Blade of Argus"),
+(17658,0,0,17659,-1945.48,-11813.6,60.9112,5.35298,2,300000,"Exarch Admetius - Group 0 - Blade of Argus"),
+(17658,0,0,17659,-1944.12,-11823.2,59.0743,2.18733,2,300000,"Exarch Admetius - Group 0 - Blade of Argus"),
+(17658,0,0,17659,-1948.83,-11816.8,60.053,5.34669,2,300000,"Exarch Admetius - Group 0 - Blade of Argus"),
+(17658,0,0,17116,-1958.72,-11821.6,58.8921,0.461123,2,300000,"Exarch Admetius - Group 0 - Exarch Menelaous"),
+(17658,0,0,17214,-1960.27,-11819.9,59.571,0.295709,2,300000,"Exarch Admetius - Group 0 - Anchorite Fateema"),
+(17658,0,0,17101,-1959.95,-11823.8,57.6277,0.372766,2,300000,"Exarch Admetius - Group 0 - Diktynna"),
+(17658,0,0,17215,-1961.16,-11823.4,57.702,0.640498,2,300000,"Exarch Admetius - Group 0 - Daedal"),
+(17658,0,0,17110,-1961.2,-11821.9,58.6004,0.525438,2,300000,"Exarch Admetius - Group 0 - Acteon"),
+(17658,0,0,17440,-1964.16,-11827,56.1668,0.561564,2,300000,"Exarch Admetius - Group 0 - High Chief Stillpine"),
+(17658,0,0,17682,-1966.07,-11824.7,57.2651,0.161011,2,300000,"Exarch Admetius - Group 0 - Princess Stillpine"),
+(17658,0,0,17443,-1966.24,-11822,58.598,6.20858,2,300000,"Exarch Admetius - Group 0 - Kurz the Revelator"),
+(17658,0,0,17445,-1968.9,-11829.1,55.0413,0.386419,2,300000,"Exarch Admetius - Group 0 - Stillpine the Younger"),
+(17658,0,0,17242,-1948.33,-11832.6,57.24,1.14982,2,300000,"Exarch Admetius - Group 0 - Archaeologist Adamant Ironheart"),
+(17658,0,0,17240,-1950.2,-11831.7,56.9671,1.09092,2,300000,"Exarch Admetius - Group 0 - Admiral Odesyus"),
+(17658,0,0,17117,-1952.31,-11831.3,56.7056,0.91224,2,300000,"Exarch Admetius - Group 0 - Injured Night Elf Priestess"),
+(17658,0,0,17246,-1949.92,-11834,56.7319,1.21854,2,300000,"Exarch Admetius - Group 0 - Cookie McWeaksauce"),
+(17658,0,0,17241,-1952.39,-11833.5,56.4305,0.977035,2,300000,"Exarch Admetius - Group 0 - Priestess Kyleen Ildinare"),
+(17658,0,0,17311,-1954.8,-11838.6,55.2527,1.1616,2,300000,"Exarch Admetius - Group 0 - Cowlen"),
+(17658,0,0,17649,-1955.7,-11843.1,54.1458,1.17557,2,300000,"Exarch Admetius - Group 0 - Kessel"),
+(17658,0,0,17468,-1965.8,-11838.7,53.2196,0.792683,2,300000,"Exarch Admetius - Group 0 - Prophet Velen");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_01_world.sql
new file mode 100644
index 00000000000..3f418ee2dce
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_01_world.sql
@@ -0,0 +1,70 @@
+--
+UPDATE `smart_scripts` SET `action_type` = 107, `action_param1` = 0, `action_param2` = 0, `action_param3` = 0, `target_type` = 0, `target_x` = 0, `target_y` = 0, `target_z` = 0, `target_o` = 0, `comment` = "Baelgun's Event Generator (Cave) - On Script - Summon Group 0" WHERE `entryorguid` = 2484500 AND `source_type` = 9 AND `id` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 2484500 AND `source_type` = 9 AND `id` BETWEEN 1 AND 15;
+UPDATE `smart_scripts` SET `id` = 1, `comment` = "Baelgun's Event Generator (Cave) - On Script - Despawn (0) (Iron Dwarf)" WHERE `entryorguid` = 2484500 AND `source_type` = 9 AND `id` = 16;
+
+DELETE FROM `creature_summon_groups` WHERE `summonerId` = 24845 AND `summonerType` = 0;
+INSERT INTO `creature_summon_groups` (`summonerId`,`summonerType`,`groupId`,`entry`,`position_x`,`position_y`,`position_z`,`orientation`,`summonType`,`summonTime`,`Comment`) VALUES
+(24845,0,0,24846,306.099,-5706.15,102.435,4.96977,5,0,"Baelgun's Event Generator (Cave) - Group 0 - Iron Dwarf"),
+(24845,0,0,24846,311.025,-5702.8,101.935,5.18722,5,0,"Baelgun's Event Generator (Cave) - Group 0 - Iron Dwarf"),
+(24845,0,0,24846,309.754,-5703.16,102.071,5.18722,5,0,"Baelgun's Event Generator (Cave) - Group 0 - Iron Dwarf"),
+(24845,0,0,24846,308.223,-5703.8,102.232,5.18722,5,0,"Baelgun's Event Generator (Cave) - Group 0 - Iron Dwarf"),
+(24845,0,0,24846,307.044,-5704.32,102.356,5.18722,5,0,"Baelgun's Event Generator (Cave) - Group 0 - Iron Dwarf"),
+(24845,0,0,24846,304.169,-5706.84,102.697,5.18722,5,0,"Baelgun's Event Generator (Cave) - Group 0 - Iron Dwarf"),
+(24845,0,0,24846,303.13,-5707.28,102.978,5.18722,5,0,"Baelgun's Event Generator (Cave) - Group 0 - Iron Dwarf"),
+(24845,0,0,24846,297.246,-5726.82,96.2681,0.347607,5,0,"Baelgun's Event Generator (Cave) - Group 0 - Iron Dwarf"),
+(24845,0,0,24846,292.82,-5726.04,96.5843,0.347607,5,0,"Baelgun's Event Generator (Cave) - Group 0 - Iron Dwarf"),
+(24845,0,0,24846,292.562,-5728.57,96.5857,0.347607,5,0,"Baelgun's Event Generator (Cave) - Group 0 - Iron Dwarf"),
+(24845,0,0,24846,292.15,-5727.42,96.5874,0.347607,5,0,"Baelgun's Event Generator (Cave) - Group 0 - Iron Dwarf"),
+(24845,0,0,24846,294.578,-5730.09,96.2958,0.347607,5,0,"Baelgun's Event Generator (Cave) - Group 0 - Iron Dwarf"),
+(24845,0,0,24846,296.196,-5730.17,96.0082,0.347607,5,0,"Baelgun's Event Generator (Cave) - Group 0 - Iron Dwarf"),
+(24845,0,0,24846,297.603,-5730.79,95.6955,0.347607,5,0,"Baelgun's Event Generator (Cave) - Group 0 - Iron Dwarf"),
+(24845,0,0,24846,299.397,-5729.56,95.7274,0.347607,5,0,"Baelgun's Event Generator (Cave) - Group 0 - Iron Dwarf"),
+(24845,0,0,24847,315.101,-5723.06,96.2541,3.05433,5,0,"Baelgun's Event Generator (Cave) - Group 0 - Loken");
+
+UPDATE `smart_scripts` SET `action_type` = 107, `action_param1` = 0, `action_param2` = 0, `action_param3` = 0, `target_type` = 0, `target_x` = 0, `target_y` = 0, `target_z` = 0, `target_o` = 0, `comment` = "Dark Keeper Portrait - On Script - Summon Group 0" WHERE `entryorguid` = 16481900 AND `source_type` = 9 AND `id` = 2;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 16481900 AND `source_type` = 9 AND `id` BETWEEN 3 AND 4;
+UPDATE `smart_scripts` SET `action_type` = 107, `action_param1` = 1, `action_param2` = 0, `action_param3` = 0, `target_type` = 0, `target_x` = 0, `target_y` = 0, `target_z` = 0, `target_o` = 0, `comment` = "Dark Keeper Portrait - On Script - Summon Group 1" WHERE `entryorguid` = 16481901 AND `source_type` = 9 AND `id` = 2;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 16481901 AND `source_type` = 9 AND `id` BETWEEN 3 AND 4;
+UPDATE `smart_scripts` SET `action_type` = 107, `action_param1` = 2, `action_param2` = 0, `action_param3` = 0, `target_type` = 0, `target_x` = 0, `target_y` = 0, `target_z` = 0, `target_o` = 0, `comment` = "Dark Keeper Portrait - On Script - Summon Group 2" WHERE `entryorguid` = 16481902 AND `source_type` = 9 AND `id` = 2;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 16481902 AND `source_type` = 9 AND `id` BETWEEN 3 AND 4;
+UPDATE `smart_scripts` SET `action_type` = 107, `action_param1` = 3, `action_param2` = 0, `action_param3` = 0, `target_type` = 0, `target_x` = 0, `target_y` = 0, `target_z` = 0, `target_o` = 0, `comment` = "Dark Keeper Portrait - On Script - Summon Group 3" WHERE `entryorguid` = 16481903 AND `source_type` = 9 AND `id` = 2;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 16481903 AND `source_type` = 9 AND `id` BETWEEN 3 AND 4;
+UPDATE `smart_scripts` SET `action_type` = 107, `action_param1` = 4, `action_param2` = 0, `action_param3` = 0, `target_type` = 0, `target_x` = 0, `target_y` = 0, `target_z` = 0, `target_o` = 0, `comment` = "Dark Keeper Portrait - On Script - Summon Group 4" WHERE `entryorguid` = 16481904 AND `source_type` = 9 AND `id` = 2;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 16481904 AND `source_type` = 9 AND `id` BETWEEN 3 AND 6;
+UPDATE `smart_scripts` SET `action_type` = 107, `action_param1` = 5, `action_param2` = 0, `action_param3` = 0, `target_type` = 0, `target_x` = 0, `target_y` = 0, `target_z` = 0, `target_o` = 0, `comment` = "Dark Keeper Portrait - On Script - Summon Group 5" WHERE `entryorguid` = 16481905 AND `source_type` = 9 AND `id` = 2;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 16481905 AND `source_type` = 9 AND `id` BETWEEN 3 AND 4;
+
+UPDATE `smart_scripts` SET `action_type` = 107, `action_param1` = 0, `action_param2` = 0, `action_param3` = 0, `target_type` = 0, `target_x` = 0, `target_y` = 0, `target_z` = 0, `target_o` = 0, `comment` = "Highborne Relic Fragment - On Gameobject State Changed - Summon Group 0" WHERE `entryorguid` IN (175888,175891,175892,175893) AND `source_type` = 1 AND `id` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (175888,175891,175892,175893) AND `source_type` = 1 AND `id` = 1;
+
+DELETE FROM `creature_summon_groups` WHERE `summonerId` IN (164819,175888,175891,175892) AND `summonerType` = 1;
+INSERT INTO `creature_summon_groups` (`summonerId`,`summonerType`,`groupId`,`entry`,`position_x`,`position_y`,`position_z`,`orientation`,`summonType`,`summonTime`,`Comment`) VALUES
+(164819,1,0,9437,914.055,-164.125,-49.7607,2.16251,8,0,"Dark Keeper Portrait - Group 0 - Dark Keeper Vorfalk"),
+(164819,1,0,9445,916.782,-163.222,-49.7607,2.22296,8,0,"Dark Keeper Portrait - Group 0 - Dark Guard"),
+(164819,1,0,9445,912.515,-166.48,-49.7607,2.22296,8,0,"Dark Keeper Portrait - Group 0 - Dark Guard"),
+(164819,1,1,9438,812.246,-348.875,-50.5781,0.710542,8,0,"Dark Keeper Portrait - Group 1 - Dark Keeper Bethek"),
+(164819,1,1,9445,809.895,-348.221,-50.5781,0.713424,8,0,"Dark Keeper Portrait - Group 1 - Dark Guard"),
+(164819,1,1,9445,812.575,-351.318,-50.5781,0.713424,8,0,"Dark Keeper Portrait - Group 1 - Dark Guard"),
+(164819,1,2,9439,888.483,-361.707,-49.9358,0.612107,8,0,"Dark Keeper Portrait - Group 2 - Dark Keeper Uggel"),
+(164819,1,2,9445,886.982,-360.478,-49.9358,0.612107,8,0,"Dark Keeper Portrait - Group 2 - Dark Guard"),
+(164819,1,2,9445,888.82,-363.746,-49.9358,0.612107,8,0,"Dark Keeper Portrait - Group 2 - Dark Guard"),
+(164819,1,3,9441,545.018,-214.379,-35.5465,0.339364,8,0,"Dark Keeper Portrait - Group 3 - Dark Keeper Zimrel"),
+(164819,1,3,9445,543.337,-211.984,-35.5118,0.40162,8,0,"Dark Keeper Portrait - Group 3 - Dark Guard"),
+(164819,1,3,9445,546.018,-217.407,-35.5704,0.505293,8,0,"Dark Keeper Portrait - Group 3 - Dark Guard"),
+(164819,1,4,9442,659.373,2.65909,-60.0585,0.990563,8,0,"Dark Keeper Portrait - Group 4 - Dark Keeper Ofgut"),
+(164819,1,4,9445,658.681,5.29951,-60.0585,0.990563,8,0,"Dark Keeper Portrait - Group 4 - Dark Guard"),
+(164819,1,4,9445,661.902,2.76951,-60.0585,0.990563,8,0,"Dark Keeper Portrait - Group 4 - Dark Guard"),
+(164819,1,4,9445,659.792,-0.450377,-60.0585,0.990563,8,0,"Dark Keeper Portrait - Group 4 - Dark Guard"),
+(164819,1,4,9445,656.213,2.17197,-60.0585,0.99056,8,0,"Dark Keeper Portrait - Group 4 - Dark Guard"),
+(164819,1,5,9443,804.041,-247.345,-43.3029,2.60616,8,0,"Dark Keeper Portrait - Group 5 - Dark Keeper Pelver"),
+(164819,1,5,9445,805.992,-246.46,-43.3029,2.52525,8,0,"Dark Keeper Portrait - Group 5 - Dark Guard"),
+(164819,1,5,9445,803.904,-249.408,-43.3029,2.52525,8,0,"Dark Keeper Portrait - Group 5 - Dark Guard"),
+(175888,1,0,7523,6505.45,-4230.91,658.636,3.31351,1,180000,"Highborne Relic Fragment - Group 0 - Suffering Highborne"),
+(175888,1,0,7524,6494.32,-4228.23,658.549,5.63829,1,180000,"Highborne Relic Fragment - Group 0 - Anguished Highborne"),
+(175891,1,0,7523,6562.16,-3919.21,658.297,4.42878,1,180000,"Highborne Relic Fragment - Group 0 - Suffering Highborne"),
+(175891,1,0,7524,6556.55,-3938.87,658.313,1.30682,1,180000,"Highborne Relic Fragment - Group 0 - Anguished Highborne"),
+(175892,1,0,7523,6482.59,-4109.64,658.291,2.21004,1,180000,"Highborne Relic Fragment - Group 0 - Suffering Highborne"),
+(175892,1,0,7524,6482.84,-4093.91,658.412,4.11463,1,180000,"Highborne Relic Fragment - Group 0 - Anguished Highborne"),
+(175893,1,0,7523,6563.31,-4047.92,658.329,1.18116,1,180000,"Highborne Relic Fragment - Group 0 - Suffering Highborne"),
+(175893,1,0,7524,6557.38,-4041.45,658.408,0.313297,1,180000,"Highborne Relic Fragment - Group 0 - Anguished Highborne");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_02_world.sql
new file mode 100644
index 00000000000..03fda171c69
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_02_world.sql
@@ -0,0 +1,182 @@
+--
+UPDATE `creature_text` SET `comment` = "Exarch Admetius" WHERE `CreatureID` = 17658;
+
+-- Injured Night Elf Priestess
+UPDATE `creature_template` SET `gossip_menu_id` = 7543 WHERE `entry` = 17117;
+DELETE FROM `gossip_menu` WHERE `MenuID` = 7543;
+INSERT INTO `gossip_menu` (`MenuID`,`TextID`) VALUES
+(7543,9151),
+(7543,9152);
+DELETE FROM `npc_text` WHERE `ID` = 9151;
+INSERT INTO `npc_text` (`ID`,`text0_0`,`text0_1`,`BroadcastTextID0`,`lang0`,`Probability0`,`EmoteDelay0_0`,`Emote0_0`) VALUES
+(9151,"","I am here to give thanks to the one that saved my life.",14677,0,1,0,1);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 14 AND `SourceGroup` = 7543;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,7543,9151,0,0,8,0,9759,0,0,1,0,0,"","Group 0: Show gossip text 9151 if quest 'Ending Their World' is not rewarded"),
+(14,7543,9151,0,0,23,1,3584,0,0,0,0,0,"","Group 0: Show gossip text 9151 if creature is located in Blood Watch"),
+(14,7543,9152,0,0,8,0,9759,0,0,0,0,0,"","Group 0: Show gossip text 9152 if quest 'Ending Their World' is rewarded"),
+(14,7543,9152,0,0,23,1,3584,0,0,0,0,0,"","Group 0: Show gossip text 9152 if creature is located in Blood Watch");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = 17117 AND `GroupID` = 5;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(17117,5,0,"%s hugs you.",16,0,100,0,0,0,14679,0,"Injured Night Elf Priestess");
+
+-- Seems she doesn't play any emote, removed
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 17117 AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(17117,0,0,1,54,0,100,0,0,0,0,0,0,91,3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Injured Night Elf Priestess - On Just Summoned - Remove Flag Standstate Sleep"),
+(17117,0,1,0,61,0,100,0,0,0,0,0,0,82,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Injured Night Elf Priestess - On Link - Add Npc Flag Gossip"),
+(17117,0,2,0,64,0,100,0,0,0,0,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Injured Night Elf Priestess - On Gossip Hello - Say Line 5"),
+(17117,0,3,0,38,0,100,0,1,1,0,0,0,91,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Injured Night Elf Priestess - On Data Set 1 1 - Set Bytes 1"),
+(17117,0,4,0,38,0,100,0,2,2,0,0,0,90,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Injured Night Elf Priestess - On Data Set 2 2 - Set Bytes 1");
+
+-- Acteon
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 17110 AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(17110,0,0,1,54,0,100,0,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Acteon - On Just Summoned - Set Event Phase 1"),
+(17110,0,1,0,61,0,100,0,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Acteon - On Link - Remove Npc Flag Questgiver"),
+(17110,0,2,0,1,1,100,0,5000,5000,5000,5000,0,10,4,21,0,0,0,0,1,0,0,0,0,0,0,0,0,"Acteon - Out of Combat - Play Random Emote (4, 21) (Phase 1)");
+
+-- Priestess Kyleen Il'dinare
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 17241 AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(17241,0,0,1,54,0,100,0,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Priestess Kyleen Il'dinare - On Just Summoned - Set Event Phase 1"),
+(17241,0,1,0,61,0,100,0,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Priestess Kyleen Il'dinare - On Link - Remove Npc Flag Questgiver"),
+(17241,0,2,0,1,1,100,0,5000,5000,5000,5000,0,10,10,71,0,0,0,0,1,0,0,0,0,0,0,0,0,"Priestess Kyleen Il'dinare - Out of Combat - Play Random Emote (10, 71) (Phase 1)"),
+(17241,0,3,0,20,0,100,0,9514,0,0,0,0,80,1724100,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Priestess Kyleen Il'dinare - On Quest 'Rune Covered Tablet' Rewarded - Run Script");
+
+-- Archaeologist Adamant Ironheart
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 17242 AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(17242,0,0,1,54,0,100,0,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Archaeologist Adamant Ironheart - On Just Summoned - Set Event Phase 1"),
+(17242,0,1,0,61,0,100,0,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Archaeologist Adamant Ironheart - On Link - Remove Npc Flag Questgiver"),
+(17242,0,2,0,1,1,100,0,6000,6000,6000,6000,0,10,10,71,0,0,0,0,1,0,0,0,0,0,0,0,0,"Archaeologist Adamant Ironheart - Out of Combat - Play Random Emote (10, 71) (Phase 1)"),
+(17242,0,3,0,38,0,100,0,1,1,0,0,0,53,0,1724200,0,0,0,1,1,0,0,0,0,0,0,0,0,"Archaeologist Adamant Ironheart - On Data Set 1 1 - Start Waypoint"),
+(17242,0,4,0,38,0,100,0,2,2,0,0,0,53,0,1724201,0,0,0,1,1,0,0,0,0,0,0,0,0,"Archaeologist Adamant Ironheart - On Data Set 2 2 - Start Waypoint"),
+(17242,0,5,0,40,0,100,0,1,1724201,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,0,6.26573,"Archaeologist Adamant Ironheart - On Reached Waypoint 1 - Set Orientation");
+
+-- Stillpine the Younger
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 17445 AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(17445,0,0,0,54,0,100,0,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Stillpine the Younger - On Just Summoned - Remove Npc Flag Questgiver"),
+(17445,0,1,0,20,0,100,0,9573,0,0,0,0,80,1744500,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Stillpine the Younger - On Quest 'Chieftain Oomooroo' Finished - Run Script");
+
+-- Diktynna
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 17101 AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(17101,0,0,0,54,0,100,0,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Diktynna - On Just Summoned - Set Event Phase 1"),
+(17101,0,1,0,1,1,100,0,5000,5000,5000,5000,0,10,4,21,0,0,0,0,1,0,0,0,0,0,0,0,0,"Diktynna - Out of Combat - Play Random Emote (4, 21) (Phase 1)"),
+(17101,0,2,0,20,0,100,0,9452,0,0,0,0,5,24,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Diktynna - On Quest 'Red Snapper - Very Tasty!' Rewarded - Play Emote 24");
+
+-- Daedal
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 17215 AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(17215,0,0,0,54,0,100,0,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Daedal - On Just Summoned - Set Event Phase 1"),
+(17215,0,1,0,1,1,100,0,5000,5000,5000,5000,0,10,4,21,0,0,0,0,1,0,0,0,0,0,0,0,0,"Daedal - Out of Combat - Play Random Emote (4, 21) (Phase 1)"),
+(17215,0,2,0,38,0,100,0,1,1,0,0,0,81,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Daedal - On Data Set 1 1 - Set NPC Flags"),
+(17215,0,3,0,38,0,100,0,2,2,0,0,0,81,83,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Daedal - On Data Set 2 2 - Set NPC Flags"),
+(17215,0,4,0,20,0,100,0,9473,0,0,0,0,80,1721500,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Daedal - On Quest 'An Alternative Alternative' Rewarded - Run Script");
+
+-- High Chief Stillpine
+DELETE FROM `gossip_menu` WHERE `MenuID` = 7434 AND `TextID` IN (9145,9146);
+INSERT INTO `gossip_menu` (`MenuID`,`TextID`) VALUES
+(7434,9145),
+(7434,9146);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 14 AND `SourceGroup` = 7434 AND `SourceEntry` IN (9145,9146);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,7434,9145,0,0,8,0,9759,0,0,1,0,0,"","Group 0: Show gossip text 9145 if quest 'Ending Their World' is not rewarded"),
+(14,7434,9145,0,0,23,1,3584,0,0,0,0,0,"","Group 0: Show gossip text 9145 if creature is located in Blood Watch"),
+(14,7434,9146,0,0,8,0,9759,0,0,0,0,0,"","Group 0: Show gossip text 9146 if quest 'Ending Their World' is rewarded"),
+(14,7434,9146,0,0,23,1,3584,0,0,0,0,0,"","Group 0: Show gossip text 9146 if creature is located in Blood Watch");
+
+-- Exarch Menelaous
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 17116 AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(17116,0,0,0,54,0,100,0,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Exarch Menelaous - On Just Summoned - Set Event Phase 1"),
+(17116,0,1,0,1,1,100,0,6000,6000,6000,6000,0,10,4,21,0,0,0,0,1,0,0,0,0,0,0,0,0,"Exarch Menelaous - Out of Combat - Play Random Emote (4, 21) (Phase 1)"),
+(17116,0,2,0,64,0,100,0,0,0,0,0,0,33,17116,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Exarch Menelaous - On Gossip Hello - Quest Credit 'The Kessel Run'");
+
+DELETE FROM `gossip_menu` WHERE `MenuID` = 7370 AND `TextID` IN (9153,9154);
+INSERT INTO `gossip_menu` (`MenuID`,`TextID`) VALUES
+(7370,9153),
+(7370,9154);
+DELETE FROM `npc_text` WHERE `ID` = 9153;
+INSERT INTO `npc_text` (`ID`,`text0_0`,`text0_1`,`BroadcastTextID0`,`lang0`,`Probability0`,`EmoteDelay0_0`,`Emote0_0`) VALUES
+(9153,"We are here to support our hero!","",14680,0,1,0,0);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 14 AND `SourceGroup` = 7370 AND `SourceEntry` IN (9153,9154);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,7370,9153,0,0,8,0,9759,0,0,1,0,0,"","Group 0: Show gossip text 9153 if quest 'Ending Their World' is not rewarded"),
+(14,7370,9153,0,0,23,1,3584,0,0,0,0,0,"","Group 0: Show gossip text 9153 if creature is located in Blood Watch"),
+(14,7370,9154,0,0,8,0,9759,0,0,0,0,0,"","Group 0: Show gossip text 9154 if quest 'Ending Their World' is rewarded"),
+(14,7370,9154,0,0,23,1,3584,0,0,0,0,0,"","Group 0: Show gossip text 9154 if creature is located in Blood Watch");
+
+-- Prophet Velen
+DELETE FROM `gossip_menu` WHERE `MenuID` = 7414 AND `TextID` IN (9162,9163);
+INSERT INTO `gossip_menu` (`MenuID`,`TextID`) VALUES
+(7414,9162),
+(7414,9163);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 14 AND `SourceGroup` = 7414 AND `SourceEntry` IN (9162,9163);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,7414,9162,0,0,8,0,9759,0,0,1,0,0,"","Group 0: Show gossip text 9162 if quest 'Ending Their World' is not rewarded"),
+(14,7414,9162,0,0,23,1,3584,0,0,0,0,0,"","Group 0: Show gossip text 9162 if creature is located in Blood Watch"),
+(14,7414,9163,0,0,8,0,9759,0,0,0,0,0,"","Group 0: Show gossip text 9163 if quest 'Ending Their World' is rewarded"),
+(14,7414,9163,0,0,23,1,3584,0,0,0,0,0,"","Group 0: Show gossip text 9163 if creature is located in Blood Watch");
+
+-- Admiral Odesyus
+DELETE FROM `gossip_menu` WHERE `MenuID` = 7399 AND `TextID` IN (9148,9149);
+INSERT INTO `gossip_menu` (`MenuID`,`TextID`) VALUES
+(7399,9148),
+(7399,9149);
+DELETE FROM `npc_text` WHERE `ID` = 9148;
+INSERT INTO `npc_text` (`ID`,`text0_0`,`text0_1`,`BroadcastTextID0`,`lang0`,`Probability0`,`EmoteDelay0_0`,`Emote0_0`) VALUES
+(9148,"A glorious victory!","",14674,0,1,0,5);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 14 AND `SourceGroup` = 7399 AND `SourceEntry` IN (9148,9149);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,7399,9148,0,0,8,0,9759,0,0,1,0,0,"","Group 0: Show gossip text 9148 if quest 'Ending Their World' is not rewarded"),
+(14,7399,9148,0,0,23,1,3584,0,0,0,0,0,"","Group 0: Show gossip text 9148 if creature is located in Blood Watch"),
+(14,7399,9149,0,0,8,0,9759,0,0,0,0,0,"","Group 0: Show gossip text 9149 if quest 'Ending Their World' is rewarded"),
+(14,7399,9149,0,0,23,1,3584,0,0,0,0,0,"","Group 0: Show gossip text 9149 if creature is located in Blood Watch");
+
+-- Cowlen
+DELETE FROM `gossip_menu` WHERE `MenuID` = 7403 AND `TextID` IN (9158,9159);
+INSERT INTO `gossip_menu` (`MenuID`,`TextID`) VALUES
+(7403,9158),
+(7403,9159);
+DELETE FROM `npc_text` WHERE `ID` = 9158;
+INSERT INTO `npc_text` (`ID`,`text0_0`,`text0_1`,`BroadcastTextID0`,`lang0`,`Probability0`,`EmoteDelay0_0`,`Emote0_0`,`EmoteDelay0_1`,`Emote0_1`) VALUES
+(9158,"We have traveled far to celebrate the hero of the draenei people.","",14685,0,1,0,1,0,1);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 14 AND `SourceGroup` = 7403 AND `SourceEntry` IN (9158,9159);
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 15 AND `SourceGroup` = 7403;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,7403,9158,0,0,8,0,9759,0,0,1,0,0,"","Group 0: Show gossip text 9158 if quest 'Ending Their World' is not rewarded"),
+(14,7403,9158,0,0,23,1,3584,0,0,0,0,0,"","Group 0: Show gossip text 9158 if creature is located in Blood Watch"),
+(14,7403,9159,0,0,8,0,9759,0,0,0,0,0,"","Group 0: Show gossip text 9159 if quest 'Ending Their World' is rewarded"),
+(14,7403,9159,0,0,23,1,3584,0,0,0,0,0,"","Group 0: Show gossip text 9159 if creature is located in Blood Watch"),
+(15,7403,0,0,0,23,1,3584,0,0,1,0,0,"","Group 0: Show Gossip Option 0 if creature is not located in Blood Watch");
+
+-- Kessel
+DELETE FROM `gossip_menu` WHERE `MenuID` = 7462 AND `TextID` IN (9155,9156);
+INSERT INTO `gossip_menu` (`MenuID`,`TextID`) VALUES
+(7462,9155),
+(7462,9156);
+DELETE FROM `npc_text` WHERE `ID` = 9155;
+INSERT INTO `npc_text` (`ID`,`text0_0`,`text0_1`,`BroadcastTextID0`,`lang0`,`Probability0`,`EmoteDelay0_0`,`Emote0_0`) VALUES
+(9155,"I have come to support the draenei champion!","",14682,0,1,0,5);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 14 AND `SourceGroup` = 7462 AND `SourceEntry` IN (9155,9156);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,7462,9155,0,0,8,0,9759,0,0,1,0,0,"","Group 0: Show gossip text 9155 if quest 'Ending Their World' is not rewarded"),
+(14,7462,9155,0,0,23,1,3584,0,0,0,0,0,"","Group 0: Show gossip text 9155 if creature is located in Blood Watch"),
+(14,7462,9156,0,0,8,0,9759,0,0,0,0,0,"","Group 0: Show gossip text 9156 if quest 'Ending Their World' is rewarded"),
+(14,7462,9156,0,0,23,1,3584,0,0,0,0,0,"","Group 0: Show gossip text 9156 if creature is located in Blood Watch");
+
+-- "Cookie" McWeaksauce
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 22 AND `SourceEntry` = 17246 AND `SourceId` = 0;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(22,12,17246,0,0,23,1,3584,0,0,1,0,0,"","Group 0: Execute SAI (Action 11) if creature is not located in Blood Watch");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_03_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_03_world.sql
new file mode 100644
index 00000000000..7f926143092
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_03_world.sql
@@ -0,0 +1,20 @@
+-- Players spells. Also fixes wrong target type
+UPDATE `smart_scripts` SET `action_param2` = 2, `target_type` = 2 WHERE `source_type` = 0 AND `action_type` = 11 AND `action_param1` IN (53,2589,2590,2591,8721);
+-- Non-player versions works well without triggered flag
+UPDATE `smart_scripts` SET `action_param2` = 0 WHERE `source_type` = 0 AND `action_type` = 11 AND `action_param1` IN (7159,15657) AND `action_param2` = 2;
+-- Range event
+UPDATE `smart_scripts` SET `event_type` = 0, `event_param1` = 5000, `event_param2` = 5000 WHERE `source_type` = 0 AND `action_type` = 11 AND `action_param1` IN (2590,7159,8721,15582,15657) AND `event_type` = 9;
+-- On Behind Target
+UPDATE `smart_scripts` SET `event_type` = 0, `event_param3` = 6000, `event_param4` = 9000 WHERE `source_type` = 0 AND `action_type` = 11 AND `action_param1` IN (53,2589,7159,15657,30992,37685,71410) AND `event_type` = 67 AND `event_param3` = 0 AND `event_param4` = 0;
+-- Unique cases
+UPDATE `smart_scripts` SET `event_type` = 0 WHERE `entryorguid` = 95 AND `source_type` = 0 AND `action_type` = 11 AND `action_param1` = 53;
+UPDATE `smart_scripts` SET `event_type` = 0, `event_flags` = 0, `event_param1` = 6000, `event_param2` = 8500 WHERE `entryorguid` IN (3530,3531) AND `source_type` = 0 AND `action_type` = 11 AND `action_param1` = 15657;
+
+DELETE FROM `spell_custom_attr` WHERE `entry` IN (30992,34614,52540,58471,63754,71410);
+INSERT INTO `spell_custom_attr` (`entry`,`attributes`) VALUES
+(30992,131072),
+(34614,131072),
+(52540,131072),
+(58471,131072),
+(63754,131072),
+(71410,131072);
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_04_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_04_world.sql
new file mode 100644
index 00000000000..41fa08dc5bb
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_04_world.sql
@@ -0,0 +1,5 @@
+-- No event params & can't repeat
+-- SMART_EVENT_AGGRO & SMART_EVENT_JUST_CREATED & SMART_EVENT_DEATH & SMART_EVENT_EVADE & SMART_EVENT_REACHED_HOME & SMART_EVENT_RESET & SMART_EVENT_JUST_SUMMONED & SMART_EVENT_ON_SPELLCLICK
+UPDATE `smart_scripts` SET `event_flags` = `event_flags` &~ 1, `event_param1` = 0, `event_param2` = 0, `event_param3` = 0, `event_param4` = 0 WHERE `event_type` IN (4,6,7,21,25,54,63,73) AND `entryorguid` NOT IN (22473,22448);
+-- SMART_EVENT_RESPAWN
+UPDATE `smart_scripts` SET `event_flags` = `event_flags` &~ 1, `event_param1` = 0, `event_param2` = 0, `event_param3` = 0, `event_param4` = 0 WHERE `event_type` = 11 AND `entryorguid` = 2435;
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_05_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_05_world.sql
new file mode 100644
index 00000000000..7b1b97b8db4
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_05_world.sql
@@ -0,0 +1,13 @@
+-- https://www.youtube.com/watch?v=1yKt1V5Qnk8
+DELETE FROM `gossip_menu` WHERE `MenuID` = 8683 AND `TextID` = 10930;
+INSERT INTO `gossip_menu` (`MenuID`,`TextID`,`VerifiedBuild`) VALUES
+(8683,10930,0);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 14 AND `SourceGroup` = 8683;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(14,8683,10930,0,0,1,0,41181,0,0,1,0,0,"","Group 0: Show gossip text 10930 if player does not have aura 'Shabby Arakkoa Disguise'"),
+(14,8683,10953,0,0,1,0,41181,0,0,0,0,0,"","Group 0: Show gossip text 10953 if player does have aura 'Shabby Arakkoa Disguise'");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 15 AND `SourceGroup` = 8683;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,8683,0,0,0,1,0,41181,0,0,0,0,0,"","Group 0: Show Gossip Option 0 if player does have aura 'Shabby Arakkoa Disguise'");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_06_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_06_world.sql
new file mode 100644
index 00000000000..778084d031e
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_06_world.sql
@@ -0,0 +1,3 @@
+-- It's just quest credit NPC
+UPDATE `creature_template` SET `AIName` = "" WHERE `entry` = 23393;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 23393 AND `source_type` = 0;
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_07_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_07_world.sql
new file mode 100644
index 00000000000..46a68b97bd7
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_07_world.sql
@@ -0,0 +1,7 @@
+--
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (11798,11800) AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(11798,0,0,1,62,0,100,0,4042,0,0,0,0,11,28001,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Bunthen Plainswind - On Gossip Option 0 Selected - Cast 'Flight Path'"),
+(11798,0,1,0,61,0,100,0,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Bunthen Plainswind - On Link - Close Gossip"),
+(11800,0,0,1,62,0,100,0,4041,0,0,0,0,11,27998,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Silva Fil'naveth - On Gossip Option 0 Selected - Cast 'Flight Path'"),
+(11800,0,1,0,61,0,100,0,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Silva Fil'naveth - On Link - Close Gossip");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_08_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_08_world.sql
new file mode 100644
index 00000000000..0fb06c262ea
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_08_world.sql
@@ -0,0 +1,17 @@
+-- Dark Iron Kidnapper SAI (Source: Movies)
+SET @ID := 15692;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ID,0,0,0,4,0,15,0,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Dark Iron Kidnapper - On Aggro - Say Line 0");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"Ye'll be feasting on me blade this Winter Veil! Yeargh!",12,0,100,0,0,0,11397,0,"Dark Iron Kidnapper"),
+(@ID,0,1,"No scallywag $c is taking our Winter Veil plunder! Get 'em!",12,0,100,0,0,0,11398,0,"Dark Iron Kidnapper"),
+(@ID,0,2,"These land lubbers are here for the reindeer! Give 'em the shank!",12,0,100,0,0,0,11399,0,"Dark Iron Kidnapper"),
+(@ID,0,3,"It's a rescue attempt! Let no one escape!",12,0,100,0,0,0,11400,0,"Dark Iron Kidnapper"),
+(@ID,0,4,"Let me give you my regards for Greatfather Winter, scum...",12,0,100,0,0,0,11401,0,"Dark Iron Kidnapper"),
+(@ID,0,5,"Humbug! Die!",12,0,100,0,0,0,11402,0,"Dark Iron Kidnapper"),
+(@ID,0,6,"It's a rescue attempt! Slay them all!",12,0,100,0,0,0,11403,0,"Dark Iron Kidnapper"),
+(@ID,0,7,"The only thing Metzen is going to be doing this Winter Veil is roasting on a spit!",12,0,100,0,0,0,11404,0,"Dark Iron Kidnapper");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_09_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_09_world.sql
new file mode 100644
index 00000000000..e8b8e9137cc
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_09_world.sql
@@ -0,0 +1,317 @@
+-- Sethekk Ravenguard
+DELETE FROM `creature_formations` WHERE `leaderGUID` IN (83296,83298,83294);
+INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES
+(83296,83296,0,0,3),
+(83296,83299,0,0,3),
+(83298,83298,0,0,3),
+(83298,83280,0,0,3),
+(83294,83294,0,0,3),
+(83294,83259,0,0,3);
+
+-- This guy shouldn't path
+DELETE FROM `creature_addon` WHERE `guid` = 83283;
+DELETE FROM `waypoint_data` WHERE `id` = 832830;
+
+-- Sethekk Spirit, took from CMaNGOS
+UPDATE `creature_template` SET `unit_flags` = 33587264, `speed_walk` = 1.111112, `speed_run` = 0.285714 WHERE `entry` IN (18703,20700);
+
+-- Sniffed
+DELETE FROM `creature_template_addon` WHERE `entry` IN (18319,20697,18320,20698,18327,20691);
+INSERT INTO `creature_template_addon` (`entry`,`auras`) VALUES
+(18319,"37509"), -- Ghostly Facade -- Time-Lost Scryer
+(20697,"37509"), -- Ghostly Facade -- Time-Lost Scryer
+(18320,"37509"), -- Ghostly Facade -- Time-Lost Shadowmage
+(20698,"37509"), -- Ghostly Facade -- Time-Lost Shadowmage
+(18327,"37509"), -- Ghostly Facade -- Time-Lost Controller
+(20691,"37509"); -- Ghostly Facade -- Time-Lost Controller
+
+-- + Sethekk Initiate SAI (Source: ACID 4.3.4 OD - N/H)
+-- Original script was without initial timers for the 'Sunder Armor'
+SET @ID := 18318;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,4,0,15,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Sethekk Initiate - On Aggro - Say Line 0"),
+(@ID,0,1,0,0,0,100,0,5300,7100,10800,18100,11,16145,0,0,0,0,0,2,0,0,0,0,0,0,0,"Sethekk Initiate - In Combat - Cast 'Sunder Armor'"),
+(@ID,0,2,0,0,0,100,0,7400,15700,27300,47100,11,33961,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sethekk Initiate - In Combat - Cast 'Spell Reflection'");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"In Terokk's name!",12,0,100,0,0,0,16716,0,"Sethekk Initiate"),
+(@ID,0,1,"Protect the Veil!",12,0,100,0,0,0,16717,0,"Sethekk Initiate"),
+(@ID,0,2,"Darkfire -- avenge us!",12,0,100,0,0,0,16718,0,"Sethekk Initiate"),
+(@ID,0,3,"Ssssekk-sara Rith-nealaak!",12,0,100,0,0,0,16719,0,"Sethekk Initiate"),
+(@ID,0,4,"Arak-ha!",12,0,100,0,0,0,16720,0,"Sethekk Initiate");
+
+-- + Time-Lost Scryer SAI (Source: ACID 4.3.4 OD - N/H)
+-- TO-DO: While OOC Arcane Destruction should be casted on self and his group members
+-- TO-DO: Should he use Arcane Destruction while IC on allies?
+-- TO-DO: Heal spells must be used both on allies and self
+SET @ID := 18319;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,1,0,100,0,1000,1000,30000,30000,11,32689,32,0,0,0,0,1,0,0,0,0,0,0,0,"Time-Lost Scryer - Out of Combat - Cast 'Arcane Destruction'"),
+(@ID,0,1,0,4,0,15,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Time-Lost Scryer - On Aggro - Say Line 0"),
+(@ID,0,2,0,0,0,100,0,3100,5300,3100,5300,11,32689,32,0,0,0,0,1,0,0,0,0,0,0,0,"Time-Lost Scryer - In Combat - Cast 'Arcane Destruction'"),
+(@ID,0,3,0,0,0,100,2,7800,13300,10400,17700,11,22272,0,0,0,0,0,2,0,0,0,0,0,0,0,"Time-Lost Scryer - In Combat - Cast 'Arcane Missiles' (Normal Dungeon)"),
+(@ID,0,4,0,0,0,100,4,7800,13300,10400,17700,11,33988,0,0,0,0,0,2,0,0,0,0,0,0,0,"Time-Lost Scryer - In Combat - Cast 'Arcane Missiles' (Heroic Dungeon)"),
+(@ID,0,5,0,74,0,100,2,0,75,9600,15700,11,17843,0,0,0,0,0,9,0,0,15,0,0,0,0,"Time-Lost Scryer - On Friendly Between 0-75% Health - Cast 'Flash Heal' (Normal Dungeon)"),
+(@ID,0,6,0,74,0,100,4,0,75,9600,15700,11,17138,0,0,0,0,0,9,0,0,15,0,0,0,0,"Time-Lost Scryer - On Friendly Between 0-75% Health - Cast 'Flash Heal' (Heroic Dungeon)"),
+(@ID,0,7,0,74,0,100,2,0,40,13200,21700,11,12160,1,0,0,0,0,9,0,0,15,0,0,0,0,"Time-Lost Scryer - On Friendly Between 0-40% Health - Cast 'Rejuvenation' (Normal Dungeon)"),
+(@ID,0,8,0,74,0,100,4,0,40,13200,21700,11,15981,1,0,0,0,0,9,0,0,15,0,0,0,0,"Time-Lost Scryer - On Friendly Between 0-40% Health - Cast 'Rejuvenation' (Heroic Dungeon)");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"In Terokk's name!",12,0,100,0,0,0,16716,0,"Time-Lost Scryer"),
+(@ID,0,1,"Protect the Veil!",12,0,100,0,0,0,16717,0,"Time-Lost Scryer"),
+(@ID,0,2,"Darkfire -- avenge us!",12,0,100,0,0,0,16718,0,"Time-Lost Scryer"),
+(@ID,0,3,"Ssssekk-sara Rith-nealaak!",12,0,100,0,0,0,16719,0,"Time-Lost Scryer"),
+(@ID,0,4,"Arak-ha!",12,0,100,0,0,0,16720,0,"Time-Lost Scryer");
+
+-- + Time-Lost Shadowmage SAI (Source: ACID 4.3.4 OD - N/H)
+-- Actually spawns only in normal mode. Currently in both. Heroic version added only because he spawns in both modes, let's keep it just because we can
+-- TO-DO: Curse of the Dark Talon only if target does not have max stack?
+SET @ID := 18320;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,4,0,15,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Time-Lost Shadowmage - On Aggro - Say Line 0"),
+(@ID,0,1,0,0,0,100,2,6600,18600,9300,21800,11,32675,0,0,0,0,0,2,0,0,0,0,0,0,0,"Time-Lost Shadowmage - In Combat - Cast 'Shadow Missiles' (Normal Dungeon)"),
+(@ID,0,2,0,0,0,100,4,6600,18600,9300,21800,11,38148,0,0,0,0,0,2,0,0,0,0,0,0,0,"Time-Lost Shadowmage - In Combat - Cast 'Shadow Missiles' (Heroic Dungeon)"),
+(@ID,0,3,0,0,0,100,2,4800,9600,21700,33800,11,32682,0,0,0,0,0,2,0,0,0,0,0,0,0,"Time-Lost Shadowmage - In Combat - Cast 'Curse of the Dark Talon' (Normal Dungeon)"),
+(@ID,0,4,0,0,0,100,4,4800,9600,21700,33800,11,38149,0,0,0,0,0,2,0,0,0,0,0,0,0,"Time-Lost Shadowmage - In Combat - Cast 'Curse of the Dark Talon' (Heroic Dungeon)");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"In Terokk's name!",12,0,100,0,0,0,16716,0,"Time-Lost Shadowmage"),
+(@ID,0,1,"Protect the Veil!",12,0,100,0,0,0,16717,0,"Time-Lost Shadowmage"),
+(@ID,0,2,"Darkfire -- avenge us!",12,0,100,0,0,0,16718,0,"Time-Lost Shadowmage"),
+(@ID,0,3,"Ssssekk-sara Rith-nealaak!",12,0,100,0,0,0,16719,0,"Time-Lost Shadowmage"),
+(@ID,0,4,"Arak-ha!",12,0,100,0,0,0,16720,0,"Time-Lost Shadowmage");
+
+-- + Sethekk Talon Lord SAI (Source: ACID 4.3.4 OD - N/H)
+-- He should cast 'Avenger's Shield' on aggro, later on timers, added
+-- TO-DO: Talon of Justice should be used on victim too if more than 1 target is available?
+SET @ID := 18321;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,4,0,15,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Sethekk Talon Lord - On Aggro - Say Line 0"),
+(@ID,0,1,0,4,0,100,0,0,0,0,0,11,32674,0,0,0,0,0,7,0,0,0,0,0,0,0,"Sethekk Talon Lord - On Aggro - Cast 'Avenger's Shield'"),
+(@ID,0,2,0,0,0,100,0,2400,7200,16300,24300,11,32674,0,0,0,0,0,5,0,0,0,0,0,0,0,"Sethekk Talon Lord - In Combat - Cast 'Avenger's Shield'"),
+(@ID,0,3,0,0,0,100,0,9300,16700,14300,25400,11,32654,0,0,0,0,0,6,0,0,0,0,0,0,0,"Sethekk Talon Lord - In Combat - Cast 'Talon of Justice'");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"In Terokk's name!",12,0,100,0,0,0,16716,0,"Sethekk Talon Lord"),
+(@ID,0,1,"Protect the Veil!",12,0,100,0,0,0,16717,0,"Sethekk Talon Lord"),
+(@ID,0,2,"Darkfire -- avenge us!",12,0,100,0,0,0,16718,0,"Sethekk Talon Lord"),
+(@ID,0,3,"Ssssekk-sara Rith-nealaak!",12,0,100,0,0,0,16719,0,"Sethekk Talon Lord"),
+(@ID,0,4,"Arak-ha!",12,0,100,0,0,0,16720,0,"Sethekk Talon Lord");
+
+-- + Sethekk Ravenguard SAI (Source: ACID 4.3.4 OD - N/H + videos (https://www.youtube.com/watch?v=jsp6n_ssyjk))
+SET @ID := 18322;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+-- Don't reset it or it will not work after evade. Maybe they should respawn if only one was killed and
+-- in this case it will not work without no reset flag
+(@ID,0,0,0,11,0,100,256,0,0,0,0,64,1,0,0,0,0,0,19,18322,30,0,0,0,0,0,"Sethekk Ravenguard - On Respawn - Store Targetlist (No Reset)"),
+(@ID,0,1,0,4,0,15,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Sethekk Ravenguard - On Aggro - Say Line 0"),
+(@ID,0,2,0,0,0,100,2,7200,20500,10800,21700,11,33964,0,0,0,0,0,2,0,0,0,0,0,0,0,"Sethekk Ravenguard - In Combat - Cast 'Bloodthirst' (Normal Dungeon)"),
+(@ID,0,3,0,0,0,100,4,7200,20500,10800,21700,11,40423,0,0,0,0,0,2,0,0,0,0,0,0,0,"Sethekk Ravenguard - In Combat - Cast 'Bloodthirst' (Heroic Dungeon)"),
+(@ID,0,4,0,0,0,100,0,6100,17400,16800,21700,11,32651,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sethekk Ravenguard - In Combat - Cast 'Howling Screech'"),
+(@ID,0,5,0,38,0,100,0,0,1,0,0,11,34970,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sethekk Ravenguard - On Data Set 0 1 - Cast 'Frenzy'"),
+(@ID,0,6,0,6,0,100,0,0,0,0,0,45,0,1,0,0,0,0,12,1,0,0,0,0,0,0,"Sethekk Ravenguard - On Death - Set Data 0 1");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"In Terokk's name!",12,0,100,0,0,0,16716,0,"Sethekk Ravenguard"),
+(@ID,0,1,"Protect the Veil!",12,0,100,0,0,0,16717,0,"Sethekk Ravenguard"),
+(@ID,0,2,"Darkfire -- avenge us!",12,0,100,0,0,0,16718,0,"Sethekk Ravenguard"),
+(@ID,0,3,"Ssssekk-sara Rith-nealaak!",12,0,100,0,0,0,16719,0,"Sethekk Ravenguard"),
+(@ID,0,4,"Arak-ha!",12,0,100,0,0,0,16720,0,"Sethekk Ravenguard");
+
+-- + Sethekk Guard SAI (Source: ACID 4.3.4 OD - N/H)
+SET @ID := 18323;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,4,0,15,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Sethekk Guard - On Aggro - Say Line 0"),
+(@ID,0,1,0,0,0,100,0,3600,15700,10900,22100,11,33967,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sethekk Guard - In Combat - Cast 'Thunderclap'");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"In Terokk's name!",12,0,100,0,0,0,16716,0,"Sethekk Guard"),
+(@ID,0,1,"Protect the Veil!",12,0,100,0,0,0,16717,0,"Sethekk Guard"),
+(@ID,0,2,"Darkfire -- avenge us!",12,0,100,0,0,0,16718,0,"Sethekk Guard"),
+(@ID,0,3,"Ssssekk-sara Rith-nealaak!",12,0,100,0,0,0,16719,0,"Sethekk Guard"),
+(@ID,0,4,"Arak-ha!",12,0,100,0,0,0,16720,0,"Sethekk Guard");
+
+-- + Sethekk Prophet SAI (Source: ACID 4.3.4 OD - N/H)
+SET @ID := 18325;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,4,0,15,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Sethekk Prophet - On Aggro - Say Line 0"),
+(@ID,0,1,0,0,0,100,0,8700,17700,13200,24100,11,27641,0,0,0,0,0,5,0,0,0,0,0,0,0,"Sethekk Prophet - In Combat - Cast 'Fear'"),
+(@ID,0,2,0,6,0,100,0,0,0,0,0,11,32692,7,0,0,0,0,1,0,0,0,0,0,0,0,"Sethekk Prophet - On Death - Cast 'Summon Arakkoa Spirit'");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"In Terokk's name!",12,0,100,0,0,0,16716,0,"Sethekk Prophet"),
+(@ID,0,1,"Protect the Veil!",12,0,100,0,0,0,16717,0,"Sethekk Prophet"),
+(@ID,0,2,"Darkfire -- avenge us!",12,0,100,0,0,0,16718,0,"Sethekk Prophet"),
+(@ID,0,3,"Ssssekk-sara Rith-nealaak!",12,0,100,0,0,0,16719,0,"Sethekk Prophet"),
+(@ID,0,4,"Arak-ha!",12,0,100,0,0,0,16720,0,"Sethekk Prophet");
+
+-- + Sethekk Shaman SAI (Source: ACID 4.3.4 OD - N/H)
+-- TO-DO: Earth Shock must be used on random player casting, according to wowhead comments
+-- TO-DO: Should resummon Dark Vortex if killed?
+SET @ID := 18326;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,4,0,15,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Sethekk Shaman - On Aggro - Say Line 0"),
+(@ID,0,1,0,0,0,100,2,4300,9100,7200,14500,11,15501,0,0,0,0,0,5,0,0,0,0,0,0,0,"Sethekk Shaman - In Combat - Cast 'Earth Shock' (Normal Dungeon)"),
+(@ID,0,2,0,0,0,100,4,4300,9100,7200,14500,11,22885,0,0,0,0,0,5,0,0,0,0,0,0,0,"Sethekk Shaman - In Combat - Cast 'Earth Shock' (Heroic Dungeon)"),
+(@ID,0,3,0,0,0,100,0,7900,14500,90000,90000,11,32663,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sethekk Shaman - In Combat - Cast 'Summon Dark Vortex'");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"In Terokk's name!",12,0,100,0,0,0,16716,0,"Sethekk Shaman"),
+(@ID,0,1,"Protect the Veil!",12,0,100,0,0,0,16717,0,"Sethekk Shaman"),
+(@ID,0,2,"Darkfire -- avenge us!",12,0,100,0,0,0,16718,0,"Sethekk Shaman"),
+(@ID,0,3,"Ssssekk-sara Rith-nealaak!",12,0,100,0,0,0,16719,0,"Sethekk Shaman"),
+(@ID,0,4,"Arak-ha!",12,0,100,0,0,0,16720,0,"Sethekk Shaman");
+
+-- + Time-Lost Controller SAI (Source: ACID 4.3.4 OD - N/H)
+SET @ID := 18327;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,4,0,15,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Time-Lost Controller - On Aggro - Say Line 0"),
+(@ID,0,1,0,0,0,100,0,9100,24100,27800,48300,11,32764,0,0,0,0,0,1,0,0,0,0,0,0,0,"Time-Lost Controller - In Combat - Cast 'Summon Charming Totem'"),
+(@ID,0,2,0,0,0,100,0,8400,23200,9700,32600,11,35013,0,0,0,0,0,5,0,0,0,0,0,0,0,"Time-Lost Controller - In Combat - Cast 'Shrink'");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"In Terokk's name!",12,0,100,0,0,0,16716,0,"Time-Lost Controller"),
+(@ID,0,1,"Protect the Veil!",12,0,100,0,0,0,16717,0,"Time-Lost Controller"),
+(@ID,0,2,"Darkfire -- avenge us!",12,0,100,0,0,0,16718,0,"Time-Lost Controller"),
+(@ID,0,3,"Ssssekk-sara Rith-nealaak!",12,0,100,0,0,0,16719,0,"Time-Lost Controller"),
+(@ID,0,4,"Arak-ha!",12,0,100,0,0,0,16720,0,"Time-Lost Controller");
+
+-- + Sethekk Oracle SAI (Source: ACID 4.3.4 OD - N/H)
+SET @ID := 18328;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,4,0,15,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Sethekk Oracle - On Aggro - Say Line 0"),
+(@ID,0,1,0,0,0,100,2,6100,12100,18500,27700,11,32690,0,0,0,0,0,2,0,0,0,0,0,0,0,"Sethekk Oracle - In Combat - Cast 'Arcane Lightning' (Normal Dungeon)"),
+(@ID,0,2,0,0,0,100,4,1200,12100,7200,13300,11,38146,0,0,0,0,0,2,0,0,0,0,0,0,0,"Sethekk Oracle - In Combat - Cast 'Arcane Lightning' (Heroic Dungeon)"),
+(@ID,0,3,0,0,0,100,0,2400,8700,8400,19300,11,32129,32,0,0,0,0,2,0,0,0,0,0,0,0,"Sethekk Oracle - In Combat - Cast 'Faerie Fire'");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"In Terokk's name!",12,0,100,0,0,0,16716,0,"Sethekk Oracle"),
+(@ID,0,1,"Protect the Veil!",12,0,100,0,0,0,16717,0,"Sethekk Oracle"),
+(@ID,0,2,"Darkfire -- avenge us!",12,0,100,0,0,0,16718,0,"Sethekk Oracle"),
+(@ID,0,3,"Ssssekk-sara Rith-nealaak!",12,0,100,0,0,0,16719,0,"Sethekk Oracle"),
+(@ID,0,4,"Arak-ha!",12,0,100,0,0,0,16720,0,"Sethekk Oracle");
+
+-- Dark Vortex SAI (Source: ACID 4.3.4 OD - N/H)
+SET @ID := 18701;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,0,0,100,0,3600,7200,8400,19300,11,12471,0,0,0,0,0,2,0,0,0,0,0,0,0,"Dark Vortex - In Combat - Cast 'Shadow Bolt'");
+
+-- + Sethekk Spirit SAI (Source: ACID 4.3.4 OD - N/H + videos)
+SET @ID := 18703;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,1,54,0,100,0,0,0,0,0,38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Sethekk Spirit - On Just Summoned - Set In Combat With Zone"),
+(@ID,0,1,2,61,0,100,0,0,0,0,0,11,17321,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sethekk Spirit - On Link - Cast 'Spirit Spawn-in'"),
+(@ID,0,2,3,61,0,100,0,0,0,0,0,11,24051,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sethekk Spirit - On Link - Cast 'Spirit Burst'"),
+(@ID,0,3,0,61,0,100,0,0,0,0,0,116,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sethekk Spirit - On Link - Set Corpse Delay"),
+(@ID,0,4,0,60,0,100,1,10000,10000,0,0,37,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sethekk Spirit - On Update - Kill Self (No Repeat)");
+
+-- Syth Fire Elemental SAI (Source: ACID 4.3.4 OD - N/H)
+-- TO-DO: Shouldn't cast on max stack?
+SET @ID := 19203;
+UPDATE `creature_template` SET `AIName` = "SmartAI", `ScriptName` = "" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,0,0,100,2,1600,7600,8400,18100,11,33526,0,0,0,0,0,2,0,0,0,0,0,0,0,"Syth Fire Elemental - In Combat - Cast 'Flame Buffet' (Normal Dungeon)"),
+(@ID,0,1,0,0,0,100,4,1200,3600,6000,7200,11,38141,0,0,0,0,0,2,0,0,0,0,0,0,0,"Syth Fire Elemental - In Combat - Cast 'Flame Buffet' (Heroic Dungeon)");
+
+-- Syth Frost Elemental SAI (Source: ACID 4.3.4 OD - N/H)
+-- TO-DO: Shouldn't cast on max stack?
+SET @ID := 19204;
+UPDATE `creature_template` SET `AIName` = "SmartAI", `ScriptName` = "" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,0,0,100,2,1600,7600,8400,18100,11,33528,0,0,0,0,0,2,0,0,0,0,0,0,0,"Syth Frost Elemental - In Combat - Cast 'Frost Buffet' (Normal Dungeon)"),
+(@ID,0,1,0,0,0,100,4,1200,3600,6000,7200,11,38142,0,0,0,0,0,2,0,0,0,0,0,0,0,"Syth Frost Elemental - In Combat - Cast 'Frost Buffet' (Heroic Dungeon)");
+
+-- Syth Arcane Elemental SAI (Source: ACID 4.3.4 OD - N/H)
+-- TO-DO: Shouldn't cast on max stack?
+SET @ID := 19205;
+UPDATE `creature_template` SET `AIName` = "SmartAI", `ScriptName` = "" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,0,0,100,2,1600,7600,8400,18100,11,33527,0,0,0,0,0,2,0,0,0,0,0,0,0,"Syth Arcane Elemental - In Combat - Cast 'Arcane Buffet' (Normal Dungeon)"),
+(@ID,0,1,0,0,0,100,4,1200,3600,6000,7200,11,38138,0,0,0,0,0,2,0,0,0,0,0,0,0,"Syth Arcane Elemental - In Combat - Cast 'Arcane Buffet' (Heroic Dungeon)");
+
+-- Syth Shadow Elemental SAI (Source: ACID 4.3.4 OD - N/H)
+-- TO-DO: Shouldn't cast on max stack?
+SET @ID := 19206;
+UPDATE `creature_template` SET `AIName` = "SmartAI", `ScriptName` = "" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,0,0,100,2,1600,7600,8400,18100,11,33529,0,0,0,0,0,2,0,0,0,0,0,0,0,"Syth Shadow Elemental - In Combat - Cast 'Shadow Buffet' (Normal Dungeon)"),
+(@ID,0,1,0,0,0,100,4,1200,3600,6000,7200,11,38143,0,0,0,0,0,2,0,0,0,0,0,0,0,"Syth Shadow Elemental - In Combat - Cast 'Shadow Buffet' (Heroic Dungeon)");
+
+-- + Cobalt Serpent SAI (Source: ACID 4.3.4 OD - N/H)
+SET @ID := 19428;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,0,0,100,2,4800,14500,13300,22900,11,17503,0,0,0,0,0,2,0,0,0,0,0,0,0,"Cobalt Serpent - In Combat - Cast 'Frostbolt' (Normal Dungeon)"),
+(@ID,0,1,0,0,0,100,4,4800,14500,13300,22900,11,38238,0,0,0,0,0,2,0,0,0,0,0,0,0,"Cobalt Serpent - In Combat - Cast 'Frostbolt' (Heroic Dungeon)"),
+(@ID,0,2,0,0,0,100,2,5600,22100,8400,25400,11,38193,0,0,0,0,0,2,0,0,0,0,0,0,0,"Cobalt Serpent - In Combat - Cast 'Lightning Breath' (Normal Dungeon)"),
+(@ID,0,3,0,0,0,100,4,3600,22100,7200,14400,11,38133,0,0,0,0,0,2,0,0,0,0,0,0,0,"Cobalt Serpent - In Combat - Cast 'Lightning Breath' (Heroic Dungeon)"),
+(@ID,0,4,0,0,0,100,0,6200,21700,12100,22800,11,38110,0,0,0,0,0,1,0,0,0,0,0,0,0,"Cobalt Serpent - In Combat - Cast 'Wing Buffet'");
+
+-- + Avian Darkhawk SAI (Source: ACID 4.3.4 OD - N/H)
+-- TO-DO: Sonic Charge maybe is used on timers
+SET @ID := 19429;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,9,0,100,3,8,25,0,0,11,38059,0,0,0,0,0,2,0,0,0,0,0,0,0,"Avian Darkhawk - Within 8-25 Range - Cast 'Sonic Charge' (Normal Dungeon) (No Repeat)"),
+(@ID,0,1,0,9,0,100,5,8,25,0,0,11,39197,0,0,0,0,0,2,0,0,0,0,0,0,0,"Avian Darkhawk - Within 8-25 Range - Cast 'Sonic Charge' (Heroic Dungeon) (No Repeat)"),
+(@ID,0,2,0,0,0,100,2,4800,13600,10900,24100,11,32901,0,0,0,0,0,2,0,0,0,0,0,0,0,"Avian Darkhawk - In Combat - Cast 'Carnivorous Bite' (Normal Dungeon)"),
+(@ID,0,3,0,0,0,100,4,4800,13600,10900,24100,11,39198,0,0,0,0,0,2,0,0,0,0,0,0,0,"Avian Darkhawk - In Combat - Cast 'Carnivorous Bite' (Heroic Dungeon)");
+
+-- + Avian Ripper SAI (Source: ACID 4.3.4 OD - N/H)
+SET @ID := 21891;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,0,0,100,0,4300,12100,15600,19300,11,38056,32,0,0,0,0,2,0,0,0,0,0,0,0,"Avian Ripper - In Combat - Cast 'Flesh Rip'");
+
+-- + Avian Warhawk SAI (Source: ACID 4.3.4 OD - N/H)
+-- TO-DO: Sonic Charge maybe is used on timers
+SET @ID := 21904;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,9,0,100,3,8,25,0,0,11,38059,0,0,0,0,0,2,0,0,0,0,0,0,0,"Avian Warhawk - Within 8-25 Range - Cast 'Sonic Charge' (Normal Dungeon) (No Repeat)"),
+(@ID,0,1,0,9,0,100,5,8,25,0,0,11,39197,0,0,0,0,0,2,0,0,0,0,0,0,0,"Avian Warhawk - Within 8-25 Range - Cast 'Sonic Charge' (Heroic Dungeon) (No Repeat)"),
+(@ID,0,2,0,0,0,100,2,3800,11100,10900,21700,11,32901,0,0,0,0,0,2,0,0,0,0,0,0,0,"Avian Warhawk - In Combat - Cast 'Carnivorous Bite' (Normal Dungeon)"),
+(@ID,0,3,0,0,0,100,4,3800,11100,10900,21700,11,39198,0,0,0,0,0,2,0,0,0,0,0,0,0,"Avian Warhawk - In Combat - Cast 'Carnivorous Bite' (Heroic Dungeon)"),
+(@ID,0,4,0,0,0,100,0,6200,25500,12100,24100,11,18144,0,0,0,0,0,2,0,0,0,0,0,0,0,"Avian Warhawk - In Combat - Cast 'Swoop'");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_10_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_10_world.sql
new file mode 100644
index 00000000000..39f53ca6a2e
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_17_10_world.sql
@@ -0,0 +1,29 @@
+-- Shadowmoon Zealot SAI (Source: https://www.youtube.com/watch?v=jPRsTn38v_U)
+SET @ID := 21788;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,6,0,25,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Shadowmoon Zealot - On Death - Say Line 0");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"We will never dissipate, mortal... Our fate is tied to Gorefiend...",15,0,100,0,0,0,19444,0,"Shadowmoon Zealot"),
+(@ID,0,1,"Pray that the chilling embrace of Teron Gorefiend does not reach out for you...",15,0,100,0,0,0,19445,0,"Shadowmoon Zealot"),
+(@ID,0,2,"It is you who have invaded our home. Gorefiend will avenge us!",15,0,100,0,0,0,19446,0,"Shadowmoon Zealot"),
+(@ID,0,3,"Gorefiend will have your head, interloper!",15,0,100,0,0,0,19447,0,"Shadowmoon Zealot"),
+(@ID,0,4,"We are bound here... eternally. It is the will of Gorefiend.",15,0,100,0,0,0,19448,0,"Shadowmoon Zealot");
+
+-- Shadowmoon Harbinger SAI (Source: https://www.youtube.com/watch?v=jPRsTn38v_U)
+SET @ID := 21795;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,6,0,25,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Shadowmoon Harbinger - On Death - Say Line 0");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"We will never dissipate, mortal... Our fate is tied to Gorefiend...",15,0,100,0,0,0,19444,0,"Shadowmoon Harbinger"),
+(@ID,0,1,"Pray that the chilling embrace of Teron Gorefiend does not reach out for you...",15,0,100,0,0,0,19445,0,"Shadowmoon Harbinger"),
+(@ID,0,2,"It is you who have invaded our home. Gorefiend will avenge us!",15,0,100,0,0,0,19446,0,"Shadowmoon Harbinger"),
+(@ID,0,3,"Gorefiend will have your head, interloper!",15,0,100,0,0,0,19447,0,"Shadowmoon Harbinger"),
+(@ID,0,4,"We are bound here... eternally. It is the will of Gorefiend.",15,0,100,0,0,0,19448,0,"Shadowmoon Harbinger");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_00_world.sql
new file mode 100644
index 00000000000..948bb614dab
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_00_world.sql
@@ -0,0 +1,8 @@
+--
+DELETE FROM `creature_addon` WHERE `guid` IN (43202,43203);
+DELETE FROM `waypoint_data` WHERE `id` IN (432020,432030);
+DELETE FROM `creature_formations` WHERE `memberGUID` IN (43201,43202,43203);
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`) VALUES
+(43201, 43201, 0, 0, 515),
+(43201, 43202, 5, 45, 515),
+(43201, 43203, 5, 315, 515);
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_01_world.sql
new file mode 100644
index 00000000000..862ce73b0e4
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_01_world.sql
@@ -0,0 +1,32 @@
+-- Qiraji Gladiator SAI (Source: Vengeance part copied from Sethekk Ravenguard(https://www.youtube.com/watch?v=fST7H_oGKoI))
+SET @ID := 15324;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+-- Don't reset it or it will not work after evade. Maybe they should respawn if only one was killed and
+-- in this case it will not work without no reset flag
+(@ID,0,0,0,11,0,100,256,0,0,0,0,64,1,0,0,0,0,0,19,15324,30,0,0,0,0,0,"Qiraji Gladiator - On Respawn - Store Targetlist (No Reset)"),
+(@ID,0,1,0,0,0,100,0,9600,22900,16900,33700,11,5568,0,0,0,0,0,1,0,0,0,0,0,0,0,"Qiraji Gladiator - In Combat - Cast 'Trample'"),
+(@ID,0,2,0,0,0,100,0,11700,25800,18400,30300,11,10966,0,0,0,0,0,2,0,0,0,0,0,0,0,"Qiraji Gladiator - In Combat - Cast 'Uppercut'"),
+(@ID,0,3,4,38,0,100,0,0,1,0,0,11,25164,0,0,0,0,0,1,0,0,0,0,0,0,0,"Qiraji Gladiator - On Data Set 0 1 - Cast 'Vengeance'"),
+(@ID,0,4,0,61,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Qiraji Gladiator - On Link - Say Line 0"),
+(@ID,0,5,0,6,0,100,0,0,0,0,0,45,0,1,0,0,0,0,12,1,0,0,0,0,0,0,"Qiraji Gladiator - On Death - Set Data 0 1");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"%s goes into a frenzy!",16,0,100,0,0,0,1191,0,"Qiraji Gladiator");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 22 AND `SourceEntry` = 15324 AND `SourceId` = 0;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(22,4,15324,0,0,36,1,0,0,0,0,0,0,"","Group 0: Execute SAI (Action 3) if creature is alive");
+
+DELETE FROM `creature_formations` WHERE `leaderGUID` IN (144482,144484,144486,144488);
+INSERT INTO `creature_formations` (`leaderGUID`,`memberGUID`,`dist`,`angle`,`groupAI`) VALUES
+(144482,144482,0,0,3),
+(144482,144483,0,0,3),
+(144484,144484,0,0,3),
+(144484,144485,0,0,3),
+(144486,144486,0,0,3),
+(144486,144487,0,0,3),
+(144488,144488,0,0,3),
+(144488,144489,0,0,3);
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_02_world.sql
new file mode 100644
index 00000000000..68d87e1820d
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_02_world.sql
@@ -0,0 +1,20 @@
+-- Spawn of Bael'Gar https://www.wowhead.com/npc=9436/spawn-of-baelgar#comments
+UPDATE `creature_template` SET `dmgschool` = 2 WHERE `entry` = 9436;
+
+-- Bael'Gar SAI (Source: 60NofGfarBE & d9lG5gYSA9c & 54vt4almLOg)
+SET @ID := 9016;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,4,2,0,100,1,0,80,0,0,11,13895,0,0,0,0,0,2,0,0,0,0,0,0,0,"Bael'Gar - Between 0-80% Health - Cast 'Summon Spawn of Bael'Gar' (No Repeat)"),
+(@ID,0,1,4,2,0,100,1,0,60,0,0,11,13895,0,0,0,0,0,2,0,0,0,0,0,0,0,"Bael'Gar - Between 0-60% Health - Cast 'Summon Spawn of Bael'Gar' (No Repeat)"),
+(@ID,0,2,4,2,0,100,1,0,40,0,0,11,13895,0,0,0,0,0,2,0,0,0,0,0,0,0,"Bael'Gar - Between 0-40% Health - Cast 'Summon Spawn of Bael'Gar' (No Repeat)"),
+(@ID,0,3,4,2,0,100,1,0,20,0,0,11,13895,0,0,0,0,0,2,0,0,0,0,0,0,0,"Bael'Gar - Between 0-20% Health - Cast 'Summon Spawn of Bael'Gar' (No Repeat)"),
+(@ID,0,4,0,61,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Bael'Gar - On Link - Say Line 0");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"%s begins to summon a lava spawn!",16,0,100,0,0,0,5283,0,"Bael'Gar");
+
+UPDATE `creature_template_addon` SET `auras` = "13879" WHERE `entry` = 9016; -- Magma Splash
+DELETE FROM `creature_addon` WHERE `guid` = 45885;
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_03_world_335.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_03_world_335.sql
new file mode 100644
index 00000000000..4bf63c5b23e
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_03_world_335.sql
@@ -0,0 +1,44 @@
+--
+UPDATE `creature_template` SET `minlevel`=5, `maxlevel`=5, `RangeAttackTime`=2000, `unit_flags`=33554432 WHERE `entry`=15087; -- Forsaken Stablehand
+UPDATE `creature_template` SET `maxlevel`=2, `RangeAttackTime`=2000, `unit_flags`=33554432 WHERE `entry`=15108; -- Forsaken Horse
+UPDATE `creature_template` SET `RangeAttackTime`=2000 WHERE `entry`=5677; -- Summoned Succubus
+UPDATE `creature_template` SET `minlevel`=5, `maxlevel`=5, `RangeAttackTime`=2000, `unit_flags`=33554432 WHERE `entry`=15074; -- Arathi Miner
+UPDATE `creature_template` SET `minlevel`=5, `maxlevel`=5, `RangeAttackTime`=2000, `unit_flags`=33554432 WHERE `entry`=15045; -- Arathi Farmer
+UPDATE `creature_template` SET `RangeAttackTime`=2000 WHERE `entry`=5676; -- Summoned Voidwalker
+UPDATE `creature_template` SET `RangeAttackTime`=2000, `unit_flags`=768 WHERE `entry`=19412; -- D'ore
+UPDATE `creature_template` SET `RangeAttackTime`=2000, `unit_flags`=32832 WHERE `entry`=18373; -- Exarch Maladaar
+UPDATE `creature_template` SET `RangeAttackTime`=2000, `unit_flags`=32832 WHERE `entry`=18702; -- Auchenai Necromancer
+UPDATE `creature_template` SET `RangeAttackTime`=2000 WHERE `entry`=18700; -- Reanimated Bones
+UPDATE `creature_template` SET `RangeAttackTime`=2000, `unit_flags`=32832 WHERE `entry`=18524; -- Angered Skeleton
+UPDATE `creature_template` SET `RangeAttackTime`=2000, `unit_flags`=32768 WHERE `entry`=18557; -- Phasing Cleric
+UPDATE `creature_template` SET `RangeAttackTime`=2000, `unit_flags`=32832 WHERE `entry`=18521; -- Raging Skeleton
+UPDATE `creature_template` SET `RangeAttackTime`=2000 WHERE `entry`=18506; -- Raging Soul
+UPDATE `creature_template` SET `RangeAttackTime`=2000, `unit_flags`=32768 WHERE `entry`=18559; -- Phasing Stalker
+UPDATE `creature_template` SET `RangeAttackTime`=2000, `unit_flags`=32768 WHERE `entry`=18556; -- Phasing Soldier
+UPDATE `creature_template` SET `RangeAttackTime`=2000, `unit_flags`=32832 WHERE `entry`=18493; -- Auchenai Soulpriest
+UPDATE `creature_template` SET `RangeAttackTime`=2000, `unit_flags`=32768 WHERE `entry`=18558; -- Phasing Sorcerer
+UPDATE `creature_template` SET `RangeAttackTime`=2000, `unit_flags`=64 WHERE `entry`=18371; -- Shirrak the Dead Watcher
+UPDATE `creature_template` SET `RangeAttackTime`=2000, `unit_flags`=32832 WHERE `entry`=18497; -- Auchenai Monk
+UPDATE `creature_template` SET `RangeAttackTime`=2000, `unit_flags`=33555200 WHERE `entry`=18726; -- Flying Raging Soul
+UPDATE `creature_template` SET `RangeAttackTime`=2000, `unit_flags`=33554688 WHERE `entry`=18778; -- Cosmetic Raging Soul
+UPDATE `creature_template` SET `RangeAttackTime`=2000, `unit_flags`=32832 WHERE `entry`=18495; -- Auchenai Vindicator
+UPDATE `creature_template` SET `RangeAttackTime`=2000, `unit_flags`=64 WHERE `entry`=18473; -- Talon King Ikiss
+UPDATE `creature_template` SET `RangeAttackTime`=2000, `unit_flags`=64 WHERE `entry`=21904; -- Avian Warhawk
+UPDATE `creature_template` SET `RangeAttackTime`=2000, `unit_flags`=64 WHERE `entry`=18321; -- Sethekk Talon Lord
+UPDATE `creature_template` SET `RangeAttackTime`=2000, `unit_flags`=64 WHERE `entry`=18326; -- Sethekk Shaman
+UPDATE `creature_template` SET `unit_flags`=64 WHERE `entry`=19428; -- Cobalt Serpent
+UPDATE `creature_template` SET `RangeAttackTime`=2000 WHERE `entry`=21891; -- Avian Ripper
+UPDATE `creature_template` SET `RangeAttackTime`=2000, `unit_flags`=64 WHERE `entry`=18322; -- Sethekk Ravenguard
+UPDATE `creature_template` SET `RangeAttackTime`=2000, `unit_flags`=64 WHERE `entry`=18320; -- Time-Lost Shadowmage
+UPDATE `creature_template` SET `RangeAttackTime`=2000 WHERE `entry`=19416; -- Ancient Draenei Spirit
+UPDATE `creature_template` SET `RangeAttackTime`=2000, `unit_flags`=33536 WHERE `entry`=19698; -- Greatfather Aldrimus
+UPDATE `creature_template` SET `RangeAttackTime`=2000, `unit_flags`=33536 WHERE `entry`=19879; -- Horvon the Armorer
+UPDATE `creature_template` SET `minlevel`=5, `maxlevel`=5, `RangeAttackTime`=2000, `unit_flags`=33554432 WHERE `entry`=15089; -- Forsaken Lumberjack
+UPDATE `creature_template` SET `RangeAttackTime`=2000, `unit_flags`=768 WHERE `entry`=15071; -- Underfoot
+UPDATE `creature_template` SET `RangeAttackTime`=2000, `unit_flags`=768 WHERE `entry`=15072; -- Spike
+UPDATE `creature_template` SET `minlevel`=5, `maxlevel`=5, `RangeAttackTime`=2000, `unit_flags`=33554432 WHERE `entry`=15064; -- Forsaken Blacksmith
+UPDATE `creature_template` SET `minlevel`=5, `maxlevel`=5, `RangeAttackTime`=2000, `unit_flags`=33554432 WHERE `entry`=15046; -- Forsaken Farmer
+UPDATE `creature_template` SET `minlevel`=5, `maxlevel`=5, `RangeAttackTime`=2000, `unit_flags`=33554432 WHERE `entry`=15062; -- Arathi Lumberjack
+UPDATE `creature_template` SET `minlevel`=5, `maxlevel`=5, `RangeAttackTime`=2000, `unit_flags`=33554432 WHERE `entry`=15075; -- Forsaken Miner
+UPDATE `creature_template` SET `minlevel`=5, `maxlevel`=5, `RangeAttackTime`=2000, `unit_flags`=33554432 WHERE `entry`=15086; -- Arathi Stablehand
+UPDATE `creature_template` SET `minlevel`=5, `maxlevel`=5, `RangeAttackTime`=2000, `unit_flags`=33554432 WHERE `entry`=15107; -- Arathi Horse
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_04_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_04_world.sql
new file mode 100644
index 00000000000..7b561326915
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_04_world.sql
@@ -0,0 +1,27 @@
+--
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 15 AND `SourceGroup` = 7868 AND `ConditionTypeOrReference` = 9;
+
+UPDATE `smart_scripts` SET `link` = 2, `event_flags` = 0 WHERE `entryorguid` = 18956 AND `source_type` = 0 AND `id` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 18956 AND `source_type` = 0 AND `id` IN (1,2);
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 1895600 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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(18956,0,1,0,40,0,100,0,9,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lakka - On Waypoint 9 Reached - Despawn (0)"),
+(18956,0,2,0,61,0,100,0,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Lakka - On Link - Close Gossip"),
+
+(1895600,9,0,0,0,0,100,0,0,0,0,0,0,83,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lakka - On Script - Remove NPC Flag Gossip"),
+(1895600,9,1,0,0,0,100,0,1000,1000,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Lakka - On Script - Say Line 0"),
+(1895600,9,2,0,0,0,100,0,0,0,0,0,0,33,18956,0,0,0,0,0,16,0,0,0,0,0,0,0,0,"Lakka - On Script - Quest Credit 'Brother Against Brother'"),
+(1895600,9,3,0,0,0,100,0,2000,2000,0,0,0,9,0,0,0,0,0,0,14,67620,183051,0,0,0,0,0,0,"Lakka - On Script - Activate Gameobject 'Sethekk Cage'"),
+(1895600,9,4,0,0,0,100,0,1000,1000,0,0,0,53,0,18956,0,0,0,2,1,0,0,0,0,0,0,0,0,"Lakka - On Script - Start Waypoint");
+
+DELETE FROM `waypoints` WHERE `entry` = 18956;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(18956,1,-156.81125,159.90024,0.55241066,"Lakka"),
+(18956,2,-152.81125,162.15024,0.55241066,"Lakka"),
+(18956,3,-148.56125,163.65024,0.55241066,"Lakka"),
+(18956,4,-141.81125,164.90024,0.55241066,"Lakka"),
+(18956,5,-136.06125,167.40024,0.55241066,"Lakka"),
+(18956,6,-129.81125,171.40024,0.55241066,"Lakka"),
+(18956,7,-118.06125,173.90024,0.55241066,"Lakka"),
+(18956,8,-99.06125,173.40024,0.30241066,"Lakka"),
+(18956,9,-79.80912,172.75728,0.010726,"Lakka");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_05_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_05_world.sql
new file mode 100644
index 00000000000..0732a1b014b
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_18_05_world.sql
@@ -0,0 +1,12 @@
+-- https://www.wowhead.com/npc=17769/blood-knight-adept#comments:id=932320
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 4339 AND `source_type` = 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`,`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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(4339,2,0,0,46,0,100,0,4339,0,0,0,0,5,66,0,0,0,0,0,9,17769,0,20,0,0,0,0,0,"Areatrigger (Silvermoon City) - On Trigger - Play Emote 66 (Blood Knight Adept)");
+
+DELETE FROM `areatrigger_scripts` WHERE `entry` = 4339;
+INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES
+(4339,"SmartTrigger");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 22 AND `SourceEntry` = 4339 AND `SourceId` = 2;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(22,1,4339,2,0,15,0,2,0,0,0,0,0,"","Group 0: Execute SAI (Action 0) if player is a Paladin");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_19_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_19_00_world.sql
new file mode 100644
index 00000000000..6ddde608b37
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_19_00_world.sql
@@ -0,0 +1,21 @@
+--
+DELETE FROM `areatrigger_scripts` WHERE `entry` = 4762;
+INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES
+(4762,"SmartTrigger");
+
+DELETE FROM `creature` WHERE `id` = 24137;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` IN (24137,23746);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (24137,-126049) AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 4762 AND `source_type` = 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`,`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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(4762,2,0,0,46,0,100,0,4762,0,0,0,0,45,1,1,0,0,0,0,19,23746,0,0,0,0,0,0,0,"Areatrigger (Utgarde Keep) - On Trigger - Set data"),
+(-126049,0,0,0,38,0,100,1,1,1,0,0,0,12,24137,8,0,0,0,0,8,0,0,0,0,207.48018,-68.84115,23.854694,3.333578,"Zul'Aman Exterior InvisMan - On data set - Summon creature"),
+(24137,0,0,1,11,0,100,0,0,0,0,0,0,83,3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Dark Ranger Marrah - On Respawn - Remove NPC Flag Questgiver and gossip"),
+(24137,0,1,0,61,0,100,1,0,1,0,0,0,69,1,0,0,0,0,0,8,0,0,0,0,183.85152,-76.50118,15.842874,3.45508,"Dark Ranger Marrah - On Data Set 0 1 - Move To Position (No Repeat)"),
+(24137,0,2,3,34,0,100,0,8,1,0,0,0,91,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Dark Ranger Marrah - On Reached Point 1 - Remove Flag Standstate Sit Down"),
+(24137,0,3,4,61,0,100,0,0,0,0,0,0,82,3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Dark Ranger Marrah - On Link - Add NPC Flag Questgiver and gossip"),
+(24137,0,4,0,61,0,100,0,0,0,0,0,0,28,34189,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Dark Ranger Marrah - On Link - Remove Aura 'Stealth'");
+DELETE FROM conditions WHERE SourceTypeOrReferenceId=22 AND SourceId=2 AND SourceEntry IN (4762);
+INSERT INTO `conditions` (SourceTypeOrReferenceId, SourceGroup, SourceEntry, SourceId, ElseGroup, ConditionTypeOrReference, ConditionTarget, ConditionValue1, ConditionValue2, ConditionValue3, NegativeCondition, ErrorType, ErrorTextId, ScriptName, COMMENT) VALUES
+(22, 1, 4762, 2, 0, 6, 0, 67, 0, 0, 0, 0, 0, "", "Area trigger 4762 sai Summon Marrah only for the horde");
+
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_00_world.sql
new file mode 100644
index 00000000000..315d28b3f4e
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_00_world.sql
@@ -0,0 +1,250 @@
+-- Remove wrong unconfirmed by sniffs Soul Mirror spawns
+DELETE FROM `gameobject` WHERE `guid` IN (50349,50350,50351,50352,50353) AND `id` = 183441;
+DELETE FROM `gameobject_addon` WHERE `guid` IN (50349,50350,50351,50352,50353);
+
+DELETE FROM `creature_template_addon` WHERE `entry` IN (18498,20321,18521,20315,18524,20298,18556,20311,18700,20317);
+INSERT INTO `creature_template_addon` (`entry`,`auras`) VALUES
+(18498,"32828"), -- Protection Aura -- Unliving Soldier
+(20321,"32828"), -- Protection Aura -- Unliving Soldier
+(18521,"10095"), -- Hate to Zero -- Angered Skeleton
+(20315,"10095"), -- Hate to Zero -- Angered Skeleton
+(18524,"32885"), -- Infuriate -- Angered Skeleton
+(20298,"32885"), -- Infuriate -- Angered Skeleton
+(18556,"32828"), -- Protection Aura -- Phasing Soldier
+(20311,"32828"), -- Protection Aura -- Phasing Soldier
+(18700,"19818"), -- Double Attack -- Reanimated Bones
+(20317,"19818"); -- Double Attack -- Reanimated Bones
+
+-- Avatar of the Martyred SAI (Source: ACID 4.3.4 Official Data - Normal/Heroic)
+-- Original script was without initial timers for the 'Sunder Armor'
+SET @ID := 18478;
+UPDATE `creature_template` SET `AIName` = "SmartAI", `ScriptName` = "" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,0,0,100,0,6500,11500,6200,15700,11,16145,0,0,0,0,0,2,0,0,0,0,0,0,0,"Avatar of the Martyred - In Combat - Cast 'Sunder Armor'"),
+(@ID,0,1,0,0,0,100,0,12100,16800,10900,24100,11,16856,0,0,0,0,0,2,0,0,0,0,0,0,0,"Avatar of the Martyred - In Combat - Cast 'Mortal Strike'");
+
+-- Auchenai Soulpriest SAI (Source: ACID 4.3.4 Official Data - Normal/Heroic)
+SET @ID := 18493;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,4,0,15,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Auchenai Soulpriest - On Aggro - Say Line 0"),
+(@ID,0,1,0,0,0,100,2,0,0,3600,4800,11,32860,64,0,0,0,0,2,0,0,0,0,0,0,0,"Auchenai Soulpriest - In Combat CMC - Cast 'Shadow Bolt' (Normal Dungeon)"),
+(@ID,0,2,0,0,0,100,4,0,0,3600,4800,11,38378,64,0,0,0,0,2,0,0,0,0,0,0,0,"Auchenai Soulpriest - In Combat CMC - Cast 'Shadow Bolt' (Heroic Dungeon)"),
+(@ID,0,3,0,0,0,100,2,10800,19300,18300,33700,11,32858,1,0,0,0,0,5,0,0,0,0,0,0,0,"Auchenai Soulpriest - In Combat - Cast 'Touch of the Forgotten' (Normal Dungeon)"),
+(@ID,0,4,0,0,0,100,4,10800,13300,16900,27700,11,38377,1,0,0,0,0,5,0,0,0,0,0,0,0,"Auchenai Soulpriest - In Combat - Cast 'Touch of the Forgotten' (Heroic Dungeon)"),
+(@ID,0,5,0,2,0,100,0,0,50,19200,37400,11,32859,33,0,0,0,0,1,0,0,0,0,0,0,0,"Auchenai Soulpriest - Between 0-50% Health - Cast 'Falter'"),
+(@ID,0,6,0,0,0,100,1,2000,5000,0,0,88,@ID*100+0,@ID*100+4,0,0,0,0,1,0,0,0,0,0,0,0,"Auchenai Soulpriest - In Combat - Run Random Script (No Repeat)");
+
+-- Actionlist SAI
+DELETE FROM `smart_scripts` WHERE `entryorguid` BETWEEN @ID*100+0 AND @ID*100+4 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
+(@ID*100+0,9,0,0,0,0,100,0,0,0,0,0,11,32853,0,0,0,0,0,1,0,0,0,0,0,0,0,"Auchenai Soulpriest - On Script - Cast 'Summon Unliving Soldier'"),
+(@ID*100+1,9,0,0,0,0,100,0,0,0,0,0,11,32854,0,0,0,0,0,1,0,0,0,0,0,0,0,"Auchenai Soulpriest - On Script - Cast 'Summon Unliving Sorcerer'"),
+(@ID*100+2,9,0,0,0,0,100,0,0,0,0,0,11,32855,0,0,0,0,0,1,0,0,0,0,0,0,0,"Auchenai Soulpriest - On Script - Cast 'Summon Unliving Cleric'"),
+(@ID*100+3,9,0,0,0,0,100,0,0,0,0,0,11,32856,0,0,0,0,0,1,0,0,0,0,0,0,0,"Auchenai Soulpriest - On Script - Cast 'Summon Unliving Stalker'"),
+(@ID*100+4,9,0,0,0,0,100,0,0,0,0,0,11,32857,0,0,0,0,0,1,0,0,0,0,0,0,0,"Auchenai Soulpriest - On Script - Cast 'Summon Phantasmal Possessor'");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"You will rest with the honored dead.",12,0,100,0,0,0,16788,0,"Auchenai Soulpriest"),
+(@ID,0,1,"You have chosen death.",12,0,100,0,0,0,16791,0,"Auchenai Soulpriest"),
+(@ID,0,2,"You will pay for this violation.",12,0,100,0,0,0,16793,0,"Auchenai Soulpriest"),
+(@ID,0,3,"Shhh! The spirits are sleeping!",12,0,100,0,0,0,16797,0,"Auchenai Soulpriest");
+
+-- Auchenai Vindicator SAI (Source: ACID 4.3.4 Official Data - Normal/Heroic)
+SET @ID := 18495;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,1,0,100,2,1000,1000,30000,30000,11,32861,32,0,0,0,0,1,0,0,0,0,0,0,0,"Auchenai Vindicator - Out of Combat - Cast 'Shadowguard' (Normal Dungeon)"),
+(@ID,0,1,0,1,0,100,4,1000,1000,30000,30000,11,38379,32,0,0,0,0,1,0,0,0,0,0,0,0,"Auchenai Vindicator - Out of Combat - Cast 'Shadowguard' (Heroic Dungeon)"),
+(@ID,0,2,0,4,0,15,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Auchenai Vindicator - On Aggro - Say Line 0"),
+(@ID,0,3,0,0,0,100,2,3100,5300,3100,5300,11,32861,32,0,0,0,0,1,0,0,0,0,0,0,0,"Auchenai Vindicator - In Combat - Cast 'Shadowguard' (Normal Dungeon)"),
+(@ID,0,4,0,0,0,100,4,3100,5300,3100,5300,11,38379,32,0,0,0,0,1,0,0,0,0,0,0,0,"Auchenai Vindicator - In Combat - Cast 'Shadowguard' (Heroic Dungeon)"),
+(@ID,0,5,0,0,0,100,2,7200,13300,18100,25300,11,17439,0,0,0,0,0,2,0,0,0,0,0,0,0,"Auchenai Vindicator - In Combat - Cast 'Shadow Shock' (Normal Dungeon)"),
+(@ID,0,6,0,0,0,100,4,7200,10900,15700,24100,11,17289,0,0,0,0,0,2,0,0,0,0,0,0,0,"Auchenai Vindicator - In Combat - Cast 'Shadow Shock' (Heroic Dungeon)"),
+(@ID,0,7,0,0,0,100,1,2000,5000,0,0,88,1849300,1849304,0,0,0,0,1,0,0,0,0,0,0,0,"Auchenai Vindicator - In Combat - Run Random Script (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"You will rest with the honored dead.",12,0,100,0,0,0,16788,0,"Auchenai Vindicator"),
+(@ID,0,1,"You have chosen death.",12,0,100,0,0,0,16791,0,"Auchenai Vindicator"),
+(@ID,0,2,"You will pay for this violation.",12,0,100,0,0,0,16793,0,"Auchenai Vindicator"),
+(@ID,0,3,"Shhh! The spirits are sleeping!",12,0,100,0,0,0,16797,0,"Auchenai Vindicator");
+
+-- Auchenai Monk SAI (Source: ACID 4.3.4 Official Data - Normal/Heroic)
+SET @ID := 18497;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,1,0,100,0,1000,3000,30000,30000,11,38168,32,0,0,0,0,1,0,0,0,0,0,0,0,"Auchenai Monk - Out of Combat - Cast 'Spiritual Sight'"),
+(@ID,0,1,0,4,0,15,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Auchenai Monk - On Aggro - Say Line 0"),
+(@ID,0,2,0,0,0,100,0,3100,5300,3100,5300,11,38168,32,0,0,0,0,1,0,0,0,0,0,0,0,"Auchenai Monk - In Combat - Cast 'Spiritual Sight'"),
+(@ID,0,3,0,0,0,100,0,11500,14000,16900,30100,11,32849,0,0,0,0,0,1,0,0,0,0,0,0,0,"Auchenai Monk - In Combat - Cast 'Cyclone Strike'"),
+(@ID,0,4,0,0,0,100,0,18100,40400,20500,33700,11,37321,0,0,0,0,0,2,0,0,0,0,0,0,0,"Auchenai Monk - In Combat - Cast 'Overpower'"),
+(@ID,0,5,0,13,0,100,0,8400,19300,0,0,11,32846,1,0,0,0,0,2,0,0,0,0,0,0,0,"Auchenai Monk - Target Casting - Cast 'Counter Kick'"),
+(@ID,0,6,0,0,0,100,1,2000,5000,0,0,88,1849300,1849304,0,0,0,0,1,0,0,0,0,0,0,0,"Auchenai Monk - In Combat - Run Random Script (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"You will rest with the honored dead.",12,0,100,0,0,0,16788,0,"Auchenai Monk"),
+(@ID,0,1,"You have chosen death.",12,0,100,0,0,0,16791,0,"Auchenai Monk"),
+(@ID,0,2,"You will pay for this violation.",12,0,100,0,0,0,16793,0,"Auchenai Monk"),
+(@ID,0,3,"Shhh! The spirits are sleeping!",12,0,100,0,0,0,16797,0,"Auchenai Monk");
+
+-- Unliving Soldier SAI (Source: ACID 4.3.4 Official Data - Normal/Heroic)
+SET @ID := 18498;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,1,54,0,100,0,0,0,0,0,11,33422,0,0,0,0,0,1,0,0,0,0,0,0,0,"Unliving Soldier - On Just Summoned - Cast 'Phase In'"),
+(@ID,0,1,0,61,0,100,0,0,0,0,0,38,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Unliving Soldier - On Link - Set In Combat With Zone"),
+(@ID,0,2,0,0,0,100,0,4800,10900,7200,14500,11,11972,32,0,0,0,0,2,0,0,0,0,0,0,0,"Unliving Soldier - In Combat - Cast 'Shield Bash'"),
+(@ID,0,3,0,7,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Unliving Soldier - On Evade - Despawn (0)");
+
+-- Unliving Sorcerer SAI (Source: ACID 4.3.4 Official Data - Normal/Heroic)
+SET @ID := 18499;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,1,54,0,100,0,0,0,0,0,11,33422,0,0,0,0,0,1,0,0,0,0,0,0,0,"Unliving Sorcerer - On Just Summoned - Cast 'Phase In'"),
+(@ID,0,1,0,61,0,100,0,0,0,0,0,38,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Unliving Sorcerer - On Link - Set In Combat With Zone"),
+(@ID,0,2,0,0,0,100,2,0,0,2400,3800,11,12466,64,0,0,0,0,2,0,0,0,0,0,0,0,"Unliving Sorcerer - In Combat CMC - Cast 'Fireball' (Normal Dungeon)"),
+(@ID,0,3,0,0,0,100,4,0,0,2400,3800,11,17290,64,0,0,0,0,2,0,0,0,0,0,0,0,"Unliving Sorcerer - In Combat CMC - Cast 'Fireball' (Heroic Dungeon)"),
+(@ID,0,4,0,0,0,100,2,3600,7800,7800,14500,11,15043,1,0,0,0,0,2,0,0,0,0,0,0,0,"Unliving Sorcerer - In Combat - Cast 'Frostbolt' (Normal Dungeon)"),
+(@ID,0,5,0,0,0,100,4,6000,8000,7800,14500,11,15530,1,0,0,0,0,2,0,0,0,0,0,0,0,"Unliving Sorcerer - In Combat - Cast 'Frostbolt' (Heroic Dungeon)"),
+(@ID,0,6,0,0,0,100,2,10900,16900,9700,15700,11,15744,1,0,0,0,0,1,0,0,0,0,0,0,0,"Unliving Sorcerer - In Combat - Cast 'Blast Wave' (Normal Dungeon)"),
+(@ID,0,7,0,0,0,100,4,10900,16900,7200,10900,11,22424,1,0,0,0,0,1,0,0,0,0,0,0,0,"Unliving Sorcerer - In Combat - Cast 'Blast Wave' (Heroic Dungeon)"),
+(@ID,0,8,0,7,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Unliving Sorcerer - On Evade - Despawn (0)");
+
+-- Unliving Cleric SAI (Source: ACID 4.3.4 Official Data - Normal/Heroic)
+SET @ID := 18500;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,1,54,0,100,0,0,0,0,0,11,33422,0,0,0,0,0,1,0,0,0,0,0,0,0,"Unliving Cleric - On Just Summoned - Cast 'Phase In'"),
+(@ID,0,1,0,61,0,100,0,0,0,0,0,38,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Unliving Cleric - On Link - Set In Combat With Zone"),
+(@ID,0,2,0,74,0,100,2,0,85,9700,16800,11,25058,0,0,0,0,0,9,0,0,20,0,0,0,0,"Unliving Cleric - On Friendly Between 0-85% Health - Cast 'Renew' (Normal Dungeon)"),
+(@ID,0,3,0,74,0,100,4,0,85,9700,16800,11,38210,0,0,0,0,0,9,0,0,20,0,0,0,0,"Unliving Cleric - On Friendly Between 0-85% Health - Cast 'Renew' (Heroic Dungeon)"),
+(@ID,0,4,0,74,0,100,2,0,70,12100,16900,11,33324,1,0,0,0,0,9,0,0,20,0,0,0,0,"Unliving Cleric - On Friendly Between 0-70% Health - Cast 'Major Heal' (Normal Dungeon)"),
+(@ID,0,5,0,74,0,100,4,0,70,10800,16900,11,22883,1,0,0,0,0,9,0,0,20,0,0,0,0,"Unliving Cleric - On Friendly Between 0-70% Health - Cast 'Heal' (Heroic Dungeon)"),
+(@ID,0,6,0,7,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Unliving Cleric - On Evade - Despawn (0)");
+
+-- Unliving Stalker SAI (Source: ACID 4.3.4 Official Data - Normal/Heroic)
+SET @ID := 18501;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,1,54,0,100,0,0,0,0,0,11,33422,0,0,0,0,0,1,0,0,0,0,0,0,0,"Unliving Stalker - On Just Summoned - Cast 'Phase In'"),
+(@ID,0,1,0,61,0,100,0,0,0,0,0,38,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Unliving Stalker - On Link - Set In Combat With Zone"),
+(@ID,0,2,0,0,0,100,2,0,0,2400,4800,11,15547,64,0,0,0,0,2,0,0,0,0,0,0,0,"Unliving Stalker - In Combat CMC - Cast 'Shoot' (Normal Dungeon)"),
+(@ID,0,3,0,0,0,100,4,0,0,2400,4800,11,16100,64,0,0,0,0,2,0,0,0,0,0,0,0,"Unliving Stalker - In Combat CMC - Cast 'Shoot' (Heroic Dungeon)"),
+(@ID,0,4,0,0,0,100,2,10000,14000,13300,22900,11,31975,0,0,0,0,0,5,0,0,0,0,0,0,0,"Unliving Stalker - In Combat - Cast 'Serpent Sting' (Normal Dungeon)"),
+(@ID,0,5,0,0,0,100,4,10000,14000,15700,22900,11,35511,0,0,0,0,0,5,0,0,0,0,0,0,0,"Unliving Stalker - In Combat - Cast 'Serpent Sting' (Heroic Dungeon)"),
+(@ID,0,6,0,0,0,100,4,6000,11000,12000,16000,11,37551,1,0,0,0,0,6,0,0,0,0,0,0,0,"Unliving Stalker - In Combat - Cast 'Viper Sting' (Heroic Dungeon)"),
+(@ID,0,7,0,0,0,100,0,2400,10400,3900,7200,11,32829,32,0,0,0,0,1,0,0,0,0,0,0,0,"Unliving Stalker - In Combat - Cast 'Spirit Vengeance'"),
+(@ID,0,8,0,7,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Unliving Stalker - On Evade - Despawn (0)");
+
+-- Phantasmal Possessor SAI (Source: ACID)
+SET @ID := 18503;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,1,54,0,100,0,0,0,0,0,11,33422,0,0,0,0,0,1,0,0,0,0,0,0,0,"Phantasmal Possessor - On Just Summoned - Cast 'Phase In'"),
+(@ID,0,1,0,61,0,100,0,0,0,0,0,38,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Phantasmal Possessor - On Link - Set In Combat With Zone"),
+(@ID,0,2,0,0,0,100,0,5000,10000,20000,30000,11,33401,0,0,0,0,0,6,0,0,0,0,0,0,0,"Phantasmal Possessor - In Combat - Cast 'Possess'"),
+(@ID,0,3,0,7,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Phantasmal Possessor - On Evade - Despawn (0)");
+
+-- Raging Soul SAI (Source: ACID & Movies)
+-- TO-DO: Use spells 'Raging Soul' (32887)(N) & 'Raging Soul' (38381)(H) if they're related
+-- TO-DO: This script is incomplete and probably wrong, sniffs tells absolutely nothing to me
+-- Seems they shouldn't despawn like this
+-- Seems like they shouldn't be invisible because of actions used right now
+SET @ID := 18506;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,25,0,100,0,0,0,0,0,20,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Raging Soul - On Reset - Stop Attacking"),
+(@ID,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,"Raging Soul - On Reset - Set Visibility Off"),
+(@ID,0,2,0,4,0,100,0,0,0,0,0,47,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Raging Soul - On Aggro - Set Visibility On"),
+-- Initial min and initial max are not supported
+-- but if I'm not wrong they should start it if they're close enough to target
+-- and after 2000-5000 sec after aggro
+(@ID,0,3,5,9,0,100,3,0,2,0,0,11,32888,0,0,0,0,0,2,0,0,0,0,0,0,0,"Raging Soul - Within 0-2 Range - Cast 'Rage' (Normal Dungeon) (No Repeat)"),
+(@ID,0,4,5,9,0,100,5,0,2,0,0,11,38380,0,0,0,0,0,2,0,0,0,0,0,0,0,"Raging Soul - Within 0-2 Range - Cast 'Rage' (Heroic Dungeon) (No Repeat)"),
+(@ID,0,5,0,61,0,100,0,0,0,0,0,41,6000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Raging Soul - On Link - Despawn (6000)");
+
+-- Phasing Soldier SAI (Source: ACID 4.3.4 Official Data - Normal/Heroic)
+SET @ID := 18556;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,13,0,100,1,7200,18100,0,0,11,11972,0,0,0,0,0,2,0,0,0,0,0,0,0,"Phasing Soldier - Target Casting - Cast 'Shield Bash' (No Repeat)");
+
+-- Phasing Cleric SAI (Source: ACID 4.3.4 Official Data - Normal/Heroic)
+SET @ID := 18557;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,74,0,100,2,0,85,9700,16800,11,25058,0,0,0,0,0,9,0,0,20,0,0,0,0,"Phasing Cleric - On Friendly Between 0-85% Health - Cast 'Renew' (Normal Dungeon)"),
+(@ID,0,1,0,74,0,100,4,0,85,9700,16800,11,38210,0,0,0,0,0,9,0,0,20,0,0,0,0,"Phasing Cleric - On Friendly Between 0-85% Health - Cast 'Renew' (Heroic Dungeon)"),
+(@ID,0,2,0,74,0,100,2,0,70,12100,16900,11,33324,1,0,0,0,0,9,0,0,20,0,0,0,0,"Phasing Cleric - On Friendly Between 0-70% Health - Cast 'Major Heal' (Normal Dungeon)"),
+(@ID,0,3,0,74,0,100,4,0,70,10800,16900,11,22883,1,0,0,0,0,9,0,0,20,0,0,0,0,"Phasing Cleric - On Friendly Between 0-70% Health - Cast 'Heal' (Heroic Dungeon)");
+
+-- Phasing Sorcerer SAI (Source: ACID 4.3.4 Official Data - Normal/Heroic)
+SET @ID := 18558;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,0,0,100,2,0,0,2400,3800,11,12466,64,0,0,0,0,2,0,0,0,0,0,0,0,"Phasing Sorcerer - In Combat CMC - Cast 'Fireball' (Normal Dungeon)"),
+(@ID,0,1,0,0,0,100,4,0,0,2400,3800,11,17290,64,0,0,0,0,2,0,0,0,0,0,0,0,"Phasing Sorcerer - In Combat CMC - Cast 'Fireball' (Heroic Dungeon)"),
+(@ID,0,2,0,0,0,100,2,3600,7800,7800,14500,11,15043,1,0,0,0,0,2,0,0,0,0,0,0,0,"Phasing Sorcerer - In Combat - Cast 'Frostbolt' (Normal Dungeon)"),
+(@ID,0,3,0,0,0,100,4,6000,8000,7800,14500,11,15530,1,0,0,0,0,2,0,0,0,0,0,0,0,"Phasing Sorcerer - In Combat - Cast 'Frostbolt' (Heroic Dungeon)"),
+(@ID,0,4,0,0,0,100,2,10900,16900,9700,15700,11,15744,1,0,0,0,0,1,0,0,0,0,0,0,0,"Phasing Sorcerer - In Combat - Cast 'Blast Wave' (Normal Dungeon)"),
+(@ID,0,5,0,0,0,100,4,10900,16900,7200,10900,11,22424,1,0,0,0,0,1,0,0,0,0,0,0,0,"Phasing Sorcerer - In Combat - Cast 'Blast Wave' (Heroic Dungeon)");
+
+-- Phasing Stalker SAI (Source: ACID 4.3.4 Official Data - Normal/Heroic)
+SET @ID := 18559;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,0,0,100,2,0,0,2400,4800,11,15547,64,0,0,0,0,2,0,0,0,0,0,0,0,"Phasing Stalker - In Combat CMC - Cast 'Shoot' (Normal Dungeon)"),
+(@ID,0,1,0,0,0,100,4,0,0,2400,4800,11,16100,64,0,0,0,0,2,0,0,0,0,0,0,0,"Phasing Stalker - In Combat CMC - Cast 'Shoot' (Heroic Dungeon)"),
+(@ID,0,2,0,0,0,100,2,10000,14000,13300,22900,11,31975,0,0,0,0,0,5,0,0,0,0,0,0,0,"Phasing Stalker - In Combat - Cast 'Serpent Sting' (Normal Dungeon)"),
+(@ID,0,3,0,0,0,100,4,10000,14000,15700,22900,11,35511,0,0,0,0,0,5,0,0,0,0,0,0,0,"Phasing Stalker - In Combat - Cast 'Serpent Sting' (Heroic Dungeon)"),
+(@ID,0,4,0,0,0,100,4,6000,11000,12000,16000,11,37551,1,0,0,0,0,6,0,0,0,0,0,0,0,"Phasing Stalker - In Combat - Cast 'Viper Sting' (Heroic Dungeon)"),
+(@ID,0,5,0,0,0,100,0,2400,10400,3900,7200,11,32829,32,0,0,0,0,1,0,0,0,0,0,0,0,"Phasing Stalker - In Combat - Cast 'Spirit Vengeance'");
+
+-- Reanimated Bones SAI (Source: ACID 4.3.4 Official Data - Normal/Heroic)
+SET @ID := 18700;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,0,0,100,0,5000,9000,5000,9000,11,13444,0,0,0,0,0,2,0,0,0,0,0,0,0,"Reanimated Bones - In Combat - Cast 'Sunder Armor'"),
+(@ID,0,1,0,0,0,100,0,6000,14000,8000,14000,11,13584,0,0,0,0,0,2,0,0,0,0,0,0,0,"Reanimated Bones - In Combat - Cast 'Strike'");
+
+-- Auchenai Necromancer SAI (Source: ACID 4.3.4 Official Data - Normal/Heroic)
+SET @ID := 18702;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,4,0,40,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Auchenai Necromancer - On Aggro - Say Line 0"),
+(@ID,0,1,0,0,0,100,0,1000,15200,4800,15700,11,35839,32,0,0,0,0,2,0,0,0,0,0,0,0,"Auchenai Necromancer - In Combat - Cast 'Drain Soul'"),
+(@ID,0,2,0,0,0,100,2,12100,29000,22900,35000,11,32863,33,0,0,0,0,2,0,0,0,0,0,0,0,"Auchenai Necromancer - In Combat - Cast 'Seed of Corruption' (Normal Dungeon)"),
+(@ID,0,3,0,0,0,100,4,12100,17500,4800,9600,11,38252,33,0,0,0,0,2,0,0,0,0,0,0,0,"Auchenai Necromancer - In Combat - Cast 'Seed of Corruption' (Heroic Dungeon)"),
+(@ID,0,4,0,74,0,100,2,0,70,15700,26500,11,33325,1,0,0,0,0,9,0,0,15,0,0,0,0,"Auchenai Necromancer - On Friendly Between 0-70% Health - Cast 'Shadow Mend' (Normal Dungeon)"),
+(@ID,0,5,0,74,0,100,4,0,70,6100,8400,11,37367,1,0,0,0,0,9,0,0,15,0,0,0,0,"Auchenai Necromancer - On Friendly Between 0-70% Health - Cast 'Shadow Mend' (Heroic Dungeon)");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"This is sacred ground!",12,0,100,0,0,10530,17641,0,"Auchenai Necromancer"),
+(@ID,0,1,"How dare you come here?",12,0,100,0,0,10531,17642,0,"Auchenai Necromancer"),
+(@ID,0,2,"Outsiders are forbidden!",12,0,100,0,0,10532,17643,0,"Auchenai Necromancer"),
+(@ID,0,3,"This is sacred ground!",12,0,100,0,0,10533,17641,0,"Auchenai Necromancer"),
+(@ID,0,4,"How dare you come here?",12,0,100,0,0,10534,17642,0,"Auchenai Necromancer"),
+(@ID,0,5,"Outsiders are forbidden!",12,0,100,0,0,10535,17643,0,"Auchenai Necromancer"),
+(@ID,0,6,"This is sacred ground!",12,0,100,0,0,10536,17641,0,"Auchenai Necromancer"),
+(@ID,0,7,"How dare you come here?",12,0,100,0,0,10537,17642,0,"Auchenai Necromancer"),
+(@ID,0,8,"Outsiders are forbidden!",12,0,100,0,0,10538,17643,0,"Auchenai Necromancer");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_01_world.sql
new file mode 100644
index 00000000000..dca3b40208c
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_01_world.sql
@@ -0,0 +1,2 @@
+-- spell 28147, values copied from classic dbs
+UPDATE `spell_target_position` SET `mapid` = 0, `positionx` = -11123.3, `positiony` = -2014.44, `positionz` = 47.0927, `orientation` = 0.675977 WHERE `id` = 28147;
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_02_world.sql
new file mode 100644
index 00000000000..6654825882c
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_02_world.sql
@@ -0,0 +1,379 @@
+-- Cabal Ritualist, handled in script
+UPDATE `creature` SET `equipment_id` = 0 WHERE `id` = 18794;
+
+-- Cabal Ritualist, 3 per pack in normal, 4 in heroic
+UPDATE `creature` SET `spawnMask` = 2 WHERE `guid` IN (68738,67088,67087,66893,66888,66883) AND `id` = 18794;
+
+-- Took from CMaNGOS
+UPDATE `creature_template_addon` SET `auras` = "8876" WHERE `entry` = 18631;
+UPDATE `creature_template_addon` SET `auras` = "30982 30991 30998" WHERE `entry` = 18636;
+UPDATE `creature_template_addon` SET `auras` = "16592" WHERE `entry` = 18637;
+DELETE FROM `creature_template_addon` WHERE `entry` IN (20640,20639,20646);
+INSERT INTO `creature_template_addon` (`entry`,`auras`) VALUES
+(20640,"8876"),
+(20639,"30982 30991 30998"),
+(20646,"16592");
+
+-- Cabal Cultist SAI (Source: ACID 4.3.4 OD - N/H)
+SET @ID := 18631;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,4,0,10,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Cabal Cultist - On Aggro - Say Line 0"),
+(@ID,0,1,0,13,0,100,0,5000,10000,0,0,11,15614,0,0,0,0,0,2,0,0,0,0,0,0,0,"Cabal Cultist - Target Casting - Cast 'Kick'"),
+(@ID,0,2,0,2,0,100,1,0,15,0,0,25,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Cabal Cultist - Between 0-15% Health - Flee For Assist (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"Ruin finds us all!",12,0,100,0,0,0,16798,0,"Cabal Cultist"),
+(@ID,0,1,"In Sargeras' name!",12,0,100,0,0,0,16799,0,"Cabal Cultist"),
+(@ID,0,2,"The end comes for you!",12,0,100,0,0,0,16800,0,"Cabal Cultist"),
+(@ID,0,3,"I do as I must!",12,0,100,0,0,0,16801,0,"Cabal Cultist"),
+(@ID,0,4,"The Legion reigns!",12,0,100,0,0,0,16802,0,"Cabal Cultist"),
+(@ID,0,5,"I shall be rewarded!",12,0,100,0,0,0,16803,0,"Cabal Cultist");
+
+-- Cabal Executioner SAI (Source: ACID 4.3.4 OD - N/H)
+SET @ID := 18632;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,4,0,10,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Cabal Executioner - On Aggro - Say Line 0"),
+(@ID,0,1,0,0,0,100,2,7200,15900,15700,32500,11,33500,0,0,0,0,0,1,0,0,0,0,0,0,0,"Cabal Executioner - In Combat - Cast 'Whirlwind' (Normal Dungeon)"),
+(@ID,0,2,0,0,0,100,4,7200,15900,15700,32500,11,15578,0,0,0,0,0,1,0,0,0,0,0,0,0,"Cabal Executioner - In Combat - Cast 'Whirlwind' (Heroic Dungeon)"),
+(@ID,0,3,0,12,0,100,0,0,20,8000,12000,11,7160,1,0,0,0,0,2,0,0,0,0,0,0,0,"Cabal Executioner - Target Between 0-20% Health - Cast 'Execute'"),
+(@ID,0,4,0,2,0,100,1,0,25,0,0,11,30485,0,0,0,0,0,1,0,0,0,0,0,0,0,"Cabal Executioner - Between 0-25% Health - Cast 'Enrage' (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"Ruin finds us all!",12,0,100,0,0,0,16798,0,"Cabal Executioner"),
+(@ID,0,1,"In Sargeras' name!",12,0,100,0,0,0,16799,0,"Cabal Executioner"),
+(@ID,0,2,"The end comes for you!",12,0,100,0,0,0,16800,0,"Cabal Executioner"),
+(@ID,0,3,"I do as I must!",12,0,100,0,0,0,16801,0,"Cabal Executioner"),
+(@ID,0,4,"The Legion reigns!",12,0,100,0,0,0,16802,0,"Cabal Executioner"),
+(@ID,0,5,"I shall be rewarded!",12,0,100,0,0,0,16803,0,"Cabal Executioner");
+
+-- Cabal Acolyte SAI (Source: ACID 4.3.4 OD - N/H)
+SET @ID := 18633;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,1,0,100,0,1000,1000,30000,30000,11,33482,32,0,0,0,0,1,0,0,0,0,0,0,0,"Cabal Acolyte - Out of Combat - Cast 'Shadow Defense'"),
+(@ID,0,1,0,4,0,10,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Cabal Acolyte - On Aggro - Say Line 0"),
+(@ID,0,2,0,74,0,100,2,0,60,15700,27700,11,12039,0,0,0,0,0,9,0,0,15,0,0,0,0,"Cabal Acolyte - On Friendly Between 0-60% Health - Cast 'Heal' (Normal Dungeon)"),
+(@ID,0,3,0,74,0,100,4,0,60,15700,27700,11,38209,0,0,0,0,0,9,0,0,15,0,0,0,0,"Cabal Acolyte - On Friendly Between 0-60% Health - Cast 'Heal' (Heroic Dungeon)"),
+(@ID,0,4,0,74,0,100,2,0,50,13200,19300,11,25058,0,0,0,0,0,9,0,0,15,0,0,0,0,"Cabal Acolyte - On Friendly Between 0-50% Health - Cast 'Renew' (Normal Dungeon)"),
+(@ID,0,5,0,74,0,100,4,0,50,13200,19300,11,38210,0,0,0,0,0,9,0,0,15,0,0,0,0,"Cabal Acolyte - On Friendly Between 0-50% Health - Cast 'Renew' (Heroic Dungeon)"),
+(@ID,0,6,0,2,0,100,1,0,15,0,0,25,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Cabal Acolyte - At 15% Health - Flee For Assist (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"Ruin finds us all!",12,0,100,0,0,0,16798,0,"Cabal Acolyte"),
+(@ID,0,1,"In Sargeras' name!",12,0,100,0,0,0,16799,0,"Cabal Acolyte"),
+(@ID,0,2,"The end comes for you!",12,0,100,0,0,0,16800,0,"Cabal Acolyte"),
+(@ID,0,3,"I do as I must!",12,0,100,0,0,0,16801,0,"Cabal Acolyte"),
+(@ID,0,4,"The Legion reigns!",12,0,100,0,0,0,16802,0,"Cabal Acolyte"),
+(@ID,0,5,"I shall be rewarded!",12,0,100,0,0,0,16803,0,"Cabal Acolyte");
+
+-- Cabal Summoner SAI (Source: ACID 4.3.4 OD - N/H)
+-- TO-DO: Use the 'Summon Aid' (33505) spell if related to this NPC
+SET @ID := 18634;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,4,0,10,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Cabal Summoner - On Aggro - Say Line 0"),
+(@ID,0,1,0,0,0,100,2,1800,6200,4800,16900,11,14034,0,0,0,0,0,2,0,0,0,0,0,0,0,"Cabal Summoner - In Combat - Cast 'Fireball' (Normal Dungeon)"),
+(@ID,0,2,0,0,0,100,4,1800,6200,4800,16900,11,15228,0,0,0,0,0,2,0,0,0,0,0,0,0,"Cabal Summoner - In Combat - Cast 'Fireball' (Heroic Dungeon)"),
+(@ID,0,3,5,0,0,100,0,4300,17200,13300,25300,11,33506,0,0,0,0,0,1,0,0,0,0,0,0,0,"Cabal Summoner - In Combat - Cast 'Summon Cabal Deathsworn'"),
+(@ID,0,4,6,0,0,100,0,3600,33200,12100,27900,11,33507,0,0,0,0,0,1,0,0,0,0,0,0,0,"Cabal Summoner - In Combat - Cast 'Summon Cabal Acolyte'"),
+(@ID,0,5,0,61,0,100,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Cabal Summoner - On Link - Say Line 1"),
+(@ID,0,6,0,61,0,100,0,0,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Cabal Summoner - On Link - Say Line 2"),
+(@ID,0,7,0,17,0,100,0,19208,0,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Cabal Summoner - On Summoned Unit - Say Line 3"),
+(@ID,0,8,0,17,0,100,0,19209,0,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,"Cabal Summoner - On Summoned Unit - Say Line 4");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"Ruin finds us all!",12,0,100,0,0,0,16798,0,"Cabal Summoner"),
+(@ID,0,1,"In Sargeras' name!",12,0,100,0,0,0,16799,0,"Cabal Summoner"),
+(@ID,0,2,"The end comes for you!",12,0,100,0,0,0,16800,0,"Cabal Summoner"),
+(@ID,0,3,"I do as I must!",12,0,100,0,0,0,16801,0,"Cabal Summoner"),
+(@ID,0,4,"The Legion reigns!",12,0,100,0,0,0,16802,0,"Cabal Summoner"),
+(@ID,0,5,"I shall be rewarded!",12,0,100,0,0,0,16803,0,"Cabal Summoner"),
+(@ID,1,0,"%s begins to summon in a Cabal Deathsworn!",16,0,100,0,0,0,16271,0,"Cabal Summoner"),
+(@ID,2,0,"%s begins to summon in a Cabal Acolyte!",16,0,100,0,0,0,16275,0,"Cabal Summoner"),
+(@ID,3,0,"%s summons a Cabal Acolyte to his aid!",16,0,100,0,0,0,16278,0,"Cabal Summoner"),
+(@ID,4,0,"%s summons a Cabal Deathsworn to his aid!",16,0,100,0,0,0,16280,0,"Cabal Summoner");
+
+-- Cabal Deathsworn SAI (Source: ACID 4.3.4 OD - N/H)
+SET @ID := 18635;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,4,0,10,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Cabal Deathsworn - On Aggro - Say Line 0"),
+(@ID,0,1,0,0,0,100,2,10200,18100,14100,26200,11,33480,0,0,0,0,0,2,0,0,0,0,0,0,0,"Cabal Deathsworn - In Combat - Cast 'Black Cleave' (Normal Dungeon)"),
+(@ID,0,2,0,0,0,100,4,10200,18100,14100,26200,11,38226,0,0,0,0,0,2,0,0,0,0,0,0,0,"Cabal Deathsworn - In Combat - Cast 'Black Cleave' (Heroic Dungeon)"),
+(@ID,0,3,0,0,0,100,0,10900,28200,12100,22900,11,11428,0,0,0,0,0,2,0,0,0,0,0,0,0,"Cabal Deathsworn - In Combat - Cast 'Knockdown'"),
+(@ID,0,4,5,2,0,100,1,0,25,0,0,11,8599,0,0,0,0,0,1,0,0,0,0,0,0,0,"Cabal Deathsworn - Between 0-25% Health - Cast 'Enrage'(No Repeat)"),
+(@ID,0,5,0,61,0,100,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Cabal Deathsworn - On Link - Say Line 1");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"Ruin finds us all!",12,0,100,0,0,0,16798,0,"Cabal Deathsworn"),
+(@ID,0,1,"In Sargeras' name!",12,0,100,0,0,0,16799,0,"Cabal Deathsworn"),
+(@ID,0,2,"The end comes for you!",12,0,100,0,0,0,16800,0,"Cabal Deathsworn"),
+(@ID,0,3,"I do as I must!",12,0,100,0,0,0,16801,0,"Cabal Deathsworn"),
+(@ID,0,4,"The Legion reigns!",12,0,100,0,0,0,16802,0,"Cabal Deathsworn"),
+(@ID,0,5,"I shall be rewarded!",12,0,100,0,0,0,16803,0,"Cabal Deathsworn"),
+(@ID,1,0,"%s goes into a frenzy!",16,0,100,0,0,0,2384,0,"Cabal Deathsworn");
+
+-- Cabal Assassin SAI (Source: ACID)
+-- TO-DO: Wound Poison (30983 36975) isn't related?
+SET @ID := 18636;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,0,0,100,0,5000,7000,4500,6500,11,30992,0,0,0,0,0,2,0,0,0,0,0,0,0,"Cabal Assassin - In Combat - Cast 'Backstab'");
+
+-- Cabal Shadow Priest SAI (Source: ACID 4.3.4 OD - N/H)
+SET @ID := 18637;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,4,0,10,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Cabal Shadow Priest - On Aggro - Say Line 0"),
+(@ID,0,1,0,0,0,100,2,3200,10800,4800,9700,11,17165,0,0,0,0,0,2,0,0,0,0,0,0,0,"Cabal Shadow Priest - In Combat - Cast 'Mind Flay' (Normal Dungeon)"),
+(@ID,0,2,0,0,0,100,4,3200,10800,2400,4800,11,38243,0,0,0,0,0,2,0,0,0,0,0,0,0,"Cabal Shadow Priest - In Combat - Cast 'Mind Flay' (Heroic Dungeon)"),
+(@ID,0,3,0,0,0,100,2,3600,12100,5400,12900,11,14032,0,0,0,0,0,5,0,0,0,0,0,0,0,"Cabal Shadow Priest - In Combat - Cast 'Shadow Word: Pain' (Normal Dungeon)"),
+(@ID,0,4,0,0,0,100,4,3100,12100,4800,7200,11,17146,0,0,0,0,0,5,0,0,0,0,0,0,0,"Cabal Shadow Priest - In Combat - Cast 'Shadow Word: Pain' (Heroic Dungeon)");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"Ruin finds us all!",12,0,100,0,0,0,16798,0,"Cabal Shadow Priest"),
+(@ID,0,1,"In Sargeras' name!",12,0,100,0,0,0,16799,0,"Cabal Shadow Priest"),
+(@ID,0,2,"The end comes for you!",12,0,100,0,0,0,16800,0,"Cabal Shadow Priest"),
+(@ID,0,3,"I do as I must!",12,0,100,0,0,0,16801,0,"Cabal Shadow Priest"),
+(@ID,0,4,"The Legion reigns!",12,0,100,0,0,0,16802,0,"Cabal Shadow Priest"),
+(@ID,0,5,"I shall be rewarded!",12,0,100,0,0,0,16803,0,"Cabal Shadow Priest");
+
+-- Cabal Zealot SAI (Source: ACID 4.3.4 OD - N/H)
+SET @ID := 18638;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,4,0,10,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Cabal Zealot - On Aggro - Say Line 0"),
+(@ID,0,1,0,0,0,100,2,0,0,3400,4500,11,12471,64,0,0,0,0,2,0,0,0,0,0,0,0,"Cabal Zealot - In Combat CMC - Cast 'Shadow Bolt' (Normal Dungeon)"),
+(@ID,0,2,0,0,0,100,4,0,0,3400,4500,11,15472,64,0,0,0,0,2,0,0,0,0,0,0,0,"Cabal Zealot - In Combat CMC - Cast 'Shadow Bolt' (Heroic Dungeon)"),
+(@ID,0,3,4,2,0,100,1,0,50,0,0,11,33949,1,0,0,0,0,1,0,0,0,0,0,0,0,"Cabal Zealot - Between 0-50% Health - Cast 'Shape of the Beast' (No Repeat)"),
+(@ID,0,4,5,61,0,100,0,0,0,0,0,11,33499,1,0,0,0,0,1,0,0,0,0,0,0,0,"Cabal Zealot - On Link - Cast 'Shape of the Beast'"),
+(@ID,0,5,0,61,0,100,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Cabal Zealot - On Link - Say Line 1");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"Ruin finds us all!",12,0,100,0,0,0,16798,0,"Cabal Zealot"),
+(@ID,0,1,"In Sargeras' name!",12,0,100,0,0,0,16799,0,"Cabal Zealot"),
+(@ID,0,2,"The end comes for you!",12,0,100,0,0,0,16800,0,"Cabal Zealot"),
+(@ID,0,3,"I do as I must!",12,0,100,0,0,0,16801,0,"Cabal Zealot"),
+(@ID,0,4,"The Legion reigns!",12,0,100,0,0,0,16802,0,"Cabal Zealot"),
+(@ID,0,5,"I shall be rewarded!",12,0,100,0,0,0,16803,0,"Cabal Zealot"),
+(@ID,1,0,"%s makes some strange gestures.",16,8,100,0,0,0,16259,0,"Cabal Zealot");
+
+-- Cabal Spellbinder SAI (Source: ACID 4.3.4 OD - N/H)
+SET @ID := 18639;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,4,0,10,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Cabal Spellbinder - On Aggro - Say Line 0"),
+(@ID,0,1,0,0,0,100,0,5700,19300,9600,16900,11,32691,0,0,0,0,0,2,0,0,0,0,0,0,0,"Cabal Spellbinder - In Combat - Cast 'Spell Shock'"),
+(@ID,0,2,0,0,0,100,0,8000,12000,20000,30000,11,33502,1,0,0,0,0,6,0,0,0,0,0,0,0,"Cabal Spellbinder - In Combat - Cast 'Brain Wash'"),
+(@ID,0,3,0,23,0,100,1,8734,1,0,0,11,8734,0,0,0,0,0,1,0,0,0,0,0,0,0,"Cabal Spellbinder - On Has Aura - Cast 'Blackfathom Channeling' (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"Ruin finds us all!",12,0,100,0,0,0,16798,0,"Cabal Spellbinder"),
+(@ID,0,1,"In Sargeras' name!",12,0,100,0,0,0,16799,0,"Cabal Spellbinder"),
+(@ID,0,2,"The end comes for you!",12,0,100,0,0,0,16800,0,"Cabal Spellbinder"),
+(@ID,0,3,"I do as I must!",12,0,100,0,0,0,16801,0,"Cabal Spellbinder"),
+(@ID,0,4,"The Legion reigns!",12,0,100,0,0,0,16802,0,"Cabal Spellbinder"),
+(@ID,0,5,"I shall be rewarded!",12,0,100,0,0,0,16803,0,"Cabal Spellbinder");
+
+-- Cabal Warlock SAI (Source: ACID 4.3.4 OD - N/H)
+SET @ID := 18640;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,1,0,100,0,1000,1000,30000,30000,11,13787,32,0,0,0,0,1,0,0,0,0,0,0,0,"Cabal Warlock - Out of Combat - Cast 'Demon Armor'"),
+(@ID,0,1,0,4,0,10,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Cabal Warlock - On Aggro - Say Line 0"),
+(@ID,0,2,0,0,0,100,2,0,0,3600,4800,11,12471,64,0,0,0,0,2,0,0,0,0,0,0,0,"Cabal Warlock - In Combat CMC - Cast 'Shadow Bolt' (Normal Dungeon)"),
+(@ID,0,3,0,0,0,100,4,0,0,3600,4800,11,15232,64,0,0,0,0,2,0,0,0,0,0,0,0,"Cabal Warlock - In Combat CMC - Cast 'Shadow Bolt' (Heroic Dungeon)"),
+(@ID,0,4,0,0,0,100,2,7800,24100,19300,36200,11,32863,32,0,0,0,0,5,0,0,0,0,0,0,0,"Cabal Warlock - In Combat - Cast 'Seed of Corruption' (Normal Dungeon)"),
+(@ID,0,5,0,0,0,100,4,7800,24100,19300,36200,11,38252,32,0,0,0,0,5,0,0,0,0,0,0,0,"Cabal Warlock - In Combat - Cast 'Seed of Corruption' (Heroic Dungeon)"),
+(@ID,0,6,0,0,0,100,0,3100,5300,3100,5300,11,13787,32,0,0,0,0,1,0,0,0,0,0,0,0,"Cabal Warlock - In Combat - Cast 'Demon Armor'");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"Ruin finds us all!",12,0,100,0,0,0,16798,0,"Cabal Warlock"),
+(@ID,0,1,"In Sargeras' name!",12,0,100,0,0,0,16799,0,"Cabal Warlock"),
+(@ID,0,2,"The end comes for you!",12,0,100,0,0,0,16800,0,"Cabal Warlock"),
+(@ID,0,3,"I do as I must!",12,0,100,0,0,0,16801,0,"Cabal Warlock"),
+(@ID,0,4,"The Legion reigns!",12,0,100,0,0,0,16802,0,"Cabal Warlock"),
+(@ID,0,5,"I shall be rewarded!",12,0,100,0,0,0,16803,0,"Cabal Warlock");
+
+-- Cabal Familiar SAI (Source: ACID 4.3.4 OD - N/H)
+SET @ID := 18641;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,0,0,100,2,0,0,2400,3600,11,20801,64,0,0,0,0,2,0,0,0,0,0,0,0,"Cabal Familiar - In Combat CMC - Cast 'Firebolt' (Normal Dungeon)"),
+(@ID,0,1,0,0,0,100,4,0,0,2400,3600,11,38239,64,0,0,0,0,2,0,0,0,0,0,0,0,"Cabal Familiar - In Combat CMC - Cast 'Firebolt' (Heroic Dungeon)");
+
+-- Fel Guardhound SAI (Source: ACID 4.3.4 OD - N/H)
+SET @ID := 18642;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,0,0,100,0,4800,14500,12100,18100,11,30849,0,0,0,0,0,2,0,0,0,0,0,0,0,"Fel Guardhound - In Combat - Cast 'Spell Lock'");
+
+-- Maiden of Discipline SAI (Source: ACID)
+SET @ID := 18663;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,0,0,100,0,5000,11000,12000,18000,11,31865,0,0,0,0,0,6,0,0,0,0,0,0,0,"Maiden of Discipline - In Combat - Cast 'Seduction' (Dungeon)"),
+(@ID,0,1,0,0,0,100,0,9100,9100,8000,12000,11,32202,0,0,0,0,0,2,0,0,0,0,0,0,0,"Maiden of Discipline - In Combat - Cast 'Lash of Pain' (Dungeon)");
+
+-- Cabal Ritualist SAI (Source: ACID 4.3.4 OD - N/H)
+-- Phases and equipment are linked together
+-- (Source: https://www.youtube.com/watch?v=OM-TmH_3UVM & Wowhead)
+SET @ID := 18794;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,1,0,100,1,1000,1000,0,0,11,32958,0,0,0,0,0,1,0,0,0,0,0,0,0,"Cabal Ritualist - Out of Combat - Cast 'Crystal Channel' (No Repeat)"),
+-- Do not reset
+(@ID,0,1,0,1,0,100,257,0,0,0,0,31,1,4,0,0,0,0,1,0,0,0,0,0,0,0,"Cabal Ritualist - Out of Combat - Set Random Phase (1-4) (No Repeat) (No Reset)"),
+(@ID,0,2,0,4,0,10,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Cabal Ritualist - On Aggro - Say Line 0"),
+-- Frost Bolt & Nova - White staff 12421
+(@ID,0,3,0,66,0,100,0,1,0,0,0,71,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Cabal Ritualist - On Enter Phase 1 - Change Equipment"),
+(@ID,0,4,0,0,1,100,2,0,0,3400,4500,11,15497,64,0,0,0,0,2,0,0,0,0,0,0,0,"Cabal Ritualist - In Combat CMC - Cast 'Frostbolt' (Normal Dungeon) (Phase 1)"),
+(@ID,0,5,0,0,1,100,4,0,0,3400,4500,11,12675,64,0,0,0,0,2,0,0,0,0,0,0,0,"Cabal Ritualist - In Combat CMC - Cast 'Frostbolt' (Heroic Dungeon) (Phase 1)"),
+(@ID,0,6,0,0,1,100,2,10000,18000,12100,16900,11,15532,0,0,0,0,0,1,0,0,0,0,0,0,0,"Cabal Ritualist - In Combat - Cast 'Frost Nova' (Normal Dungeon) (Phase 1)"),
+(@ID,0,7,0,0,1,100,4,10000,18000,12100,16900,11,15063,0,0,0,0,0,1,0,0,0,0,0,0,0,"Cabal Ritualist - In Combat - Cast 'Frost Nova' (Normal Dungeon) (Phase 1)"),
+-- Arcane Missiles - Yellow staff 14618
+(@ID,0,8,0,66,0,100,0,2,0,0,0,71,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Cabal Ritualist - On Enter Phase 2 - Change Equipment"),
+(@ID,0,9,0,0,2,100,2,0,0,5000,5000,11,33832,64,0,0,0,0,2,0,0,0,0,0,0,0,"Cabal Ritualist - In Combat CMC - Cast 'Arcane Missiles' (Normal Dungeon) (Phase 2)"),
+(@ID,0,10,0,0,2,100,4,0,0,5000,5000,11,38263,64,0,0,0,0,2,0,0,0,0,0,0,0,"Cabal Ritualist - In Combat CMC - Cast 'Arcane Missiles' (Heroic Dungeon) (Phase 2)"),
+(@ID,0,11,0,0,2,100,0,2400,14300,5200,21700,11,33487,1,0,0,0,0,5,0,0,0,0,0,0,0,"Cabal Ritualist - In Combat - Cast 'Addle Humanoid' (Phase 2)"),
+-- Flame Buffet & Fire Blast - Sword 13718
+(@ID,0,12,0,66,0,100,0,4,0,0,0,71,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Cabal Ritualist - On Enter Phase 3 - Change Equipment"),
+(@ID,0,13,0,0,4,100,0,3600,6200,4800,11200,11,9574,0,0,0,0,0,2,0,0,0,0,0,0,0,"Cabal Ritualist - In Combat - Cast 'Flame Buffet' (Phase 3)"),
+(@ID,0,14,0,0,4,100,2,6100,20200,8400,22900,11,20795,0,0,0,0,0,2,0,0,0,0,0,0,0,"Cabal Ritualist - In Combat - Cast 'Fire Blast' (Normal Dungeon) (Phase 3)"),
+(@ID,0,15,0,0,4,100,4,6100,20200,8400,22900,11,14145,0,0,0,0,0,2,0,0,0,0,0,0,0,"Cabal Ritualist - In Combat - Cast 'Fire Blast' (Heroic Dungeon) (Phase 3)"),
+-- Gouge - Daggers 19980
+(@ID,0,16,0,66,0,100,0,8,0,0,0,71,4,0,0,0,0,0,1,0,0,0,0,0,0,0,"Cabal Ritualist - On Enter Phase 4 - Change Equipment"),
+(@ID,0,17,0,0,8,100,0,10000,15000,12100,19300,11,12540,0,0,0,0,0,2,0,0,0,0,0,0,0,"Cabal Ritualist - In Combat - Cast 'Gouge' (Phase 4)"),
+(@ID,0,18,0,15,0,100,4,15,15000,20000,0,11,17201,0,0,0,0,0,7,0,0,0,0,0,0,0,"Cabal Ritualist - Friendly Crowd Controlled - Cast 'Dispel Magic' (Heroic Dungeon)"),
+(@ID,0,19,0,2,0,100,1,0,15,0,0,25,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Cabal Ritualist - Between 0-15% Health - Flee For Assist (No Repeat)");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"Ruin finds us all!",12,0,100,0,0,0,16798,0,"Cabal Ritualist"),
+(@ID,0,1,"In Sargeras' name!",12,0,100,0,0,0,16799,0,"Cabal Ritualist"),
+(@ID,0,2,"The end comes for you!",12,0,100,0,0,0,16800,0,"Cabal Ritualist"),
+(@ID,0,3,"I do as I must!",12,0,100,0,0,0,16801,0,"Cabal Ritualist"),
+(@ID,0,4,"The Legion reigns!",12,0,100,0,0,0,16802,0,"Cabal Ritualist"),
+(@ID,0,5,"I shall be rewarded!",12,0,100,0,0,0,16803,0,"Cabal Ritualist");
+
+-- Fel Overseer SAI (Source: ACID 4.3.4 OD - N/H)
+SET @ID := 18796;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,4,0,15,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Fel Overseer - On Aggro - Say Line 0"),
+(@ID,0,1,0,4,0,100,0,0,0,0,0,11,27577,0,0,0,0,0,7,0,0,0,0,0,0,0,"Fel Overseer - On Aggro - Cast 'Intercept'"),
+(@ID,0,2,0,0,0,100,4,4800,9300,15700,20300,11,16856,0,0,0,0,0,2,0,0,0,0,0,0,0,"Fel Overseer - In Combat - Cast 'Mortal Strike' (Heroic Dungeon)"),
+(@ID,0,3,0,0,0,100,4,30000,30000,30000,30000,11,19134,0,0,0,0,0,2,0,0,0,0,0,0,0,"Fel Overseer - In Combat - Cast 'Frightening Shout' (Heroic Dungeon)"),
+(@ID,0,4,0,0,0,100,0,13300,18900,15700,26500,11,30471,0,0,0,0,0,2,0,0,0,0,0,0,0,"Fel Overseer - In Combat - Cast 'Uppercut'");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"This world shall burn!",12,0,100,0,0,0,16805,0,"Fel Overseer"),
+(@ID,0,1,"The end is come!",12,0,100,0,0,0,16807,0,"Fel Overseer"),
+(@ID,0,2,"Embrace the Nothing!",12,0,100,0,0,0,16808,0,"Fel Overseer"),
+(@ID,0,3,"Pathetic worm!",12,0,100,0,0,0,16809,0,"Fel Overseer"),
+(@ID,0,4,"None can stand against the Legion!",12,0,100,0,0,0,16810,0,"Fel Overseer"),
+(@ID,0,5,"I'll feast on your soul!",12,0,100,0,0,0,16811,0,"Fel Overseer"),
+(@ID,0,6,"You shall not escape.",12,0,100,0,0,0,16812,0,"Fel Overseer"),
+(@ID,0,7,"The only justice is death!",12,0,100,0,0,0,16813,0,"Fel Overseer");
+
+-- Cabal Fanatic SAI (Source: ACID 4.3.4 OD - N/H)
+SET @ID := 18830;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,4,0,10,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Cabal Fanatic - On Aggro - Say Line 0"),
+(@ID,0,1,0,0,0,100,0,9600,20500,13300,22900,11,12021,0,0,0,0,0,2,0,0,0,0,0,0,0,"Cabal Fanatic - In Combat - Cast 'Fixate'");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"Ruin finds us all!",12,0,100,0,0,0,16798,0,"Cabal Fanatic"),
+(@ID,0,1,"In Sargeras' name!",12,0,100,0,0,0,16799,0,"Cabal Fanatic"),
+(@ID,0,2,"The end comes for you!",12,0,100,0,0,0,16800,0,"Cabal Fanatic"),
+(@ID,0,3,"I do as I must!",12,0,100,0,0,0,16801,0,"Cabal Fanatic"),
+(@ID,0,4,"The Legion reigns!",12,0,100,0,0,0,16802,0,"Cabal Fanatic"),
+(@ID,0,5,"I shall be rewarded!",12,0,100,0,0,0,16803,0,"Cabal Fanatic");
+
+-- Malicious Instructor SAI (Source: ACID 4.3.4 OD - N/H)
+SET @ID := 18848;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,4,0,15,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Malicious Instructor - On Aggro - Say Line 0"),
+(@ID,0,1,0,0,0,100,4,16100,25300,21700,25300,11,6713,0,0,0,0,0,2,0,0,0,0,0,0,0,"Malicious Instructor - In Combat - Cast 'Disarm' (Heroic Dungeon)"),
+(@ID,0,2,0,0,0,100,0,10800,15700,18100,29100,11,33493,32,0,0,0,0,2,0,0,0,0,0,0,0,"Malicious Instructor - In Combat - Cast 'Mark of Malice'"),
+(@ID,0,3,0,0,0,100,0,9600,16900,7200,18100,11,33501,0,0,0,0,0,1,0,0,0,0,0,0,0,"Malicious Instructor - In Combat - Cast 'Shadow Nova'");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"This world shall burn!",12,0,100,0,0,0,16805,0,"Malicious Instructor"),
+(@ID,0,1,"The end is come!",12,0,100,0,0,0,16807,0,"Malicious Instructor"),
+(@ID,0,2,"Embrace the Nothing!",12,0,100,0,0,0,16808,0,"Malicious Instructor"),
+(@ID,0,3,"Pathetic worm!",12,0,100,0,0,0,16809,0,"Malicious Instructor"),
+(@ID,0,4,"None can stand against the Legion!",12,0,100,0,0,0,16810,0,"Malicious Instructor"),
+(@ID,0,5,"I'll feast on your soul!",12,0,100,0,0,0,16811,0,"Malicious Instructor"),
+(@ID,0,6,"You shall not escape.",12,0,100,0,0,0,16812,0,"Malicious Instructor"),
+(@ID,0,7,"The only justice is death!",12,0,100,0,0,0,16813,0,"Malicious Instructor");
+
+-- Summoned Cabal Acolyte SAI (Source: ACID 4.3.4 OD - N/H)
+-- TO-DO: What exactly happens after evade?
+-- TO-DO: Spawn spell missing
+SET @ID := 19208;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,1,54,0,100,0,0,0,0,0,11,33482,0,0,0,0,0,1,0,0,0,0,0,0,0,"Summoned Cabal Acolyte - On Just Summoned - Cast 'Shadow Defense'"),
+(@ID,0,1,0,61,0,100,0,0,0,0,0,38,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Summoned Cabal Acolyte - On Link - Set In Combat With Zone"),
+(@ID,0,2,0,74,0,100,2,0,60,15700,27700,11,12039,0,0,0,0,0,9,0,0,15,0,0,0,0,"Summoned Cabal Acolyte - On Friendly Between 0-60% Health - Cast 'Heal' (Normal Dungeon)"),
+(@ID,0,3,0,74,0,100,4,0,60,15700,27700,11,38209,0,0,0,0,0,9,0,0,15,0,0,0,0,"Summoned Cabal Acolyte - On Friendly Between 0-60% Health - Cast 'Heal' (Heroic Dungeon)"),
+(@ID,0,4,0,74,0,100,2,0,50,13200,19300,11,25058,0,0,0,0,0,9,0,0,15,0,0,0,0,"Summoned Cabal Acolyte - On Friendly Between 0-50% Health - Cast 'Renew' (Normal Dungeon)"),
+(@ID,0,5,0,74,0,100,4,0,50,13200,19300,11,38210,0,0,0,0,0,9,0,0,15,0,0,0,0,"Summoned Cabal Acolyte - On Friendly Between 0-50% Health - Cast 'Renew' (Heroic Dungeon)"),
+(@ID,0,6,0,2,0,100,1,0,15,0,0,25,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Summoned Cabal Acolyte - Between 0-15% Health - Flee For Assist (No Repeat)"),
+(@ID,0,7,0,7,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Summoned Cabal Acolyte - On Evade - Despawn (0)"),
+(@ID,0,8,0,7,0,100,0,0,0,0,0,18,33554432,0,0,0,0,0,1,0,0,0,0,0,0,0,"Summoned Cabal Acolyte - On Evade - Set Flag Not Selectable");
+
+-- Summoned Cabal Deathsworn SAI (Source: ACID 4.3.4 OD - N/H)
+-- TO-DO: What exactly happens after evade?
+-- TO-DO: Spawn spell missing
+SET @ID := 19209;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,54,0,100,0,0,0,0,0,38,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Summoned Cabal Deathsworn - On Just Summoned - Set In Combat With Zone"),
+(@ID,0,1,0,0,0,100,2,10200,18100,14100,26200,11,33480,0,0,0,0,0,2,0,0,0,0,0,0,0,"Summoned Cabal Deathsworn - In Combat - Cast 'Black Cleave' (Normal Dungeon)"),
+(@ID,0,2,0,0,0,100,4,10200,18100,14100,26200,11,38226,0,0,0,0,0,2,0,0,0,0,0,0,0,"Summoned Cabal Deathsworn - In Combat - Cast 'Black Cleave' (Heroic Dungeon)"),
+(@ID,0,3,0,0,0,100,0,10900,28200,12100,22900,11,11428,0,0,0,0,0,2,0,0,0,0,0,0,0,"Summoned Cabal Deathsworn - In Combat - Cast 'Knockdown'"),
+(@ID,0,4,5,2,0,100,1,0,25,0,0,11,8599,0,0,0,0,0,1,0,0,0,0,0,0,0,"Summoned Cabal Deathsworn - Between 0-25% Health - Cast 'Enrage' (No Repeat)"),
+(@ID,0,5,0,61,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Summoned Cabal Deathsworn - On Link - Say Line 0"),
+(@ID,0,6,0,7,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Summoned Cabal Deathsworn - On Evade - Despawn (0)"),
+(@ID,0,7,0,7,0,100,0,0,0,0,0,18,33554432,0,0,0,0,0,1,0,0,0,0,0,0,0,"Summoned Cabal Deathsworn - On Evade - Set Flag Not Selectable");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"%s goes into a frenzy!",16,0,100,0,0,0,2384,0,"Summoned Cabal Deathsworn");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_03_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_03_world.sql
new file mode 100644
index 00000000000..bed5b36db36
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_03_world.sql
@@ -0,0 +1,15 @@
+-- These too should move randomly
+UPDATE `creature` SET `wander_distance` = 5, `MovementType` = 1 WHERE `id` = 18797 AND `guid` IN (67109,67110,67111,67112,67113,67114,67115,67116,67117,67118);
+
+-- Make NPCs in heroic too appear dead
+DELETE FROM `creature_template_addon` WHERE `entry` = 20662;
+INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES
+(20662,0,0,7,4097,0,0,"");
+
+-- Make all appeared dead non-selectable
+UPDATE `creature` SET `unit_flags` = 33554432 WHERE `id` = 18797 AND `guid` IN (67090,67091,67092,67093,67094,67095,67096,67097,67098,67099,67100,67101,67102,67103,67104,67105,67106,67107,67108,67120,67121,67122,67133,67134,67135,67136,67137,67138,67139,67140,67141,67142,67143,67145,67146,67147,67148);
+
+UPDATE `smart_scripts` SET `event_flags` = 0 WHERE `entryorguid` = 18797 AND `source_type` = 0 AND `id` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 18797 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
+(18797,0,1,0,4,0,100,0,0,0,0,0,19,33554432,0,0,0,0,0,1,0,0,0,0,0,0,0,"Tortured Skeleton - On Aggro - Remove Flag Not Selectable");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_04_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_04_world.sql
new file mode 100644
index 00000000000..cbd34281a95
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_04_world.sql
@@ -0,0 +1,13 @@
+-- Spy To'gun SAI (Source: CMaNGOS & https://www.youtube.com/watch?v=s_gMF0yQcVw)
+SET @ID := 18891;
+UPDATE `creature_template` SET `AIName` = "SmartAI", `ScriptName` = "" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ID,0,0,0,19,0,100,1,10091,0,0,0,0,80,@ID*100+0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Spy To'gun - On Quest 'The Soul Devices' Taken - Run Script (No Repeat)");
+
+-- Actionlist SAI
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID*100+0 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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ID*100+0,9,0,0,0,0,100,0,0,0,0,0,0,9,0,0,0,0,0,0,20,182942,0,0,0,0,0,0,0,"Spy To'gun - On Script - Activate Closest Gameobject (Cage)"),
+(@ID*100+0,9,1,0,0,0,100,0,0,0,0,0,0,59,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Spy To'gun - On Script - Set Run Off"),
+(@ID*100+0,9,2,0,0,0,100,0,2000,2000,0,0,0,69,1,0,0,0,0,0,8,0,0,0,0,-63.5416,42.9283,0.206252,2.42972,"Spy To'gun - On Script - Move To Position");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_05_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_05_world.sql
new file mode 100644
index 00000000000..63df7cfeac6
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_05_world.sql
@@ -0,0 +1,18 @@
+DELETE FROM `event_scripts` WHERE `id` IN (3201,3202,3203,3204);
+UPDATE `gameobject_template` SET `AIName` = "SmartGameObjectAI" WHERE `entry` IN (149025,149030,149031,149032);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (149025,149030,149031,149032) AND `source_type` = 1;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (14902500,14903000,14903100,14903200) 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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(149025,1,0,0,71,0,100,0,3201,0,0,0,0,80,14902500,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Sentry Brazier - On Event 3201 Inform - Run Script"),
+(149030,1,0,0,71,0,100,0,3202,0,0,0,0,80,14903000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Sentry Brazier - On Event 3202 Inform - Run Script"),
+(149031,1,0,0,71,0,100,0,3203,0,0,0,0,80,14903100,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Sentry Brazier - On Event 3203 Inform - Run Script"),
+(149032,1,0,0,71,0,100,0,3204,0,0,0,0,80,14903200,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Sentry Brazier - On Event 3204 Inform - Run Script"),
+
+(14902500,9,0,0,0,0,100,0,2000,2000,0,0,0,70,600,0,0,0,0,0,15,149020,50,0,0,0,0,0,0,"Sentry Brazier - On Script - Respawn Closest Gameobject 'Tower Fire'"),
+(14902500,9,1,0,0,0,100,0,0,0,0,0,0,70,600,0,0,0,0,0,15,149022,50,0,0,0,0,0,0,"Sentry Brazier - On Script - Respawn Closest Gameobject 'Tower Smoke'"),
+(14903000,9,0,0,0,0,100,0,2000,2000,0,0,0,70,600,0,0,0,0,0,15,149017,50,0,0,0,0,0,0,"Sentry Brazier - On Script - Respawn Closest Gameobject 'Tower Fire'"),
+(14903000,9,1,0,0,0,100,0,0,0,0,0,0,70,600,0,0,0,0,0,15,149018,50,0,0,0,0,0,0,"Sentry Brazier - On Script - Respawn Closest Gameobject 'Tower Smoke'"),
+(14903100,9,0,0,0,0,100,0,2000,2000,0,0,0,70,600,0,0,0,0,0,15,149019,50,0,0,0,0,0,0,"Sentry Brazier - On Script - Respawn Closest Gameobject 'Tower Fire'"),
+(14903100,9,1,0,0,0,100,0,0,0,0,0,0,70,600,0,0,0,0,0,15,149021,50,0,0,0,0,0,0,"Sentry Brazier - On Script - Respawn Closest Gameobject 'Tower Smoke'"),
+(14903200,9,0,0,0,0,100,0,2000,2000,0,0,0,70,600,0,0,0,0,0,15,148996,50,0,0,0,0,0,0,"Sentry Brazier - On Script - Respawn Closest Gameobject 'Tower Fire'"),
+(14903200,9,1,0,0,0,100,0,0,0,0,0,0,70,600,0,0,0,0,0,15,148997,50,0,0,0,0,0,0,"Sentry Brazier - On Script - Respawn Closest Gameobject 'Tower Smoke'");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_06_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_06_world.sql
new file mode 100644
index 00000000000..f0b8a157160
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_20_06_world.sql
@@ -0,0 +1,19 @@
+DELETE FROM `command` WHERE `name` IN ('account set gmlevel','account set seclevel');
+INSERT INTO `command` (`name`,`permission`,`help`) VALUES
+('account set gmlevel', 228, 'Syntax: .account set gmlevel [$accountName] #level [#realmID]
+
+Set the security level for targeted player (can\'t be used at self) or for account $accountName to a level of #level on the realm #realmID.
+
+#level may range from 0 to 3.
+
+#realmID - Default: -1 for all realms.
+
+Note: this command will be removed soon. Use \'account set seclevel\' instead.'),
+
+('account set seclevel', 228, 'Syntax: .account set seclevel [$accountName] #level [#realmID]
+
+Set the security level for targeted player (can\'t be used at self) or for account $accountName to a level of #level on the realm #realmID.
+
+#level may range from 0 to 3.
+
+#realmID - Default: -1 for all realms.');
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_22_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_22_00_world.sql
new file mode 100644
index 00000000000..4b26e95037c
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_22_00_world.sql
@@ -0,0 +1,5 @@
+-- Stranglethorn Fishing Extravaganza Turn-ins
+UPDATE `game_event` SET `holiday`= 0, `holidayStage`= 0 WHERE `eventEntry`= 62;
+-- Darkmoon Faire Building (Mulgore / Terokkar Forest)
+UPDATE `game_event` SET `length`= 4320, `holiday`= 375, `holidayStage`= 1 WHERE `eventEntry`= 71;
+UPDATE `game_event` SET `length`= 4320, `holiday`= 376, `holidayStage`= 1 WHERE `eventEntry`= 77;
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_24_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_24_00_world.sql
new file mode 100644
index 00000000000..a34ebb739ea
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_24_00_world.sql
@@ -0,0 +1,8 @@
+DROP TABLE IF EXISTS `battlefield_template`;
+CREATE TABLE `battlefield_template` (
+ `TypeId` tinyint unsigned not null,
+ `ScriptName` varchar(64) default '' not null,
+ `comment` text null
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+INSERT INTO `battlefield_template` (`TypeId`, `ScriptName`, `comment`) VALUES (1, 'battlefield_wg', null);
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_24_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_24_01_world.sql
new file mode 100644
index 00000000000..1c1cbd66423
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_24_01_world.sql
@@ -0,0 +1,6 @@
+UPDATE `achievement_criteria_data` SET `type`=6, `value1`=4395 WHERE `criteria_id`=6937;
+
+DELETE FROM `spell_script_names` WHERE `ScriptName` IN ("spell_midsummer_juggle_torch", "spell_midsummer_torch_catch");
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(45819, "spell_midsummer_juggle_torch"),
+(45644, "spell_midsummer_torch_catch");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_24_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_24_02_world.sql
new file mode 100644
index 00000000000..9f4aa567a5b
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_24_02_world.sql
@@ -0,0 +1,112 @@
+SET @GUID := 130968; -- Need 3 free GUIDs
+
+DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+2;
+INSERT INTO `creature` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`) VALUES
+(@GUID , 23377, 530, 0, 0, 1, 2, 0, 0, -3712.531494, 3514.539551, 325.550507, 3.277899, 0, 0, 0, 1, 0, 0, 0, 0, 0, "", 0),
+(@GUID+1, 23377, 530, 0, 0, 1, 2, 0, 0, -3712.062256, 3510.393799, 319.9505, 3.277899, 0, 0, 0, 1, 0, 0, 0, 0, 0, "", 0),
+(@GUID+2, 23377, 530, 0, 0, 1, 2, 0, 0, -3712.901123, 3517.808594, 319.9505, 3.277899, 0, 0, 0, 1, 0, 0, 0, 0, 0, "", 0);
+
+UPDATE `creature_template` SET `unit_flags`=256+512, `AIName`="SmartAI" WHERE `entry`=23377;
+UPDATE `creature_template` SET `unit_flags`=256+512 WHERE `entry`=21838;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=23277;
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (21838, 23277, -@GUID, -(@GUID+1), -(@GUID+2)) AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=185928 AND `source_type`=1;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (2183800, 2183801, 2327700, 2337700) 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_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(185928, 1, 0, 1, 62, 0, 100, 0, 8687, 0, 0, 0, 0, 85, 41004, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, "Ancient Skull Pile - On Gossip Option 0 Selected - Invoker Cast Summon Terokk"),
+(185928, 1, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, "Ancient Skull Pile - On Gossip Option 0 Selected - Close Gossip"),
+(185928, 1, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 41, 0, 900, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Ancient Skull Pile - On Gossip Option 0 Selected - Despawn for 15 minutes"),
+
+(21838, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 80, 2183800, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Terokk - On Respawn - Call Script"),
+(21838, 0, 1, 0, 0, 0, 100, 0, 4000, 7000, 15000, 20000, 0, 11, 40721, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, "Terokk - In Combat - Cast 'Shadow Bolt Volley'"),
+(21838, 0, 2, 0, 0, 0, 100, 0, 6000, 9000, 7000, 9000, 0, 11, 15284, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, "Terokk - In Combat - Cast 'Cleave'"),
+(21838, 0, 3, 0, 0, 0, 100, 0, 30000, 40000, 30000, 40000, 0, 80, 2183801, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Terokk - In Combat - Call Script"),
+(21838, 0, 4, 0, 2, 0, 100, 1, 0, 50, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 10, @GUID, 0, 0, 0, 0, 0, 0, 0, "Terokk - Between 0-50% Health - Set Data 1 1 (Skyguard Ace) (No Repeat)"),
+(21838, 0, 5, 6, 2, 0, 100, 1, 0, 25, 0, 0, 0, 11, 40733, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Terokk - Between 0-25% Health - Cast 'Divine Shield' (No Repeat)"),
+(21838, 0, 6, 7, 61, 0, 100, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Terokk - Between 0-25% Health - Say Line 2 (No Repeat)"),
+(21838, 0, 7, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 45, 2, 2, 0, 0, 0, 0, 10, @GUID, 0, 0, 0, 0, 0, 0, 0, "Terokk - Between 0-25% Health - Set Data 1 1 (Skyguard Ace) (No Repeat)"),
+(21838, 0, 8, 0, 23, 0, 100, 0, 40657, 1, 1000, 1000, 0, 28, 40733, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Terokk - On Has Aura 'Ancient Flames' - Remove Aura 'Divine Shield'"),
+(21838, 0, 9, 10, 23, 0, 100, 1, 40657, 1, 0, 0, 0, 11, 28747, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Terokk - On Has Aura 'Ancient Flames' - Cast 'Frenzy' (No Repeat)"),
+(21838, 0, 10, 11, 61, 0, 100, 0, 0, 0, 0, 0, 0, 1, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Terokk - On Has Aura 'Ancient Flames' - Say Line 3 (No Repeat)"),
+(21838, 0, 11, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Terokk - On Has Aura 'Ancient Flames' - Set Event Phase 1"),
+(21838, 0, 12, 0, 0, 1, 100, 0, 5000, 10000, 5000, 10000, 0, 11, 40733, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Terokk - In Combat - Cast 'Divine Shield' (Phase 1)"),
+(21838, 0, 13, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 45, 3, 3, 0, 0, 0, 0, 10, @GUID, 0, 0, 0, 0, 0, 0, 0, "Terokk - On Death - Set Data 3 3 (Skyguard Ace)"),
+(21838, 0, 14, 0, 7, 0, 100, 0, 0, 0, 0, 0, 0, 45, 4, 4, 0, 0, 0, 0, 10, @GUID, 0, 0, 0, 0, 0, 0, 0, "Terokk - On Evade - Set Data 4 4 (Skyguard Ace)"),
+(21838, 0, 15, 0, 21, 0, 100, 0, 0, 0, 0, 0, 0, 67, 1, 5000, 5000, 0, 0, 100, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Terokk - On Reached Home - Start Timed Event"),
+(21838, 0, 16, 0, 59, 0, 100, 0, 1, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Terokk - On Timed Event Triggered - Despawn"),
+(21838, 0, 17, 0, 4, 0, 100, 0, 0, 0, 0, 0, 0, 74, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Terokk - On Aggro - Remove Timed Event"),
+(21838, 0, 18, 0, 31, 0, 100, 0, 40726, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, "Terokk - On Target Hit By Spell 'Chosen One' - Say Line 1"),
+
+(2183800, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 11, 24240, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Terokk - On Script - Cast 'Spawn - Red Lightning'"),
+(2183800, 9, 1, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 0, 11, 41408, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Terokk - On Script - Cast 'Shadowform'"),
+(2183800, 9, 2, 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Terokk - On Script - Say Line 0"),
+(2183800, 9, 3, 0, 0, 0, 100, 0, 8000, 8000, 0, 0, 0, 19, 256+512, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Terokk - On Script - Remove Unitflag Immune to PC+NPC"),
+(2183800, 9, 4, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 0, "Terokk - On Script - Attack Summoner"),
+(2183801, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 11, 40726, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, "Terokk - On Script - Cast 'Chosen One'"),
+(2183801, 9, 1, 0, 0, 0, 100, 0, 500, 500, 0, 0, 0, 11, 40722, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, "Terokk - On Script - Cast 'Will of the Arakkoa God'"),
+
+(23277, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 80, 2327700, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Target - On Spawn - Run Script"),
+(2327700, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 11, 40656, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Target - On Script - Cast 'Skyguard Flare'"),
+(2327700, 9, 1, 0, 0, 0, 100, 0, 30000, 30000, 0, 0, 0, 45, 5, 5, 0, 0, 0, 0, 10, @GUID, 0, 0, 0, 0, 0, 0, 0, "Skyguard Target - On Script - Set Data 5 5 (Skyguard Ace)"),
+
+(-@GUID, 0, 0, 1, 38, 0, 100, 0, 1, 1, 0, 0, 0, 44, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Ace - On Data 1 1 Set - Set Phasemask 1"),
+(-@GUID, 0, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Ace - On Data 1 1 Set - Say Line 0"),
+(-@GUID, 0, 2, 3, 61, 0, 100, 0, 0, 0, 0, 0, 0, 53, 1, 23377, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Ace - On Data 1 1 Set - Start WP"),
+(-@GUID, 0, 3, 4, 61, 0, 100, 0, 0, 0, 0, 0, 0, 44, 1, 0, 0, 0, 0, 0, 10, @GUID+1, 0, 0, 0, 0, 0, 0, 0, "Skyguard Ace - On Data 1 1 Set - Set Phasemask 1 (Skyguard Ace)"),
+(-@GUID, 0, 4, 5, 61, 0, 100, 0, 0, 0, 0, 0, 0, 44, 1, 0, 0, 0, 0, 0, 10, @GUID+2, 0, 0, 0, 0, 0, 0, 0, "Skyguard Ace - On Data 1 1 Set - Set Phasemask 1 (Skyguard Ace)"),
+(-@GUID, 0, 5, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 67, 1, 600000, 600000, 0, 0, 100, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Ace - On Data 1 1 Set - Start Timed Event"),
+(-@GUID, 0, 6, 0, 59, 0, 100, 0, 1, 0, 0, 0, 0, 80, 2337700, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Ace - On Timed Event Triggered - Run Script"),
+(-@GUID, 0, 7, 8, 38, 0, 100, 0, 2, 2, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Ace - On Data 2 2 Set - Say Line 1"),
+(-@GUID, 0, 8, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Ace - On Data 2 2 Set - Set Event Phase 1"),
+(-@GUID, 0, 9, 10, 38, 0, 100, 0, 3, 3, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Ace - On Data 3 3 Set - Say Line 2"),
+(-@GUID, 0, 10, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 80, 2337700, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Ace - On Data 3 3 Set - Run Script"),
+(-@GUID, 0, 11, 0, 38, 0, 100, 0, 4, 4, 0, 0, 0, 80, 2337700, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Ace - On Data 4 4 Set - Run Script"),
+(-@GUID, 0, 12, 0, 1, 1, 100, 0, 10000, 15000, 30000, 40000, 0, 11, 40655, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Ace - OOC - Cast Skyguard Flare (Phase 1)"),
+(-@GUID, 0, 13, 0, 38, 0, 100, 0, 5, 5, 0, 0, 0, 11, 40657, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Ace - On Data 5 5 Set - Cast 'Ancient Flames'"),
+
+(2337700, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 41, 5000, 0, 0, 0, 0, 0, 10, @GUID+1, 0, 0, 0, 0, 0, 0, 0, "Skyguard Ace - On Script - Despawn In 5 Seconds (Skyguard Ace)"),
+(2337700, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 41, 5000, 0, 0, 0, 0, 0, 10, @GUID+2, 0, 0, 0, 0, 0, 0, 0, "Skyguard Ace - On Script - Despawn In 5 Seconds (Skyguard Ace)"),
+(2337700, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 41, 5000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Ace - On Script - Despawn In 5 Seconds");
+
+DELETE FROM `creature_text` WHERE `CreatureID` IN (21838, 23377);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(21838, 0, 0, "Who calls me to this world? The stars are not yet aligned... my powers fail me! You will pay for this!", 12, 0, 100, 0, 0, 0, 21639, 0, "Terokk"),
+(21838, 1, 0, "Show me what you're made of, $n!", 14, 0, 100, 0, 0, 0, 21327, 0, "Terokk"),
+(21838, 2, 0, "Kwa! You cannot kill me, I am immortal!", 14, 0, 100, 0, 0, 0, 24020, 0, "Terokk"),
+(21838, 3, 0, "%s becomes enraged as his shield shatters.", 41, 0, 100, 0, 0, 0, 21328, 0, "Terokk"),
+(23377, 0, 0, "Enemy sighted! Fall into formation and prepare for bombing maneuvers!", 14, 0, 100, 0, 0, 0, 21439, 0, "Skyguard Ace"),
+(23377, 1, 0, "Quickly! Use the flames and support the ground troops. Its ancient magic should cleanse Terokk's shield.", 14, 0, 100, 0, 0, 0, 24021, 0, "Skyguard Ace"),
+(23377, 2, 0, "They did it! Enemy down! Return to base!", 14, 0, 100, 0, 0, 0, 21437, 0, "Skyguard Ace");
+
+DELETE FROM `spell_script_names` WHERE `ScriptName`="spell_skyguard_flare";
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(40655, "spell_skyguard_flare");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=40722;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry`=21838;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13, 3, 40722, 0, 0, 1, 0, 40726, 0, 0, 1, 0, 0, "", "Will of the Arakkoa God does not affect targets with Chosen One aura"),
+(22, 13, 21838, 0, 0, 1, 1, 40657, 1, 0, 1, 0, 0, "", "SAI executes only if Terokk does not have Ancient Flames aura AND"),
+(22, 13, 21838, 0, 0, 1, 1, 40733, 0, 0, 1, 0, 0, "", "SAI executes only if Terokk does not have Divine Shield aura");
+
+DELETE FROM `creature_template_movement` WHERE `CreatureId`=23377;
+INSERT INTO `creature_template_movement` (`CreatureId`, `Flight`) VALUES
+(23377, 1);
+
+DELETE FROM `creature_template_addon` WHERE `entry`=23377;
+INSERT INTO `creature_template_addon` (`entry`, `mount`, `auras`) VALUES
+(23377, 21152, "");
+
+DELETE FROM `waypoints` WHERE `entry`=23377;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(23377, 1, -3774.552246, 3514.509766, 325.550507, "Skyguard Ace"),
+(23377, 2, -3794.875, 3497.479004, 325.550507, "Skyguard Ace"),
+(23377, 3, -3808.633789, 3515.702393, 325.550507, "Skyguard Ace"),
+(23377, 4, -3783.597168, 3524.585205, 325.550507, "Skyguard Ace");
+
+DELETE FROM `creature_formations` WHERE `leaderGUID`=@GUID;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`) VALUES
+(@GUID, @GUID, 0, 0, 515),
+(@GUID, @GUID+1, 5, 45, 515),
+(@GUID, @GUID+2, 5, 315, 515);
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_00_world.sql
new file mode 100644
index 00000000000..ff7e06e31ef
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_00_world.sql
@@ -0,0 +1,217 @@
+-- ScriptEffect for 32348 from sniffs. 32352 probably used on heroic only or not used at all
+DELETE FROM `spell_scripts` WHERE `id` = 32348;
+INSERT INTO `spell_scripts` (`id`,`effIndex`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`) VALUES
+(32348,0,0,15,32349,2,0,0,0,0,0),
+(32348,0,0,15,32353,2,0,0,0,0,0);
+
+-- Ethereal Darkcaster
+DELETE FROM `creature_addon` WHERE `guid` IN (83332,83335,83338,83339,83341,83345,83348,86396,91124,91186,91187);
+UPDATE `creature_addon` SET `auras` = "16592" WHERE `guid` IN (SELECT `guid` FROM `creature` WHERE `id` = 18331);
+DELETE FROM `creature_template_addon` WHERE `entry` IN (18331,20256);
+INSERT INTO `creature_template_addon` (`entry`,`auras`) VALUES
+(18331,"16592"), -- Shadowform
+(20256,"16592"); -- Shadowform
+
+-- Ethereal Scavenger SAI (Source: ACID 4.3.4 OD - N/H)
+SET @ID := 18309;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,4,0,15,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Ethereal Scavenger - On Aggro - Say Line 0"),
+(@ID,0,1,0,0,0,100,0,2400,4800,7200,21700,11,33871,32,0,0,0,0,2,0,0,0,0,0,0,0,"Ethereal Scavenger - In Combat - Cast 'Shield Bash'"),
+(@ID,0,2,0,0,0,100,0,2400,8300,12100,20500,11,33865,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ethereal Scavenger - In Combat - Cast 'Singe'"),
+(@ID,0,3,0,0,0,100,0,14100,28200,8100,16200,11,34920,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ethereal Scavenger - In Combat - Cast 'Strike'");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"What have the netherwinds brought us?",12,0,100,0,0,0,16721,0,"Ethereal Scavenger"),
+(@ID,0,1,"You're far from home, stranger.",12,0,100,0,0,0,16722,0,"Ethereal Scavenger"),
+(@ID,0,2,"Welcome to the Void...",12,0,100,0,0,0,16723,0,"Ethereal Scavenger"),
+(@ID,0,3,"If you hear the whisper, you're dying...",12,0,100,0,0,0,16724,0,"Ethereal Scavenger");
+
+-- Ethereal Crypt Raider SAI (Source: ACID 4.3.4 OD - N/H)
+SET @ID := 18311;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,4,0,15,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Ethereal Crypt Raider - On Aggro - Say Line 0"),
+(@ID,0,1,0,9,0,100,1,8,25,0,0,11,22911,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ethereal Crypt Raider - Within 8-25 Range - Cast 'Charge' (No Repeat)"),
+(@ID,0,2,0,0,0,100,0,5800,8400,60200,66200,11,31403,1,0,0,0,0,1,0,0,0,0,0,0,0,"Ethereal Crypt Raider - In Combat - Cast 'Battle Shout'"),
+(@ID,0,3,0,0,0,100,0,3600,13300,12100,18300,11,32315,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ethereal Crypt Raider - In Combat - Cast 'Soul Strike'"),
+(@ID,0,4,5,2,0,100,1,0,25,0,0,11,8599,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ethereal Crypt Raider - Between 0-25% Health - Cast 'Enrage' (No Repeat)"),
+(@ID,0,5,0,61,0,100,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ethereal Crypt Raider - On Link - Say Line 1"),
+(@ID,0,6,0,54,0,100,0,0,0,0,0,49,0,0,0,0,0,0,19,19671,0,0,0,0,0,0,"Ethereal Crypt Raider - On Just Summoned - Start Attacking Closest Creature 'Cryo-Engineer Sha'heen'");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"What have the netherwinds brought us?",12,0,100,0,0,0,16721,0,"Ethereal Crypt Raider"),
+(@ID,0,1,"You're far from home, stranger.",12,0,100,0,0,0,16722,0,"Ethereal Crypt Raider"),
+(@ID,0,2,"Welcome to the Void...",12,0,100,0,0,0,16723,0,"Ethereal Crypt Raider"),
+(@ID,0,3,"If you hear the whisper, you're dying...",12,0,100,0,0,0,16724,0,"Ethereal Crypt Raider"),
+(@ID,1,0,"%s goes into a frenzy!",16,0,100,0,0,0,2384,0,"Ethereal Crypt Raider");
+
+-- Ethereal Spellbinder SAI (Source: ACID 4.3.4 OD - N/H)
+SET @ID := 18312;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,4,0,15,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Ethereal Spellbinder - On Aggro - Say Line 0"),
+(@ID,0,1,0,0,0,100,2,4800,12400,14500,28900,11,17883,0,0,0,0,0,5,0,0,0,0,0,0,0,"Ethereal Spellbinder - In Combat - Cast 'Immolate' (Normal Dungeon)"),
+(@ID,0,2,0,0,0,100,4,4800,12400,14500,28900,11,37668,0,0,0,0,0,5,0,0,0,0,0,0,0,"Ethereal Spellbinder - In Combat - Cast 'Immolate' (Heroic Dungeon)"),
+(@ID,0,3,0,0,0,100,0,7200,14500,6100,16900,11,37470,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ethereal Spellbinder - In Combat - Cast 'Counterspell'"),
+(@ID,0,4,0,0,0,100,1,15700,20900,0,0,11,32316,1,0,0,0,0,1,0,0,0,0,0,0,0,"Ethereal Spellbinder - In Combat - Cast 'Summon Ethereal Wraith' (No Repeat)"),
+(@ID,0,5,0,54,0,100,0,0,0,0,0,49,0,0,0,0,0,0,19,19671,0,0,0,0,0,0,"Ethereal Spellbinder - On Just Summoned - Start Attacking Closest Creature 'Cryo-Engineer Sha'heen'");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"What have the netherwinds brought us?",12,0,100,0,0,0,16721,0,"Ethereal Spellbinder"),
+(@ID,0,1,"You're far from home, stranger.",12,0,100,0,0,0,16722,0,"Ethereal Spellbinder"),
+(@ID,0,2,"Welcome to the Void...",12,0,100,0,0,0,16723,0,"Ethereal Spellbinder"),
+(@ID,0,3,"If you hear the whisper, you're dying...",12,0,100,0,0,0,16724,0,"Ethereal Spellbinder");
+
+-- Ethereal Sorcerer SAI (Source: ACID 4.3.4 OD - N/H)
+SET @ID := 18313;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,4,0,15,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Ethereal Sorcerer - On Aggro - Say Line 0"),
+(@ID,0,1,0,0,0,100,2,5200,15700,15200,21200,11,15790,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ethereal Sorcerer - In Combat - Cast 'Arcane Missiles' (Normal Dungeon)"),
+(@ID,0,2,0,0,0,100,4,5200,15700,15200,21200,11,22272,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ethereal Sorcerer - In Combat - Cast 'Arcane Missiles' (Heroic Dungeon)"),
+(@ID,0,3,0,0,0,100,0,5100,11600,10800,21700,11,25603,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ethereal Sorcerer - In Combat - Cast 'Slow'"),
+(@ID,0,4,0,0,0,100,0,14000,25600,70700,71100,11,32348,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ethereal Sorcerer - In Combat - Cast 'Summon Arcane Fiends'");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"What have the netherwinds brought us?",12,0,100,0,0,0,16721,0,"Ethereal Sorcerer"),
+(@ID,0,1,"You're far from home, stranger.",12,0,100,0,0,0,16722,0,"Ethereal Sorcerer"),
+(@ID,0,2,"Welcome to the Void...",12,0,100,0,0,0,16723,0,"Ethereal Sorcerer"),
+(@ID,0,3,"If you hear the whisper, you're dying...",12,0,100,0,0,0,16724,0,"Ethereal Sorcerer");
+
+-- Nexus Stalker SAI (Source: ACID 4.3.4 OD - N/H)
+-- Phantom Strike is used on random target
+SET @ID := 18314;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,4,0,15,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Nexus Stalker - On Aggro - Say Line 0"),
+(@ID,0,1,0,0,0,100,0,4300,12100,9700,22100,11,34940,0,0,0,0,0,2,0,0,0,0,0,0,0,"Nexus Stalker - In Combat - Cast 'Gouge'"),
+(@ID,0,2,0,0,0,100,2,5900,12100,10900,21700,11,33925,0,0,0,0,0,5,0,0,0,0,0,0,0,"Nexus Stalker - In Combat - Cast 'Phantom Strike' (Normal Dungeon)"),
+(@ID,0,3,0,0,0,100,4,5900,12100,10900,21700,11,39332,0,0,0,0,0,5,0,0,0,0,0,0,0,"Nexus Stalker - In Combat - Cast 'Phantom Strike' (Heroic Dungeon)");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"What have the netherwinds brought us?",12,0,100,0,0,0,16721,0,"Nexus Stalker"),
+(@ID,0,1,"You're far from home, stranger.",12,0,100,0,0,0,16722,0,"Nexus Stalker"),
+(@ID,0,2,"Welcome to the Void...",12,0,100,0,0,0,16723,0,"Nexus Stalker"),
+(@ID,0,3,"If you hear the whisper, you're dying...",12,0,100,0,0,0,16724,0,"Nexus Stalker");
+
+-- Ethereal Theurgist SAI (Source: ACID 4.3.4 OD - N/H)
+-- Original script was without initial timers for the 'Strike'
+SET @ID := 18315;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,4,0,15,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Ethereal Theurgist - On Aggro - Say Line 0"),
+(@ID,0,1,0,0,0,100,2,5300,10300,7700,14400,11,15580,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ethereal Theurgist - In Combat - Cast 'Strike' (Normal Dungeon)"),
+(@ID,0,2,0,0,0,100,4,5300,10300,7700,14400,11,34920,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ethereal Theurgist - In Combat - Cast 'Strike' (Heroic Dungeon)"),
+(@ID,0,3,0,0,0,100,2,4200,13300,18100,24100,11,17145,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ethereal Theurgist - In Combat - Cast 'Blast Wave' (Normal Dungeon)"),
+(@ID,0,4,0,0,0,100,4,4200,13300,18100,24100,11,38064,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ethereal Theurgist - In Combat - Cast 'Blast Wave' (Heroic Dungeon)"),
+(@ID,0,5,0,0,0,100,0,2400,7200,18000,24000,11,13323,1,0,0,0,0,6,0,0,0,0,0,0,0,"Ethereal Theurgist - In Combat - Cast 'Polymorph'"),
+(@ID,0,6,0,54,0,100,0,0,0,0,0,49,0,0,0,0,0,0,19,19671,0,0,0,0,0,0,"Ethereal Theurgist - On Just Summoned - Start Attacking Closest Creature 'Cryo-Engineer Sha'heen'");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"What have the netherwinds brought us?",12,0,100,0,0,0,16721,0,"Ethereal Theurgist"),
+(@ID,0,1,"You're far from home, stranger.",12,0,100,0,0,0,16722,0,"Ethereal Theurgist"),
+(@ID,0,2,"Welcome to the Void...",12,0,100,0,0,0,16723,0,"Ethereal Theurgist"),
+(@ID,0,3,"If you hear the whisper, you're dying...",12,0,100,0,0,0,16724,0,"Ethereal Theurgist");
+
+-- Ethereal Priest SAI (Source: ACID 4.3.4 OD - N/H)
+SET @ID := 18317;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,4,0,15,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Ethereal Priest - On Aggro - Say Line 0"),
+(@ID,0,1,0,0,0,100,2,3400,9600,10800,18100,11,17139,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ethereal Priest - In Combat - Cast 'Power Word: Shield' (Normal Dungeon)"),
+(@ID,0,2,0,0,0,100,4,3400,9600,10800,18100,11,35944,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ethereal Priest - In Combat - Cast 'Power Word: Shield' (Heroic Dungeon)"),
+(@ID,0,3,0,0,0,100,2,4800,7700,10800,20500,11,34944,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ethereal Priest - In Combat - Cast 'Holy Nova' (Normal Dungeon)"),
+(@ID,0,4,0,0,0,100,4,4800,7700,10800,20500,11,37669,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ethereal Priest - In Combat - Cast 'Holy Nova' (Heroic Dungeon)"),
+(@ID,0,5,0,74,0,100,2,0,70,25000,35000,11,22883,1,0,0,0,0,9,0,0,40,0,0,0,0,"Ethereal Priest - On Friendly Between 0-70% Health - Cast 'Heal' (Normal Dungeon)"),
+(@ID,0,6,0,74,0,100,4,0,70,25000,35000,11,34945,1,0,0,0,0,9,0,0,40,0,0,0,0,"Ethereal Priest - On Friendly Between 0-70% Health - Cast 'Heal' (Heroic Dungeon)");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"What have the netherwinds brought us?",12,0,100,0,0,0,16721,0,"Ethereal Priest"),
+(@ID,0,1,"You're far from home, stranger.",12,0,100,0,0,0,16722,0,"Ethereal Priest"),
+(@ID,0,2,"Welcome to the Void...",12,0,100,0,0,0,16723,0,"Ethereal Priest"),
+(@ID,0,3,"If you hear the whisper, you're dying...",12,0,100,0,0,0,16724,0,"Ethereal Priest");
+
+-- Ethereal Darkcaster SAI (Source: ACID 4.3.4 OD - N/H & sniffs)
+SET @ID := 18331;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,11,0,100,2,0,0,0,0,11,34928,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ethereal Darkcaster - On Respawn - Cast 'Vampiric Aura' (Normal Dungeon)"),
+(@ID,0,1,0,11,0,100,4,0,0,0,0,11,38060,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ethereal Darkcaster - On Respawn - Cast 'Vampiric Aura' (Heroic Dungeon)"),
+(@ID,0,2,0,4,0,15,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Ethereal Darkcaster - On Aggro - Say Line 0"),
+(@ID,0,3,0,0,0,100,0,4300,8400,8400,18100,11,34942,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ethereal Darkcaster - In Combat - Cast 'Shadow Word: Pain'"),
+(@ID,0,4,0,0,0,100,2,5600,10800,15600,25300,11,34930,0,0,0,0,0,5,0,0,0,0,0,0,0,"Ethereal Darkcaster - In Combat - Cast 'Mana Burn' (Normal Dungeon)"),
+(@ID,0,5,0,0,0,100,4,5600,10800,15600,25300,11,34931,0,0,0,0,0,5,0,0,0,0,0,0,0,"Ethereal Darkcaster - In Combat - Cast 'Mana Burn' (Heroic Dungeon)");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"What have the netherwinds brought us?",12,0,100,0,0,0,16721,0,"Ethereal Darkcaster"),
+(@ID,0,1,"You're far from home, stranger.",12,0,100,0,0,0,16722,0,"Ethereal Darkcaster"),
+(@ID,0,2,"Welcome to the Void...",12,0,100,0,0,0,16723,0,"Ethereal Darkcaster"),
+(@ID,0,3,"If you hear the whisper, you're dying...",12,0,100,0,0,0,16724,0,"Ethereal Darkcaster");
+
+-- Tavarok SAI (Source: ACID 4.3.4 OD - N/H)
+SET @ID := 18343;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,0,0,100,2,7400,16800,7200,15500,11,8374,0,0,0,0,0,2,0,0,0,0,0,0,0,"Tavarok - In Combat - Cast 'Arcing Smash' (Normal Dungeon)"),
+(@ID,0,1,0,0,0,100,4,5400,12300,7200,15500,11,38761,0,0,0,0,0,2,0,0,0,0,0,0,0,"Tavarok - In Combat - Cast 'Arcing Smash' (Heroic Dungeon)"),
+(@ID,0,2,0,0,0,100,0,8500,17400,21700,27700,11,33919,1,0,0,0,0,1,0,0,0,0,0,0,0,"Tavarok - In Combat - Cast 'Earthquake'"),
+(@ID,0,3,0,0,0,100,0,16900,37400,13300,25300,11,32361,1,0,0,0,0,5,0,0,0,0,0,0,0,"Tavarok - In Combat - Cast 'Crystal Prison'");
+
+-- Ethereal Wraith SAI (Source: ACID 4.3.4 OD - N/H)
+-- Original script was without initial timers for 'Shadowbolt Volley'
+SET @ID := 18394;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,0,0,100,0,3000,7000,7800,13300,11,34934,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ethereal Wraith - In Combat - Cast 'Shadowbolt Volley'"),
+(@ID,0,1,0,7,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ethereal Wraith - On Evade - Despawn (0)");
+
+-- Arcane Fiend SAI (Source: ACID 4.3.4 OD - N/H)
+-- Original script was without initial timers for 'Arcane Explosion'
+SET @ID := 18429;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,0,0,100,2,3400,5300,8400,10200,11,15253,0,0,0,0,0,1,0,0,0,0,0,0,0,"Arcane Fiend - In Combat - Cast 'Arcane Explosion' (Normal Dungeon)"),
+(@ID,0,1,0,0,0,100,4,1300,5300,6600,10200,11,33860,0,0,0,0,0,1,0,0,0,0,0,0,0,"Arcane Fiend - In Combat - Cast 'Arcane Explosion' (Heroic Dungeon)"),
+(@ID,0,2,0,0,0,100,0,8400,13700,10800,13300,11,15122,0,0,0,0,0,2,0,0,0,0,0,0,0,"Arcane Fiend - In Combat - Cast 'Counterspell'"),
+(@ID,0,3,0,7,0,100,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Arcane Fiend - On Evade - Despawn (0)");
+
+-- Mana Leech SAI (Source: ACID 4.3.4 OD - N/H)
+SET @ID := 19306;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,0,0,100,0,8200,14500,13300,20500,11,15785,1,0,0,0,0,5,0,0,0,0,0,0,0,"Mana Leech - In Combat - Cast 'Mana Burn'"),
+(@ID,0,1,0,0,0,100,0,5800,10800,14600,18100,11,25602,0,0,0,0,0,5,0,0,0,0,0,0,0,"Mana Leech - In Combat - Cast 'Faerie Fire'"),
+(@ID,0,2,0,6,0,100,0,0,0,0,0,11,34933,7,0,0,0,0,1,0,0,0,0,0,0,0,"Mana Leech - On Death - Cast 'Arcane Explosion'");
+
+-- Nexus Terror SAI (Source: ACID 4.3.4 OD - N/H)
+-- Death Coil used only in heroic
+SET @ID := 19307;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,0,0,100,0,4800,19700,10800,21700,11,34322,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nexus Terror - In Combat - Cast 'Psychic Scream'"),
+(@ID,0,1,0,0,0,100,0,3600,16900,15700,24100,11,34922,0,0,0,0,0,2,0,0,0,0,0,0,0,"Nexus Terror - In Combat - Cast 'Shadows Embrace'"),
+(@ID,0,2,0,0,0,100,0,7100,20900,26500,37400,11,34925,0,0,0,0,0,5,0,0,0,0,0,0,0,"Nexus Terror - In Combat - Cast 'Curse of Impotence'"),
+(@ID,0,3,0,0,0,100,4,8400,17100,15700,25300,11,38065,1,0,0,0,0,2,0,0,0,0,0,0,0,"Nexus Terror - In Combat - Cast 'Death Coil' (Heroic Dungeon)"),
+(@ID,0,4,0,54,0,100,0,0,0,0,0,49,0,0,0,0,0,0,19,19671,0,0,0,0,0,0,"Nexus Terror - On Just Summoned - Start Attacking Closest Creature 'Cryo-Engineer Sha'heen'");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_01_world.sql
new file mode 100644
index 00000000000..de21fcad423
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_01_world.sql
@@ -0,0 +1,384 @@
+--
+SET @GUID := 150145; -- 3
+
+-- Spell 34444 is used by player after 34445
+UPDATE `quest_template_addon` SET `SourceSpellID` = 0 WHERE `ID` = 10211;
+
+-- A'dal SAI (rewrite and re-order actions)
+UPDATE `smart_scripts` SET `target_type` = 7, `target_param1` = 0 WHERE `entryorguid` = 1848100 AND `source_type` = 9 AND `id` IN (0,1,2,3);
+
+-- Removed the spell 'Blessing of A'dal' since is used only after turning in quest
+-- https://www.wowhead.com/spell=35076/blessing-of-adal#comments
+-- Confirmed by https://youtu.be/gvEYGFP4Kfc?t=42
+SET @ID := 18481;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID*100+1 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
+(@ID,0,0,0,20,0,100,0,11007,0,0,0,80,@ID*100+0,2,0,0,0,0,1,0,0,0,0,0,0,0,"A'dal - On Quest 'Kael'thas and the Verdant Sphere' Finished - Run Script"),
+(@ID,0,1,0,20,0,100,0,10210,0,0,0,80,@ID*100+1,2,0,0,0,0,1,0,0,0,0,0,0,0,"A'dal - On Quest 'A'dal' Finished - Run Script"),
+(@ID,0,2,0,19,0,100,0,13082,0,0,0,11,53141,0,0,0,0,0,7,0,0,0,0,0,0,0,"A'dal - On Quest 'The Boon of A'dal' Taken - Cast 'Portal Effect: Dalaran'"),
+
+(@ID*100+1,9,0,0,0,0,100,0,0,0,0,0,64,1,0,0,0,0,0,7,0,0,0,0,0,0,0,"A'dal - On Script - Store Targetlist"),
+(@ID*100+1,9,1,0,0,0,100,0,0,0,0,0,100,1,0,0,0,0,0,19,18166,0,0,0,0,0,0,"A'dal - On Script - Send Target 1 (Khadgar)"),
+(@ID*100+1,9,2,0,0,0,100,0,0,0,0,0,45,0,1,0,0,0,0,19,18166,0,0,0,0,0,0,"A'dal - On Script - Set Data 0 1 (Khadgar)");
+
+-- Khadgar SAI
+SET @ID := 18166;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID*100+0 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
+(@ID,0,0,0,38,0,100,0,0,1,0,0,1,0,0,0,0,0,0,12,1,0,0,0,0,0,0,"Khadgar - On Data Set 0 1 - Say Line 0"),
+(@ID,0,1,0,19,0,100,0,10211,0,0,0,80,@ID*100+0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Khadgar - On Quest 'City of Light' Taken - Run Script"),
+
+(@ID*100+0,9,0,0,0,0,100,0,0,0,0,0,11,34445,0,0,0,0,0,7,0,0,0,0,0,0,0,"Khadgar - On Script - Cast 'Trigger Khadgar's Servant'"),
+-- Hack, it must be done in spell script (spell 34445)
+(@ID*100+0,9,1,0,0,0,100,0,0,0,0,0,86,34444,0,7,0,0,0,7,0,0,0,0,0,0,0,"Khadgar - On Script - Cross Cast 'Summon Khadgar's Servant'"),
+(@ID*100+0,9,2,0,0,0,100,0,4000,4000,0,0,1,1,0,0,0,0,0,7,0,0,0,0,0,0,0,"Khadgar - On Script - Say Line 1");
+
+-- Khadgar's Servant SAI
+SET @ID := 19685;
+UPDATE `creature_template` SET `AIName` = "SmartAI", `ScriptName` = "" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` BETWEEN @ID*100+0 AND @ID*100+6 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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ID,0,0,0,54,0,100,0,0,0,0,0,80,@ID*100+0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Just Summoned - Run Script"),
+(@ID,0,1,0,40,0,100,0,9,0,0,0,80,@ID*100+1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Waypoint 9 Reached - Run Script"),
+(@ID,0,2,0,40,0,100,0,24,0,0,0,80,@ID*100+2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Waypoint 24 Reached - Run Script"),
+(@ID,0,3,0,40,0,100,0,52,0,0,0,80,@ID*100+3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Waypoint 52 Reached - Run Script"),
+(@ID,0,4,0,40,0,100,0,63,0,0,0,80,@ID*100+4,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Waypoint 63 Reached - Run Script"),
+(@ID,0,5,0,40,0,100,0,75,0,0,0,80,@ID*100+5,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Waypoint 75 Reached - Run Script"),
+(@ID,0,6,0,40,0,100,0,79,0,0,0,80,@ID*100+6,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Waypoint 79 Reached - Run Script"),
+
+-- Stop follow owner, he's guardian now
+(@ID*100+0,9,0,0,0,0,100,0,0,0,0,0,29,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Script - Stop Follow"),
+-- Hack, seems like the only way to really stop follow for guardians is
+-- to stop it by action above and then move creature to some point
+(@ID*100+0,9,1,0,0,0,100,0,0,0,0,0,69,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Script - Move To Self"),
+(@ID*100+0,9,2,0,0,0,100,0,8000,8000,0,0,1,0,0,0,0,0,0,23,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Script - Say Line 0"),
+(@ID*100+0,9,3,0,0,0,100,0,5000,5000,0,0,53,0,19685,0,0,0,0,1,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Script - Start Waypoint"),
+
+(@ID*100+1,9,0,0,0,0,100,0,0,0,0,0,54,25000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Script - Pause Waypoint"),
+(@ID*100+1,9,1,0,0,0,100,0,0,0,0,0,1,1,0,0,0,0,0,23,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Script - Say Line 1"),
+(@ID*100+1,9,2,0,0,0,100,0,6000,6000,0,0,1,2,0,0,0,0,0,23,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Script - Say Line 2"),
+(@ID*100+1,9,3,0,0,0,100,0,8000,8000,0,0,1,3,0,0,0,0,0,23,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Script - Say Line 3"),
+(@ID*100+1,9,4,0,0,0,100,0,6000,6000,0,0,1,4,0,0,0,0,0,23,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Script - Say Line 4"),
+
+(@ID*100+2,9,0,0,0,0,100,0,0,0,0,0,54,20000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Script - Pause Waypoint"),
+(@ID*100+2,9,1,0,0,0,100,0,0,0,0,0,1,5,0,0,0,0,0,23,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Script - Say Line 5"),
+(@ID*100+2,9,2,0,0,0,100,0,5000,5000,0,0,1,6,0,0,0,0,0,23,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Script - Say Line 6"),
+(@ID*100+2,9,3,0,0,0,100,0,8000,8000,0,0,1,7,0,0,0,0,0,23,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Script - Say Line 7"),
+
+(@ID*100+3,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,0,"Khadgar's Servant - On Script - Pause Waypoint"),
+(@ID*100+3,9,1,0,0,0,100,0,0,0,0,0,1,8,0,0,0,0,0,23,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Script - Say Line 8"),
+(@ID*100+3,9,2,0,0,0,100,0,8000,8000,0,0,1,9,0,0,0,0,0,23,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Script - Say Line 9"),
+(@ID*100+3,9,3,0,0,0,100,0,8000,8000,0,0,1,10,0,0,0,0,0,23,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Script - Say Line 10"),
+(@ID*100+3,9,4,0,0,0,100,0,8000,8000,0,0,1,11,0,0,0,0,0,23,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Script - Say Line 11"),
+
+(@ID*100+4,9,0,0,0,0,100,0,0,0,0,0,54,20000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Script - Pause Waypoint"),
+(@ID*100+4,9,1,0,0,0,100,0,0,0,0,0,1,12,0,0,0,0,0,23,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Script - Say Line 12"),
+(@ID*100+4,9,2,0,0,0,100,0,12000,12000,0,0,1,13,0,0,0,0,0,23,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Script - Say Line 13"),
+
+(@ID*100+5,9,0,0,0,0,100,0,0,0,0,0,54,22000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Script - Pause Waypoint"),
+(@ID*100+5,9,1,0,0,0,100,0,0,0,0,0,1,14,0,0,0,0,0,23,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Script - Say Line 14"),
+(@ID*100+5,9,2,0,0,0,100,0,7000,7000,0,0,1,15,0,0,0,0,0,23,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Script - Say Line 15"),
+(@ID*100+5,9,3,0,0,0,100,0,8000,8000,0,0,1,16,0,0,0,0,0,23,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Script - Say Line 16"),
+(@ID*100+5,9,4,0,0,0,100,0,7000,7000,0,0,1,17,0,0,0,0,0,23,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Script - Say Line 17"),
+
+(@ID*100+6,9,0,0,0,0,100,0,0,0,0,0,54,23000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Script - Pause Waypoint"),
+(@ID*100+6,9,1,0,0,0,100,0,7000,7000,0,0,1,18,0,0,0,0,0,23,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Script - Say Line 18"),
+(@ID*100+6,9,2,0,0,0,100,0,9000,9000,0,0,1,19,0,0,0,0,0,23,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Script - Say Line 19"),
+(@ID*100+6,9,3,0,0,0,100,0,12000,12000,0,0,1,20,0,0,0,0,0,23,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Script - Say Line 20"),
+(@ID*100+6,9,4,0,0,0,100,0,10000,10000,0,0,1,21,0,0,0,0,0,23,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Script - Say Line 21"),
+(@ID*100+6,9,5,0,0,0,100,0,6000,6000,0,0,11,34443,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Script - Cast 'Tour Complete'"),
+(@ID*100+6,9,6,0,0,0,100,0,4000,4000,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Khadgar's Servant - On Script - Despawn");
+
+DELETE FROM `script_waypoint` WHERE `entry` = 19685;
+DELETE FROM `waypoints` WHERE `entry` = 19685;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(19685,1,-1856.7291,5412.545,-12.428734,"Khadgar's Servant"),
+(19685,2,-1851.104,5399.949,-12.428146,"Khadgar's Servant"),
+(19685,3,-1847.482,5389.796,-12.428139,"Khadgar's Servant"),
+(19685,4,-1827.3976,5348.053,-12.42815,"Khadgar's Servant"),
+(19685,5,-1821.0642,5335.8955,-12.42815,"Khadgar's Servant"),
+(19685,6,-1802.9408,5316.994,-12.42815,"Khadgar's Servant"),
+(19685,7,-1798.6168,5309.4126,-14.128704,"Khadgar's Servant"),
+(19685,8,-1788.5541,5293.4414,-24.505981,"Khadgar's Servant"),
+(19685,9,-1779.5438,5277.361,-34.690746,"Khadgar's Servant"),
+(19685,10,-1771.0858,5261.3037,-38.817463,"Khadgar's Servant"),
+(19685,11,-1759.6964,5259.905,-40.20918,"Khadgar's Servant"),
+(19685,12,-1753.8544,5260.21,-40.20918,"Khadgar's Servant"),
+(19685,13,-1747.248,5259.636,-40.20918,"Khadgar's Servant"),
+(19685,14,-1746.0751,5253.2456,-42.85606,"Khadgar's Servant"),
+(19685,15,-1742.3296,5243.56,-46.769466,"Khadgar's Servant"),
+(19685,16,-1730.8258,5236.6045,-49.55395,"Khadgar's Servant"),
+(19685,17,-1683.7133,5220.5083,-49.08398,"Khadgar's Servant"),
+(19685,18,-1670.9059,5217.952,-46.45898,"Khadgar's Servant"),
+(19685,19,-1652.6665,5226.6304,-44.08592,"Khadgar's Servant"),
+(19685,20,-1634.3944,5250.019,-40.897358,"Khadgar's Servant"),
+(19685,21,-1630.9922,5271.961,-41.013546,"Khadgar's Servant"),
+(19685,22,-1626.7494,5289.8457,-40.59592,"Khadgar's Servant"),
+(19685,23,-1621.2554,5297.61,-40.20918,"Khadgar's Servant"),
+(19685,24,-1614.4084,5298.0903,-40.20918,"Khadgar's Servant"),
+(19685,25,-1632.7439,5300.1255,-40.20918,"Khadgar's Servant"),
+(19685,26,-1643.0891,5308.961,-40.20918,"Khadgar's Servant"),
+(19685,27,-1653.7859,5315.9053,-40.20918,"Khadgar's Servant"),
+(19685,28,-1659.5901,5336.533,-45.95236,"Khadgar's Servant"),
+(19685,29,-1662.5231,5352.865,-45.892548,"Khadgar's Servant"),
+(19685,30,-1648.3981,5373.665,-45.754517,"Khadgar's Servant"),
+(19685,31,-1642.712,5388.85,-45.504517,"Khadgar's Servant"),
+(19685,32,-1644.5186,5403.5293,-44.493343,"Khadgar's Servant"),
+(19685,33,-1646.4899,5413.0654,-45.243343,"Khadgar's Servant"),
+(19685,34,-1653.3834,5421.3716,-43.112034,"Khadgar's Servant"),
+(19685,35,-1666.6986,5426.2163,-38.837574,"Khadgar's Servant"),
+(19685,36,-1688.5514,5425.893,-35.175846,"Khadgar's Servant"),
+(19685,37,-1713.5116,5426.5933,-21.384369,"Khadgar's Servant"),
+(19685,38,-1736.4636,5427.166,-12.428154,"Khadgar's Servant"),
+(19685,39,-1740.6917,5401.8325,-12.428154,"Khadgar's Servant"),
+(19685,40,-1745.5271,5378.9697,-12.428154,"Khadgar's Servant"),
+(19685,41,-1762.5303,5368.7065,-12.428154,"Khadgar's Servant"),
+(19685,42,-1775.9219,5363.033,-12.42815,"Khadgar's Servant"),
+(19685,43,-1796.6299,5352.968,-12.42815,"Khadgar's Servant"),
+(19685,44,-1819.3346,5335.0957,-12.42815,"Khadgar's Servant"),
+(19685,45,-1846.719,5328.497,-12.428154,"Khadgar's Servant"),
+(19685,46,-1860.551,5321.537,-12.428154,"Khadgar's Servant"),
+(19685,47,-1879.4563,5312.3325,-12.428154,"Khadgar's Servant"),
+(19685,48,-1887.5878,5318.0654,-10.759747,"Khadgar's Servant"),
+(19685,49,-1891.0618,5339.536,0.9520931,"Khadgar's Servant"),
+(19685,50,-1897.5068,5326.246,1.2132931,"Khadgar's Servant"),
+(19685,51,-1912.0924,5287.3804,1.5652809,"Khadgar's Servant"),
+(19685,52,-1916.7811,5270.458,3.3536053,"Khadgar's Servant"),
+(19685,53,-1923.3287,5270.8525,3.6359081,"Khadgar's Servant"),
+(19685,54,-1927.7502,5278.948,-0.23987198,"Khadgar's Servant"),
+(19685,55,-1928.264,5297.987,-11.442955,"Khadgar's Servant"),
+(19685,56,-1922.1162,5313.118,-12.428154,"Khadgar's Servant"),
+(19685,57,-1923.5797,5337.27,-12.428158,"Khadgar's Servant"),
+(19685,58,-1927.2803,5350.631,-12.428154,"Khadgar's Servant"),
+(19685,59,-1956.068,5388.3394,-12.428158,"Khadgar's Servant"),
+(19685,60,-1969.9077,5433.6436,-12.428154,"Khadgar's Servant"),
+(19685,61,-1977.7777,5448.807,-12.428154,"Khadgar's Servant"),
+(19685,62,-1951.7997,5458.225,0.9233341,"Khadgar's Servant"),
+(19685,63,-1966.2068,5463.945,1.1968708,"Khadgar's Servant"),
+(19685,64,-1957.9502,5462.5312,1.0414124,"Khadgar's Servant"),
+(19685,65,-1953.9803,5461.978,0.9717388,"Khadgar's Servant"),
+(19685,66,-1951.378,5464.6187,0.7884636,"Khadgar's Servant"),
+(19685,67,-1970.6925,5486.3354,-12.428154,"Khadgar's Servant"),
+(19685,68,-1960.5685,5504.846,-12.428158,"Khadgar's Servant"),
+(19685,69,-1922.1747,5535.598,-12.428154,"Khadgar's Servant"),
+(19685,70,-1885.1937,5545.7783,-12.428154,"Khadgar's Servant"),
+(19685,71,-1857.5562,5548.6274,-12.428154,"Khadgar's Servant"),
+(19685,72,-1840.5497,5540.975,-10.218967,"Khadgar's Servant"),
+(19685,73,-1836.9247,5522.585,0.94164085,"Khadgar's Servant"),
+(19685,74,-1834.1553,5524.043,1.0545769,"Khadgar's Servant"),
+(19685,75,-1830.9613,5531.5635,1.2079754,"Khadgar's Servant"),
+(19685,76,-1831.6431,5526.3687,1.111126,"Khadgar's Servant"),
+(19685,77,-1838.75,5505.8076,0.85694885,"Khadgar's Servant"),
+(19685,78,-1845.4235,5485.2446,0.8564892,"Khadgar's Servant"),
+(19685,79,-1847.9873,5477.499,0.85691833,"Khadgar's Servant");
+
+UPDATE `creature_text` SET `comment` = "Khadgar's Servant" WHERE `CreatureID` = 19685;
+
+-- Haggard War Veteran
+-- Missing spawns
+DELETE FROM `creature` WHERE `guid` IN (@GUID+0,@GUID+1,@GUID+2);
+INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `MovementType`) VALUES
+(@GUID+0, 19684, 530, 1, 1, 0, -1853.81, 5129.783, -38.854, 2.015334, 300, 0, 2), --
+(@GUID+1, 19684, 530, 1, 1, 0, -1834.7545, 5355.983, -12.344798, 5.65486, 300, 0, 2), --
+(@GUID+2, 19684, 530, 1, 1, 0, -1568.29, 5139.5, -23.9051, 2.54298, 300, 0, 2); -- 170028
+
+DELETE FROM `creature_addon` WHERE `guid` IN (@GUID+0,@GUID+1,@GUID+2);
+INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES
+(@GUID+0,(@GUID+0)*10,0,1,0,''),
+(@GUID+1,(@GUID+1)*10,0,1,0,''),
+(@GUID+2,(@GUID+2)*10,0,1,0,'');
+
+DELETE FROM `waypoint_data` WHERE `id` IN ((@GUID+0)*10,(@GUID+1)*10,(@GUID+2)*10);
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+((@GUID+0)*10, 1, -1853.810, 5129.783, -38.854, 1.794635, 180000,0,0,100,0),
+((@GUID+0)*10, 2, -1852.098, 5112.867, -38.875, 4.614215, 0,0,0,100,0),
+((@GUID+0)*10, 3, -1854.521, 5075.556, -33.129, 4.629922, 0,0,0,100,0),
+((@GUID+0)*10, 4, -1858.051, 5038.752, -27.035, 4.602435, 0,0,0,100,0),
+((@GUID+0)*10, 5, -1861.358, 5013.369, -22.824, 4.574946, 0,0,0,100,0),
+((@GUID+0)*10, 6, -1858.051, 5038.752, -27.035, 4.602435, 0,0,0,100,0),
+((@GUID+0)*10, 7, -1854.521, 5075.556, -33.129, 4.629922, 0,0,0,100,0),
+((@GUID+0)*10, 8, -1852.098, 5112.867, -38.875, 4.614215, 0,0,0,100,0),
+((@GUID+1)*10, 1, -1834.7545, 5355.983, -12.344798, 5.651, 180000,0,0,100,0),
+((@GUID+1)*10, 2, -1856.9169, 5330.034, -12.427, 4.005531, 0,0,0,100,0),
+((@GUID+1)*10, 3, -1871.6191, 5312.819, -12.427, 4.005531, 0,0,0,100,0),
+((@GUID+1)*10, 4, -1890.5996, 5288.959, -12.427, 4.076217, 0,0,0,100,0),
+((@GUID+1)*10, 5, -1903.5646, 5270.025, 0.35275, 4.072291, 0,0,0,100,0),
+((@GUID+1)*10, 6, -1920.8806, 5255.520, 6.69293, 4.358962, 0,0,0,100,0),
+((@GUID+1)*10, 7, -1933.0880, 5221.805, 14.4307, 4.370744, 0,0,0,100,0),
+((@GUID+1)*10, 8, -1944.6090, 5187.949, 16.8348, 4.386452, 0,0,0,100,0),
+((@GUID+1)*10, 9, -1955.4442, 5154.369, 17.2905, 4.366816, 0,0,0,100,0),
+((@GUID+1)*10, 10, -1944.6090, 5187.949, 16.8348, 4.386452, 0,0,0,100,0),
+((@GUID+1)*10, 11, -1933.0880, 5221.805, 14.4307, 4.370744, 0,0,0,100,0),
+((@GUID+1)*10, 12, -1920.8806, 5255.520, 6.69293, 4.358962, 0,0,0,100,0),
+((@GUID+1)*10, 13, -1903.5646, 5270.025, 0.35275, 4.072291, 0,0,0,100,0),
+((@GUID+1)*10, 14, -1890.5996, 5288.959, -12.427, 4.076217, 0,0,0,100,0),
+((@GUID+1)*10, 15, -1871.6191, 5312.819, -12.427, 4.005531, 0,0,0,100,0),
+((@GUID+1)*10, 16, -1856.9169, 5330.034, -12.427, 4.005531, 0,0,0,100,0),
+((@GUID+2)*10, 1, -1568.29, 5139.5, -23.9051, 0, 0, 0,0,100,0),
+((@GUID+2)*10, 2, -1628.91, 5181.64, -36.080, 0, 0, 0,0,100,0),
+((@GUID+2)*10, 3, -1634.13, 5185.49, -37.146, 0, 0, 0,0,100,0),
+((@GUID+2)*10, 4, -1660.66, 5198.37, -38.855, 3.173009, 180000, 0, 0,100,0),
+((@GUID+2)*10, 5, -1634.13, 5185.49, -37.146, 0, 0, 0,0,100,0),
+((@GUID+2)*10, 6, -1628.91, 5181.64, -36.080, 0, 0, 0,0,100,0);
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 4426 AND `source_type` = 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`,`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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(4426,2,0,1,46,0,100,0,4426,0,0,0,0,64,1,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Areatrigger (Terrace of Light) - On Trigger - Store Targetlist"),
+(4426,2,1,2,61,0,100,0,0,0,0,0,0,100,1,0,0,0,0,0,19,19684,30,0,0,0,0,0,0,"Areatrigger (Terrace of Light) - On Link - Send Target 1 (Haggard War Veteran)"),
+(4426,2,2,0,61,0,100,0,0,0,0,0,0,45,0,1,0,0,0,0,19,19684,30,0,0,0,0,0,0,"Areatrigger (Terrace of Light) - On Link - Set Data 0 1 (Haggard War Veteran)");
+
+DELETE FROM `areatrigger_scripts` WHERE `entry` = 4426;
+INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES
+(4426,"SmartTrigger");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 22 AND `SourceEntry` = 4426 AND `SourceId` = 2;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(22,1,4426,2,0,9,0,10211,0,0,0,0,0,"","Group 0: Execute SAI (Action 0) if player has taken quest 'City of Light'");
+
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = 19684;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 19684 AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(19684,0,0,0,38,0,100,0,0,1,60000,60000,0,1,1,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Haggard War Veteran - On Data Set 0 1 - Say Line 1");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = 19684;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+-- 0 probably used in waypoint script by creature in -1955.3021 5184.2227 16.977425
+(19684,0,0,"The market sure looks busy today.",12,0,100,0,0,0,17235,0,"Haggard War Veteran"),
+(19684,0,1,"Look at those crazy kids running around. Not a care in the world.",12,0,100,0,0,0,17236,0,"Haggard War Veteran"),
+(19684,0,2,"What manner of creature is that? Looks like a purple goblin.",12,0,100,0,0,0,17237,0,"Haggard War Veteran"),
+(19684,1,0,"Khadgar himself is showing you around? You must have made a good impression, $n.",12,0,100,0,0,0,17283,0,"Haggard War Veteran");
+
+-- Sha'nir
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 4425 AND `source_type` = 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`,`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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(4425,2,0,0,46,0,100,0,4425,0,0,0,0,45,0,1,0,0,0,0,19,18597,0,0,0,0,0,0,0,"Areatrigger (Lower City) - On Trigger - Set Data 0 1 (Sha'nir)");
+
+DELETE FROM `areatrigger_scripts` WHERE `entry` = 4425;
+INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES
+(4425,"SmartTrigger");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 22 AND `SourceEntry` = 4425 AND `SourceId` = 2;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(22,1,4425,2,0,9,0,10211,0,0,0,0,0,"","Group 0: Execute SAI (Action 0) if player has taken quest 'City of Light'");
+
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = 18597;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 18597 AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 1859700 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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(18597,0,0,0,38,0,100,0,0,1,60000,60000,0,80,1859700,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Sha'nir - On Data Set 0 1 - Run Script"), -- 02:53:29.000
+(1859700,9,0,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,0,"Sha'nir - On Script - Say Line 0"); -- 02:53:35.000
+
+DELETE FROM `creature_text` WHERE `CreatureID` = 18597;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(18597,0,0,"A newcomer to Shattrath! Make sure to drop by later. We can always use a hand with the injured.",12,0,100,0,0,0,17282,0,"Sha'nir");
+
+-- Iz'zard & Arcanist Adyria
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 4428 AND `source_type` = 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`,`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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(4428,2,0,0,46,0,100,0,4428,0,0,0,0,45,0,1,0,0,0,0,19,18622,0,0,0,0,0,0,0,"Areatrigger (Lower City) - On Trigger - Set Data 0 1 (Iz'zard)");
+
+DELETE FROM `areatrigger_scripts` WHERE `entry` = 4428;
+INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES
+(4428,"SmartTrigger");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 22 AND `SourceEntry` = 4428 AND `SourceId` = 2;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(22,1,4428,2,0,9,0,10211,0,0,0,0,0,"","Group 0: Execute SAI (Action 0) if player has taken quest 'City of Light'");
+
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = 18622;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 18622 AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 1862200 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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(18622,0,0,0,38,0,100,0,0,1,60000,60000,0,80,1862200,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Iz'zard - On Data Set 0 1 - Run Script"), -- 02:54:32.000
+(1862200,9,0,0,0,0,100,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Iz'zard - On Script - Say Line 0"), -- 02:54:32.000
+(1862200,9,1,0,0,0,100,0,6000,6000,0,0,0,1,0,0,0,0,0,0,19,18596,0,0,0,0,0,0,0,"Iz'zard - On Script - Say Line 0 (Arcanist Adyria)"); -- 02:54:38.000
+
+DELETE FROM `creature_text` WHERE `CreatureID` IN (18622,18596);
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(18622,0,0,"Be mindful of what you say, this one's being shown around by Khadgar's pet.",12,0,100,0,0,0,17284,0,"Iz'zard"),
+(18596,0,0,"Are you joking? I'm a Scryer, I always watch what I say. More enemies than allies in this city, it seems.",12,0,100,0,0,0,17285,0,"Arcanist Adyria");
+
+
+
+-- Aldor Anchorite
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 4429 AND `source_type` = 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`,`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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(4429,2,0,1,46,0,100,0,4429,0,0,0,0,64,1,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Areatrigger (Terrace of Light) - On Trigger - Store Targetlist"),
+(4429,2,1,2,61,0,100,0,0,0,0,0,0,12,19142,8,0,0,0,0,8,0,0,0,0,-1890.9529,5338.5063,1.0447,4.939281,"Areatrigger (Terrace of Light) - On Link - Summon Creature 'Aldor Anchorite'"),
+(4429,2,2,0,61,0,100,0,0,0,0,0,0,100,1,0,0,0,0,0,19,19142,100,0,0,0,0,0,0,"Areatrigger (Terrace of Light) - On Link - Send Target 1 (Aldor Anchorite)");
+
+DELETE FROM `areatrigger_scripts` WHERE `entry` = 4429;
+INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES
+(4429,"SmartTrigger");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 22 AND `SourceEntry` = 4429 AND `SourceId` = 2;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(22,1,4429,2,0,9,0,10211,0,0,0,0,0,"","Group 0: Execute SAI (Action 0) if player has taken quest 'City of Light'"),
+(22,1,4429,2,0,29,0,19142,100,0,1,0,0,"","Group 0: Execute SAI (Action 0) if creature 'Aldor Anchorite' is not near");
+
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = 19142;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 19142 AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(19142,0,0,0,54,0,100,0,0,0,0,0,0,53,0,19142,0,0,0,2,1,0,0,0,0,0,0,0,0,"Aldor Anchorite - On Just Summoned - Start Waypoint"),
+(19142,0,1,0,40,0,100,0,1,0,0,0,0,1,0,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Aldor Anchorite - On Waypoint 1 Reached - Say Line 0"),
+(19142,0,2,0,40,0,100,0,7,0,0,0,0,41,1000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Aldor Anchorite - On Waypoint 7 Reached - Despawn (1000)");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = 19142;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(19142,0,0,"Light be with you, $n. And welcome to Shattrath.",12,0,100,0,0,0,17286,0,"Aldor Anchorite");
+
+DELETE FROM `waypoints` WHERE `entry` = 19142;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(19142,1,-1888.4237,5326.354,-3.825138,"Aldor Anchorite"),
+(19142,2,-1887.8665,5322.0596,-7.4228554,"Aldor Anchorite"),
+(19142,3,-1885.7524,5312.7925,-12.428154,"Aldor Anchorite"),
+(19142,4,-1880.2937,5306.304,-12.428154,"Aldor Anchorite"),
+(19142,5,-1871.0533,5302.632,-12.428154,"Aldor Anchorite"),
+(19142,6,-1846.2037,5304.3022,-12.428154,"Aldor Anchorite"),
+(19142,7,-1834.7722,5303.1914,-12.428154,"Aldor Anchorite");
+
+-- Scryer Arcanist
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 4430 AND `source_type` = 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`,`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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(4430,2,0,1,46,0,100,0,4430,0,0,0,0,64,1,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Areatrigger (Terrace of Light) - On Trigger - Store Targetlist"),
+(4430,2,1,2,61,0,100,0,0,0,0,0,0,12,18547,8,0,0,0,0,8,0,0,0,0,-2011.0538,5479.285,3.8012,0.104719,"Areatrigger (Terrace of Light) - On Link - Summon Creature 'Scryer Arcanist'"),
+(4430,2,2,0,61,0,100,0,0,0,0,0,0,100,1,0,0,0,0,0,19,18547,100,0,0,0,0,0,0,"Areatrigger (Terrace of Light) - On Link - Send Target 1 (Scryer Arcanist)");
+
+DELETE FROM `areatrigger_scripts` WHERE `entry` = 4430;
+INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES
+(4430,"SmartTrigger");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 22 AND `SourceEntry` = 4430 AND `SourceId` = 2;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(22,1,4430,2,0,9,0,10211,0,0,0,0,0,"","Group 0: Execute SAI (Action 0) if player has taken quest 'City of Light'"),
+(22,1,4430,2,0,29,0,18547,100,0,1,0,0,"","Group 0: Execute SAI (Action 0) if creature 'Scryer Arcanist' is not near");
+
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = 18547;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 18547 AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(18547,0,0,0,54,0,100,0,0,0,0,0,0,53,0,18547,0,0,0,2,1,0,0,0,0,0,0,0,0,"Scryer Arcanist - On Just Summoned - Start Waypoint"),
+(18547,0,1,0,40,0,100,0,2,0,0,0,0,1,0,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Scryer Arcanist - On Waypoint 2 Reached - Say Line 0"),
+(18547,0,2,0,40,0,100,0,11,0,0,0,0,41,1000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Scryer Arcanist - On Waypoint 11 Reached - Despawn (1000)");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = 18547;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(18547,0,0,"We're rather selective of who we befriend, $n. You think you have what it takes?",12,0,100,0,0,0,17287,0,"Scryer Arcanist");
+
+DELETE FROM `waypoints` WHERE `entry` = 18547;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(18547,1,-1984.6294,5469.5337,0.9833431,"Scryer Arcanist"),
+(18547,2,-1969.3099,5464.869,1.2419147,"Scryer Arcanist"),
+(18547,3,-1957.1414,5460.9097,1.0112228,"Scryer Arcanist"),
+(18547,4,-1935.9397,5453.796,0.85699654,"Scryer Arcanist"),
+(18547,5,-1919.1415,5447.9434,0.85645866,"Scryer Arcanist"),
+(18547,6,-1914.0087,5445.4805,0.85712814,"Scryer Arcanist"),
+(18547,7,-1910.4358,5435.6807,1.0386486,"Scryer Arcanist"),
+(18547,8,-1915.1366,5424.12,1.7555523,"Scryer Arcanist"),
+(18547,9,-1916.685,5417.044,2.154705,"Scryer Arcanist"),
+(18547,10,-1908.1824,5399.165,2.3604717,"Scryer Arcanist"),
+(18547,11,-1910.6818,5390.2026,2.254301,"Scryer Arcanist"); -- probably incomplete, no despawn packet
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_02_world.sql
new file mode 100644
index 00000000000..1f868bc3638
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_02_world.sql
@@ -0,0 +1,65 @@
+-- Goblin Land Mine SAI (based on a video but I haven't saved the url)
+SET @ID := 7527;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ID,0,0,0,54,0,100,0,0,0,0,0,0,80,@ID*100+0,2,0,0,0,0,1,0,0,0,0,0,0,0,0,"Goblin Land Mine - On Just Summoned - Run Script"),
+-- Probably 4043 is used only when the mine is summoned by player and 11815 is used if summoned by NPCs
+-- Used also by NPC Weegli Blastfuse (7607), Spell 21688
+(@ID,0,1,3,10,1,100,1,0,10,0,0,0,11,4043,2,0,0,0,0,1,0,0,0,0,0,0,0,0,"Goblin Land Mine - OOC Los - Cast 'Detonation' (Phase 1) (No Repeat)"),
+(@ID,0,2,3,26,1,100,1,0,10,0,0,0,11,4043,2,0,0,0,0,1,0,0,0,0,0,0,0,0,"Goblin Land Mine - IC Los - Cast 'Detonation' (Phase 1) (No Repeat)"),
+(@ID,0,3,0,61,0,100,0,0,0,0,0,0,37,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Goblin Land Mine - On Link - Kill Self");
+
+-- Actionlist SAI
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID*100+0 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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ID*100+0,9,0,0,0,0,100,0,0,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Goblin Land Mine - On Script - Set Event Phase 2"),
+(@ID*100+0,9,1,0,0,0,100,0,0,0,0,0,0,116,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Goblin Land Mine - On Script - Set Corpse Delay"),
+(@ID*100+0,9,2,0,0,0,100,0,0,0,0,0,0,8,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Goblin Land Mine - On Script - Set Reactstate Passive"),
+(@ID*100+0,9,3,0,0,0,100,0,0,0,0,0,0,11,11816,2,0,0,0,0,1,0,0,0,0,0,0,0,0,"Goblin Land Mine - On Script - Cast 'Land Mine Arming'"),
+-- It appears that the first emote is not used immediately after spawn
+(@ID*100+0,9,4,0,0,0,100,0,1000,1000,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Goblin Land Mine - On Script - Say Line 0"),
+(@ID*100+0,9,5,0,0,0,100,0,5000,5000,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Goblin Land Mine - On Script - Say Line 1"),
+(@ID*100+0,9,6,0,0,0,100,0,5000,5000,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Goblin Land Mine - On Script - Say Line 2"),
+-- Now the mine becomes active
+(@ID*100+0,9,7,0,0,0,100,0,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Goblin Land Mine - On Script - Set Event Phase 1"),
+(@ID*100+0,9,8,0,0,0,100,0,0,0,0,0,0,28,11816,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Goblin Land Mine - On Script - Remove Aura 'Land Mine Arming'");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextID`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"%s will be armed in 10 seconds!",16,0,100,0,0,0,3541,0,"Goblin Land Mine"),
+(@ID,1,0,"%s will be armed in 5 seconds!",16,0,100,0,0,0,3542,0,"Goblin Land Mine"),
+(@ID,2,0,"%s is now armed!",16,0,100,0,0,0,3543,0,"Goblin Land Mine");
+
+DELETE FROM `creature_template_movement` WHERE `CreatureId` = 7527;
+INSERT INTO `creature_template_movement` (`CreatureId`, `Ground`, `Swim`, `Flight`, `Rooted`, `Chase`, `Random`) VALUES
+(7527,1,1,0,1,0,0);
+
+-- Dark Iron Land Mine SAI (based on a video but I haven't saved the url)
+SET @ID := 8035;
+UPDATE `creature_template` SET `AIName` = "SmartAI", `unit_flags` = 0 WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ID,0,0,0,54,0,100,0,0,0,0,0,0,80,@ID*100+0,2,0,0,0,0,1,0,0,0,0,0,0,0,0,"Dark Iron Land Mine - On Just Summoned - Run Script"),
+-- Probably 11815 is used
+(@ID,0,1,3,10,1,100,1,0,10,0,0,0,11,4043,2,0,0,0,0,1,0,0,0,0,0,0,0,0,"Dark Iron Land Mine - OOC Los - Cast 'Detonation' (Phase 1) (No Repeat)"),
+(@ID,0,2,3,26,1,100,1,0,10,0,0,0,11,4043,2,0,0,0,0,1,0,0,0,0,0,0,0,0,"Dark Iron Land Mine - IC Los - Cast 'Detonation' (Phase 1) (No Repeat)"),
+(@ID,0,3,0,61,0,100,0,0,0,0,0,0,37,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Dark Iron Land Mine - On Link - Kill Self");
+
+-- Actionlist SAI
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID*100+0 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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ID*100+0,9,0,0,0,0,100,0,0,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Dark Iron Land Mine - On Script - Set Event Phase 2"),
+(@ID*100+0,9,1,0,0,0,100,0,0,0,0,0,0,116,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Dark Iron Land Mine - On Script - Set Corpse Delay"),
+(@ID*100+0,9,2,0,0,0,100,0,0,0,0,0,0,8,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Dark Iron Land Mine - On Script - Set Reactstate Passive"),
+(@ID*100+0,9,3,0,0,0,100,0,0,0,0,0,0,11,11816,2,0,0,0,0,1,0,0,0,0,0,0,0,0,"Dark Iron Land Mine - On Script - Cast 'Land Mine Arming'"),
+-- It appears that the first emote is not used immediately after spawn
+(@ID*100+0,9,4,0,0,0,100,0,1000,1000,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Dark Iron Land Mine - On Script - Say Line 0"),
+(@ID*100+0,9,5,0,0,0,100,0,5000,5000,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Dark Iron Land Mine - On Script - Say Line 1"),
+(@ID*100+0,9,6,0,0,0,100,0,5000,5000,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Dark Iron Land Mine - On Script - Say Line 2"),
+-- Now the mine becomes active
+(@ID*100+0,9,7,0,0,0,100,0,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Dark Iron Land Mine - On Script - Set Event Phase 1"),
+(@ID*100+0,9,8,0,0,0,100,0,0,0,0,0,0,28,11816,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Dark Iron Land Mine - On Script - Remove Aura 'Land Mine Arming'");
+
+UPDATE `creature_text` SET `Sound` = 0 WHERE `CreatureID` = @ID;
+UPDATE `smart_scripts` SET `event_type` = 0 WHERE `entryorguid` = 6212 AND `source_type` = 0 AND `id` = 0;
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_03_world_335.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_03_world_335.sql
new file mode 100644
index 00000000000..8cbf09d7647
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_03_world_335.sql
@@ -0,0 +1,80 @@
+-- Galen Goodward SAI (Source: https://www.youtube.com/watch?v=57_CgmmO-hI & https://www.youtube.com/watch?v=Uxvm_uQvQhQ)
+SET @ID := 5391;
+UPDATE `creature_template` SET `AIName` = "SmartAI", `ScriptName` = "" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ID,0,0,0,11,0,100,0,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Galen Goodward - On Respawn - Set Event Phase 1"),
+(@ID,0,1,0,4,0,100,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Galen Goodward - On Aggro - Say Line 0"),
+(@ID,0,2,0,19,0,100,0,1393,0,0,0,0,80,@ID*100+0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Galen Goodward - On Quest 'Galen's Escape' Taken - Run Script"),
+
+(@ID,0,3,0,40,0,100,0,1,0,0,0,0,54,3000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Galen Goodward - On Waypoint 1 Reached - Pause Waypoint"),
+
+(@ID,0,4,5,40,0,100,0,21,0,0,0,0,59,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Galen Goodward - On Waypoint 21 Reached - Set Run On"),
+(@ID,0,5,6,61,0,100,0,0,0,0,0,0,66,0,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Galen Goodward - On Link - Set Orientation Stored Target"),
+(@ID,0,6,7,61,0,100,0,0,0,0,0,0,1,3,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Galen Goodward - On Link - Say Line 3"),
+(@ID,0,7,8,61,0,100,0,0,0,0,0,0,1,4,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Galen Goodward - On Link - Say Line 4"),
+(@ID,0,8,9,61,0,100,0,0,0,0,0,0,1,5,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Galen Goodward - On Link - Say Line 5"),
+(@ID,0,9,0,61,0,100,0,0,0,0,0,0,15,1393,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Galen Goodward - On Link - Quest Credit 'Galen's Escape'"),
+
+(@ID,0,10,0,40,0,100,0,22,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Galen Goodward - On Waypoint 22 Reached - Despawn (0)"),
+
+(@ID,0,11,0,38,1,100,0,0,1,60000,60000,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Galen Goodward - On Data Set 0 1 - Say Line 1 (Phase 1)"),
+(@ID,0,12,0,6,0,100,0,0,0,0,0,0,6,1393,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Galen Goodward - On Death - Fail Quest 'Galen's Escape'");
+
+-- Actionlist SAI
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID*100+0 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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ID*100+0,9,0,0,0,0,100,0,0,0,0,0,0,64,1,0,0,0,0,0,16,0,0,0,0,0,0,0,0,"Galen Goodward - On Script - Store Targetlist"),
+(@ID*100+0,9,1,0,0,0,100,0,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Galen Goodward - On Script - Set Event Phase 0"),
+(@ID*100+0,9,2,0,0,0,100,0,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Galen Goodward - On Script - Remove NPC Flag Questgiver"),
+(@ID*100+0,9,3,0,0,0,100,0,0,0,0,0,0,2,250,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Galen Goodward - On Script - Set Faction 250"),
+(@ID*100+0,9,4,0,0,0,100,0,0,0,0,0,0,19,256,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Galen Goodward - On Script - Remove Flags Immune To Players"),
+(@ID*100+0,9,5,0,0,0,100,0,0,0,0,0,0,1,2,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Galen Goodward - On Script - Say Line 2"),
+(@ID*100+0,9,6,0,0,0,100,0,3000,3000,0,0,0,9,0,0,0,0,0,0,20,37118,0,0,0,0,0,0,0,"Galen Goodward - On Script - Activate Closest Gameobject 'Galen's Cage'"),
+(@ID*100+0,9,7,0,0,0,100,0,0,0,0,0,0,53,0,5391,0,0,0,2,1,0,0,0,0,0,0,0,0,"Galen Goodward - On Script - Start Waypoint");
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 2387 AND `source_type` = 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`,`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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(2387,2,0,0,46,0,100,0,2387,0,0,0,0,45,0,1,0,0,0,0,19,5391,20,0,0,0,0,0,0,"Areatrigger (Swamp of Sorrows) - On Trigger - Set Data 0 1 (Galen Goodward)");
+
+DELETE FROM `areatrigger_scripts` WHERE `entry` = 2387;
+INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES
+(2387,"SmartTrigger");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"Look out! The $n attacks!",12,0,100,0,0,0,1628,0,"Galen Goodward"),
+(@ID,0,1,"Help! I'm under attack!",12,0,100,0,0,0,1629,0,"Galen Goodward"),
+(@ID,0,2,"Help! The beast is on me!",12,0,100,0,0,0,1630,0,"Galen Goodward"),
+(@ID,1,0,"I'm glad you're here! Because I need your help!!",12,0,100,0,0,0,1631,0,"Galen Goodward"),
+(@ID,1,1,"Help! Please, you must help me!",12,0,100,0,0,0,7124,0,"Galen Goodward"),
+(@ID,2,0,"Let us leave this place.",12,0,100,0,0,0,1854,0,"Galen Goodward"),
+(@ID,3,0,"Thank you, $n. I will remember you always. You can find my strongbox in my camp, north of Stonard.",12,0,100,0,0,0,1855,0,"Galen Goodward"),
+(@ID,4,0,"%s whispers to $n the secret to opening his strongbox.",16,0,100,0,0,0,2076,0,"Galen Goodward"),
+(@ID,5,0,"%s disappears into the swamp.",16,0,100,0,0,0,1856,0,"Galen Goodward");
+
+DELETE FROM `script_waypoint` WHERE `entry` = 5391;
+DELETE FROM `waypoints` WHERE `entry` = 5391;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(5391,1,-9901.12,-3727.29,22.11,"Galen Goodward"),
+(5391,2,-9909.27,-3727.81,23.25,"Galen Goodward"),
+(5391,3,-9935.25,-3729.02,22.11,"Galen Goodward"),
+(5391,4,-9945.83,-3719.34,21.68,"Galen Goodward"),
+(5391,5,-9963.41,-3710.18,21.71,"Galen Goodward"),
+(5391,6,-9972.75,-3690.13,21.68,"Galen Goodward"),
+(5391,7,-9989.7,-3669.67,21.67,"Galen Goodward"),
+(5391,8,-9989.21,-3647.76,23,"Galen Goodward"),
+(5391,9,-9992.27,-3633.74,21.67,"Galen Goodward"),
+(5391,10,-10002.3,-3611.67,22.26,"Galen Goodward"),
+(5391,11,-9999.25,-3586.33,21.85,"Galen Goodward"),
+(5391,12,-10006.5,-3571.99,21.67,"Galen Goodward"),
+(5391,13,-10014.3,-3545.24,21.67,"Galen Goodward"),
+(5391,14,-10018.9,-3525.03,21.68,"Galen Goodward"),
+(5391,15,-10030.2,-3514.77,21.67,"Galen Goodward"),
+(5391,16,-10045.1,-3501.49,21.67,"Galen Goodward"),
+(5391,17,-10052.9,-3479.13,21.67,"Galen Goodward"),
+(5391,18,-10060.7,-3460.31,21.67,"Galen Goodward"),
+(5391,19,-10074.7,-3436.85,20.97,"Galen Goodward"),
+(5391,20,-10074.7,-3436.85,20.97,"Galen Goodward"),
+(5391,21,-10072.9,-3408.92,20.43,"Galen Goodward"),
+(5391,22,-10108,-3406.05,22.06,"Galen Goodward");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_04_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_04_world.sql
new file mode 100644
index 00000000000..e692950c67b
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_04_world.sql
@@ -0,0 +1,155 @@
+--
+UPDATE `creature_template` SET `speed_walk` = 6.5/2.5, `speed_run` = 10/7, `unit_flags` = 33536, `BaseAttackTime` = 2000, RangeAttackTime = 2000 WHERE `entry` = 23365;
+UPDATE `creature_template` SET `speed_run` = 9.7/7 WHERE `entry` = 23380;
+UPDATE `creature_model_info` SET `BoundingRadius` = 0.938, `CombatReach` = 1.4 WHERE `DisplayID` = 21433;
+UPDATE `creature_model_info` SET `BoundingRadius` = 2.260511 WHERE `DisplayID` = 21444;
+UPDATE `spell_target_position` SET `PositionX` = 2330.46, `PositionY` = 7303.28, `PositionZ` = 365.7003, `Orientation` = 3.54216 WHERE `ID` = 41108 AND `EffectIndex` = 0;
+
+-- Torkus SAI
+SET @ENTRY := 23316;
+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`,`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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,20,0,100,0,11061,0,0,0,0,11,41109,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Torkus - On Quest 'A Father's Duty' Finished - Cast 'Periodic - Summon Torkus Jr.'");
+
+-- Torkus Jr. SAI
+SET @ENTRY := 23365;
+UPDATE `creature_template` SET `AIName` = "SmartAI", `flags_extra` = `flags_extra`|512 WHERE `entry` = @ENTRY;
+UPDATE `creature_template` SET `flags_extra` = `flags_extra`|512 WHERE `entry` = 30813;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ENTRY AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` BETWEEN @ENTRY*100+0 AND @ENTRY*100+3 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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,54,0,100,0,0,0,0,0,0,80,@ENTRY*100+0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Torkus Jr. - On Just Summoned - Run Script"),
+(@ENTRY,0,1,0,40,0,100,0,12,0,0,0,0,80,@ENTRY*100+1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Torkus Jr. - On Waypoint 12 Reached - Run Script"),
+(@ENTRY,0,2,0,40,0,100,0,17,0,0,0,0,80,@ENTRY*100+2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Torkus Jr. - On Waypoint 17 Reached - Run Script"),
+(@ENTRY,0,3,0,40,0,100,0,43,0,0,0,0,80,@ENTRY*100+3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Torkus Jr. - On Waypoint 43 Reached - Run Script"),
+(@ENTRY,0,4,0,40,0,100,0,48,0,0,0,0,41,1000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Torkus Jr. - On Waypoint 9 Reached - Despawn (1000)"),
+
+(@ENTRY*100+0,9,0,0,0,0,100,0,3000,3000,0,0,0,66,0,0,0,0,0,0,23,0,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Set Orientation Owner"),
+(@ENTRY*100+0,9,1,0,0,0,100,0,0,0,0,0,0,1,0,0,0,0,0,0,23,0,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Say Line 0"),
+(@ENTRY*100+0,9,2,0,0,0,100,0,4000,4000,0,0,0,1,1,0,0,0,0,0,23,0,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Say Line 1"),
+(@ENTRY*100+0,9,3,0,0,0,100,0,2000,2000,0,0,0,5,92,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Play Emote 92"),
+(@ENTRY*100+0,9,4,0,0,0,100,0,0,0,0,0,0,71,0,0,3699,0,0,0,1,0,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Change Equipment"),
+(@ENTRY*100+0,9,5,0,0,0,100,0,4000,4000,0,0,0,5,92,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Play Emote 92"),
+(@ENTRY*100+0,9,6,0,0,0,100,0,0,0,0,0,0,71,0,0,2198,0,0,0,1,0,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Change Equipment"),
+(@ENTRY*100+0,9,7,0,0,0,100,0,4000,4000,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Say Line 2"),
+(@ENTRY*100+0,9,8,0,0,0,100,0,0,0,0,0,0,71,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Change Equipment"),
+(@ENTRY*100+0,9,9,0,0,0,100,0,2000,2000,0,0,0,53,0,23365,0,0,0,0,1,0,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Start Waypoint"),
+
+(@ENTRY*100+1,9,0,0,0,0,100,0,0,0,0,0,0,54,28000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Pause Waypoint"),
+(@ENTRY*100+1,9,1,0,0,0,100,0,2000,2000,0,0,0,90,8,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Set Flag Standstate Kneel"),
+(@ENTRY*100+1,9,2,0,0,0,100,0,0,0,0,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Say Line 3"),
+(@ENTRY*100+1,9,3,0,0,0,100,0,3000,3000,0,0,0,1,1,0,0,0,0,0,19,23334,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Say Line 1 (Sky Commander Keller)"),
+(@ENTRY*100+1,9,4,0,0,0,100,0,2000,2000,0,0,0,91,8,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Remove Flag Standstate Kneel"),
+(@ENTRY*100+1,9,5,0,0,0,100,0,1000,1000,0,0,0,5,1,0,0,0,0,0,19,23334,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Play Emote 1 (Sky Commander Keller)"),
+(@ENTRY*100+1,9,6,0,0,0,100,0,6000,6000,0,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Say Line 4"),
+(@ENTRY*100+1,9,7,0,0,0,100,0,8000,8000,0,0,0,1,2,0,0,0,0,0,19,23334,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Say Line 2 (Sky Commander Keller)"),
+(@ENTRY*100+1,9,8,0,0,0,100,0,4000,4000,0,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Say Line 5"),
+(@ENTRY*100+1,9,9,0,0,0,100,0,0,0,0,0,0,1,6,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Say Line 6"),
+
+(@ENTRY*100+2,9,0,0,0,0,100,0,0,0,0,0,0,54,5000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Pause Waypoint"),
+(@ENTRY*100+2,9,1,0,0,0,100,0,1000,1000,0,0,0,1,7,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Say Line 7"),
+(@ENTRY*100+2,9,2,0,0,0,100,0,2000,2000,0,0,0,1,0,0,0,0,0,0,19,22987,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Say Line 0 (Skyguard Nether Ray)"),
+(@ENTRY*100+2,9,3,0,0,0,100,0,1000,1000,0,0,0,43,0,21444,0,0,0,0,1,0,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Mount"),
+(@ENTRY*100+2,9,4,0,0,0,100,0,0,0,0,0,0,60,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Set Fly On"),
+(@ENTRY*100+2,9,5,0,0,0,100,0,1000,1000,0,0,0,1,3,0,0,0,0,0,19,23334,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Say Line 3 (Sky Commander Keller)"),
+
+(@ENTRY*100+3,9,0,0,0,0,100,0,0,0,0,0,0,54,9500,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Pause Waypoint"),
+(@ENTRY*100+3,9,1,0,0,0,100,0,0,0,0,0,0,43,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Dismount"),
+(@ENTRY*100+3,9,2,0,0,0,100,0,0,0,0,0,0,60,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Set Fly Off"),
+(@ENTRY*100+3,9,3,0,0,0,100,0,0,0,0,0,0,59,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Set Run On"),
+(@ENTRY*100+3,9,4,0,0,0,100,0,0,0,0,0,0,1,8,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Say Line 8"),
+(@ENTRY*100+3,9,5,0,0,0,100,0,1000,1000,0,0,0,11,41123,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Cast 'Summon Bronco'"),
+(@ENTRY*100+3,9,6,0,0,0,100,0,0,0,0,0,0,66,0,0,0,0,0,0,19,23380,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Set Orientation Closest Creature 'Bronco'"),
+(@ENTRY*100+3,9,7,0,0,0,100,0,0,0,0,0,0,90,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Set Flag Standstate Sit"),
+(@ENTRY*100+3,9,8,0,0,0,100,0,3000,3000,0,0,0,1,0,0,0,0,0,0,19,23380,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Say Line 0 (Bronco)"),
+(@ENTRY*100+3,9,9,0,0,0,100,0,0,0,0,0,0,45,0,1,0,0,0,0,19,23380,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Set Data 0 1 (Bronco)"),
+(@ENTRY*100+3,9,10,0,0,0,100,0,2000,2000,0,0,0,1,9,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Say Line 9"),
+(@ENTRY*100+3,9,11,0,0,0,100,0,3000,3000,0,0,0,91,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Torkus Jr. - On Script - Remove Flag Standstate Sit");
+
+-- Bronco SAI
+SET @ENTRY := 23380;
+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`,`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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ENTRY,0,0,0,38,0,100,0,0,1,0,0,0,53,1,23380,0,0,0,0,1,0,0,0,0,0,0,0,0,"Bronco - On Data Set 0 1 - Start Waypoint"),
+(@ENTRY,0,1,0,40,0,100,0,9,0,0,0,0,41,1000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Bronco - On Waypoint 9 Reached - Despawn (1000)");
+
+DELETE FROM `waypoints` WHERE `entry` IN (23365,23380);
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(23365,1,2388.48,7323.022,366.0821,"Torkus Jr."),
+(23365,2,2403.956,7326.238,365.3166,"Torkus Jr."),
+(23365,3,2425.602,7328.778,366.0603,"Torkus Jr."),
+(23365,4,2456.905,7328.807,364.9909,"Torkus Jr."),
+(23365,5,2478.453,7318.382,365.0911,"Torkus Jr."),
+(23365,6,2489.64,7319.959,367.9602,"Torkus Jr."),
+(23365,7,2499.269,7322.674,371.8641,"Torkus Jr."),
+(23365,8,2507.406,7322.218,374.0491,"Torkus Jr."),
+(23365,9,2513.396,7324.969,374.6715,"Torkus Jr."),
+(23365,10,2506.65,7334.407,376.5914,"Torkus Jr."),
+(23365,11,2501.301,7339.496,378.507,"Torkus Jr."),
+(23365,12,2502.115,7354.8,380.4968,"Torkus Jr."), --
+(23365,13,2501.762,7340.44,378.7509,"Torkus Jr."),
+(23365,14,2504.961,7335.365,376.9442,"Torkus Jr."),
+(23365,15,2514.731,7329.022,375.3513,"Torkus Jr."),
+(23365,16,2523.857,7323.703,373.4666,"Torkus Jr."),
+(23365,17,2530.638,7314.663,373.4666,"Torkus Jr."), --
+(23365,18,2533.652,7313.149,374.7746,"Torkus Jr."),
+(23365,19,2533.447,7316.091,376.6632,"Torkus Jr."),
+(23365,20,2533.632,7318.173,374.5524,"Torkus Jr."),
+(23365,21,2535.23,7315.936,375.0524,"Torkus Jr."),
+(23365,22,2537.44,7314.543,375.5802,"Torkus Jr."),
+(23365,23,2537.963,7317.232,375.3579,"Torkus Jr."),
+(23365,24,2536.23,7319.043,376.0521,"Torkus Jr."),
+(23365,25,2533.874,7320.764,375.08,"Torkus Jr."),
+(23365,26,2530.911,7318.042,374.4968,"Torkus Jr."),
+(23365,27,2530.487,7316.014,376.4689,"Torkus Jr."),
+(23365,28,2528.512,7319.185,375.4412,"Torkus Jr."),
+(23365,29,2529.733,7322.888,376.1076,"Torkus Jr."),
+(23365,30,2531.962,7323.523,376.4968,"Torkus Jr."),
+(23365,31,2537.023,7322.074,376.2847,"Torkus Jr."),
+(23365,32,2541.908,7319.018,375.09,"Torkus Jr."),
+(23365,33,2547.636,7318.503,375.2287,"Torkus Jr."),
+(23365,34,2558.549,7312.783,375.2287,"Torkus Jr."),
+(23365,35,2567.508,7306.688,375.2287,"Torkus Jr."),
+(23365,36,2575.549,7305.697,378.951,"Torkus Jr."),
+(23365,37,2571.671,7308.094,383.7288,"Torkus Jr."),
+(23365,38,2561.646,7313.308,387.7843,"Torkus Jr."),
+(23365,39,2555.156,7311.284,383.8676,"Torkus Jr."),
+(23365,40,2560.29,7306.233,378.8124,"Torkus Jr."),
+(23365,41,2563.351,7296.057,378.8124,"Torkus Jr."),
+(23365,42,2567.216,7299.937,378.8124,"Torkus Jr."),
+(23365,43,2573.686,7298.948,365.813,"Torkus Jr."), --
+(23365,44,2593.253,7268.279,364.9899,"Torkus Jr."),
+(23365,45,2591.54,7239.053,364.9277,"Torkus Jr."),
+(23365,46,2578.906,7225.053,364.9814,"Torkus Jr."),
+(23365,47,2574.136,7205.383,364.1418,"Torkus Jr."),
+(23365,48,2583.654,7164.126,364.8251,"Torkus Jr."),
+(23380,1,2573.233,7295.982,365.5504,"Bronco"),
+(23380,2,2591.895,7269.491,364.827,"Bronco"),
+(23380,3,2595.734,7247.869,364.185,"Bronco"),
+(23380,4,2583.377,7237.241,364.5394,"Bronco"),
+(23380,5,2569.756,7223.433,363.8503,"Bronco"),
+(23380,6,2575.606,7193.863,363.8637,"Bronco"),
+(23380,7,2587.886,7161.841,364.5957,"Bronco"),
+(23380,8,2603.697,7122.514,365.4023,"Bronco"),
+(23380,9,2607.468,7087.224,365.3389,"Bronco");
+
+DELETE FROM `creature_text` WHERE `CreatureID` IN (23365,22987,23380);
+DELETE FROM `creature_text` WHERE `CreatureID` = 23334 AND `GroupID` IN (1,2,3);
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(23365,0,0,"Thank you for helping us with the flasks.",12,0,100,1,0,0,21479,0,"Torkus Jr."),
+(23365,1,0,"Now that the flasks are ready, we can show the Skyguard our moves!",12,0,100,1,0,0,21445,0,"Torkus Jr."),
+(23365,2,0,"Watch out, Skyguard. Here comes Torkus Jr.!",12,0,100,15,0,0,21446,0,"Torkus Jr."),
+(23365,3,0,"Commander, sir! Cadet Torkus Jr. reporting for duty, sir!",12,0,100,0,0,0,21447,0,"Torkus Jr."),
+(23365,4,0,"Yes, sir. An ogre, sir. But give us a chance, sir! We've been preparing for this since the first time the Skyguard flew over Ogri'la, sir!",12,0,100,1,0,0,21449,0,"Torkus Jr."),
+(23365,5,0,"Nonsense!",12,0,100,11,0,0,21488,0,"Torkus Jr."),
+(23365,6,0,"%s makes a gesture of dismissal and heads for the launch pad.",16,0,100,0,0,0,21450,0,"Torkus Jr."),
+(23365,7,0,"Bronco? That sounds like a good one!",12,0,100,1,0,0,21472,0,"Torkus Jr."),
+(23365,8,0,"Bronco bucks %s from its back and escapes into the wild!",16,0,100,0,0,0,21468,0,"Torkus Jr."),
+(23365,9,0,"Come back, Mr. Bronco! We're gonna be in the Skyguard together!",14,0,100,15,0,0,21476,0,"Torkus Jr."),
+(23334,1,0,"Look here, lad. I admire your dedication, but I'm not sure how to tell you this... You're an ogre, son.",12,0,100,5,0,0,21448,0,"Sky Commander Keller"),
+(23334,2,0,"I don't think yer hearin' me. Nether rays just aren't made for --",12,0,100,1,0,0,21473,0,"Sky Commander Keller"),
+(23334,3,0,"No, lad, not Bronco! He's not been broken yet! You'll get yerself killed up there!",14,0,100,5,0,0,21467,0,"Sky Commander Keller"),
+(22987,0,0,"%s cowers in fear as it realizies what the ogre has in mind.",16,0,100,0,0,0,21451,0,"Skyguard Nether Ray"),
+(23380,0,0,"%s hisses loudly at Torkus Jr.",16,0,100,35,0,0,21482,0,"Bronco");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_05_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_05_world.sql
new file mode 100644
index 00000000000..c2ee21711f3
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_05_world.sql
@@ -0,0 +1,137 @@
+--
+UPDATE `creature` SET `position_x` = -1890.8405, `position_y` = 5364.6646, `position_z` = -12.344814, `orientation` = 0.855211 WHERE `id` = 17076;
+UPDATE `creature` SET `position_x` = -1892.8138, `position_y` = 5358.005, `position_z` = -12.344588, `orientation` = 1.41371 WHERE `id` = 23131 AND `guid` = 121269;
+UPDATE `creature` SET `position_x` = -1891.7179, `position_y` = 5361.508, `position_z` = -12.344777, `orientation` = 1.27409 WHERE `id` = 23131 AND `guid` = 121277;
+
+-- I found only info about her respawn timer when she was attackable(as boss in Silvermoon)
+UPDATE `creature` SET `spawntimesecs` = 600 WHERE `id` = 17076;
+UPDATE `creature` SET `spawntimesecs` = 600 WHERE `id` = 23131 AND `guid` = 121269;
+UPDATE `creature` SET `spawntimesecs` = 600 WHERE `id` = 23131 AND `guid` = 121277;
+
+DELETE FROM `creature_formations` WHERE `leaderGUID` = 68464;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES
+(68464,68464,0,0,512,0,0),
+(68464,121277,5,310,512,0,0),
+(68464,121269,5,50,512,0,0);
+
+UPDATE `creature_template_addon` SET `mount` = 19085 WHERE `entry` = 17076;
+DELETE FROM `creature_addon` WHERE `guid` IN (121277,121269);
+INSERT INTO `creature_addon` (`guid`,`mount`) VALUES
+(121277,19296),
+(121269,19296);
+
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` IN (17076,25167);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (17076,25167) AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` BETWEEN 1707600 AND 1707603 AND `source_type` = 9;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 2516700 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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(17076,0,0,0,63,0,100,0,0,0,0,0,0,80,1707600,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lady Liadrin - On Just Created - Run Script"),
+(17076,0,1,0,40,0,100,0,9,0,0,0,0,80,1707601,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lady Liadrin - On Waypoint 9 Reached - Run Script"),
+(17076,0,2,0,40,0,100,0,10,0,0,0,0,80,1707602,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lady Liadrin - On Waypoint 10 Reached - Run Script"),
+(17076,0,3,0,40,0,100,0,22,0,0,0,0,80,1707603,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lady Liadrin - On Waypoint 22 Reached - Run Script"),
+(17076,0,4,0,38,0,100,0,1,1,0,0,0,65,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lady Liadrin - On Data Set 1 1 - Resume Waypoint"),
+
+(1707600,9,0,0,0,0,100,0,0,0,0,0,0,83,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lady Liadrin - On Script - Remove NPC Flag Gossip"),
+(1707600,9,1,0,0,0,100,0,4000,4000,0,0,0,53,0,17076,0,0,0,2,1,0,0,0,0,0,0,0,0,"Lady Liadrin - On Script - Start Waypoint"),
+
+(1707601,9,0,0,0,0,100,0,0,0,0,0,0,54,3000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lady Liadrin - On Script - Pause Waypoint"),
+(1707601,9,1,0,0,0,100,0,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0.436332,"Lady Liadrin - On Script - Set Orientation"),
+(1707601,9,2,0,0,0,100,0,0,0,0,0,0,43,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lady Liadrin - On Script - Dismount"),
+(1707601,9,3,0,0,0,100,0,0,0,0,0,0,43,0,0,0,0,0,0,11,23131,30,0,0,0,0,0,0,"Lady Liadrin - On Script - Dismount (Blood Knight Honor Guard)"),
+
+(1707602,9,0,0,0,0,100,0,0,0,0,0,0,54,300000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lady Liadrin - On Script - Pause Waypoint"),
+(1707602,9,1,0,0,0,100,0,1000,1000,0,0,0,5,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lady Liadrin - On Script - Play Emote 2"),
+(1707602,9,2,0,0,0,100,0,0,0,0,0,0,5,25,0,0,0,0,0,19,25167,0,0,0,0,0,0,0,"Lady Liadrin - On Script - Play Emote 25 (General Tiras'alan)"),
+(1707602,9,3,0,0,0,100,0,2000,2000,0,0,0,1,0,0,0,0,0,0,19,25167,0,0,0,0,0,0,0,"Lady Liadrin - On Script - Say Line 0 (General Tiras'alan)"), -- 03:08:21.000
+(1707602,9,4,0,0,0,100,0,7000,7000,0,0,0,1,4,0,0,0,0,0,19,18481,0,0,0,0,0,0,0,"Lady Liadrin - On Script - Say Line 4 (A'dal)"),
+(1707602,9,5,0,0,0,100,0,7000,7000,0,0,0,1,5,0,0,0,0,0,19,18481,0,0,0,0,0,0,0,"Lady Liadrin - On Script - Say Line 5 (A'dal)"),
+(1707602,9,6,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,0,"Lady Liadrin - On Script - Say Line 0"), -- 03:08:41.000
+(1707602,9,7,0,0,0,100,0,7000,7000,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lady Liadrin - On Script - Say Line 1"), -- 03:08:48.000
+(1707602,9,8,0,0,0,100,0,7000,7000,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lady Liadrin - On Script - Say Line 2"), -- 03:08:55.000
+(1707602,9,9,0,0,0,100,0,12000,12000,0,0,0,1,6,0,0,0,0,0,19,18481,0,0,0,0,0,0,0,"Lady Liadrin - On Script - Say Line 6 (A'dal)"),
+(1707602,9,10,0,0,0,100,0,9000,9000,0,0,0,1,7,0,0,0,0,0,19,18481,0,0,0,0,0,0,0,"Lady Liadrin - On Script - Say Line 7 (A'dal)"),
+(1707602,9,11,0,0,0,100,0,3000,3000,0,0,0,5,6,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lady Liadrin - On Script - Play Emote 6"), -- 03:09:19.000
+(1707602,9,12,0,0,0,100,0,3000,3000,0,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lady Liadrin - On Script - Say Line 3"), -- 03:09:22.000
+(1707602,9,13,0,0,0,100,0,7000,7000,0,0,0,1,8,0,0,0,0,0,19,18481,0,0,0,0,0,0,0,"Lady Liadrin - On Script - Say Line 8 (A'dal)"),
+(1707602,9,14,0,0,0,100,0,7000,7000,0,0,0,1,9,0,0,0,0,0,19,18481,0,0,0,0,0,0,0,"Lady Liadrin - On Script - Say Line 9 (A'dal)"),
+(1707602,9,15,0,0,0,100,0,7000,7000,0,0,0,1,10,0,0,0,0,0,19,18481,0,0,0,0,0,0,0,"Lady Liadrin - On Script - Say Line 10 (A'dal)"),
+(1707602,9,16,0,0,0,100,0,7000,7000,0,0,0,1,11,0,0,0,0,0,19,18481,0,0,0,0,0,0,0,"Lady Liadrin - On Script - Say Line 11 (A'dal)"),
+(1707602,9,17,0,0,0,100,0,7000,7000,0,0,0,1,12,0,0,0,0,0,19,18481,0,0,0,0,0,0,0,"Lady Liadrin - On Script - Say Line 12 (A'dal)"),
+(1707602,9,18,0,0,0,100,0,7000,7000,0,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lady Liadrin - On Script - Say Line 4"), -- 03:10:04.000
+(1707602,9,19,0,0,0,100,0,7000,7000,0,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lady Liadrin - On Script - Say Line 5"), -- 03:10:11.000
+(1707602,9,20,0,0,0,100,0,5000,5000,0,0,0,1,6,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lady Liadrin - On Script - Say Line 6"), -- 03:10:16.000
+(1707602,9,21,0,0,0,100,0,4000,4000,0,0,0,1,13,0,0,0,0,0,19,18481,0,0,0,0,0,0,0,"Lady Liadrin - On Script - Say Line 13 (A'dal)"),
+(1707602,9,22,0,0,0,100,0,2000,2000,0,0,0,45,1,1,0,0,0,0,19,25167,0,0,0,0,0,0,0,"Lady Liadrin - On Script - Set Data 1 1 (General Tiras'alan)"),
+
+(25167,0,0,0,38,0,100,0,1,1,0,0,0,53,0,25167,0,0,0,2,1,0,0,0,0,0,0,0,0,"General Tiras'alan - On Data Set 1 1 - Start Waypoint"),
+(25167,0,1,0,40,0,100,0,6,0,0,0,0,80,2516700,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"General Tiras'alan - On Waypoint 6 Reached - Run Script"),
+(25167,0,2,0,40,0,100,0,12,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,0,3.75246,"General Tiras'alan - On Waypoint 12 Reached - Set Orientation"),
+
+(2516700,9,0,0,0,0,100,0,0,0,0,0,0,54,17000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"General Tiras'alan - On Script - Pause Waypoint"),
+(2516700,9,1,0,0,0,100,0,3000,3000,0,0,0,5,2,0,0,0,0,0,19,17076,0,0,0,0,0,0,0,"General Tiras'alan - On Script - Play Emote 2 (Lady Liadrin)"), -- 03:10:46.000
+(2516700,9,2,0,0,0,100,0,3000,3000,0,0,0,86,45372,0,19,17076,0,0,19,17076,0,0,0,0,0,0,0,"General Tiras'alan - On Script - Cross Cast 'Lady Liadrin Transform' (Lady Liadrin)"), -- 03:10:49.000
+(2516700,9,3,0,0,0,100,0,5000,5000,0,0,0,1,14,0,0,0,0,0,19,18481,0,0,0,0,0,0,0,"General Tiras'alan - On Script - Say Line 14 (A'dal)"),
+(2516700,9,4,0,0,0,100,0,6000,6000,0,0,0,45,1,1,0,0,0,0,19,17076,0,0,0,0,0,0,0,"General Tiras'alan - On Script - Set Data 1 1 (Lady Liadrin)"), -- 03:11:00.000
+
+(1707603,9,0,0,0,0,100,0,0,0,0,0,0,41,1000,0,0,0,0,0,11,23131,30,0,0,0,0,0,0,"Lady Liadrin - On Script - Despawn (1000) (Blood Knight Honor Guard)"),
+(1707603,9,1,0,0,0,100,0,0,0,0,0,0,41,1000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lady Liadrin - On Script - Despawn (1000)");
+
+DELETE FROM `waypoints` WHERE `entry` IN (17076,25167);
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(17076,1,-1889.4803,5367.829,-12.428146,"Lady Liadrin"),
+(17076,2,-1886.6562,5374.237,-12.428158,"Lady Liadrin"),
+(17076,3,-1884.9547,5379.1855,-12.428162,"Lady Liadrin"),
+(17076,4,-1882.9539,5389.4424,-12.428177,"Lady Liadrin"),
+(17076,5,-1887.939,5393.2563,-12.428234,"Lady Liadrin"),
+(17076,6,-1895.2999,5398.5,-12.428314,"Lady Liadrin"),
+(17076,7,-1901.1967,5407.4243,-12.428253,"Lady Liadrin"),
+(17076,8,-1898.3171,5413.7007,-12.428177,"Lady Liadrin"),
+(17076,9,-1891.4534,5417.7334,-12.428192,"Lady Liadrin"), --
+(17076,10,-1884.4406,5419.7715,-12.428157,"Lady Liadrin"), --
+(17076,11,-1890.5408,5416.6855,-12.428154,"Lady Liadrin"),
+(17076,12,-1898.2704,5412.5674,-12.428158,"Lady Liadrin"),
+(17076,13,-1908.1675,5407.589,-12.428158,"Lady Liadrin"),
+(17076,14,-1922.0374,5400.8384,-12.428452,"Lady Liadrin"),
+(17076,15,-1930.2853,5396.7983,-12.428349,"Lady Liadrin"),
+(17076,16,-1938.9174,5392.78,-12.428242,"Lady Liadrin"),
+(17076,17,-1944.8556,5383.025,-12.428135,"Lady Liadrin"),
+(17076,18,-1941.9391,5387.816,-12.428187,"Lady Liadrin"),
+(17076,19,-1945.7522,5373.704,-12.428147,"Lady Liadrin"),
+(17076,20,-1943.0194,5349.0454,-12.428154,"Lady Liadrin"),
+(17076,21,-1915.2404,5312.3843,-12.428154,"Lady Liadrin"),
+(17076,22,-1905.5239,5302.4785,-12.428154,"Lady Liadrin"),
+(25167,1,-1856.5751,5438.3955,-10.463867,"General Tiras'alan"),
+(25167,2,-1863.747559,5440.479492,-10.463867,"General Tiras'alan"),
+(25167,3,-1871.633667,5436.593262,-10.463867,"General Tiras'alan"),
+(25167,4,-1874.043823,5430.138672,-10.463867,"General Tiras'alan"),
+(25167,5,-1873.248291,5425.577148,-10.463867,"General Tiras'alan"),
+(25167,6,-1883.137329,5420.372070,-12.428157,"General Tiras'alan"), --
+(25167,7,-1873.248291,5425.577148,-10.463867,"General Tiras'alan"),
+(25167,8,-1874.043823,5430.138672,-10.463867,"General Tiras'alan"),
+(25167,9,-1871.633667,5436.593262,-10.463867,"General Tiras'alan"),
+(25167,10,-1863.747559,5440.479492,-10.463867,"General Tiras'alan"),
+(25167,11,-1856.5751,5438.3955,-10.463867,"General Tiras'alan"), -- sniffed
+(25167,12,-1854.0193,5435.058,-10.4803505,"General Tiras'alan"); -- sniffed
+
+DELETE FROM `creature_text` WHERE `CreatureID` IN (17076,25167);
+DELETE FROM `creature_text` WHERE `CreatureID` = 18481 AND `GroupID` BETWEEN 4 AND 14;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(25167,0,0,"Why do you suffer the presence of this despicable Lady Liadrin? She and her followers distort the Light and make a mockery of all we stand for!",12,0,100,5,0,0,24461,0,"General Tiras'alan"),
+(18481,4,0,"Patience, general. The Light embraces all who enter Shattrath in good faith.",12,0,100,0,0,0,24462,0,"A'dal"),
+(18481,5,0,"You are welcome in Shattrath, Lady Liadrin. We have long awaited your arrival.",12,0,100,0,0,0,24463,0,"A'dal"),
+(17076,0,0,"Thank you for allowing me to speak, A'dal. I know many of your allies despise me and my knights for our treatment of M'uru.",12,0,100,1,0,0,24464,0,"Lady Liadrin"),
+(17076,1,0,"When he was given to us by 'Prince' Kael'thas, we believed his power would help us lead our people into a new age.",12,0,100,1,0,0,24485,0,"Lady Liadrin"),
+(17076,2,0,"I've come to realize our path was a false one. We were betrayed by the man we called our prince. In his lust for power, he sent the felblood to attack us, and to spirit M'uru away to the Sunwell.",12,0,100,1,0,0,24465,0,"Lady Liadrin"),
+(18481,6,0,"Both our peoples have suffered greatly at the hands of Kael'thas and his agents, Lady Liadrin. Your people were not the authors of their own fate, but they will die if they do not change.",12,0,100,0,0,0,24466,0,"A'dal"),
+(18481,7,0,"M'uru accepted his role in this long ago, knowing full well what would happen to him. Will you accept your own?",12,0,100,0,0,0,24467,0,"A'dal"),
+(17076,3,0,"I... I don't understand. You -- and M'uru -- knew all along that this would occur?",12,0,100,1,0,0,24468,0,"Lady Liadrin"),
+(18481,8,0,"It wasn't I who foretold it, but Velen of the Draenei:",12,0,100,0,0,0,24469,0,"A'dal"),
+(18481,9,0,"'Silvery moon, washed in blood,'",12,0,100,0,0,0,24470,0,"A'dal"),
+(18481,10,0,"'Led astray into the night, armed with sword of broken Light.'",12,0,100,0,0,0,24471,0,"A'dal"),
+(18481,11,0,"'Broken, then betrayed by one, standing there bestride the sun.'",12,0,100,0,0,0,24472,0,"A'dal"),
+(18481,12,0,"'At darkest hour, redemption comes, in knightly lady sworn to blood.'",12,0,100,0,0,0,24473,0,"A'dal"),
+(17076,4,0,"I see it clearly now. I renounce my loyalties to House Sunstrider and its false prince.",12,0,100,1,0,0,24474,0,"Lady Liadrin"),
+(17076,5,0,"I pledge the blades of my Blood Knights to the defeat of Kil'jaeden and the restoration of Silvermoon.",12,0,100,1,0,0,24484,0,"Lady Liadrin"),
+(17076,6,0,"We will fight beside you, A'dal.",12,0,100,66,0,0,24477,0,"Lady Liadrin"),
+(18481,13,0,"The Shattered Sun Offensive will surely benefit from the addition of your knights, Lady Liadrin.",12,0,100,0,0,0,24480,0,"A'dal"),
+(18481,14,0,"The battle for the Sunwell is but the first step on your new path, Lady Liadrin. Shattrath is open to you and all who follow you.",12,0,100,0,0,0,24481,0,"A'dal");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_06_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_06_world.sql
new file mode 100644
index 00000000000..e357cb1c1a5
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_06_world.sql
@@ -0,0 +1,5 @@
+--
+UPDATE `creature` a LEFT JOIN `creature_template` b ON a.`id` = b.`entry` SET `modelid` = 0 WHERE a.`id` IN (SELECT b.`entry` FROM `creature_template` WHERE b.`modelid1` != 0 AND b.`modelid2` = 0 AND b.`modelid3` = 0 AND b.`modelid4` = 0) AND a.`modelid` = b.`modelid1`;
+UPDATE `creature` a LEFT JOIN `creature_template` b ON a.`id` = b.`entry` SET `modelid` = 0 WHERE a.`id` IN (SELECT b.`entry` FROM `creature_template` WHERE b.`modelid1` = 0 AND b.`modelid2` != 0 AND b.`modelid3` = 0 AND b.`modelid4` = 0) AND a.`modelid` = b.`modelid2`;
+UPDATE `creature` a LEFT JOIN `creature_template` b ON a.`id` = b.`entry` SET `modelid` = 0 WHERE a.`id` IN (SELECT b.`entry` FROM `creature_template` WHERE b.`modelid1` != 0 AND b.`modelid2` != 0 AND b.`modelid3` != 0 AND b.`modelid4` != 0) AND (a.`modelid` = b.`modelid1` OR a.`modelid` = b.`modelid2` OR a.`modelid` = b.`modelid3` OR a.`modelid` = b.`modelid4`);
+UPDATE `creature` SET `modelid` = 0 WHERE `id`=1505;
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_07_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_07_world.sql
new file mode 100644
index 00000000000..4cfde66c88e
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_07_world.sql
@@ -0,0 +1,8 @@
+--
+UPDATE `creature` SET `modelid` = 0 WHERE `modelid`=11686;
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`|128 WHERE entry IN (30090,17459,23398);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-119105) AND `source_type`=0 AND `id`=4;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-119104) AND `source_type`=0 AND `id`=6;
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `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_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(-119104, 0, 6, 0, 25, 0, 100, 0, 0, 0, 0, 0, 0, 3, 0, 11686, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mistwhisper Lightning Cloud - On reset - Morph invisible'),
+(-119105, 0, 4, 0, 25, 0, 100, 0, 0, 0, 0, 0, 0, 3, 0, 11686, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Mistwhisper Lightning Cloud - On reset - Morph invisible');
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_08_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_08_world.sql
new file mode 100644
index 00000000000..440ddbddbb7
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_08_world.sql
@@ -0,0 +1,34 @@
+--
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 4546 AND `source_type` = 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`,`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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(4546,2,0,1,46,0,100,0,4546,0,0,0,0,64,1,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Areatrigger (Sylvanaar) - On Trigger - Store Targetlist"),
+(4546,2,1,2,61,0,100,0,0,0,0,0,0,100,1,0,0,0,0,0,19,21469,0,0,0,0,0,0,0,"Areatrigger (Sylvanaar) - On Link - Send Target 1 (Daranelle)"),
+(4546,2,2,0,61,0,100,0,0,0,0,0,0,45,0,1,0,0,0,0,19,21469,0,0,0,0,0,0,0,"Areatrigger (Sylvanaar) - On Link - Set Data 0 1 (Daranelle)");
+
+DELETE FROM `areatrigger_scripts` WHERE `entry` = 4546;
+INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES
+(4546,"SmartTrigger");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 22 AND `SourceEntry` = 4546 AND `SourceId` = 2;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(22,1,4546,2,0,1,0,36904,0,0,0,0,0,"","Group 0: Execute SAI (Action 0) if player does have aura 'Lashh'an Channeling'"),
+-- Nothing will happen without the guardian https://youtu.be/ckevGJXt-sk?t=45
+(22,1,4546,2,0,29,0,21468,20,0,0,0,0,"","Group 0: Execute SAI (Action 0) if creature 'Kaliri Totem' is near");
+
+UPDATE `creature_template` SET `AIName` = "SmartAI", `ScriptName` = "" WHERE `entry` = 21469;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 21469 AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(21469,0,0,1,38,0,100,0,0,1,0,0,0,1,0,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Daranelle - On Data Set 0 1 - Say Line 0"),
+(21469,0,1,2,61,0,100,0,0,0,0,0,0,11,37028,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Daranelle - On Link - Cast 'Dispelling Analysis'"),
+(21469,0,2,0,61,0,100,0,0,0,0,0,0,11,37013,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Daranelle - On Link - Cast 'Despawn Kaliri Totem'");
+
+-- Spawned only by Effect 2 (Spell 36904)
+DELETE FROM `event_scripts` WHERE `id` = 12890;
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 13 AND `SourceEntry` = 37013;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,1,37013,0,0,31,0,3,21468,0,0,0,0,"","Group 0: Spell 'Despawn Kaliri Totem' targets creature 'Kaliri Totem'");
+
+DELETE FROM `spell_scripts` WHERE `id` = 37013;
+INSERT INTO `spell_scripts` (`id`,`effIndex`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`) VALUES
+(37013,0,0,18,1000,0,0,0,0,0,0);
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_09_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_09_world.sql
new file mode 100644
index 00000000000..4502cc73149
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_09_world.sql
@@ -0,0 +1,5 @@
+--
+DELETE FROM `creature_addon` WHERE `guid` IN (129727, 129769);
+INSERT INTO `creature_addon` (`guid`, `auras`) VALUES
+(129727, "29266"),
+(129769, "29266");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_10_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_10_world.sql
new file mode 100644
index 00000000000..6431feff38e
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_10_world.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature_template_movement` SET `Flight`=1 WHERE `CreatureId` IN (23969, 23051);
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_11_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_11_world.sql
new file mode 100644
index 00000000000..94efc4c3338
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_11_world.sql
@@ -0,0 +1,9 @@
+--
+DELETE FROM `smart_scripts` WHERE `entryorguid`=23941 AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(23941, 0, 0, 0, 11, 0, 100, 0, 0, 15, 0, 0, 0, 42, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Gavis Greyshield - On Respawn - Set Invincible (1 HP)"),
+(23941, 0, 1, 0, 2, 0, 100, 1, 0, 15, 0, 0, 0, 11, 42660, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Gavis Greyshield - Between 0-15% Health - Cast 'Gavis Greyshield Credit' (No Repeat)"),
+(23941, 0, 2, 3, 2, 0, 100, 1, 0, 15, 0, 0, 0, 80, 2394100, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Gavis Greyshield - Between 0-15% Health - Run Script (No Repeat)"),
+(23941, 0, 3, 4, 61, 0, 100, 0, 0, 0, 0, 0, 0, 102, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Gavis Greyshield - Between 0-15% Health - Disable Health Regen"),
+(23941, 0, 4, 5, 61, 0, 100, 0, 0, 0, 0, 0, 0, 2, 35, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Gavis Greyshield - Between 0-15% Health - Set Faction 35"),
+(23941, 0, 5, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 103, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Gavis Greyshield - Between 0-15% Health - Set Root On");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_12_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_12_world.sql
new file mode 100644
index 00000000000..c81cdcf64c1
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_26_12_world.sql
@@ -0,0 +1,2 @@
+--
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=9832 AND `SourceEntry` IN (4, 5) AND `ConditionTypeOrReference`=2 AND `ConditionValue1`=31408;
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_28_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_28_00_world.sql
new file mode 100644
index 00000000000..dd941febfe2
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_28_00_world.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature_template_movement` SET `Flight`=0, `Rooted`=0 WHERE `CreatureId`=37690;
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_28_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_28_01_world.sql
new file mode 100644
index 00000000000..5f0c607e463
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_28_01_world.sql
@@ -0,0 +1,5 @@
+--
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_war_intervene';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(3411,'spell_war_intervene');
+
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_00_world.sql
new file mode 100644
index 00000000000..8be85d2d2ee
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_00_world.sql
@@ -0,0 +1,53 @@
+--
+DELETE FROM `smart_scripts` WHERE `entryorguid`=17109 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` BETWEEN 1710900 AND 1710907 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_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(17109, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Spawn - Set Event Phase 1"),
+(17109, 0, 1, 0, 25, 0, 100, 0, 0, 0, 0, 0, 0, 11, 8722, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Reset - Cast Summon Succubus"),
+(17109, 0, 2, 0, 1, 1, 100, 0, 5000, 5000, 100000, 100000, 0, 80, 1710900, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - Out of Combat - Run Script 1 (Phase 1)"),
+(17109, 0, 3, 0, 1, 2, 100, 0, 100000, 100000, 100000, 100000, 0, 80, 1710901, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - Out of Combat - Run Script 2 (Phase 2)"),
+(17109, 0, 4, 0, 40, 0, 100, 0, 2, 1710900, 0, 0, 0, 80, 1710902, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Waypoint 2 Reached (Path 1) - Run Script 3"),
+(17109, 0, 5, 0, 40, 0, 100, 0, 4, 1710900, 0, 0, 0, 80, 1710903, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Waypoint 4 Reached (Path 1) - Run Script 4"),
+(17109, 0, 6, 0, 1, 4, 100, 0, 100000, 100000, 100000, 100000, 0, 80, 1710904, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - Out of Combat - Run Script 5 (Phase 3)"),
+(17109, 0, 7, 0, 1, 8, 100, 0, 100000, 100000, 100000, 100000, 0, 80, 1710905, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - Out of Combat - Run Script 6 (Phase 4)"),
+(17109, 0, 8, 0, 40, 0, 100, 0, 4, 1710901, 0, 0, 0, 80, 1710906, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Waypoint 4 Reached (Path 2) - Run Script 7"),
+(17109, 0, 9, 0, 40, 0, 100, 0, 8, 1710901, 0, 0, 0, 80, 1710907, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Waypoint 8 Reached (Path 2) - Run Script 8"),
+(1710900, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 1 - Set Event Phase 0"),
+(1710900, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 1 - Say Line 0"),
+(1710900, 9, 2, 0, 0, 0, 100, 0, 15000, 15000, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 19, 27705, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 1 - Say Line 0 (Lorrin Foxfire)"),
+(1710900, 9, 3, 0, 0, 0, 100, 0, 15000, 15000, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 19, 1386, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 1 - Say Line 1 (Rogvar)"),
+(1710900, 9, 4, 0, 0, 0, 100, 0, 55000, 55000, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 1 - Say Line 0"),
+(1710900, 9, 5, 0, 0, 0, 100, 0, 15000, 15000, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 19, 27705, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 1 - Say Line 0 (Lorrin Foxfire)"),
+(1710900, 9, 6, 0, 0, 0, 100, 0, 15000, 15000, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 19, 1386, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 1 - Say Line 1 (Rogvar)"),
+(1710900, 9, 7, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 22, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 1 - Set Event Phase 2"),
+(1710901, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 2 - Set Event Phase 0"),
+(1710901, 9, 1, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 19, 12807, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 2 - Say Line 0 (Greshka)"),
+(1710901, 9, 2, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 19, 988, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 2 - Say Line 0 (Kartosh)"),
+(1710901, 9, 3, 0, 0, 0, 100, 0, 9000, 9000, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 19, 1386, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 2 - Say Line 0 (Rogvar)"),
+(1710901, 9, 4, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 0, 53, 0, 1710900, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 2 - Start Waypoint 1"),
+(1710902, 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, 0, "Cersei Dusksinger - On Script 3 - Pause Waypoint"),
+(1710902, 9, 1, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 3 - Say Line 1"),
+(1710902, 9, 2, 0, 0, 0, 100, 0, 14000, 14000, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 3 - Say Line 2"),
+(1710902, 9, 3, 0, 0, 0, 100, 0, 4000, 4000, 0, 0, 0, 5, 14, 0, 0, 0, 0, 0, 19, 12807, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 3 - Play Emote Rude (Greshka)"),
+(1710902, 9, 4, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 5, 14, 0, 0, 0, 0, 0, 19, 988, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 3 - Play Emote Rude (Kartosh)"),
+(1710902, 9, 5, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 5, 14, 0, 0, 0, 0, 0, 19, 1386, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 3 - Play Emote Rude (Rogvar)"),
+(1710903, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0.952855, "Cersei Dusksinger - On Script 4 - Set Orientation"),
+(1710903, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 22, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 4 - Set Event Phase 3"),
+(1710904, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 5 - Set Event Phase 0"),
+(1710904, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 5 - Say Line 0"),
+(1710904, 9, 2, 0, 0, 0, 100, 0, 15000, 15000, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 19, 27705, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 5 - Say Line 0 (Lorrin Foxfire)"),
+(1710904, 9, 3, 0, 0, 0, 100, 0, 15000, 15000, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 19, 1386, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 5 - Say Line 1 (Rogvar)"),
+(1710904, 9, 4, 0, 0, 0, 100, 0, 55000, 55000, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 5 - Say Line 0"),
+(1710904, 9, 5, 0, 0, 0, 100, 0, 15000, 15000, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 19, 27705, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 5 - Say Line 0 (Lorrin Foxfire)"),
+(1710904, 9, 6, 0, 0, 0, 100, 0, 15000, 15000, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 19, 1386, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 5 - Say Line 1 (Rogvar)"),
+(1710904, 9, 7, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 22, 4, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 5 - Set Event Phase 4"),
+(1710905, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 6 - Set Event Phase 0"),
+(1710905, 9, 1, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 19, 27705, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 6 - Set Orientation"),
+(1710905, 9, 2, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 0, 1, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 6 - Say Line 3"),
+(1710905, 9, 3, 0, 0, 0, 100, 0, 8000, 8000, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 19, 27705, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 6 - Say Line 1 (Lorrin Foxfire)"),
+(1710905, 9, 4, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 0, 53, 0, 1710901, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 6 - Start Waypoint 2"),
+(1710906, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 54, 8000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 7 - Pause Waypoint"),
+(1710906, 9, 1, 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 19, 10928, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 7 - Set Orientation"),
+(1710906, 9, 2, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 0, 1, 4, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 7 - Say Line 4"),
+(1710907, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0.952855, "Cersei Dusksinger - On Script 8 - Set Orientation"),
+(1710907, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cersei Dusksinger - On Script 8 - Set Event Phase 1");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_01_world.sql
new file mode 100644
index 00000000000..9055d737c9a
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_01_world.sql
@@ -0,0 +1,88 @@
+-- They should change model if the 'Nights' event is active but I found only one video
+-- and I'm not sure if models are randomized (there's only two, big and small) or not
+-- so for now they will be not randomized
+
+-- Also they don't flee in https://www.youtube.com/watch?v=4Mj5tH2goIc but were
+-- able to flee in http://youtube.com/watch?v=1eREORqoCr4 (no longer available)
+-- Changed in TBC with their elite status I guess
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` IN (2060,2061,2062,2063,2064,2065,2066,2067,2068);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (2060,2061,2062,2063,2064,2065,2066,2067,2068) AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+-- Small
+(2060,0,0,0,54,0,100,0,0,0,0,0,0,3,0,729,0,0,0,0,1,0,0,0,0,0,0,0,0,"Councilman Smithers - On Just Summoned - Morph To Model 729"),
+(2060,0,1,0,54,0,100,0,0,0,0,0,0,53,0,2060,0,0,0,2,1,0,0,0,0,0,0,0,0,"Councilman Smithers - On Just Summoned - Start Waypoint"),
+(2060,0,2,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,0,"Councilman Smithers - Between 0-15% Health - Flee For Assist (No Repeat)"),
+(2060,0,3,0,7,0,100,0,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Councilman Smithers - On Evade - Despawn (0)"),
+-- Big
+(2061,0,0,0,54,0,100,0,0,0,0,0,0,3,0,574,0,0,0,0,1,0,0,0,0,0,0,0,0,"Councilman Thatcher - On Just Summoned - Morph To Model 574"),
+(2061,0,1,0,54,0,100,0,0,0,0,0,0,53,0,2061,0,0,0,2,1,0,0,0,0,0,0,0,0,"Councilman Thatcher - On Just Summoned - Start Waypoint"),
+(2061,0,2,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,0,"Councilman Thatcher - Between 0-15% Health - Flee For Assist (No Repeat)"),
+(2061,0,3,0,7,0,100,0,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Councilman Thatcher - On Evade - Despawn (0)"),
+-- Small
+(2062,0,0,0,54,0,100,0,0,0,0,0,0,3,0,729,0,0,0,0,1,0,0,0,0,0,0,0,0,"Councilman Hendricks - On Just Summoned - Morph To Model 729"),
+(2062,0,1,0,54,0,100,0,0,0,0,0,0,53,0,2062,0,0,0,2,1,0,0,0,0,0,0,0,0,"Councilman Hendricks - On Just Summoned - Start Waypoint"),
+(2062,0,2,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,0,"Councilman Hendricks - Between 0-15% Health - Flee For Assist (No Repeat)"),
+(2062,0,3,0,7,0,100,0,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Councilman Hendricks - On Evade - Despawn (0)"),
+-- Big
+(2063,0,0,0,54,0,100,0,0,0,0,0,0,3,0,574,0,0,0,0,1,0,0,0,0,0,0,0,0,"Councilman Wilhelm - On Just Summoned - Morph To Model 574"),
+(2063,0,1,0,54,0,100,0,0,0,0,0,0,53,0,2063,0,0,0,2,1,0,0,0,0,0,0,0,0,"Councilman Wilhelm - On Just Summoned - Start Waypoint"),
+(2063,0,2,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,0,"Councilman Wilhelm - Between 0-15% Health - Flee For Assist (No Repeat)"),
+(2063,0,3,0,7,0,100,0,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Councilman Wilhelm - On Evade - Despawn (0)"),
+-- Big
+(2064,0,0,0,54,0,100,0,0,0,0,0,0,3,0,574,0,0,0,0,1,0,0,0,0,0,0,0,0,"Councilman Hartin - On Just Summoned - Morph To Model 574"),
+(2064,0,1,0,54,0,100,0,0,0,0,0,0,53,0,2064,0,0,0,2,1,0,0,0,0,0,0,0,0,"Councilman Hartin - On Just Summoned - Start Waypoint"),
+(2064,0,2,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,0,"Councilman Hartin - Between 0-15% Health - Flee For Assist (No Repeat)"),
+(2064,0,3,0,7,0,100,0,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Councilman Hartin - On Evade - Despawn (0)"),
+-- Big
+(2065,0,0,0,54,0,100,0,0,0,0,0,0,3,0,574,0,0,0,0,1,0,0,0,0,0,0,0,0,"Councilman Cooper - On Just Summoned - Morph To Model 574"),
+(2065,0,1,0,54,0,100,0,0,0,0,0,0,53,0,2065,0,0,0,2,1,0,0,0,0,0,0,0,0,"Councilman Cooper - On Just Summoned - Start Waypoint"),
+(2065,0,2,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,0,"Councilman Cooper - Between 0-15% Health - Flee For Assist (No Repeat)"),
+(2065,0,3,0,7,0,100,0,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Councilman Cooper - On Evade - Despawn (0)"),
+-- Big
+(2066,0,0,0,54,0,100,0,0,0,0,0,0,3,0,574,0,0,0,0,1,0,0,0,0,0,0,0,0,"Councilman Higarth - On Just Summoned - Morph To Model 574"),
+(2066,0,1,0,54,0,100,0,0,0,0,0,0,53,0,2066,0,0,0,2,1,0,0,0,0,0,0,0,0,"Councilman Higarth - On Just Summoned - Start Waypoint"),
+(2066,0,2,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,0,"Councilman Higarth - Between 0-15% Health - Flee For Assist (No Repeat)"),
+(2066,0,3,0,7,0,100,0,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Councilman Higarth - On Evade - Despawn (0)"),
+-- Big
+(2067,0,0,0,54,0,100,0,0,0,0,0,0,3,0,574,0,0,0,0,1,0,0,0,0,0,0,0,0,"Councilman Brunswick - On Just Summoned - Morph To Model 574"),
+(2067,0,1,0,54,0,100,0,0,0,0,0,0,53,0,2067,0,0,0,2,1,0,0,0,0,0,0,0,0,"Councilman Brunswick - On Just Summoned - Start Waypoint"),
+(2067,0,2,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,0,"Councilman Brunswick - Between 0-15% Health - Flee For Assist (No Repeat)"),
+(2067,0,3,0,7,0,100,0,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Councilman Brunswick - On Evade - Despawn (0)"),
+-- Small
+(2068,0,0,0,54,0,100,0,0,0,0,0,0,3,0,729,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lord Mayor Morrison - On Just Summoned - Morph To Model 729"),
+(2068,0,1,0,54,0,100,0,0,0,0,0,0,53,0,2068,0,0,0,2,1,0,0,0,0,0,0,0,0,"Lord Mayor Morrison - On Link - Start Waypoint"),
+(2068,0,2,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,0,"Lord Mayor Morrison - Between 0-15% Health - Flee For Assist (No Repeat)"),
+(2068,0,3,0,7,0,100,0,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lord Mayor Morrison - On Evade - Despawn (0)");
+
+DELETE FROM `waypoints` WHERE `entry` IN (2060,2061,2062,2063,2064,2065,2066,2067,2068);
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(2060,1,-397.731445,1502.890625,19.770845,"Councilman Smithers"),
+(2060,2,-401.691681,1499.818726,19.770845,"Councilman Smithers"),
+(2061,1,-396.266296,1502.207153,19.770849,"Councilman Thatcher"),
+(2061,2,-400.981476,1498.297241,19.770849,"Councilman Thatcher"),
+(2062,1,-397.731445,1502.890625,19.770845,"Councilman Hendricks"),
+(2062,2,-401.691681,1499.818726,19.770845,"Councilman Hendricks"),
+(2063,1,-397.731445,1502.890625,19.770845,"Councilman Wilhelm"),
+(2063,2,-401.691681,1499.818726,19.770845,"Councilman Wilhelm"),
+(2064,1,-397.009979,1502.273804,19.747398,"Councilman Hartin"),
+(2064,2,-401.794128,1498.638428,19.747398,"Councilman Hartin"),
+(2065,1,-397.731445,1502.890625,19.770845,"Councilman Cooper"),
+(2065,2,-401.691681,1499.818726,19.770845,"Councilman Cooper"),
+(2066,1,-396.266296,1502.207153,19.770849,"Councilman Higarth"),
+(2066,2,-400.981476,1498.297241,19.770849,"Councilman Higarth"),
+(2067,1,-396.266296,1502.207153,19.770849,"Councilman Brunswick"),
+(2067,2,-400.981476,1498.297241,19.770849,"Councilman Brunswick"),
+(2068,1,-397.009979,1502.273804,19.747398,"Councilman Morrison"),
+(2068,2,-401.794128,1498.638428,19.747398,"Councilman Morrison");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 22 AND `SourceEntry` IN (2060,2061,2062,2063,2064,2065,2066,2067,2068) AND `SourceId` = 0;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(22,1,2060,0,0,12,1,25,0,0,0,0,0,"","Group 0: Execute SAI (Action 0) if event 'Nights' is active"),
+(22,1,2061,0,0,12,1,25,0,0,0,0,0,"","Group 0: Execute SAI (Action 0) if event 'Nights' is active"),
+(22,1,2062,0,0,12,1,25,0,0,0,0,0,"","Group 0: Execute SAI (Action 0) if event 'Nights' is active"),
+(22,1,2063,0,0,12,1,25,0,0,0,0,0,"","Group 0: Execute SAI (Action 0) if event 'Nights' is active"),
+(22,1,2064,0,0,12,1,25,0,0,0,0,0,"","Group 0: Execute SAI (Action 0) if event 'Nights' is active"),
+(22,1,2065,0,0,12,1,25,0,0,0,0,0,"","Group 0: Execute SAI (Action 0) if event 'Nights' is active"),
+(22,1,2066,0,0,12,1,25,0,0,0,0,0,"","Group 0: Execute SAI (Action 0) if event 'Nights' is active"),
+(22,1,2067,0,0,12,1,25,0,0,0,0,0,"","Group 0: Execute SAI (Action 0) if event 'Nights' is active"),
+(22,1,2068,0,0,12,1,25,0,0,0,0,0,"","Group 0: Execute SAI (Action 0) if event 'Nights' is active");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_02_world.sql
new file mode 100644
index 00000000000..68dd7bf05a2
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_02_world.sql
@@ -0,0 +1,53 @@
+-- Source: CMaNGOS & http://youtube.com/watch?v=1eREORqoCr4 no longer available but some parts are based on it
+-- Classic https://www.youtube.com/watch?v=4Mj5tH2goIc
+-- Deathstalker Faerleia SAI
+SET @ID := 2058;
+UPDATE `creature_template` SET `AIName` = "SmartAI", `ScriptName` = "" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` BETWEEN @ID*100+0 AND @ID*100+4 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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ID,0,0,0,19,0,100,0,452,0,0,0,0,80,@ID*100+0,2,0,0,0,0,1,0,0,0,0,0,0,0,0,"Deathstalker Faerleia - On Quest 'Pyrewood Ambush' Taken - Run Script"),
+
+(@ID*100+0,9,0,0,0,0,100,0,0,0,0,0,0,64,1,0,0,0,0,0,16,0,0,0,0,0,0,0,0,"Deathstalker Faerleia - On Script - Store Targetlist"),
+(@ID*100+0,9,1,0,0,0,100,0,0,0,0,0,0,1,0,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Deathstalker Faerleia - On Script - Say Line 0"),
+(@ID*100+0,9,2,0,0,0,100,0,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Deathstalker Faerleia - On Script - Remove Npc Flag Questgiver"),
+(@ID*100+0,9,3,0,0,0,100,0,0,0,0,0,0,2,232,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Deathstalker Faerleia - On Script - Set Faction 232"),
+(@ID*100+0,9,4,0,0,0,100,0,10000,10000,0,0,0,107,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Deathstalker Faerleia - On Script - Summon Group 0"),
+
+(@ID,0,1,0,82,0,100,0,0,0,0,0,0,63,1,1,0,0,0,0,1,0,0,0,0,0,0,0,0,"Deathstalker Faerleia - On Summoned Unit Dies - Set Counter 1 1"),
+(@ID,0,2,0,77,0,100,0,1,1,0,0,0,80,@ID*100+1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Deathstalker Faerleia - On Counter Set 1 1 - Run Script"),
+(@ID,0,3,0,77,0,100,0,1,3,0,0,0,80,@ID*100+2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Deathstalker Faerleia - On Counter Set 1 3 - Run Script"),
+(@ID,0,4,0,77,0,100,0,1,6,0,0,0,80,@ID*100+3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Deathstalker Faerleia - On Counter Set 1 6 - Run Script"),
+(@ID,0,5,0,77,0,100,0,1,9,0,0,0,80,@ID*100+4,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Deathstalker Faerleia - On Counter Set 1 9 - Run Script"),
+
+(@ID*100+1,9,1,0,0,0,100,0,10000,10000,0,0,0,107,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Deathstalker Faerleia - On Script - Summon Group 1"),
+(@ID*100+2,9,1,0,0,0,100,0,10000,10000,0,0,0,107,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Deathstalker Faerleia - On Script - Summon Group 2"),
+(@ID*100+3,9,1,0,0,0,100,0,8000,8000,0,0,0,107,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Deathstalker Faerleia - On Script - Summon Group 3"),
+
+(@ID*100+4,9,0,0,0,0,100,0,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Deathstalker Faerleia - On Script - Say Line 1"),
+(@ID*100+4,9,1,0,0,0,100,0,0,0,0,0,0,15,452,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Deathstalker Faerleia - On Script - Quest Credit 'Pyrewood Ambush'"),
+(@ID*100+4,9,2,0,0,0,100,0,0,0,0,0,0,2,68,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Deathstalker Faerleia - On Script - Set Faction 68"),
+(@ID*100+4,9,3,0,0,0,100,0,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Deathstalker Faerleia - On Script - Add Npc Flag Questgiver"),
+(@ID*100+4,9,5,0,0,0,100,0,0,0,0,0,0,63,1,0,1,0,0,0,1,0,0,0,0,0,0,0,0,"Deathstalker Faerleia - On Script - Reset Counter"),
+(@ID*100+4,9,6,0,0,0,100,0,0,0,0,0,0,78,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Deathstalker Faerleia - On Script - Reset All Scripts"),
+
+(@ID,0,6,0,2,0,100,0,0,20,10000,15000,0,11,3359,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Deathstalker Faerleia - On Health pct - Cast 'Drink Potion'"),
+(@ID,0,7,0,6,0,100,0,0,0,0,0,0,6,452,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Deathstalker Faerleia - On Death - Fail Quest 'Pyrewood Ambush'");
+
+UPDATE `creature_text` SET `comment` = "Deathstalker Faerleia" WHERE `CreatureID` = @ID;
+-- 548 "All is lost!" - probably used on death
+
+DELETE FROM `creature_summon_groups` WHERE `summonerId` = 2058 AND `summonerType` = 0;
+INSERT INTO `creature_summon_groups` (`summonerId`,`summonerType`,`groupId`,`entry`,`position_x`,`position_y`,`position_z`,`orientation`,`summonType`,`summonTime`,`Comment`) VALUES
+(2058,0,0,2060,-398.35,1510.75,18.87,4.76,4,60000,"Deathstalker Faerleia - Group 0 - Councilman Smithers"),
+
+(2058,0,1,2061,-396.41,1511.06,18.87,4.74,4,60000,"Deathstalker Faerleia - Group 1 - Councilman Thatcher"),
+(2058,0,1,2062,-398.35,1510.75,18.87,4.76,4,60000,"Deathstalker Faerleia - Group 1 - Councilman Hendricks"),
+-- Not ordered by entry
+(2058,0,2,2063,-398.35,1510.75,18.87,4.76,4,60000,"Deathstalker Faerleia - Group 2 - Councilman Wilhelm"),
+(2058,0,2,2064,-397.45,1509.56,18.87,4.73,4,60000,"Deathstalker Faerleia - Group 2 - Councilman Hartin"),
+(2058,0,2,2066,-396.41,1511.06,18.87,4.74,4,60000,"Deathstalker Faerleia - Group 2 - Councilman Higarth"),
+
+(2058,0,3,2065,-398.35,1510.75,18.87,4.76,4,60000,"Deathstalker Faerleia - Group 3 - Councilman Cooper"),
+(2058,0,3,2067,-396.41,1511.06,18.87,4.74,4,60000,"Deathstalker Faerleia - Group 3 - Councilman Brunswick"),
+(2058,0,3,2068,-397.45,1509.56,18.87,4.73,4,60000,"Deathstalker Faerleia - Group 3 - Councilman Morrison");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_03_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_03_world.sql
new file mode 100644
index 00000000000..dc7b07a7b2b
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_03_world.sql
@@ -0,0 +1,89 @@
+-- The video from 3.x.x or TBC is no longer available, I used it as source for some parts of this script
+-- Videos from classic sometimes looks like they're from private servers
+-- Deathstalker Erland SAI
+SET @ID := 1978;
+UPDATE `creature_template` SET `AIName` = "SmartAI", `ScriptName` = "" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` BETWEEN @ID*100+0 AND @ID*100+5 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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ID,0,0,0,4,0,50,0,0,0,0,0,0,1,8,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Deathstalker Erland - On Aggro - Say Line 8"),
+(@ID,0,1,0,19,0,100,0,435,0,0,0,0,80,@ID*100+0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Deathstalker Erland - On Quest 'Escorting Erland' Taken - Run Script"),
+(@ID,0,2,0,40,0,100,0,2,0,0,0,0,80,@ID*100+1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Deathstalker Erland - On Waypoint 2 Reached - Run Script"),
+(@ID,0,3,0,40,0,100,0,14,0,0,0,0,80,@ID*100+2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Deathstalker Erland - On Waypoint 14 Reached - Run Script"),
+(@ID,0,4,0,40,0,100,0,15,0,0,0,0,80,@ID*100+3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Deathstalker Erland - On Waypoint 15 Reached - Run Script"),
+(@ID,0,5,0,40,0,100,0,22,0,0,0,0,80,@ID*100+4,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Deathstalker Erland - On Waypoint 22 Reached - Run Script"),
+(@ID,0,6,0,40,0,100,0,23,0,0,0,0,80,@ID*100+5,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Deathstalker Erland - On Waypoint 23 Reached - Run Script"),
+(@ID,0,7,0,6,0,100,0,0,0,0,0,0,6,435,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Deathstalker Erland - On Death - Fail Quest 'Escorting Erland'"),
+
+(@ID*100+0,9,0,0,0,0,100,0,0,0,0,0,0,64,1,0,0,0,0,0,16,0,0,0,0,0,0,0,0,"Deathstalker Erland - On Script - Store Targetlist"),
+(@ID*100+0,9,1,0,0,0,100,0,0,0,0,0,0,1,0,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Deathstalker Erland - On Script - Say Line 0"),
+(@ID*100+0,9,2,0,0,0,100,0,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Deathstalker Erland - On Script - Remove NPC Flag Questgiver"),
+-- Aggressive reactstate https://www.wowhead.com/quest=435/escorting-erland#comments:id=140653
+(@ID*100+0,9,3,0,0,0,100,0,0,0,0,0,0,53,0,1978,0,0,0,2,1,0,0,0,0,0,0,0,0,"Deathstalker Erland - On Script - Start Waypoint"),
+
+(@ID*100+1,9,0,0,0,0,100,0,0,0,0,0,0,54,1000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Deathstalker Erland - On Script - Pause Waypoint"),
+(@ID*100+1,9,1,0,0,0,100,0,1000,1000,0,0,0,1,1,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Deathstalker Erland - On Script - Say Line 1"),
+
+(@ID*100+2,9,0,0,0,0,100,0,0,0,0,0,0,54,1000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Deathstalker Erland - On Script - Pause Waypoint"),
+(@ID*100+2,9,1,0,0,0,100,0,0,0,0,0,0,26,435,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Deathstalker Erland - On Script - Quest Credit 'Escorting Erland'"),
+(@ID*100+2,9,2,0,0,0,100,0,0,0,0,0,0,1,2,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Deathstalker Erland - On Script - Say Line 2"),
+(@ID*100+2,9,3,0,0,0,100,0,0,0,0,0,0,59,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Deathstalker Erland - On Script - Set Run On"),
+
+(@ID*100+3,9,0,0,0,0,100,0,0,0,0,0,0,54,15000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Deathstalker Erland - On Script - Pause Waypoint"),
+(@ID*100+3,9,1,0,0,0,100,0,0,0,0,0,0,59,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Deathstalker Erland - On Script - Set Run Off"),
+(@ID*100+3,9,2,0,0,0,100,0,0,0,0,0,0,1,3,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Deathstalker Erland - On Script - Say Line 3"),
+(@ID*100+3,9,3,0,0,0,100,0,3000,3000,0,0,0,1,0,0,0,0,0,0,19,1950,0,0,0,0,0,0,0,"Deathstalker Erland - On Script - Say Line 0 (Rane Yorick)"),
+(@ID*100+3,9,4,0,0,0,100,0,5000,5000,0,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Deathstalker Erland - On Script - Say Line 4"),
+(@ID*100+3,9,5,0,0,0,100,0,5000,5000,0,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Deathstalker Erland - On Script - Say Line 5"),
+
+(@ID*100+4,9,0,0,0,0,100,0,0,0,0,0,0,54,5000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Deathstalker Erland - On Script - Pause Waypoint"),
+(@ID*100+4,9,1,0,0,0,100,0,0,0,0,0,0,1,6,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Deathstalker Erland - On Script - Say Line 6"),
+
+(@ID*100+5,9,0,0,0,0,100,0,0,0,0,0,0,54,35000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Deathstalker Erland - On Script - Pause Waypoint"),
+(@ID*100+5,9,1,0,0,0,100,0,0,0,0,0,0,1,0,0,0,0,0,0,19,1951,0,0,0,0,0,0,0,"Deathstalker Erland - On Script - Say Line 0 (Quinn Yorick)"),
+(@ID*100+5,9,2,0,0,0,100,0,5000,5000,0,0,0,1,7,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Deathstalker Erland - On Script - Say Line 7"),
+(@ID*100+5,9,3,0,0,0,100,0,0,0,0,0,0,41,30000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Deathstalker Erland - On Script - Despawn (30000)");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,(SELECT `Text` FROM `broadcast_text` WHERE `ID`=481),12,0,100,0,0,0,481,0,"Deathstalker Erland"), -- Let's get to the others, and keep an eye open for those wolves outside...
+(@ID,1,0,(SELECT `Text` FROM `broadcast_text` WHERE `ID`=482),12,0,100,0,0,0,482,0,"Deathstalker Erland"), -- Be careful, $n. Those wolves like to hide among the trees.
+(@ID,2,0,(SELECT `Text` FROM `broadcast_text` WHERE `ID`=483),12,0,100,0,0,0,483,0,"Deathstalker Erland"), -- We're almost there!
+(@ID,3,0,(SELECT `Text` FROM `broadcast_text` WHERE `ID`=484),12,0,100,0,0,0,484,0,"Deathstalker Erland"), -- We made it! Thanks, $n. I couldn't have gotten here without you.
+(@ID,4,0,(SELECT `Text` FROM `broadcast_text` WHERE `ID`=535),12,0,100,0,0,0,535,0,"Deathstalker Erland"), -- Masses of wolves are to the east, and whoever lived at Malden's Orchard is gone.
+(@ID,5,0,(SELECT `Text` FROM `broadcast_text` WHERE `ID`=536),12,0,100,0,0,0,536,0,"Deathstalker Erland"), -- If I am excused, then I'd like to check on Quinn...
+(@ID,6,0,(SELECT `Text` FROM `broadcast_text` WHERE `ID`=537),12,0,100,0,0,0,537,0,"Deathstalker Erland"), -- Hello, Quinn. How are you faring?
+(@ID,7,0,(SELECT `Text` FROM `broadcast_text` WHERE `ID`=538),12,0,100,0,0,0,538,0,"Deathstalker Erland"), -- Try to take better care of yourself, Quinn. You were lucky this time.
+(@ID,8,0,(SELECT `Text` FROM `broadcast_text` WHERE `ID`=541),12,0,100,0,0,0,541,0,"Deathstalker Erland"), -- Beware! A $n is upon us!
+(@ID,8,1,(SELECT `Text` FROM `broadcast_text` WHERE `ID`=543),12,0,100,0,0,0,543,0,"Deathstalker Erland"), -- A $n attacks!
+(@ID,8,2,(SELECT `Text` FROM `broadcast_text` WHERE `ID`=544),12,0,100,0,0,0,544,0,"Deathstalker Erland"); -- Beware! I am under attack!
+
+UPDATE `creature_text` SET `comment` = "Rane Yorick" WHERE `CreatureID` = 1950;
+UPDATE `creature_text` SET `comment` = "Quinn Yorick" WHERE `CreatureID` = 1951;
+
+DELETE FROM `script_waypoint` WHERE `entry` = 1978;
+DELETE FROM `waypoints` WHERE `entry` = 1978;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(1978,1,1406.32,1083.10,52.55,"Deathstalker Erland"),
+(1978,2,1400.49,1080.42,52.50,"Deathstalker Erland"), --
+(1978,3,1388.48,1083.10,52.52,"Deathstalker Erland"),
+(1978,4,1370.16,1084.02,52.30,"Deathstalker Erland"),
+(1978,5,1359.02,1080.85,52.46,"Deathstalker Erland"),
+(1978,6,1341.43,1087.39,52.69,"Deathstalker Erland"),
+(1978,7,1321.93,1090.51,50.66,"Deathstalker Erland"),
+(1978,8,1312.98,1095.91,47.49,"Deathstalker Erland"),
+(1978,9,1301.09,1102.94,47.76,"Deathstalker Erland"),
+(1978,10,1297.73,1106.35,50.18,"Deathstalker Erland"),
+(1978,11,1295.49,1124.32,50.49,"Deathstalker Erland"),
+(1978,12,1294.84,1137.25,51.75,"Deathstalker Erland"),
+(1978,13,1292.89,1158.99,52.65,"Deathstalker Erland"),
+(1978,14,1290.75,1168.67,52.56,"Deathstalker Erland"), --
+(1978,15,1287.12,1203.49,52.66,"Deathstalker Erland"), --
+(1978,16,1290.72,1207.44,52.69,"Deathstalker Erland"),
+(1978,17,1297.50,1207.18,53.74,"Deathstalker Erland"),
+(1978,18,1301.32,1220.90,53.74,"Deathstalker Erland"),
+(1978,19,1298.55,1220.43,53.74,"Deathstalker Erland"),
+(1978,20,1297.38,1212.87,58.51,"Deathstalker Erland"),
+(1978,21,1297.80,1210.04,58.51,"Deathstalker Erland"),
+(1978,22,1305.01,1206.10,58.51,"Deathstalker Erland"), --
+(1978,23,1310.51,1207.36,58.51,"Deathstalker Erland"); --
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_04_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_04_world.sql
new file mode 100644
index 00000000000..474a9f13a48
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_04_world.sql
@@ -0,0 +1,23 @@
+-- Tanaris
+-- [Q] Rumors for Kravel -- http://wotlk.openwow.com/quest=1117
+-- https://www.youtube.com/watch?reload=9&v=9bW2cscKMc8
+-- (c) Toxic/ICC
+-- Kravel Koalbeard SAI
+SET @ID := 4452;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ID AND `source_type`=0 and `id` =3;
+INSERT INTO `smart_scripts` VALUES (@ID, 0, 3, 0, 20, 0, 100, 0, 1117, 0, 0, 0, 0, 80, @ID*100+2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Kravel Koalbeard - On Quest \'Rumors for Kravel\' Finished - Run Script');
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ID*100+2 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
+(@ID*100+2,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,"Kravel Koalbeard - On Script - Remove Npc Flag Questgiver"),
+(@ID*100+2,9,1,0,0,0,100,0,1000,1000,0,0,1,6,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kravel Koalbeard - On Script - Say Line 6"),
+(@ID*100+2,9,2,0,0,0,100,0,1000,1000,0,0,5,94,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kravel Koalbeard - On Script - Emote Dance"),
+(@ID*100+2,9,3,0,0,0,100,0,5000,5000,0,0,5,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kravel Koalbeard - On Script - Emote None"),
+(@ID*100+2,9,4,0,0,0,100,0,1000,1000,0,0,1,7,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kravel Koalbeard - On Script - Say Line 7"),
+(@ID*100+2,9,5,0,0,0,100,0,2000,2000,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kravel Koalbeard - On Script - Add Npc Flag Questgiver");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=@ID AND `GroupID` IN (6,7);
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,6,0,"%s begins to dance.",16,0,100,0,0,0,1480,0,"Kravel Koalbeard"),
+(@ID,7,0,"Hahah! $n, you make quite a partner!",12,0,100,11,0,0,1481,0,"Kravel Koalbeard");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_05_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_05_world.sql
new file mode 100644
index 00000000000..da9da9e8d39
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_29_05_world.sql
@@ -0,0 +1,8 @@
+--
+DELETE FROM `creature_template_addon` WHERE `entry` IN (32149,32255);
+INSERT INTO `creature_template_addon` (`entry`, `bytes1`, `bytes2`, `auras`) VALUES
+(32149, 0, 1, "54262"),
+(32255, 0, 1, "54262 60231");
+UPDATE `creature` SET `modelid`=27774 WHERE `id`=32257;
+UPDATE `creature` SET `modelid`=25796 WHERE `guid`IN (123325,123293,123294,123295,123296,123297,123298,123299,123300,123301,123302,123303,123323,123321,123320,123307,123324,123315,123310,123311,123312);
+UPDATE `creature` SET `modelid`=27775 WHERE `guid`IN (123313,123314,123309,123316,123317,123318,123319,123306,123305,123322,123304,123308,123292);
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_30_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_30_00_world.sql
new file mode 100644
index 00000000000..dc70f8cf025
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_30_00_world.sql
@@ -0,0 +1,148 @@
+UPDATE `creature_template` SET `faction`=104, `unit_flags`=`unit_flags`&~512 WHERE `entry`=10600;
+UPDATE `creature_template` SET `type_flags`=8, `flags_extra`=`flags_extra`|0x40000000 WHERE `entry` IN (10599, 10600);
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry` IN (3063, 10599, 10600, 10721);
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (3063, 10599, 10600, 10721) AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (306300, 306301, 1059900, 1059901, 1059902, 1059903, 1059904, 1060000, 1060001, 1060002, 1060003, 1060004, 1072100, 1072101, 1072102, 1072103, 1072104, 1072105) 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_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(3063, 0, 0, 0, 1, 0, 100, 0, 5000, 5000, 780000, 900000, 0, 80, 306300, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Krang Stonehoof - OOC - Run Script"),
+(3063, 0, 1, 0, 1, 1, 100, 0, 0, 0, 8000, 8000, 0, 45, 3, 3, 0, 0, 0, 0, 9, 10721, 0, 100, 0, 0, 0, 0, 0, "Krang Stonehoof - OOC - Set Data 3 3 (Novice Warrior)"),
+(3063, 0, 2, 0, 38, 0, 100, 0, 1, 1, 0, 0, 0, 1, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Krang Stonehoof - On Data 1 1 Set - Say Line 3"),
+(3063, 0, 3, 0, 38, 0, 100, 0, 2, 2, 0, 0, 0, 80, 306301, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Krang Stonehoof - On Data 2 2 Set - Run Script"),
+
+(306300, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Krang Stonehoof - On Script - Say Line 0"),
+(306300, 9, 1, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 19, 10599, 100, 0, 0, 0, 0, 0, 0, "Krang Stonehoof - On Script - Set Data 1 1 (Hulfnar Stonetotem)"),
+(306300, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 19, 10600, 100, 0, 0, 0, 0, 0, 0, "Krang Stonehoof - On Script - Set Data 1 1 (Thontek Rumblehoof)"),
+(306300, 9, 3, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Krang Stonehoof - On Script - Say Line 1"),
+(306300, 9, 4, 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 9, 10721, 0, 100, 0, 0, 0, 0, 0, "Krang Stonehoof - On Script - Set Data 1 1 (Novice Warrior)"),
+(306300, 9, 5, 0, 0, 0, 100, 0, 4000, 4000, 0, 0, 0, 45, 2, 2, 0, 0, 0, 0, 19, 10599, 100, 0, 0, 0, 0, 0, 0, "Krang Stonehoof - On Script - Set Data 2 2 (Hulfnar Stonetotem)"),
+(306300, 9, 6, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 45, 2, 2, 0, 0, 0, 0, 19, 10600, 100, 0, 0, 0, 0, 0, 0, "Krang Stonehoof - On Script - Set Data 2 2 (Thontek Rumblehoof)"),
+(306300, 9, 7, 0, 0, 0, 100, 0, 10000, 10000, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Krang Stonehoof - On Script - Say Line 2"),
+(306300, 9, 8, 0, 0, 0, 100, 0, 10000, 10000, 0, 0, 0, 45, 2, 2, 0, 0, 0, 0, 9, 10721, 0, 100, 0, 0, 0, 0, 0, "Krang Stonehoof - On Script - Set Data 2 2 (Novice Warrior)"),
+(306300, 9, 9, 0, 0, 0, 100, 0, 8000, 8000, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Krang Stonehoof - On Script - Set Event Phase 1"),
+(306301, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Krang Stonehoof - On Script - Set Event Phase 0"),
+(306301, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 1, 4, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Krang Stonehoof - On Script - Say Line 4"),
+(306301, 9, 2, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 0, 1, 5, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Krang Stonehoof - On Script - Say Line 5"),
+(306301, 9, 3, 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 0, 1, 6, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Krang Stonehoof - On Script - Say Line 6"),
+(306301, 9, 4, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 45, 4, 4, 0, 0, 0, 0, 9, 10721, 0, 100, 0, 0, 0, 0, 0, "Krang Stonehoof - On Script - Set Data 4 4 (Novice Warrior)"),
+(306301, 9, 5, 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 0, 1, 7, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Krang Stonehoof - On Script - Say Line 7"),
+(306301, 9, 6, 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 0, 5, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Krang Stonehoof - On Script - Play Emote Bow"),
+(306301, 9, 7, 0, 0, 0, 100, 0, 4000, 4000, 0, 0, 0, 1, 8, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Krang Stonehoof - On Script - Say Line 8"),
+
+(10721, 0, 0, 0, 38, 0, 100, 0, 1, 1, 0, 0, 0, 91, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Novice Warrior - On Data 1 1 Set - Remove Standstate Sit"),
+(10721, 0, 1, 0, 38, 0, 100, 0, 2, 2, 0, 0, 0, 5, 4, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Novice Warrior - On Data 2 2 Set - Play Emote Cheer"),
+(10721, 0, 2, 0, 38, 0, 100, 0, 3, 3, 0, 0, 0, 88, 1072100, 1072104, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Novice Warrior - On Data 3 3 Set - Play Emote Cheer"),
+(10721, 0, 3, 0, 38, 0, 100, 0, 4, 4, 0, 0, 0, 80, 1072105, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Novice Warrior - On Data 4 4 Set - Run Script"),
+
+(1072100, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 5, 4, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Novice Warrior - On Script - Play Emote Cheer"),
+(1072101, 9, 0, 0, 0, 0, 100, 0, 1500, 1500, 0, 0, 0, 5, 4, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Novice Warrior - On Script - Play Emote Cheer"),
+(1072102, 9, 0, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 0, 5, 4, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Novice Warrior - On Script - Play Emote Cheer"),
+(1072103, 9, 0, 0, 0, 0, 100, 0, 4500, 4500, 0, 0, 0, 5, 4, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Novice Warrior - On Script - Play Emote Cheer"),
+(1072104, 9, 0, 0, 0, 0, 100, 0, 6000, 6000, 0, 0, 0, 5, 4, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Novice Warrior - On Script - Play Emote Cheer"),
+(1072105, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 90, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Novice Warrior - On Script - Set Standstate Sit"),
+
+(10599, 0, 0, 0, 38, 0, 100, 0, 1, 1, 0, 0, 0, 80, 1059900, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On Data 1 1 Set - Run Script"),
+(10599, 0, 1, 0, 38, 0, 100, 0, 2, 2, 0, 0, 0, 80, 1059901, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On Data 2 2 Set - Run Script"),
+(10599, 0, 2, 0, 0, 1, 100, 0, 8000, 20000, 8000, 20000, 0, 80, 1059902, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - In Combat - Run Script (Phase 1)"),
+(10599, 0, 3, 0, 2, 1, 100, 1, 0, 15, 0, 0, 0, 11, 17648, 0, 0, 0, 0, 0, 19, 10600, 100, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On Health Below 15% - Cast 'Surrender' (Thontek Rumblehoof) (Phase 1)"),
+(10599, 0, 4, 5, 8, 0, 100, 0, 17648, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On SpellHit 'Surrender' - Set ReactState Passive"),
+(10599, 0, 5, 6, 61, 0, 100, 0, 0, 0, 0, 0, 0, 46, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On SpellHit 'Surrender' - Stop Attack"),
+(10599, 0, 6, 7, 61, 0, 100, 0, 0, 0, 0, 0, 0, 11, 17649, 0, 0, 0, 0, 0, 19, 10600, 100, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On SpellHit 'Surrender' - Cast 'Accept Surrender' (Thontek Rumblehoof)"),
+(10599, 0, 7, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 80, 1059903, 2, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On SpellHit 'Surrender' - Run Script"),
+(10599, 0, 8, 9, 8, 0, 100, 0, 17649, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On SpellHit 'Accept Surrender' - Set ReactState Passive"),
+(10599, 0, 9, 10, 61, 0, 100, 0, 0, 0, 0, 0, 0, 46, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On SpellHit 'Accept Surrender' - Stop Attack"),
+(10599, 0, 10, 11, 61, 0, 100, 0, 0, 0, 0, 0, 0, 45, 2, 2, 0, 0, 0, 0, 19, 3063, 100, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On SpellHit 'Accept Surrender' - Set Data 2 2 (Krang Stonehoof)"),
+(10599, 0, 11, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 80, 1059903, 2, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On SpellHit 'Accept Surrender' - Run Script"),
+(10599, 0, 12, 0, 34, 0, 100, 0, 0, 1, 0, 0, 0, 80, 1059904, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On MovePoint 1 Reached - Run Script"),
+
+(1059900, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 91, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On Data 1 1 Set - Remove Standstate Sit"),
+(1059900, 9, 1, 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 0, 59, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On Script - Set Run Off"),
+(1059900, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 114, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 3, 0, 0, "Hulfnar Stonetotem - On Data 1 1 Set - Move Forward"),
+(1059900, 9, 3, 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 19, 3063, 100, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On Script - Face Krang Stonehoof"),
+(1059900, 9, 4, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 59, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On Script - Set Run On"),
+(1059900, 9, 5, 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 0, 5, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On Script - Play Emote Bow"),
+(1059901, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 19, 10600, 100, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On Script - Face Thontek Rumblehoof"),
+(1059901, 9, 1, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On Script - Say Line 0"),
+(1059901, 9, 2, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On Script - Say Line 1"),
+(1059901, 9, 3, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 0, 5, 15, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On Script - Play Emote Roar"),
+(1059901, 9, 4, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 0, 2, 1606, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On Script - Set Faction"),
+(1059901, 9, 5, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On Script - Set Event Phase 1"),
+(1059901, 9, 6, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 19, 10600, 100, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On Script - Attack Thontek Rumblehoof"),
+(1059902, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 11, 16740, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On Script - Cast 'War Stomp'"),
+(1059902, 9, 1, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 19, 3063, 100, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On Script - Set Data 1 1 (Krang Stonehoof)"),
+(1059903, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On Script - Set Event Phase 0"),
+(1059903, 9, 1, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 0, 5, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On Script - Play Emote Bow"),
+(1059903, 9, 2, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 19, 3063, 100, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On Script - Face Krang Stonehoof"),
+(1059903, 9, 3, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 0, 5, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On Script - Play Emote Bow"),
+(1059903, 9, 4, 0, 0, 0, 100, 0, 4000, 4000, 0, 0, 0, 59, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On Script - Set Run Off"),
+(1059903, 9, 5, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 69, 1, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, -2360.290039, -519.245972, -9.299930, 0, "Hulfnar Stonetotem - On Script - Move To Pos"),
+(1059904, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 117, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On Script - Disable Evade Mode"),
+(1059904, 9, 1, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On Script - Reset Orienation"),
+(1059904, 9, 2, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 0, 117, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On Script - Enable Evade Mode"),
+(1059904, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 59, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On Script - Set Run On"),
+(1059904, 9, 4, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 2, 104, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On Script - Set Faction"),
+(1059904, 9, 5, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 8, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On Script - Set ReactState Aggressive"),
+(1059904, 9, 6, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Hulfnar Stonetotem - On Script - Enter Evade Mode"),
+
+(10600, 0, 0, 0, 38, 0, 100, 0, 1, 1, 0, 0, 0, 80, 1060000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On Data 1 1 Set - Run Script"),
+(10600, 0, 1, 0, 38, 0, 100, 0, 2, 2, 0, 0, 0, 80, 1060001, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On Data 2 2 Set - Run Script"),
+(10600, 0, 2, 0, 0, 1, 100, 0, 8000, 20000, 8000, 20000, 0, 80, 1060002, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - In Combat - Run Script (Phase 1)"),
+(10600, 0, 3, 0, 2, 1, 100, 1, 0, 15, 0, 0, 0, 11, 17648, 0, 0, 0, 0, 0, 19, 10599, 100, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On Health Below 15% - Cast 'Surrender' (Hulfnar Stonetotem) (Phase 1)"),
+(10600, 0, 4, 5, 8, 0, 100, 0, 17648, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On SpellHit 'Surrender' - Set ReactState Passive"),
+(10600, 0, 5, 6, 61, 0, 100, 0, 0, 0, 0, 0, 0, 46, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On SpellHit 'Surrender' - Stop Attack"),
+(10600, 0, 6, 7, 61, 0, 100, 0, 0, 0, 0, 0, 0, 11, 17649, 0, 0, 0, 0, 0, 19, 10599, 100, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On SpellHit 'Surrender' - Cast 'Accept Surrender' (Hulfnar Stonetotem)"),
+(10600, 0, 7, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 80, 1060003, 2, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On SpellHit 'Surrender' - Run Script"),
+(10600, 0, 8, 9, 8, 0, 100, 0, 17649, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On SpellHit 'Accept Surrender' - Set ReactState Passive"),
+(10600, 0, 9, 10, 61, 0, 100, 0, 0, 0, 0, 0, 0, 46, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On SpellHit 'Accept Surrender' - Stop Attack"),
+(10600, 0, 10, 11, 61, 0, 100, 0, 0, 0, 0, 0, 0, 45, 2, 2, 0, 0, 0, 0, 19, 3063, 100, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On SpellHit 'Accept Surrender' - Set Data 2 2 (Krang Stonehoof)"),
+(10600, 0, 11, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 80, 1060003, 2, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On SpellHit 'Accept Surrender' - Run Script"),
+(10600, 0, 12, 0, 34, 0, 100, 0, 0, 1, 0, 0, 0, 80, 1060004, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On MovePoint 1 Reached - Run Script"),
+
+(1060000, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 91, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On Script - Remove Standstate Sit"),
+(1060000, 9, 1, 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 0, 59, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On Script - Set Run Off"),
+(1060000, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 114, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 3, 0, 0, "Thontek Rumblehoof - On Script - Move Forward"),
+(1060000, 9, 3, 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 19, 3063, 100, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On Script - Face Krang Stonehoof"),
+(1060000, 9, 4, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 59, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On Script - Set Run On"),
+(1060000, 9, 5, 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 0, 5, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On Script - Play Emote Bow"),
+(1060001, 9, 0, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 19, 10599, 100, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On Script - Face Hulfnar Stonetotem"),
+(1060001, 9, 1, 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On Script - Say Line 0"),
+(1060001, 9, 2, 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 0, 5, 25, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On Script - Play Emote Point"),
+(1060001, 9, 3, 0, 0, 0, 100, 0, 8000, 8000, 0, 0, 0, 4, 6278, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On Script - Play Sound"),
+(1060001, 9, 4, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 5, 15, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On Script - Play Emote Roar"),
+(1060001, 9, 5, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 0, 2, 1606, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On Script - Set Faction"),
+(1060001, 9, 6, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On Script - Set Event Phase 1"),
+(1060001, 9, 7, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 19, 10599, 100, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On Script - Attack Hulfnar Stonetotem"),
+(1060002, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 11, 16740, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On Script - Cast 'War Stomp'"),
+(1060002, 9, 1, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 19, 3063, 100, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On Script - Set Data 1 1 (Krang Stonehoof)"),
+(1060003, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On Script - Set Event Phase 0"),
+(1060003, 9, 1, 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 0, 5, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On Script - Play Emote Bow"),
+(1060003, 9, 2, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 19, 3063, 100, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On Script - Face Krang Stonehoof"),
+(1060003, 9, 3, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 0, 5, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On Script - Play Emote Bow"),
+(1060003, 9, 4, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 0, 59, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On Script - Set Run Off"),
+(1060003, 9, 5, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 69, 1, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, -2333.959961, -512.051025, -9.299930, 0, "Thontek Rumblehoof - On Script - Move To Pos"),
+(1060004, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 117, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On Script - Disable Evade Mode"),
+(1060004, 9, 1, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On Script - Reset Orienation"),
+(1060004, 9, 2, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 0, 117, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On Script - Enable Evade Mode"),
+(1060004, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 59, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On Script - Set Run On"),
+(1060004, 9, 4, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 2, 104, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On Script - Set Faction"),
+(1060004, 9, 5, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 8, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On Script - Set ReactState Aggressive"),
+(1060004, 9, 6, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Thontek Rumblehoof - On Script - Enter Evade Mode");
+
+DELETE FROM `creature_text` WHERE `CreatureID` IN (3063, 10599, 10600);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(3063, 0, 0, "Hulfnar! Thontek! Stand and address me.", 12, 3, 100, 1, 0, 0, 6005, 0, "Krang Stonehoof"),
+(3063, 1, 0, "I want you both to demonstrate the techniques I have taught you for the benefit of the younger students here. Ready... begin!", 12, 3, 100, 1, 0, 0, 6020, 0, "Krang Stonehoof"),
+(3063, 2, 0, "Enough talk you two! Commence fighting!", 12, 3, 100, 22, 0, 0, 6025, 0, "Krang Stonehoof"),
+(3063, 3, 0, "Now that's a War Stomp! Good job!", 12, 3, 100, 21, 0, 0, 6072, 0, "Krang Stonehoof"),
+(3063, 3, 1, "That's how it's done class! You better be paying attention!", 12, 3, 100, 21, 0, 0, 6073, 0, "Krang Stonehoof"),
+(3063, 3, 2, "Now that's putting your hoof down!", 12, 3, 100, 21, 0, 0, 6074, 0, "Krang Stonehoof"),
+(3063, 4, 0, "Ish nu! That's enough!", 12, 3, 100, 1, 0, 0, 6091, 0, "Krang Stonehoof"),
+(3063, 5, 0, "Well Done!", 12, 3, 100, 1, 0, 6575, 6038, 0, "Krang Stonehoof"),
+(3063, 6, 0, "Good, good. Now bow to each other.", 12, 3, 100, 1, 0, 0, 6098, 0, "Krang Stonehoof"),
+(3063, 7, 0, "Now bow to me.", 12, 3, 100, 1, 0, 0, 6099, 0, "Krang Stonehoof"),
+(3063, 8, 0, "Good job you two. Now go have a seat.", 12, 3, 100, 1, 0, 0, 6100, 0, "Krang Stonehoof"),
+(10599, 0, 0, "Start running!", 12, 3, 100, 25, 0, 6280, 5966, 0, "Hulfnar Stonetotem"),
+(10599, 1, 0, "Bring it on!", 12, 3, 100, 22, 0, 6281, 5967, 0, "Hulfnar Stonetotem"),
+(10600, 0, 0, "Do not push me, or I will impale you on my horns!", 12, 3, 100, 22, 0, 6277, 5968, 0, "Thontek Rumblehoof");
+
+UPDATE `creature` SET `modelid`=0 WHERE id=10721;
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_30_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_30_01_world.sql
new file mode 100644
index 00000000000..f4ce7c15a67
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_30_01_world.sql
@@ -0,0 +1,24 @@
+--
+UPDATE `creature_addon` SET `emote`=0 WHERE `guid`=6460;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=3191;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=3191 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (319100, 319101, 319102) 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_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(3191, 0, 0, 0, 1, 0, 100, 0, 5000, 5000, 80000, 120000, 0, 80, 319100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cook Torka - OOC - Run Script"),
+(3191, 0, 1, 0, 40, 0, 100, 0, 1, 3191, 0, 0, 0, 80, 319101, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cook Torka - On WP 1 Reached - Run Script"),
+(3191, 0, 2, 0, 40, 0, 100, 0, 2, 3191, 0, 0, 0, 80, 319102, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cook Torka - On WP 2 Reached - Run Script"),
+(319100, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 20, 18075, 20, 0, 0, 0, 0, 0, 0, "Cook Torka - On Script - Face Cooking Table"),
+(319100, 9, 1, 0, 0, 0, 100, 0, 200, 200, 0, 0, 0, 5, 25, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cook Torka - On Script - Play Emote Point"),
+(319100, 9, 2, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 20, 18079, 20, 0, 0, 0, 0, 0, 0, "Cook Torka - On Script - Face Bubbling Cauldron"),
+(319100, 9, 3, 0, 0, 0, 100, 0, 200, 200, 0, 0, 0, 5, 25, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cook Torka - On Script - Play Emote Point"),
+(319100, 9, 4, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 0, 53, 0, 3191, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cook Torka - On Script - Start WP"),
+(319101, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 54, 60000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cook Torka - On Script - Pause WP"),
+(319101, 9, 1, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 0, 17, 69, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cook Torka - On Script - Set Emote State STATE_USESTANDING"),
+(319101, 9, 2, 0, 0, 0, 100, 0, 20000, 50000, 0, 0, 0, 17, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cook Torka - On Script - Remove Emote State"),
+(319101, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 65, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Cook Torka - On Script - Resume WP"),
+(319102, 9, 0, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 4.171340, "Cook Torka - On Script - Reset Orientation");
+
+DELETE FROM `waypoints` WHERE `entry`=3191;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(3191, 1, 310.098022, -4663.778809, 16.389601, "Cook Torka"),
+(3191, 2, 312.098999, -4664.950195, 16.4254, "Cook Torka");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_30_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_30_02_world.sql
new file mode 100644
index 00000000000..16ba10c414e
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_06_30_02_world.sql
@@ -0,0 +1,4 @@
+--
+DELETE FROM `gossip_menu_option` WHERE `MenuID`=5349 AND `OptionID`=0;
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=5349 AND `SourceEntry`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=13716 AND `source_type`=0 AND id=22;
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_00_world.sql
new file mode 100644
index 00000000000..e240b28e714
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_00_world.sql
@@ -0,0 +1,4 @@
+--
+DELETE FROM `spell_script_names` WHERE `ScriptName` IN ('spell_war_intervene','spell_warr_intervene');
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(3411,'spell_warr_intervene');
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_02_world.sql
new file mode 100644
index 00000000000..ccedb95dd86
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_02_world.sql
@@ -0,0 +1,24 @@
+--
+UPDATE `areatrigger_scripts` SET `ScriptName` = "SmartTrigger" WHERE `entry` = 4960;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 4960 AND `source_type` = 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`,`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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(4960,2,0,1,46,0,100,0,4960,0,0,0,0,64,1,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Areatrigger (Agmar's Hammer) - On Trigger - Store Targetlist"),
+(4960,2,1,2,61,0,100,0,0,0,0,0,0,100,1,0,0,0,0,0,19,26649,0,0,0,0,0,0,0,"Areatrigger (Agmar's Hammer) - On Link - Send Target 1 (Messenger Torvus)"),
+(4960,2,2,0,61,0,100,0,0,0,0,0,0,45,0,1,0,0,0,0,19,26649,0,0,0,0,0,0,0,"Areatrigger (Agmar's Hammer) - On Link - Set Data 0 1 (Messenger Torvus)");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 22 AND `SourceEntry` = 4960 AND `SourceId` = 2;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+-- CanTakeQuest (level checks) are not included because https://www.wowhead.com/npc=26649/messenger-torvus#comments:id=441648
+(22,1,4960,2,0,8,0,11916,0,0,0,0,0,"","Group 0: Execute SAI (Action 0) if quest 'Hellscream's Champion' is rewarded"),
+(22,1,4960,2,0,9,0,12033,0,0,1,0,0,"","Group 0: Execute SAI (Action 0) if player has not taken quest 'Message from the West'"),
+(22,1,4960,2,0,28,0,12033,0,0,1,0,0,"","Group 0: Execute SAI (Action 0) if quest 'Message from the West' is not completed");
+-- Handled in core
+-- (22,1,4960,2,0,36,0,0,0,0,0,0,0,"","Group 0: Execute SAI (Action 0) if player is alive");
+
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = 26649;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 26649 AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+-- No timer?
+(26649,0,0,0,38,0,100,0,0,1,30000,30000,0,1,0,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Messenger Torvus - On Data Set 0 1 - Say Line 0");
+
+UPDATE `creature_text` SET `comment` = "Messenger Torvus" WHERE `CreatureID` = 26649;
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_03_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_03_world.sql
new file mode 100644
index 00000000000..f2647802191
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_03_world.sql
@@ -0,0 +1,9 @@
+--
+UPDATE `smart_scripts` SET `target_type` = 19, `target_param1` = 11152, `target_param2` = 0 WHERE `entryorguid` IN (2246,2248,2250,2252,2626,2627,2628,2629,2630,2631,2632,2633,2634,2635,2636,2637) AND `source_type` = 2 AND `id` = 0;
+UPDATE `smart_scripts` SET `target_type` = 19, `target_param1` = 7917, `target_param2` = 0 WHERE `entryorguid` = 1125 AND `source_type` = 2 AND `id` IN (1,2);
+UPDATE `smart_scripts` SET `target_type` = 19, `target_param1` = 20242, `target_param2` = 0 WHERE `entryorguid` = 4495 AND `source_type` = 2 AND `id` IN (1,2);
+UPDATE `smart_scripts` SET `target_type` = 19, `target_param1` = 19227, `target_param2` = 0 WHERE `entryorguid` = 4389 AND `source_type` = 2 AND `id` IN (1,2);
+
+UPDATE `smart_scripts` SET `comment` = "Areatrigger (Lower City) - On Trigger - Store Targetlist" WHERE `entryorguid` = 4389 AND `source_type` = 2 AND `id` = 0;
+UPDATE `smart_scripts` SET `comment` = "Areatrigger (Lower City) - On Link - Send Target 1 (Griftah)" WHERE `entryorguid` = 4389 AND `source_type` = 2 AND `id` = 1;
+UPDATE `smart_scripts` SET `comment` = "Areatrigger (Lower City) - On Link - Set Data 0 1 (Griftah)" WHERE `entryorguid` = 4389 AND `source_type` = 2 AND `id` = 2;
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_04_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_04_world.sql
new file mode 100644
index 00000000000..f556f4a51ac
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_04_world.sql
@@ -0,0 +1,20 @@
+--
+DELETE FROM `smart_scripts` WHERE `entryorguid`=15420 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=1542000 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_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(15420, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Prospector Anvilward - On Respawn - Set Event Phase 1"),
+(15420, 0, 1, 0, 1, 1, 100, 0, 10000, 10000, 270000, 330000, 0, 80, 1542000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Prospector Anvilward - Out of Combat - Run Script (Phase 1)"),
+(15420, 0, 2, 3, 62, 0, 100, 0, 21311, 0, 0, 0, 0, 53, 0, 15420, 0, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Prospector Anvilward - On Gossip Option 0 Selected - Start Waypoint"),
+(15420, 0, 3, 4, 61, 0, 100, 0, 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, "Prospector Anvilward - On Gossip Option 0 Selected - Close Gossip"),
+(15420, 0, 4, 5, 61, 0, 100, 0, 0, 0, 0, 0, 0, 83, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Prospector Anvilward - On Gossip Option 0 Selected - Remove Npc Flag Gossip"),
+(15420, 0, 5, 6, 61, 0, 100, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Prospector Anvilward - On Gossip Option 0 Selected - Set Event Phase 0"),
+(15420, 0, 6, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, "Prospector Anvilward - On Gossip Option 0 Selected - Say Line 0"),
+(15420, 0, 7, 8, 40, 0, 100, 0, 8, 15420, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Prospector Anvilward - On Waypoint 8 Reached - Say Line 1"),
+(15420, 0, 8, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 2, 24, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Prospector Anvilward - On Waypoint 8 Reached - Set Faction 24"),
+(1542000, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Prospector Anvilward - Out Of Combat - Say Line 2"),
+(1542000, 9, 1, 0, 0, 0, 100, 0, 6000, 6000, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 19, 15405, 50, 0, 0, 0, 0, 0, 0, "Prospector Anvilward - Out Of Combat - Say Line 0 (Ley-Keeper Caidanis)");
+
+DELETE FROM `waypoints` WHERE `entry`=15420 AND `pointid` IN (7, 8);
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(15420, 7, 9289.319336, -6657.801270, 31.828445, "Prospector Anvilward"),
+(15420, 8, 9289.892578, -6657.924316, 31.827124, "Prospector Anvilward");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_05_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_05_world.sql
new file mode 100644
index 00000000000..298e1267938
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_05_world.sql
@@ -0,0 +1,15 @@
+DELETE FROM `gossip_menu` WHERE `MenuID`=5747 AND `TextID`=6926;
+INSERT INTO `gossip_menu` (`MenuID`, `TextID`) VALUES
+(5747, 6926);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=5747 AND `SourceEntry` IN (6926, 6925);
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=19 AND `SourceEntry` IN (7483, 7484, 7485);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(14, 5747, 6926, 0, 0, 8, 0, 7481, 0, 0, 0, 0, 0, "", "Gossip Text 6926 requires quest 'Elven Legends' (Horde) rewarded OR"),
+(14, 5747, 6926, 0, 1, 8, 0, 7482, 0, 0, 0, 0, 0, "", "Gossip Text 6926 requires quest 'Elven Legends' (Alliance) rewarded "),
+(19, 0, 7483, 0, 0, 8, 0, 7481, 0, 0, 0, 0, 0, "", "Quest 'Libram of Rapidity' is available if player has quest 'Elven Legends' (Horde) rewarded OR"),
+(19, 0, 7483, 0, 1, 8, 0, 7482, 0, 0, 0, 0, 0, "", "Quest 'Libram of Rapidity' is available if player has quest 'Elven Legends' (Alliance) rewarded"),
+(19, 0, 7484, 0, 0, 8, 0, 7481, 0, 0, 0, 0, 0, "", "Quest 'Libram of Focus' is available if player has quest 'Elven Legends' (Horde) rewarded OR"),
+(19, 0, 7484, 0, 1, 8, 0, 7482, 0, 0, 0, 0, 0, "", "Quest 'Libram of Focus' is available if player has quest 'Elven Legends' (Alliance) rewarded"),
+(19, 0, 7485, 0, 0, 8, 0, 7481, 0, 0, 0, 0, 0, "", "Quest 'Libram of Protection' is available if player has quest 'Elven Legends' (Horde) rewarded OR"),
+(19, 0, 7485, 0, 1, 8, 0, 7482, 0, 0, 0, 0, 0, "", "Quest 'Libram of Protection' is available if player has quest 'Elven Legends' (Alliance) rewarded");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_06_world_335.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_06_world_335.sql
new file mode 100644
index 00000000000..e208ec61767
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_06_world_335.sql
@@ -0,0 +1,5 @@
+--
+UPDATE `creature_template` SET `gossip_menu_id`=0, `npcflag`=0 WHERE `entry` IN (7770, 10676);
+DELETE FROM `gossip_menu` WHERE `TextID`=16642;
+DELETE FROM `gossip_menu` WHERE `MenuID` IN (11189, 11876);
+-- DELETE FROM `npc_text` WHERE `ID` IN (15572, 16642, 16644);
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_07_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_07_world.sql
new file mode 100644
index 00000000000..435341dd1e2
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_01_07_world.sql
@@ -0,0 +1,6 @@
+--
+DELETE FROM `areatrigger_scripts` WHERE `entry`=4071;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=4071 AND `source_type`=2;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=16295 AND `source_type`=0 AND `id`=8;
+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_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(16295, 0, 8, 0, 1, 1, 100, 0, 20000, 40000, 60000, 180000, 0, 1, 6, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Ranger Lilatha - OOC - Say Line 6 (Phase 1)");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_00_world.sql
new file mode 100644
index 00000000000..53dd79ba69d
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_00_world.sql
@@ -0,0 +1,84 @@
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=23038;
+UPDATE `creature` SET `orientation`=0.049211 WHERE `id`=23038;
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (23038, 23042) AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (2303800, 2304200, 2304201, 2304202, 2304203) 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_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(23042, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Severin - On Spawn - Set Event Phase 1"),
+(23042, 0, 1, 0, 19, 1, 100, 0, 11004, 0, 0, 0, 0, 80, 2304200, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Severin - On Quest 'World of Shadows' Taken - Run Script (Event Phase 1)"),
+(23042, 0, 2, 0, 20, 1, 100, 0, 11004, 0, 0, 0, 0, 80, 2304201, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Severin - On Quest 'World of Shadows' Rewarded - Run Script (Event Phase 1)"),
+(23042, 0, 3, 4, 38, 0, 100, 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Severin - On Data 1 1 Set - Say Line 1"),
+(23042, 0, 4, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 53, 1, 2304200, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Severin - On Data 1 1 Set - Start WP"),
+(23042, 0, 5, 0, 40, 0, 100, 0, 1, 2304200, 0, 0, 0, 80, 2304202, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Severin - On WP 1 Reached - Run Script"),
+(23042, 0, 6, 0, 40, 0, 100, 0, 1, 2304201, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 4.555310, "Severin - On WP 1 Reached - Reset Orientation"),
+(23042, 0, 7, 0, 38, 0, 100, 0, 2, 2, 0, 0, 0, 80, 2304203, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Severin - On Data 2 2 Set - Run Script"),
+
+(23038, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Sky Commander Adaris - On Spawn - Set Event Phase 1"),
+(23038, 0, 1, 2, 38, 0, 100, 0, 1, 1, 0, 0, 0, 91, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Sky Commander Adaris - On Data 1 1 Set - Remove StandState Sit"),
+(23038, 0, 2, 3, 61, 0, 100, 0, 0, 0, 0, 0, 0, 90, 8, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Sky Commander Adaris - On Data 1 1 Set - Set StandState Kneel"),
+(23038, 0, 3, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Sky Commander Adaris - On Data 1 1 Set - Say Line 1"),
+(23038, 0, 4, 5, 38, 0, 100, 0, 2, 2, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 5.794490, "Sky Commander Adaris - On Data 2 2 Set - Set Orientation"),
+(23038, 0, 5, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Sky Commander Adaris - On Data 2 2 Set - Say Line 2"),
+(23038, 0, 6, 7, 38, 0, 100, 0, 3, 3, 0, 0, 0, 40, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Sky Commander Adaris - On Data 3 3 Set - Unsheathe Melee Weapon"),
+(23038, 0, 7, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 53, 1, 2303800, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Sky Commander Adaris - On Data 3 3 Set - Start WP"),
+(23038, 0, 8, 0, 40, 0, 100, 0, 1, 2303800, 0, 0, 0, 80, 2303800, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Sky Commander Adaris - On WP 1 Reached - Run Script"),
+(23038, 0, 9, 10, 40, 0, 100, 0, 1, 2303801, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0.049211, "Sky Commander Adaris - On WP 1 Reached - Reset Orientation"),
+(23038, 0, 10, 11, 61, 0, 100, 0, 0, 0, 0, 0, 0, 40, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Sky Commander Adaris - On WP 1 Reached - Sheathe Melee Weapon"),
+(23038, 0, 11, 12, 61, 0, 100, 0, 0, 0, 0, 0, 0, 90, 8, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Sky Commander Adaris - On WP 1 Reached - Set StandState Kneel"),
+(23038, 0, 12, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 45, 2, 2, 0, 0, 0, 0, 19, 23042, 10, 0, 0, 0, 0, 0, 0, "Sky Commander Adaris - On WP 1 Reached - Set Data 2 2 (Severin)"),
+
+(2303800, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 19, 23042, 50, 0, 0, 0, 0, 0, 0, "Sky Commander Adaris - On Script - Set Data 1 1 (Severin)"),
+(2303800, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 5.168708, "Sky Commander Adaris - On Script - Set Orientation"),
+(2303800, 9, 2, 0, 0, 0, 100, 0, 400, 400, 0, 0, 0, 5, 54, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Sky Commander Adaris - On Script - Play Emote ONESHOT_ATTACK1H"),
+(2303800, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 12, 23207, 3, 18000, 0, 0, 0, 8, 0, 0, 0, 0, -3399.783447, 3614.886719, 276.369293, 2.089945, "Sky Commander Adaris - On Script - Summon Creature 'Skettis Assassin'"),
+(2303800, 9, 4, 0, 0, 0, 100, 0, 4000, 4000, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 6.268262, "Sky Commander Adaris - On Script - Set Orientation"),
+(2303800, 9, 5, 0, 0, 0, 100, 0, 400, 400, 0, 0, 0, 5, 54, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Sky Commander Adaris - On Script - Play Emote ONESHOT_ATTACK1H"),
+(2303800, 9, 6, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 12, 23207, 3, 18000, 0, 0, 0, 8, 0, 0, 0, 0, -3397.512207, 3617.134766, 276.865234, 3.028496, "Sky Commander Adaris - On Script - Summon Creature 'Skettis Assassin'"),
+(2303800, 9, 7, 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, 0, "Sky Commander Adaris - On Script - Say Line 3"),
+(2303800, 9, 8, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 0, 53, 0, 2303801, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Sky Commander Adaris - On Script - Start WP"),
+
+(2304200, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Severin - On Script - Set Event Phase 0"),
+(2304200, 9, 1, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 19, 23038, 10, 0, 0, 0, 0, 0, 0, "Severin - On Script - Say Line 0 (Sky Commander Adaris)"),
+(2304200, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 90, 8, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Severin - On Script - Set StandState Kneel"),
+(2304200, 9, 3, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Severin - On Script - Say Line 0"),
+(2304200, 9, 4, 0, 0, 0, 100, 0, 8000, 8000, 0, 0, 0, 91, 8, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Severin - On Script - Remove StandState Kneel"),
+(2304200, 9, 5, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Severin - On Script - Set Event Phase 1"),
+
+(2304201, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Severin - On Script - Set Event Phase 0"),
+(2304201, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 83, 3, 0, 0, 0, 0, 0, 19, 23038, 10, 0, 0, 0, 0, 0, 0, "Severin - On Script - Remove Gossip+Questgiver Npcflag (Sky Commander Adaris)"),
+(2304201, 9, 2, 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 19, 23038, 10, 0, 0, 0, 0, 0, 0, "Severin - On Script - Set Data 1 1 (Sky Commander Adaris)"),
+(2304201, 9, 3, 0, 0, 0, 100, 0, 4000, 4000, 0, 0, 0, 91, 8, 0, 0, 0, 0, 0, 19, 23038, 10, 0, 0, 0, 0, 0, 0, "Severin - On Script - Remove StandState Kneel (Sky Commander Adaris)"),
+(2304201, 9, 4, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 0, 45, 2, 2, 0, 0, 0, 0, 19, 23038, 10, 0, 0, 0, 0, 0, 0, "Severin - On Script - Set Data 2 2 (Sky Commander Adaris)"),
+(2304201, 9, 5, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 0, 45, 3, 3, 0, 0, 0, 0, 19, 23038, 10, 0, 0, 0, 0, 0, 0, "Severin - On Script - Set Data 3 3 (Sky Commander Adaris)"),
+
+(2304202, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 5.01555, "Severin - On Script - Set Orientation"),
+(2304202, 9, 1, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 0, 53, 0, 2304201, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Severin - On Script - Start WP"),
+
+(2304203, 9, 0, 0, 0, 0, 100, 0, 4000, 4000, 0, 0, 0, 1, 4, 0, 0, 0, 0, 0, 19, 23038, 10, 0, 0, 0, 0, 0, 0, "Severin - On Script - Say Line 4 (Sky Commander Adaris)"),
+(2304203, 9, 1, 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, 0, "Severin - On Script - Say Line 2"),
+(2304203, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 90, 8, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Severin - On Script - Set StandState Kneel"),
+(2304203, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 91, 8, 0, 0, 0, 0, 0, 19, 23038, 10, 0, 0, 0, 0, 0, 0, "Severin - On Script - Remove StandState Kneel (Sky Commander Adaris)"),
+(2304203, 9, 4, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 90, 1, 0, 0, 0, 0, 0, 19, 23038, 10, 0, 0, 0, 0, 0, 0, "Severin - On Script - Set StandState Sit (Sky Commander Adaris)"),
+(2304203, 9, 5, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 82, 3, 0, 0, 0, 0, 0, 19, 23038, 10, 0, 0, 0, 0, 0, 0, "Severin - On Script - Set Gossip+Questgiver Npcflag (Sky Commander Adaris)"),
+(2304203, 9, 6, 0, 0, 0, 100, 0, 6000, 6000, 0, 0, 0, 91, 8, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Severin - On Script - Remove StandState Kneel"),
+(2304203, 9, 7, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Severin - On Script - Set Event Phase 1");
+
+DELETE FROM `creature_text` WHERE `CreatureID` IN (23042, 23038) AND `GroupID`!=0;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(23038, 1, 0, "The elixir... give it to me, Severin!", 12, 0, 100, 0, 0, 0, 21083, 0, "Sky Commander Adaris"),
+(23038, 2, 0, "I see them now... assassins from Skettis!", 12, 0, 100, 25, 0, 0, 21084, 0, "Sky Commander Adaris"),
+(23038, 3, 0, "The arakkoa can send all the assassins they have... they will meet the same fate as these!", 12, 0, 100, 0, 0, 0, 21086, 0, "Sky Commander Adaris"),
+(23038, 4, 0, "Is this... blood in my lungs? If I don't die to an assassin's blade, it'll be my old injuries that get me.", 12, 0, 100, 0, 0, 0, 21094, 0, "Sky Commander Adaris"),
+(23042, 1, 0, "Adaris!", 14, 0, 100, 0, 0, 0, 21132, 0, "Severin"),
+(23042, 2, 0, "Rest now, friend. You need your strength.", 12, 0, 100, 0, 0, 0, 21133, 0, "Severin");
+
+DELETE FROM `waypoints` WHERE `entry` IN (2303800, 2303801, 2304200, 2304201);
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(2303800, 1, -3401.270020, 3617.288330, 276.939697, "Sky Commander Adaris"),
+(2303801, 1, -3408.260010, 3622.709961, 278.075012, "Sky Commander Adaris"),
+(2304200, 1, -3402.066650, 3619.804688, 277.965363, "Severin"),
+(2304201, 1, -3407.590088, 3624.570068, 278.075012, "Severin");
+
+DELETE FROM `creature_template_addon` WHERE `entry`=23207;
+INSERT INTO `creature_template_addon` (`entry`, `bytes1`, `auras`) VALUES
+(23207, 0, "29266");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_01_world.sql
new file mode 100644
index 00000000000..8132fc57f8f
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_01_world.sql
@@ -0,0 +1,25 @@
+--
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=23306;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=23306 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=23038 AND `source_type`=0 AND `id`=13;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=23042 AND `source_type`=0 AND `id` IN (8, 9);
+DELETE FROM `smart_scripts` WHERE `entryorguid`=2303801 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_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(23306, 0, 0, 0, 38, 0, 100, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 0, "Hazzik - On Data 1 1 Set - Say Line 0 (Stored Target)"),
+(23038, 0, 13, 0, 20, 1, 100, 0, 11028, 0, 0, 0, 0, 80, 2303801, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Sky Commander Adaris - On Quest 'Countdown to Doom' Rewarded - Run Script (Phase 1)"),
+(23042, 0, 8, 0, 38, 0, 100, 0, 3, 3, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Severin - On Data 3 3 Set - Set Event Phase 0"),
+(23042, 0, 9, 0, 38, 0, 100, 0, 4, 4, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Severin - On Data 4 4 Set - Set Event Phase 1"),
+(2303801, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Sky Commander Adaris - On Script - Set Event Phase 0"),
+(2303801, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 45, 3, 3, 0, 0, 0, 0, 19, 23042, 50, 0, 0, 0, 0, 0, 0, "Sky Commander Adaris - On Script - Set Data 3 3 (Severin)"),
+(2303801, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 64, 1, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, "Sky Commander Adaris - On Script - Store Invoker"),
+(2303801, 9, 3, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 100, 1, 0, 0, 0, 0, 0, 19, 23306, 50, 0, 0, 0, 0, 0, 0, "Sky Commander Adaris - On Script - Send Stored Target (Hazzik)"),
+(2303801, 9, 4, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 19, 23306, 50, 0, 0, 0, 0, 0, 0, "Sky Commander Adaris - On Script - Set Data 1 1 (Hazzik)"),
+(2303801, 9, 5, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 0, 1, 5, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Sky Commander Adaris - On Script - Say Line 5"),
+(2303801, 9, 6, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 45, 4, 4, 0, 0, 0, 0, 19, 23042, 50, 0, 0, 0, 0, 0, 0, "Sky Commander Adaris - On Script - Set Data 4 4 (Severin)"),
+(2303801, 9, 7, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Sky Commander Adaris - On Script - Set Event Phase 1");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=23306;
+DELETE FROM `creature_text` WHERE `CreatureID`=23038 AND `GroupID`=5;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(23306, 0, 0, "You over there! I must speak with you!", 15, 0, 100, 0, 0, 0, 21339, 0, "Hazzik"),
+(23038, 5, 0, "Do not... bring Terokk into our world, $n... That would be... madness...", 12, 0, 100, 0, 0, 0, 21907, 0, "Sky Commander Adaris");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_02_world.sql
new file mode 100644
index 00000000000..0ac05b4b6d2
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_02_world.sql
@@ -0,0 +1,16 @@
+--
+DELETE FROM `smart_scripts` WHERE `entryorguid`=23038 AND `source_type`=0 AND `id`=14;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=2303802 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_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(23038, 0, 14, 0, 20, 1, 100, 0, 11073, 0, 0, 0, 0, 80, 2303802, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Sky Commander Adaris - On Quest 'Terokk's Downfall' Rewarded - Run Script (Phase 1)"),
+(2303802, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Sky Commander Adaris - On Script - Set Event Phase 0"),
+(2303802, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 45, 3, 3, 0, 0, 0, 0, 19, 23042, 50, 0, 0, 0, 0, 0, 0, "Sky Commander Adaris - On Script - Set Data 3 3 (Severin)"),
+(2303802, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 91, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Sky Commander Adaris - On Script - Remove StandState Sit"),
+(2303802, 9, 3, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 0, 1, 6, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Sky Commander Adaris - On Script - Say Line 6"),
+(2303802, 9, 4, 0, 0, 0, 100, 0, 10000, 10000, 0, 0, 0, 90, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Sky Commander Adaris - On Script - Set StandState Sit"),
+(2303802, 9, 5, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 45, 4, 4, 0, 0, 0, 0, 19, 23042, 50, 0, 0, 0, 0, 0, 0, "Sky Commander Adaris - On Script - Set Data 4 4 (Severin)"),
+(2303802, 9, 6, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Sky Commander Adaris - On Script - Set Event Phase 1");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=23038 AND `GroupID`=6;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(23038, 6, 0, "You're one of our bravest, $n. All of the Skyguard is in your debt.", 12, 0, 100, 66, 0, 0, 21906, 0, "Sky Commander Adaris");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_03_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_03_world.sql
new file mode 100644
index 00000000000..010b1991f95
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_03_world.sql
@@ -0,0 +1,120 @@
+--
+DELETE FROM `gameobject` WHERE `id`=185952;
+UPDATE `quest_template_addon` SET `SpecialFlags`=`SpecialFlags`|2 WHERE `ID`=11085;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=23383;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=23383 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=21644 AND `source_type`=0 AND `id` IN (5, 6, 7);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (2338300, 2338301, 2338302, 2338303, 2338304) 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_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(23383, 0, 0, 1, 11, 0, 100, 0, 0, 0, 0, 0, 0, 18, 512, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On Spawn - Set Immune To NPC"),
+(23383, 0, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 0, 48, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On Spawn - Set Active"),
+(23383, 0, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 88, 2338300, 2338302, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On Spawn - Run Random Script"),
+(23383, 0, 3, 4, 19, 0, 100, 0, 11085, 0, 0, 0, 0, 19, 512, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On Quest 'Escape from Skettis' Accepted - Remove Immune To NPC"),
+(23383, 0, 4, 5, 61, 0, 100, 0, 0, 0, 0, 0, 0, 83, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On Quest 'Escape from Skettis' Accepted - Remove Questgiver Npcflag"),
+(23383, 0, 5, 6, 61, 0, 100, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 15, 185952, 10, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On Quest 'Escape from Skettis' Accepted - Activate Gameobject 'Cage'"),
+(23383, 0, 6, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 64, 1, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On Quest 'Escape from Skettis' Accepted - Store Invoker"),
+(23383, 0, 7, 0, 19, 0, 100, 0, 11085, 0, 0, 0, 0, 113, 2338300, 2338301, 2338302, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On Quest 'Escape from Skettis' Accepted - Start Closest WP"),
+(23383, 0, 8, 9, 40, 0, 100, 0, 1, 0, 0, 0, 0, 54, 10000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On WP 1 Reached - Pause WP (10 Seconds)"),
+(23383, 0, 9, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On WP 1 Reached - Say Line 0"),
+(23383, 0, 10, 11, 40, 0, 100, 0, 13, 2338300, 0, 0, 0, 54, 10000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On WP 13 Reached (Path 2338300) - Pause WP (10 Seconds)"),
+(23383, 0, 11, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 107, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On WP 13 Reached (Path 2338300) - Summon Creature Group 0"),
+(23383, 0, 12, 13, 40, 0, 100, 0, 8, 2338301, 0, 0, 0, 54, 10000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On WP 8 Reached (Path 2338301) - Pause WP (10 Seconds)"),
+(23383, 0, 13, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 107, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On WP 8 Reached (Path 2338301) - Summon Creature Group 1"),
+(23383, 0, 14, 15, 40, 0, 100, 0, 5, 2338302, 0, 0, 0, 54, 10000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On WP 5 Reached (Path 2338302) - Pause WP (10 Seconds)"),
+(23383, 0, 15, 16, 61, 0, 100, 0, 0, 0, 0, 0, 0, 107, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On WP 5 Reached (Path 2338302) - Summon Creature Group 2"),
+(23383, 0, 16, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 59, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On WP 5 Reached (Path 2338302) - Set Run On"),
+(23383, 0, 17, 0, 82, 0, 100, 0, 21644, 0, 0, 0, 0, 63, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On Summoned Creature Died - Increase Counter"),
+(23383, 0, 18, 0, 77, 0, 100, 0, 1, 2, 0, 0, 0, 80, 2338303, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On Counter Reached 2 - Run Script"),
+(23383, 0, 19, 0, 40, 0, 100, 0, 18, 2338300, 0, 0, 0, 80, 2338304, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On WP 18 Reached (Path 2338300) - Run Script"),
+(23383, 0, 20, 0, 40, 0, 100, 0, 13, 2338301, 0, 0, 0, 80, 2338304, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On WP 13 Reached (Path 2338301) - Run Script"),
+(23383, 0, 21, 0, 40, 0, 100, 0, 12, 2338302, 0, 0, 0, 80, 2338304, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On WP 12 Reached (Path 2338302) - Run Script"),
+(23383, 0, 22, 0, 11, 0, 100, 0, 0, 0, 0, 0, 0, 3, 0, 21184, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On Spawn - Morph to model"),
+(2338300, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 11, 41136, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On Script - Cast 'Quest - Port Skettis Prisoner - Location 01'"),
+(2338300, 9, 1, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 0, 11, 41147, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On Script - Cast 'Quest - Skettis Prisoner Cage Summon'"),
+(2338300, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 48, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On Script - Set Inactive"),
+(2338301, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 11, 41138, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On Script - Cast 'Quest - Port Skettis Prisoner - Location 02'"),
+(2338301, 9, 1, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 0, 11, 41147, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On Script - Cast 'Quest - Skettis Prisoner Cage Summon'"),
+(2338301, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 48, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On Script - Set Inactive"),
+(2338302, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 11, 41141, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On Script - Cast 'Quest - Port Skettis Prisoner - Location 03'"),
+(2338302, 9, 1, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 0, 11, 41147, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On Script - Cast 'Quest - Skettis Prisoner Cage Summon'"),
+(2338302, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 48, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On Script - Set Inactive"),
+(2338303, 9, 0, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On Script - Say Line 1"),
+(2338304, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 54, 20000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On Script - Pause WP"),
+(2338304, 9, 1, 0, 0, 0, 100, 0, 5000, 5000, 0, 0, 0, 15, 11085, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On Script - Give Quest Credit (Stored Target)"),
+(2338304, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On Script - Say Line 2"),
+(2338304, 9, 3, 0, 0, 0, 100, 0, 10000, 10000, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skyguard Prisoner - On Script - Despawn"),
+(21644, 0, 5, 0, 54, 0, 100, 0, 0, 0, 0, 0, 0, 67, 1, 1000, 1000, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skettis Wing Guard - On Just Summoned - Start Timed Event"),
+(21644, 0, 6, 0, 59, 0, 100, 0, 1, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 0, "Skettis Wing Guard - On Timed Event Triggered - Attack Summoner"),
+(21644, 0, 7, 0, 59, 0, 20, 0, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Skettis Wing Guard - On Timed Event Triggered - Say Line 1");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=23383;
+DELETE FROM `creature_text` WHERE `CreatureID`=21644 AND `GroupID`=1;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(23383, 0, 0, "Thanks for your help. Let's get out of here!", 12, 0, 100, 0, 0, 0, 21481, 0, "Skyguard Prisoner"),
+(23383, 1, 0, "Let's keep moving. I don't like this place.", 12, 0, 100, 0, 0, 0, 21484, 0, "Skyguard Prisoner"),
+(23383, 2, 0, "Thanks again. Sergeant Doryn will be glad to hear he has one less scout to replace this week.", 12, 0, 100, 0, 0, 0, 21485, 0, "Skyguard Prisoner"),
+(21644, 1, 0, "You'll go nowhere, Skyguard scum!", 12, 0, 100, 0, 0, 0, 21490, 0, "Skettis Wing Guard"),
+(21644, 1, 1, "Skettis prevails!", 12, 0, 100, 0, 0, 0, 21491, 0, "Skettis Wing Guard"),
+(21644, 1, 2, "No one escapes Skettis!", 12, 0, 100, 0, 0, 0, 21492, 0, "Skettis Wing Guard"),
+(21644, 1, 3, "Death to our enemies!", 12, 0, 100, 0, 0, 0, 21493, 0, "Skettis Wing Guard");
+
+DELETE FROM `waypoints` WHERE `entry` IN (2338300, 2338301, 2338302);
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(2338300, 1, -4109.42, 3034.16, 344.168, "Skyguard Prisoner"),
+(2338300, 2, -4113.27, 3035.99, 344.071, "Skyguard Prisoner"),
+(2338300, 3, -4120.02, 3032.22, 344.074, "Skyguard Prisoner"),
+(2338300, 4, -4124.41, 3026.33, 344.151, "Skyguard Prisoner"),
+(2338300, 5, -4128.82, 3026.65, 344.035, "Skyguard Prisoner"),
+(2338300, 6, -4138.91, 3028.95, 338.92, "Skyguard Prisoner"),
+(2338300, 7, -4152.59, 3031.23, 336.913, "Skyguard Prisoner"),
+(2338300, 8, -4169.81, 3034.3, 342.047, "Skyguard Prisoner"),
+(2338300, 9, -4174.63, 3036.04, 343.457, "Skyguard Prisoner"),
+(2338300, 10, -4174.4, 3044.98, 343.862, "Skyguard Prisoner"),
+(2338300, 11, -4176.63, 3052.01, 344.077, "Skyguard Prisoner"),
+(2338300, 12, -4183.66, 3058.9, 344.15, "Skyguard Prisoner"),
+(2338300, 13, -4182.92, 3065.41, 342.574, "Skyguard Prisoner"),
+(2338300, 14, -4182.06, 3070.56, 337.644, "Skyguard Prisoner"),
+(2338300, 15, -4181.26, 3077.13, 331.59, "Skyguard Prisoner"),
+(2338300, 16, -4179.99, 3086.1, 325.571, "Skyguard Prisoner"),
+(2338300, 17, -4178.77, 3090.1, 323.955, "Skyguard Prisoner"),
+(2338300, 18, -4177.96, 3093.87, 323.839, "Skyguard Prisoner"),
+(2338301, 1, -3716.813, 3784.913, 302.7957, "Skyguard Prisoner"),
+(2338301, 2, -3713.891, 3785.578, 302.9066, "Skyguard Prisoner"),
+(2338301, 3, -3701.317, 3788.437, 302.1635, "Skyguard Prisoner"),
+(2338301, 4, -3691.435, 3784.761, 298.6149, "Skyguard Prisoner"),
+(2338301, 5, -3679.718, 3780.137, 295.1252, "Skyguard Prisoner"),
+(2338301, 6, -3678.255, 3779.54, 294.927, "Skyguard Prisoner"),
+(2338301, 7, -3665.416, 3774.3, 296.5848, "Skyguard Prisoner"),
+(2338301, 8, -3652.483, 3769.122, 301.5699, "Skyguard Prisoner"),
+(2338301, 9, -3655.307, 3758.888, 301.9366, "Skyguard Prisoner"),
+(2338301, 10, -3647.862, 3745.505, 302.1535, "Skyguard Prisoner"),
+(2338301, 11, -3653.096, 3731.482, 293.2672, "Skyguard Prisoner"),
+(2338301, 12, -3658.584, 3718.315, 283.3129, "Skyguard Prisoner"),
+(2338301, 13, -3660.324, 3713.304, 281.269, "Skyguard Prisoner"),
+(2338302, 1, -3669.901, 3388.204, 312.9493, "Skyguard Prisoner"),
+(2338302, 2, -3672.78, 3371.396, 312.1327, "Skyguard Prisoner"),
+(2338302, 3, -3666.887, 3367.723, 312.2306, "Skyguard Prisoner"),
+(2338302, 4, -3670.773, 3352.389, 306.7109, "Skyguard Prisoner"),
+(2338302, 5, -3673.615, 3342.424, 304.9935, "Skyguard Prisoner"),
+(2338302, 6, -3679.221, 3318.798, 311.436, "Skyguard Prisoner"),
+(2338302, 7, -3687.093, 3318.624, 311.8744, "Skyguard Prisoner"),
+(2338302, 8, -3697.118, 3315.984, 312.1466, "Skyguard Prisoner"),
+(2338302, 9, -3703.314, 3309.11, 312.2234, "Skyguard Prisoner"),
+(2338302, 10, -3713.242, 3311.646, 307.328, "Skyguard Prisoner"),
+(2338302, 11, -3724.522, 3313.627, 297.02, "Skyguard Prisoner"),
+(2338302, 12, -3734.422, 3315.625, 292.3213, "Skyguard Prisoner");
+
+DELETE FROM `creature_summon_groups` WHERE `summonerId`=23383;
+INSERT INTO `creature_summon_groups` (`summonerId`, `summonerType`, `groupId`, `entry`, `position_x`, `position_y`, `position_z`, `orientation`, `summonType`, `summonTime`, `Comment`) VALUES
+(23383, 0, 0, 21644, -4179.043, 3081.007, 328.28, 4.51, 4, 60000, "Skyguard Prisoner - Group 0 - Skettis Wing Guard"),
+(23383, 0, 0, 21644, -4181.610, 3081.289, 328.32, 4.52, 4, 60000, "Skyguard Prisoner - Group 0 - Skettis Wing Guard"),
+(23383, 0, 1, 21644, -3653.75, 3750.8, 302.101, 2.11185, 4, 60000, "Skyguard Prisoner - Group 1 - Skettis Wing Guard"),
+(23383, 0, 1, 21644, -3649.91, 3754.08, 303.007, 2.3911, 4, 60000, "Skyguard Prisoner - Group 1 - Skettis Wing Guard"),
+(23383, 0, 2, 21644, -3680.32, 3318.81, 311.501, 1.55334, 4, 60000, "Skyguard Prisoner - Group 2 - Skettis Wing Guard"),
+(23383, 0, 2, 21644, -3677.91, 3317.93, 311.573, 1.48353, 4, 60000, "Skyguard Prisoner - Group 2 - Skettis Wing Guard");
+
+DELETE FROM `spell_target_position` WHERE `ID` IN (41136, 41138, 41141);
+INSERT INTO `spell_target_position` (`ID`, `EffectIndex`, `MapID`, `PositionX`, `PositionY`, `PositionZ`, `Orientation`, `VerifiedBuild`) VALUES
+(41136, 0, 530, -4106.64, 3029.76, 344.877, 0.820305, 0),
+(41138, 0, 530, -3720.35, 3789.91, 302.888, 3.615158, 0),
+(41141, 0, 530, -3664.54, 3389.79, 312.952, 2.35619, 0);
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_04_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_04_world.sql
new file mode 100644
index 00000000000..3fc9b67dec9
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_04_world.sql
@@ -0,0 +1,20 @@
+--
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `spawntimesecs` IN (190,200,360,400,425,430,444,450,490,498,500,534,543,570,588,700,720,1250,1272,1290,1416,1434,3540,5400);
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `id` IN (22024,20552,10204,10942);
+
+-- Won't touch 8 min respawn time of Son of Hodir and Frostworg, at least for now
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `spawntimesecs` = 480 AND `map` != 571;
+-- Won't touch 4 (and 2) min respawn time of Risen Zombie, at least for now
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `spawntimesecs` = 240 AND `map` != 595;
+-- Bosses
+UPDATE `creature` SET `spawntimesecs` = 604800 WHERE `spawntimesecs` = 6380;
+
+-- Loque'nahak, one of most-wanted rare tamable creature in whole game respawns in 8 min, really?
+UPDATE `creature` SET `spawntimesecs` = 21600 WHERE `id` = 32517; -- From wiki
+-- Okrek, Outland rare
+UPDATE `creature` SET `spawntimesecs` = 28800 WHERE `id` = 18685; -- From 18684
+-- High Tinker Mekkatorque
+UPDATE `creature` SET `spawntimesecs` = 600 WHERE `id` = 7937; -- From Wowhead
+
+-- Wrong spawns, summoned or spawns only after specific events
+DELETE FROM `creature` WHERE `id` IN (14350,18381,20436,20792,18297);
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_05_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_05_world.sql
new file mode 100644
index 00000000000..44f599040b1
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_05_world.sql
@@ -0,0 +1,36 @@
+-- 469 Blackwing Lair
+UPDATE `creature` SET `spawntimesecs` = 604800 WHERE `spawntimesecs` = 3520 AND `id` = 13996 AND `map` = 469;
+-- 509 Ruins of Ahn'Qiraj
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `id` IN (4076,15384,15426,15475,15476) AND `map` = 509;
+UPDATE `creature` SET `spawntimesecs` = 604800 WHERE `id` IN (15339,15340,15341,15348,15369,15370) AND `map` = 509;
+-- 531 Ahn'Qiraj Temple
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `id` IN (4076,15378,15379,15380,15384,15426,15475,15476,15502,15503,15504,15896) AND `map` = 531;
+UPDATE `creature` SET `spawntimesecs` = 604800 WHERE `id` IN (15263,15275,15276,15511,15543,15589,15727,15957,15963) AND `map` = 531;
+
+-- Skipped 532 - 559
+
+-- 560 The Escape From Durnholde
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `id` IN (385,2350,2354,2385,2408,8883,17213,18598,18644,18646,18649,18650,18651,18655,18656,18657,18664,18666,18672,18723,18725,19433,20155,20156,20342,20344,20345,20346,20347,20348,20349,20350,20351,20352,20353,20354,20355,20357,20358,20359,20360,20361,20363,20365,20368,20370,20372,20373,20376,20377,20378,20379,20380,20391,20391,20400,20401,20419,20420,20422,20424,20426,20428,20429,20430,20432,20433,20434,20441,21341,21342,21343,21344,21345) AND `map` = 560;
+-- 564 Black Temple
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `id` IN (1420,2914,14881,22515,22517,22886,22984,23033,23084,23086,23087,23157,23158,23159,23210,23288,23410,23411,23412,23417,23426,23448,23472,23499,23502) AND `map` = 564;
+-- 565 Gruul's Lair
+UPDATE `creature` SET `spawntimesecs` = 604800 WHERE `id` IN (18832,18834,18835,18836) AND `map` = 565;
+-- 568 Zul'Aman
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `id` IN (1412,14881,21252,22515,22517,23746,23807,23813,23814,23815,23897,24223,24325,24363,24551,25173) AND `map` = 568;
+-- 572 Ruins of Lordaeron
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `id` IN (23193) AND `map` = 572;
+-- 574 Utgarde Keep
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `id` IN (2110,14881,15475,22515,23746) AND `map` = 574;
+-- 575 Utgarde Pinnacle
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `id` IN (2110,14881,15475,19871,22515,23472,27327,28351,30871) AND `map` = 575;
+UPDATE `creature` SET `spawntimesecs` = 86400 WHERE `id` IN (27303,27307,27308,27309) AND `map` = 575;
+-- 576 The Nexus
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `id` IN (22515,22517,27048,27837) AND `map` = 576;
+UPDATE `creature` SET `spawntimesecs` = 86400 WHERE `id` IN (26796) AND `map` = 576;
+-- 578 The Oculus
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `id` IN (22517,27657,27658,27659) AND `map` = 578;
+-- 580 The Sunwell
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `id` IN (2110,19871,22515,23472,24928,25357,25358,25632,25638,25639,25644,25661,25770,25795,25796,25953,36991,37000,37746,37763,37764,37765,37781,38047,38048,38049,38052,38056) AND `map` = 580 AND `spawntimesecs` != 5;
+-- 585 Magister’s Terrace
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `id` IN (1412,22515,24808,24822,25042,25954,25955,25956,25957,25958,25959,25960,26057,26579) AND `map` = 585;
+UPDATE `creature` SET `spawntimesecs` = 86400 WHERE `id` IN (24560,24664,24723,24744) AND `map` = 585;
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_06_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_06_world.sql
new file mode 100644
index 00000000000..739f2333cf0
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_06_world.sql
@@ -0,0 +1,13 @@
+--
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `spawntimesecs` = 540 AND `id` NOT IN (1061,5186);
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `spawntimesecs` = 550 AND `id` NOT IN (5760,4686,4687);
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `spawntimesecs` = 644;
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `spawntimesecs` = 180 AND `id` NOT IN (18558,23188) AND `id` < 23689;
+-- Grik'nir the Cold
+UPDATE `creature` SET `spawntimesecs` = 100 WHERE `id` = 808; -- https://www.wowhead.com/npc=808/griknir-the-cold#comments:id=148734
+-- Old Icebeard
+UPDATE `creature` SET `spawntimesecs` = 90 WHERE `id` = 1271; -- https://www.wowhead.com/npc=1271/old-icebeard#comments:id=551613
+-- Mangeclaw
+UPDATE `creature` SET `spawntimesecs` = 60 WHERE `id` = 1961; -- Wowhead
+-- Lakka
+UPDATE `creature` SET `spawntimesecs` = 86400 WHERE `id` = 18956;
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_07_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_07_world.sql
new file mode 100644
index 00000000000..af7f537e418
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_07_world.sql
@@ -0,0 +1,6 @@
+--
+DELETE FROM `creature_text` WHERE `CreatureID` = 24981;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(24981,0,0,"Objective acquired. Initiating security routines.",12,0,100,0,0,0,24014,0,"Converted Sentry"),
+(24981,0,1,"Commence location defense.",12,0,100,0,0,0,24015,0,"Converted Sentry"),
+(24981,0,2,"Deployment successful. Trespassers will be neutralized.",12,0,100,0,0,0,24016,0,"Converted Sentry");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_08_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_08_world.sql
new file mode 100644
index 00000000000..77c2a3e1c8e
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_08_world.sql
@@ -0,0 +1,41 @@
+-- https://www.wowhead.com/npc=21277/vindicator-vuuleen#comments:id=172687:reply=39786
+-- https://youtu.be/EiXYromDsfc?t=112
+UPDATE `gameobject_template` SET `AIName` = "SmartGameObjectAI" WHERE `entry` = 184702;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 184702 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`,`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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(184702,1,0,1,70,0,100,0,2,0,0,0,0,64,1,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Cage - On Gameobject State Changed - Store Targetlist"),
+(184702,1,1,2,61,0,100,0,0,0,0,0,0,100,1,0,0,0,0,0,19,21277,0,0,0,0,0,0,0,"Cage - On Link - Send Target 1 (Vindicator Vuuleen)"),
+(184702,1,2,0,61,0,100,0,0,0,0,0,0,45,0,1,0,0,0,0,19,21277,0,0,0,0,0,0,0,"Cage - On Link - Set Data 0 1 (Vindicator Vuuleen)");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 22 AND `SourceEntry` = 184702 AND `SourceId` = 1;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(22,1,184702,1,0,8,0,10518,0,0,1,0,0,"","Group 0: Execute SAI (Action 0) if quest 'Planting the Banner' is not rewarded");
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 4542 AND `source_type` = 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`,`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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(4542,2,0,1,46,0,100,0,4542,0,0,0,0,64,1,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Areatrigger (Bladespire Hold) - On Trigger - Store Targetlist"),
+(4542,2,1,2,61,0,100,0,0,0,0,0,0,100,1,0,0,0,0,0,19,21277,0,0,0,0,0,0,0,"Areatrigger (Bladespire Hold) - On Link - Send Target 1 (Vindicator Vuuleen)"),
+(4542,2,2,0,61,0,100,0,0,0,0,0,0,45,0,2,0,0,0,0,19,21277,0,0,0,0,0,0,0,"Areatrigger (Bladespire Hold) - On Link - Set Data 0 2 (Vindicator Vuuleen)");
+
+DELETE FROM `areatrigger_scripts` WHERE `entry` = 4542;
+INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES
+(4542,"SmartTrigger");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 22 AND `SourceEntry` = 4542 AND `SourceId` = 2;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(22,1,4542,2,0,8,0,10516,0,0,1,0,0,"","Group 0: Execute SAI (Action 0) if quest 'The Trappings of a Vindicator' is not rewarded"),
+(22,1,4542,2,0,9,0,10516,0,0,1,0,0,"","Group 0: Execute SAI (Action 0) if player has not taken quest 'The Trappings of a Vindicator'");
+
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = 21277;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 21277 AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(21277,0,0,0,38,0,100,0,0,1,10000,10000,0,1,0,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Vindicator Vuuleen - On Data Set 0 1 - Say Line 0"),
+(21277,0,1,0,38,0,100,0,0,2,30000,30000,0,1,1,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Vindicator Vuuleen - On Data Set 0 2 - Say Line 1");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = 21277;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(21277,0,0,"Hi. Thanks for the help. But please don't open the cage.",15,0,100,0,0,0,18918,0,"Vindicator Vuuleen"),
+(21277,0,1,"Yes, the ogres are so stupid that they forgot to lock my cage. But that's exactly how I like it, so please don't open it again.",15,0,100,0,0,0,18919,0,"Vindicator Vuuleen"),
+(21277,0,2,"No. Don't open the cage. One of them might notice!",15,0,100,0,0,0,18920,0,"Vindicator Vuuleen"),
+(21277,0,3,"Please leave the cage door closed. Thanks.",15,0,100,0,0,0,18921,0,"Vindicator Vuuleen"),
+(21277,1,0,"Psst, $r, up here near the entrance. I'm in the cage. Hurry!",15,0,100,0,0,0,18922,0,"Vindicator Vuuleen");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_09_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_09_world.sql
new file mode 100644
index 00000000000..65daa61f083
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_03_09_world.sql
@@ -0,0 +1,116 @@
+-- Nat Pagle SAI
+SET @ID := 20344;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` BETWEEN @ID*100+0 AND @ID*100+6 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
+(@ID,0,0,0,1,0,100,0,30000,30000,300000,300000,88,@ID*100+0,@ID*100+6,0,0,0,0,1,0,0,0,0,0,0,0,"Nat Pagle - Out of Combat - Run Random Script"),
+
+(@ID*100+0,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,"Nat Pagle - On Script - Say Line 0"),
+(@ID*100+0,9,1,0,0,0,100,0,3000,3000,0,0,1,0,0,0,0,0,0,19,20342,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 0 (Hal McAllister)"),
+(@ID*100+0,9,2,0,0,0,100,0,4000,4000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 1"),
+(@ID*100+0,9,3,0,0,0,100,0,5000,5000,0,0,1,1,0,0,0,0,0,19,20342,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 1 (Hal McAllister)"),
+(@ID*100+0,9,4,0,0,0,100,0,5000,5000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 2"),
+(@ID*100+0,9,5,0,0,0,100,0,10000,10000,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 3"),
+(@ID*100+0,9,6,0,0,0,100,0,10000,10000,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 4"),
+(@ID*100+0,9,7,0,0,0,100,0,8000,8000,0,0,1,2,0,0,0,0,0,19,20342,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 2 (Hal McAllister)"),
+
+(@ID*100+1,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,"Nat Pagle - On Script - Say Line 0"),
+(@ID*100+1,9,1,0,0,0,100,0,3000,3000,0,0,1,0,0,0,0,0,0,19,20342,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 0 (Hal McAllister)"),
+(@ID*100+1,9,2,0,0,0,100,0,4000,4000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 1"),
+(@ID*100+1,9,3,0,0,0,100,0,5000,5000,0,0,1,1,0,0,0,0,0,19,20342,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 1 (Hal McAllister)"),
+(@ID*100+1,9,4,0,0,0,100,0,5000,5000,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 5"),
+(@ID*100+1,9,5,0,0,0,100,0,10000,10000,0,0,1,6,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 6"),
+(@ID*100+1,9,6,0,0,0,100,0,10000,10000,0,0,1,7,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 7"),
+(@ID*100+1,9,7,0,0,0,100,0,8000,8000,0,0,1,2,0,0,0,0,0,19,20342,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 2 (Hal McAllister)"),
+
+(@ID*100+2,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,"Nat Pagle - On Script - Say Line 0"),
+(@ID*100+2,9,1,0,0,0,100,0,3000,3000,0,0,1,0,0,0,0,0,0,19,20342,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 0 (Hal McAllister)"),
+(@ID*100+2,9,2,0,0,0,100,0,4000,4000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 1"),
+(@ID*100+2,9,3,0,0,0,100,0,5000,5000,0,0,1,1,0,0,0,0,0,19,20342,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 1 (Hal McAllister)"),
+(@ID*100+2,9,4,0,0,0,100,0,5000,5000,0,0,1,8,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 8"),
+(@ID*100+2,9,5,0,0,0,100,0,10000,10000,0,0,1,9,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 9"),
+(@ID*100+2,9,6,0,0,0,100,0,10000,10000,0,0,1,10,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 10"),
+(@ID*100+2,9,7,0,0,0,100,0,8000,8000,0,0,1,2,0,0,0,0,0,19,20342,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 2 (Hal McAllister)"),
+
+(@ID*100+3,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,"Nat Pagle - On Script - Say Line 0"),
+(@ID*100+3,9,1,0,0,0,100,0,3000,3000,0,0,1,0,0,0,0,0,0,19,20342,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 0 (Hal McAllister)"),
+(@ID*100+3,9,2,0,0,0,100,0,4000,4000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 1"),
+(@ID*100+3,9,3,0,0,0,100,0,5000,5000,0,0,1,1,0,0,0,0,0,19,20342,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 1 (Hal McAllister)"),
+(@ID*100+3,9,4,0,0,0,100,0,5000,5000,0,0,1,11,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 11"),
+(@ID*100+3,9,5,0,0,0,100,0,10000,10000,0,0,1,12,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 12"),
+(@ID*100+3,9,6,0,0,0,100,0,10000,10000,0,0,1,13,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 13"),
+(@ID*100+3,9,7,0,0,0,100,0,8000,8000,0,0,1,2,0,0,0,0,0,19,20342,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 2 (Hal McAllister)"),
+
+(@ID*100+4,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,"Nat Pagle - On Script - Say Line 0"),
+(@ID*100+4,9,1,0,0,0,100,0,3000,3000,0,0,1,0,0,0,0,0,0,19,20342,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 0 (Hal McAllister)"),
+(@ID*100+4,9,2,0,0,0,100,0,4000,4000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 1"),
+(@ID*100+4,9,3,0,0,0,100,0,5000,5000,0,0,1,1,0,0,0,0,0,19,20342,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 1 (Hal McAllister)"),
+(@ID*100+4,9,4,0,0,0,100,0,5000,5000,0,0,1,14,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 14"),
+(@ID*100+4,9,5,0,0,0,100,0,10000,10000,0,0,1,15,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 15"),
+(@ID*100+4,9,6,0,0,0,100,0,10000,10000,0,0,1,16,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 16"),
+(@ID*100+4,9,7,0,0,0,100,0,8000,8000,0,0,1,2,0,0,0,0,0,19,20342,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 2 (Hal McAllister)"),
+
+(@ID*100+5,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,"Nat Pagle - On Script - Say Line 0"),
+(@ID*100+5,9,1,0,0,0,100,0,3000,3000,0,0,1,0,0,0,0,0,0,19,20342,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 0 (Hal McAllister)"),
+(@ID*100+5,9,2,0,0,0,100,0,4000,4000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 1"),
+(@ID*100+5,9,3,0,0,0,100,0,5000,5000,0,0,1,1,0,0,0,0,0,19,20342,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 1 (Hal McAllister)"),
+(@ID*100+5,9,4,0,0,0,100,0,5000,5000,0,0,1,17,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 17"),
+(@ID*100+5,9,5,0,0,0,100,0,10000,10000,0,0,1,18,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 18"),
+(@ID*100+5,9,6,0,0,0,100,0,10000,10000,0,0,1,19,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 19"),
+(@ID*100+5,9,7,0,0,0,100,0,8000,8000,0,0,1,2,0,0,0,0,0,19,20342,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 2 (Hal McAllister)"),
+
+(@ID*100+6,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,"Nat Pagle - On Script - Say Line 0"),
+(@ID*100+6,9,1,0,0,0,100,0,3000,3000,0,0,1,0,0,0,0,0,0,19,20342,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 0 (Hal McAllister)"),
+(@ID*100+6,9,2,0,0,0,100,0,4000,4000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 1"),
+(@ID*100+6,9,3,0,0,0,100,0,5000,5000,0,0,1,1,0,0,0,0,0,19,20342,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 1 (Hal McAllister)"),
+(@ID*100+6,9,4,0,0,0,100,0,5000,5000,0,0,1,20,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 20"),
+(@ID*100+6,9,5,0,0,0,100,0,10000,10000,0,0,1,21,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 21"),
+(@ID*100+6,9,6,0,0,0,100,0,10000,10000,0,0,1,22,0,0,0,0,0,1,0,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 22"),
+(@ID*100+6,9,7,0,0,0,100,0,8000,8000,0,0,1,2,0,0,0,0,0,19,20342,0,0,0,0,0,0,"Nat Pagle - On Script - Say Line 2 (Hal McAllister)");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"Hal...",12,0,100,0,0,0,17966,0,"Nat Pagle"),
+(@ID,1,0,"Had that dream again last night...",12,0,100,0,0,0,17968,0,"Nat Pagle"),
+
+(@ID,2,0,"That one dream... The crazy one. Remember?",12,0,100,0,0,0,17970,0,"Nat Pagle"),
+(@ID,3,0,"Tarren Mill is destroyed by some crazy force of undead and forever more becomes an enemy to Southshore.",12,0,100,0,0,0,17971,0,"Nat Pagle"),
+(@ID,4,0,"Could ya imagine such a thing, Hal? Could ya?",12,0,100,0,0,0,17972,0,"Nat Pagle"),
+
+(@ID,5,0,"That one where I'm in Durnholde and that one orc that Blackmoore keeps as his personal slave breaks out...",12,0,100,0,0,0,17973,0,"Nat Pagle"),
+(@ID,6,0,"He ends up destroying the whole keep, freeing all the orcs we're keeping in the camps, and rising to power as the king of orcs... Warchief or somethin'.",12,0,100,0,0,0,17974,0,"Nat Pagle"),
+(@ID,7,0,"Crazy, isn't it?",12,0,100,0,0,0,17975,0,"Nat Pagle"),
+
+(@ID,8,0,"So I'm on some mountain with some big ol' tree. Bunch of elves runnin' around all over...",12,0,100,0,0,0,17976,0,"Nat Pagle"),
+(@ID,9,0,"Out of nowhere, some 300 foot tall demon or somethin' walks up and starts climbin' the tree...",12,0,100,0,0,0,17977,0,"Nat Pagle"),
+(@ID,10,0,"And if that weren't crazy enough, that big demon gets killed by a bunch of little floating light things... Oh, I was also a female elf in that one... Yep...",12,0,100,0,0,0,17978,0,"Nat Pagle"),
+
+(@ID,11,0,"In this dream, I was fishin' master of the world. I moved to some place called Kalimdor...",12,0,100,0,0,0,17979,0,"Nat Pagle"),
+(@ID,12,0,"And people from all over the world come to me to pay homage... and learn to fish.",12,0,100,0,0,0,17980,0,"Nat Pagle"),
+(@ID,13,0,"I'm like some kind of fishing god...",12,0,100,0,0,0,17981,0,"Nat Pagle"),
+
+(@ID,14,0,"I can't even believe this one... You know those two loud-mouthed ruffians, Foror and Tigule?",12,0,100,0,0,0,17982,0,"Nat Pagle"),
+(@ID,15,0,"Well in this dream, they somehow end up inventing something called ice-cream and flavoring it with strawberries... Well, long story short, they end up striking it rich!",12,0,100,0,0,0,17983,0,"Nat Pagle"),
+(@ID,16,0,"If that weren't crazy enough, they decide to quit the ice-cream business and become adventurers... They travel all over the place and finally disappear into some portal. I woke up in a cold sweat after that one...",12,0,100,0,0,0,17984,0,"Nat Pagle"),
+
+(@ID,17,0,"This one's real grim... So the king's kid, Arthas... Well he goes out to battle evil, along with Uther... *Nat pats his brow dry*",12,0,100,0,0,0,17985,0,"Nat Pagle"),
+(@ID,18,0,"But tragically, Arthas is consumed by the evil and becomes evil himself...",12,0,100,0,0,0,17986,0,"Nat Pagle"),
+(@ID,19,0,"Well, he comes back to the king all pretendin' to be nice, draws his sword, and runs the king through, elbow to ... well you know... kills him on the spot.",12,0,100,0,0,0,17987,0,"Nat Pagle"),
+
+(@ID,20,0,"That one where thousands of people are all watching us from up in the sky...",12,0,100,0,0,0,18060,0,"Nat Pagle"),
+(@ID,21,0,"We're like their puppets - we dance and cry and fight and say silly things for their amusement.",12,0,100,0,0,0,18061,0,"Nat Pagle"),
+(@ID,22,0,"Sometimes, even when I'm awake, I think they're watching us. Maybe they're watching us right now...",12,0,100,0,0,0,18062,0,"Nat Pagle");
+
+SET @ID := 20342;
+UPDATE `creature_template` SET `AIName` = "" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID AND `source_type` = 0;
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID AND `GroupID` = 2;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,2,0,"It'll never happen, Nat.",12,0,100,0,0,0,17988,0,"Hal McAllister"),
+(@ID,2,1,"Impossible!",12,0,100,0,0,0,17989,0,"Hal McAllister"),
+(@ID,2,2,"I worry about you sometimes, Nat.",12,0,100,0,0,0,17990,0,"Hal McAllister"),
+(@ID,2,3,"No way.",12,0,100,0,0,0,17991,0,"Hal McAllister"),
+(@ID,2,4,"Nat, I've heard a whopper or two in my day but that one takes the cake.",12,0,100,0,0,0,17992,0,"Hal McAllister"),
+(@ID,2,5,"What you got in that pipe, Nat?",12,0,100,0,0,0,17993,0,"Hal McAllister"),
+(@ID,2,6,"*Hal shakes his head* Nat, Nat, Nat...",12,0,100,0,0,0,17994,0,"Hal McAllister"),
+(@ID,2,7,"Shut up and fish, Nat.",12,0,100,0,0,0,17995,0,"Hal McAllister");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_04_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_04_00_world.sql
new file mode 100644
index 00000000000..22e80936fa5
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_04_00_world.sql
@@ -0,0 +1,8 @@
+--
+-- Baron Geddon: Ignite Mana isn't needed
+DELETE FROM `spell_custom_attr` WHERE `entry`=19659;
+
+-- Mana-Tombs: Death Coil must be negative
+DELETE FROM `spell_custom_attr` WHERE `entry`=38065;
+INSERT INTO `spell_custom_attr` (`entry`,`attributes`) VALUES
+(38065,8192);
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_04_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_04_01_world.sql
new file mode 100644
index 00000000000..43c1abae10c
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_04_01_world.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `conditions` SET `ConditionValue1`=6, `ConditionValue2`=3 , `ConditionValue3`=2 WHERE `SourceGroup`=7139 AND `SourceTypeOrReferenceId`=15 AND `SourceEntry`=3;
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_04_02_world_335.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_04_02_world_335.sql
new file mode 100644
index 00000000000..e34dc6a4230
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_04_02_world_335.sql
@@ -0,0 +1,15 @@
+--
+DELETE FROM `quest_template_addon` WHERE `id` = 4321;
+SET @ID := 9117;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ID AND `source_type`=0 AND `id` =0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ID*100 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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ID,0,0,0,20,0,100,0,4321,0,0,0,0,80,@ID*100+0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"J.D. Collie - On Quest \Making Sense of It\ Rewarded - Run Script"),
+(@ID*100+0,9,0,0,0,0,100,0,0,0,0,0,0,83,3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"J.D. Collie - On Script - Remove Npc Flag Questgiver+Gossip"),
+(@ID*100+0,9,1,0,0,0,100,0,1000,1000,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,0,3.08,"J.D. Collie - Set Orientation 3.08"),
+(@ID*100+0,9,2,0,0,0,100,0,2000,2000,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"J.D. Collie - On Script - Say Line 0"),
+(@ID*100+0,9,3,0,0,0,100,0,1000,1000,0,0,0,50,174683,15,0,0,0,0,8,0,0,0,0,-6037.161,-1016.886,-216.920,5.958,"J.D. Collie - Summon Gameobject Book"),
+(@ID*100+0,9,4,0,0,0,100,0,2000,2000,0,0,0,1,1,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"J.D. Collie - On Script - Say Line 1"),
+(@ID*100+0,9,5,0,0,0,100,0,3000,3000,0,0,0,1,2,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"J.D. Collie - On Script - Say Line 2"),
+(@ID*100+0,9,6,0,0,0,100,0,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0.87,"J.D. Collie - Set Orientation 0.87"),
+(@ID*100+0,9,7,0,0,0,100,0,0,0,0,0,0,82,3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"J.D. Collie - On Script - Add Npc Flag Questgiver+Gossip");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_04_03_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_04_03_world.sql
new file mode 100644
index 00000000000..b64dfd5f48a
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_04_03_world.sql
@@ -0,0 +1,40 @@
+-- https://www.youtube.com/watch?v=NHHkFiHvxWA https://youtu.be/NHHkFiHvxWA?t=349
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (4501,4502,4503) AND `source_type` = 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`,`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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(4501,2,0,1,46,0,100,0,4501,0,0,0,0,64,1,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Areatrigger (Southshore) - On Trigger - Store Targetlist"),
+(4501,2,1,2,61,0,100,0,0,0,0,0,0,100,1,0,0,0,0,0,19,20365,0,0,0,0,0,0,0,"Areatrigger (Southshore) - On Link - Send Target 1 (Bartolo Ginsetti)"),
+(4501,2,2,0,61,0,100,0,0,0,0,0,0,45,0,1,0,0,0,0,19,20365,0,0,0,0,0,0,0,"Areatrigger (Southshore) - On Link - Set Data 0 1 (Bartolo Ginsetti)"),
+(4502,2,0,1,46,0,100,0,4502,0,0,0,0,64,1,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Areatrigger (Southshore) - On Trigger - Store Targetlist"),
+(4502,2,1,2,61,0,100,0,0,0,0,0,0,100,1,0,0,0,0,0,19,20432,0,0,0,0,0,0,0,"Areatrigger (Southshore) - On Link - Send Target 1 (Beggar)"),
+(4502,2,2,0,61,0,100,0,0,0,0,0,0,45,0,1,0,0,0,0,19,20432,0,0,0,0,0,0,0,"Areatrigger (Southshore) - On Link - Set Data 0 1 (Beggar)"),
+(4503,2,0,1,46,0,100,0,4503,0,0,0,0,64,1,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Areatrigger (Southshore) - On Trigger - Store Targetlist"),
+(4503,2,1,2,61,0,100,0,0,0,0,0,0,100,1,0,0,0,0,0,19,20432,0,0,0,0,0,0,0,"Areatrigger (Southshore) - On Link - Send Target 1 (Beggar)"),
+(4503,2,2,0,61,0,100,0,0,0,0,0,0,45,0,1,0,0,0,0,19,20432,0,0,0,0,0,0,0,"Areatrigger (Southshore) - On Link - Set Data 0 1 (Beggar)");
+
+DELETE FROM `areatrigger_scripts` WHERE `entry` IN (4501,4502,4503);
+INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES
+(4501,"SmartTrigger"),
+(4502,"SmartTrigger"),
+(4503,"SmartTrigger");
+
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` IN (20365,20432);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (20365,20432) AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 2036500 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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(20365,0,0,0,38,0,100,0,0,1,60000,60000,0,80,2036500,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Bartolo Ginsetti - On Data Set 0 1 - Run Script"),
+(2036500,9,0,0,0,0,100,0,0,0,0,0,0,1,0,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Bartolo Ginsetti - On Script - Say Line 0"),
+(2036500,9,1,0,0,0,100,0,4000,4000,0,0,0,5,23,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Bartolo Ginsetti - On Script - Play Emote 23"),
+(2036500,9,2,0,0,0,100,0,2000,2000,0,0,0,1,1,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Bartolo Ginsetti - On Script - Say Line 1"),
+(20432,0,0,0,38,0,100,0,0,1,60000,60000,0,1,0,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Beggar - On Data Set 0 1 - Say Line 0");
+
+DELETE FROM `creature_text` WHERE `CreatureID` IN (20365,20432);
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(20365,0,0,"You there! Yes, you, peasant $g boy:girl;. Come quickly, I must tell you something... I must tell you about my greatness, lest such things are lost in the void!",12,0,100,25,0,0,18137,0,"Bartolo Ginsetti"),
+(20365,1,0,"Ooooh, YAH! Gaze upon my rippling musculature. Bask in the glow of my physique.",12,0,100,0,0,0,18138,0,"Bartolo Ginsetti"),
+(20432,0,0,"Spare a silver, friend?",12,0,100,20,0,0,18148,0,"Beggar"),
+(20432,0,1,"Spare a copper? You won't need it soon. The end of days nears...",12,0,100,20,0,0,18149,0,"Beggar"),
+(20432,0,2,"Got any food?",12,0,100,20,0,0,18150,0,"Beggar"),
+(20432,0,3,"Please, $g sir:madam;, I have three hungry children! Did I say three? TEN HUNGRY CHILDREN!",12,0,100,20,0,0,18151,0,"Beggar"),
+(20432,0,4,"Psst... Spare a copper for some grog?",12,0,100,20,0,0,18152,0,"Beggar"),
+(20432,0,5,"Will work for food...",12,0,100,20,0,0,18153,0,"Beggar"),
+(20432,0,6,"Allow me to shine your shoes! Only one copper for the service!",12,0,100,20,0,0,18154,0,"Beggar");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_00_world.sql
new file mode 100644
index 00000000000..a5a94c7a4b3
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_00_world.sql
@@ -0,0 +1,22 @@
+-- https://www.youtube.com/watch?v=JCNeC9Re4go
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 4485 AND `source_type` = 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`,`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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(4485,2,0,1,46,0,100,0,4485,0,0,0,0,64,1,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Areatrigger (Caverns of Time) - On Trigger - Store Targetlist"),
+(4485,2,1,2,61,0,100,0,0,0,0,0,0,100,1,0,0,0,0,0,19,20201,0,0,0,0,0,0,0,"Areatrigger (Caverns of Time) - On Link - Send Target 1 (Sa'at)"),
+(4485,2,2,0,61,0,100,0,0,0,0,0,0,45,0,1,0,0,0,0,19,20201,0,0,0,0,0,0,0,"Areatrigger (Caverns of Time) - On Link - Set Data 0 1 (Sa'at)");
+
+DELETE FROM `areatrigger_scripts` WHERE `entry` = 4485;
+INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES
+(4485,"SmartTrigger");
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 20201 AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 2020100 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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(20201,0,0,0,38,0,100,1,0,1,0,0,0,80,2020100,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Sa'at - On Data Set 0 1 - Run Script (No Repeat)"),
+(20201,0,1,3,62,0,100,0,8088,0,0,0,0,11,34975,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Sa'at - On Gossip Option 0 Selected - Cast 'Conjure Chrono-Beacon'"),
+(20201,0,2,3,62,0,100,0,8088,1,0,0,0,11,34975,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Sa'at - On Gossip Option 1 Selected - Cast 'Conjure Chrono-Beacon'"),
+(20201,0,3,0,61,0,100,0,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Sa'at - On Link - Close Gossip"),
+
+(2020100,9,0,0,0,0,100,0,0,0,0,0,0,1,0,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Sa'at - On Script - Say Line 0"),
+(2020100,9,1,0,0,0,100,0,0,0,0,0,0,66,0,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Sa'at - On Script - Set Orientation Stored Target"),
+(2020100,9,2,0,0,0,100,0,10000,10000,0,0,0,66,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Sa'at - On Script - Set Orientation Home Position");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_01_world.sql
new file mode 100644
index 00000000000..6179a6b9963
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_01_world.sql
@@ -0,0 +1,22 @@
+--
+UPDATE `creature_template_addon` SET `auras` = "31482" WHERE `entry` IN (17918,20746);
+
+-- Time Keeper SAI (Source: Movies(Spawn & Despawn parts))
+SET @ID := 17918;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ID,0,0,0,54,0,100,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Time Keeper - On Just Summoned - Say Line 0"),
+(@ID,0,1,0,0,0,100,0,6000,10000,18000,26000,0,11,31478,0,0,0,0,0,2,0,0,0,0,0,0,0,0,"Time Keeper - In Combat - Cast 'Sand Breath'"),
+(@ID,0,2,0,5,0,100,0,20000,20000,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Time Keeper - On Killed Unit - Say Line 1"),
+(@ID,0,3,4,8,0,100,0,31483,0,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Time Keeper - On Spellhit 'Dragon Helper Effect' - Say Line 2"),
+(@ID,0,4,0,61,0,100,0,0,0,0,0,0,41,3000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Time Keeper - On Link - Despawn (3000)");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"There is no time to waste!",12,0,100,0,0,0,15190,0,"Time Keeper"),
+(@ID,0,1,"We must hurry!",12,0,100,0,0,0,15191,0,"Time Keeper"),
+(@ID,0,2,"We must use this time wisely!",12,0,100,0,0,0,15192,0,"Time Keeper"),
+(@ID,1,0,"One less threat to the timeways!",12,0,100,0,0,0,15193,0,"Time Keeper"),
+(@ID,2,0,"Victory will be ours!",14,0,100,0,0,0,15194,0,"Time Keeper"),
+(@ID,2,1,"Carry on! Victory at all costs!",14,0,100,0,0,0,15195,0,"Time Keeper"),
+(@ID,2,2,"Continue the fight! Do not falter!",14,0,100,0,0,0,15196,0,"Time Keeper");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_02_world.sql
new file mode 100644
index 00000000000..fd346065db4
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_02_world.sql
@@ -0,0 +1,82 @@
+--
+UPDATE `creature_template` SET `AIName` = "" WHERE `entry` IN (15549,15556,15557,15558,15559,15560,15561,15562,15563,15564,15565,15566,15567,15568,15569,15570,15572,15573,15574,15575,15576,15577,15578,15579,15580,15581,15582,15583,15584,15585,15586,15587,15588,15592,15593,15594,15595,15596,15597,15598,15599,15600,15601,15602,15603,15604,15605,15606,15607,15871,30348,30357,30358,30359,30360,30362,30363,30364,30365,30367,30368,30369,30370,30371,30372,30373,30374,30375,30531,30533,30534,30535,30536,30537,30538);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (15549,15556,15557,15558,15559,15560,15561,15562,15563,15564,15565,15566,15567,15568,15569,15570,15572,15573,15574,15575,15576,15577,15578,15579,15580,15581,15582,15583,15584,15585,15586,15587,15588,15592,15593,15594,15595,15596,15597,15598,15599,15600,15601,15602,15603,15604,15605,15606,15607,15871,30348,30357,30358,30359,30360,30362,30363,30364,30365,30367,30368,30369,30370,30371,30372,30373,30374,30375,30531,30533,30534,30535,30536,30537,30538) AND `source_type` = 0;
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `id` IN (15549,15556,15557,15558,15559,15560,15561,15562,15563,15564,15565,15566,15567,15568,15569,15570,15572,15573,15574,15575,15576,15577,15578,15579,15580,15581,15582,15583,15584,15585,15586,15587,15588,15592,15593,15594,15595,15596,15597,15598,15599,15600,15601,15602,15603,15604,15605,15606,15607,15871,30348,30357,30358,30359,30360,30362,30363,30364,30365,30367,30368,30369,30370,30371,30372,30373,30374,30375,30531,30533,30534,30535,30536,30537,30538);
+DELETE FROM `creature_addon` WHERE `guid` IN (SELECT `guid` FROM `creature` WHERE `id` IN (15549,15556,15557,15558,15559,15560,15561,15562,15563,15564,15565,15566,15567,15568,15569,15570,15572,15573,15574,15575,15576,15577,15578,15579,15580,15581,15582,15583,15584,15585,15586,15587,15588,15592,15593,15594,15595,15596,15597,15598,15599,15600,15601,15602,15603,15604,15605,15606,15607,15871,30348,30357,30358,30359,30360,30362,30363,30364,30365,30367,30368,30369,30370,30371,30372,30373,30374,30375,30531,30533,30534,30535,30536,30537,30538));
+DELETE FROM `creature_template_addon` WHERE `entry` IN (15549,15556,15557,15558,15559,15560,15561,15562,15563,15564,15565,15566,15567,15568,15569,15570,15572,15573,15574,15575,15576,15577,15578,15579,15580,15581,15582,15583,15584,15585,15586,15587,15588,15592,15593,15594,15595,15596,15597,15598,15599,15600,15601,15602,15603,15604,15605,15606,15607,15871,30348,30357,30358,30359,30360,30362,30363,30364,30365,30367,30368,30369,30370,30371,30372,30373,30374,30375,30531,30533,30534,30535,30536,30537,30538);
+INSERT INTO `creature_template_addon` (`entry`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`visibilityDistanceType`,`auras`) VALUES
+(15549,0,0,0,4097,0,0,"25824"),
+(15556,0,0,0,4097,0,0,"25824"),
+(15557,0,0,0,4097,0,0,"25824"),
+(15558,0,0,0,4097,0,0,"25824"),
+(15559,0,0,0,4097,0,0,"25824"),
+(15560,0,0,0,4097,0,0,"25824"),
+(15561,0,0,0,4097,0,0,"25824"),
+(15562,0,0,0,4097,0,0,"25824"),
+(15563,0,0,0,4097,0,0,"25824"),
+(15564,0,0,0,4097,0,0,"25824"),
+(15565,0,0,0,4097,0,0,"25824"),
+(15566,0,0,0,4097,0,0,"25824"),
+(15567,0,0,0,4097,0,0,"25824"),
+(15568,0,0,0,4097,0,0,"25824"),
+(15569,0,0,0,4097,0,0,"25824"),
+(15570,0,0,0,4097,0,0,"25824"),
+(15572,0,0,0,4097,0,0,"25824"),
+(15573,0,0,0,4097,0,0,"25824"),
+(15574,0,0,0,4097,0,0,"25824"),
+(15575,0,0,0,4097,0,0,"25824"),
+(15576,0,0,0,4097,0,0,"25824"),
+(15577,0,0,0,4097,0,0,"25824"),
+(15578,0,0,0,4097,0,0,"25824"),
+(15579,0,0,0,4097,0,0,"25824"),
+(15580,0,0,0,4097,0,0,"25824"),
+(15581,0,0,0,4097,0,0,"25824"),
+(15582,0,0,0,4097,0,0,"25824"),
+(15583,0,0,0,4097,0,0,"25824"),
+(15584,0,0,0,4097,0,0,"25824"),
+(15585,0,0,0,4097,0,0,"25824"),
+(15586,0,0,0,4097,0,0,"25824"),
+(15587,0,0,0,4097,0,0,"25824"),
+(15588,0,0,0,4097,0,0,"25824"),
+(15592,0,0,0,4097,0,0,"25824"),
+(15593,0,0,0,4097,0,0,"25824"),
+(15594,0,0,0,4097,0,0,"25824"),
+(15595,0,0,0,4097,0,0,"25824"),
+(15596,0,0,0,4097,0,0,"25824"),
+(15597,0,0,0,4097,0,0,"25824"),
+(15598,0,0,0,4097,0,0,"25824"),
+(15599,0,0,0,4097,0,0,"25824"),
+(15600,0,0,0,4097,0,0,"25824"),
+(15601,0,0,0,4097,0,0,"25824"),
+(15602,0,0,0,4097,0,0,"25824"),
+(15603,0,0,0,4097,0,0,"25824"),
+(15604,0,0,0,4097,0,0,"25824"),
+(15605,0,0,0,4097,0,0,"25824"),
+(15606,0,0,0,4097,0,0,"25824"),
+(15607,0,0,0,4097,0,0,"25824"),
+(15871,0,0,0,4097,0,0,"25824"),
+(30348,0,0,0,4097,0,0,"25824"),
+(30357,0,0,0,4097,0,0,"25824"),
+(30358,0,0,0,4097,0,0,"25824"),
+(30359,0,0,0,4097,0,0,"25824"),
+(30360,0,0,0,4097,0,0,"25824"),
+(30362,0,0,0,4097,0,0,"25824"),
+(30363,0,0,0,4097,0,0,"25824"),
+(30364,0,0,0,4097,0,0,"25824"),
+(30365,0,0,0,4097,0,0,"25824"),
+(30367,0,0,0,4097,0,0,"25824"),
+(30368,0,0,0,4097,0,0,"25824"),
+(30369,0,0,0,4097,0,0,"25824"),
+(30370,0,0,0,4097,0,0,"25824"),
+(30371,0,0,0,4097,0,0,"25824"),
+(30372,0,0,0,4097,0,0,"25824"),
+(30373,0,0,0,4097,0,0,"25824"),
+(30374,0,0,0,4097,0,0,"25824"),
+(30375,0,0,0,4097,0,0,"25824"),
+(30531,0,0,0,4097,0,0,"25824"),
+(30533,0,0,0,4097,0,0,"25824"),
+(30534,0,0,0,4097,0,0,"25824"),
+(30535,0,0,0,4097,0,0,"25824"),
+(30536,0,0,0,4097,0,0,"25824"),
+(30537,0,0,0,4097,0,0,"25824"),
+(30538,0,0,0,4097,0,0,"25824");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_03_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_03_world.sql
new file mode 100644
index 00000000000..04d379e13ea
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_03_world.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `smart_scripts` SET `action_param2` = 0 WHERE `entryorguid` = 19847 AND `source_type` = 0 AND `id` = 4;
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_04_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_04_world.sql
new file mode 100644
index 00000000000..3cd883f3db1
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_04_world.sql
@@ -0,0 +1,3 @@
+--
+UPDATE `smart_scripts` SET `event_param2` = 0 WHERE `entryorguid` = 24137 AND `source_type` = 0 AND `event_type` = 61;
+UPDATE `smart_scripts` SET `event_flags` = `event_flags` &~ 1 WHERE `event_type` = 11;
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_05_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_05_world.sql
new file mode 100644
index 00000000000..40b85fae510
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_05_world.sql
@@ -0,0 +1,72 @@
+--
+DELETE FROM `spelldifficulty_dbc` WHERE `id` = 64793;
+INSERT INTO `spelldifficulty_dbc` (`id`,`spellid0`,`spellid1`,`spellid2`,`spellid3`) VALUES
+(64793,64793,64941,0,0);
+
+-- Boomer XP-500
+UPDATE `creature_addon` SET `auras` = "63767" WHERE `guid` IN (SELECT `guid` FROM `creature` WHERE `id` = 34192); -- Bomb Bot
+
+-- Superheated Winds
+UPDATE `creature_template_addon` SET `auras` = "64724" WHERE `entry` = 34194; -- Superheated Winds
+
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` IN (34190,34193,34194,34196,34197,34198,34199,34203,34223);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (34190,34193,34194,34196,34197,34198,34199,34203,34223) AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+-- Hardened Iron Golem
+-- 1 17:45:18.000
+-- 1 17:45:21.000 17:45:39.000 17:46:04.000 17:46:21.000 17:46:32.000
+(34190,0,0,0,0,0,100,2,3000,3000,11000,25000,0,11,64874,0,0,0,0,0,5,0,0,0,0,0,0,0,0,"Hardened Iron Golem - In Combat - Cast 'Rune Punch' (Normal Dungeon)"),
+(34190,0,1,0,0,0,100,4,3000,3000,11000,25000,0,11,64967,0,0,0,0,0,5,0,0,0,0,0,0,0,0,"Hardened Iron Golem - In Combat - Cast 'Rune Punch' (Heroic Dungeon)"),
+-- 1 17:45:27.000 17:45:52.000 17:46:17.000 17:46:44.000
+(34190,0,2,0,0,0,100,0,9000,9000,25000,25000,0,11,64877,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Hardened Iron Golem - In Combat - Cast 'Harden Fists'"),
+
+-- Clockwork Sapper
+(34193,0,0,0,0,0,100,0,5000,9000,10000,15000,0,11,64740,0,0,0,0,0,5,0,0,0,0,0,0,0,0,"Clockwork Sapper - In Combat - Cast 'Energy Sap'"),
+(34193,0,1,0,0,0,100,0,15000,20000,25000,30000,0,11,64873,1,0,0,0,0,1,0,0,0,0,0,0,0,0,"Clockwork Sapper - In Combat - Cast 'Sapper Explosion'"),
+
+-- Superheated Winds
+(34194,0,0,0,54,0,100,0,0,0,0,0,0,20,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Superheated Winds - On Just Summoned - Stop Attacking"),
+
+-- Rune Etched Sentry
+(34196,0,0,0,0,0,100,2,10000,13000,20000,25000,0,11,64847,0,0,0,0,0,2,0,0,0,0,0,0,0,0,"Rune Etched Sentry - In Combat - Cast 'Runed Flame Jets' (Normal Dungeon)"),
+(34196,0,1,0,0,0,100,4,10000,13000,20000,25000,0,11,64988,0,0,0,0,0,2,0,0,0,0,0,0,0,0,"Rune Etched Sentry - In Combat - Cast 'Runed Flame Jets' (Heroic Dungeon)"),
+(34196,0,2,0,0,0,100,2,5000,8000,8000,11000,0,11,64870,0,0,0,0,0,5,0,0,0,0,0,0,0,0,"Rune Etched Sentry - In Combat - Cast 'Lava Burst' (Normal Dungeon)"),
+(34196,0,3,0,0,0,100,4,5000,8000,8000,11000,0,11,64991,0,0,0,0,0,5,0,0,0,0,0,0,0,0,"Rune Etched Sentry - In Combat - Cast 'Lava Burst' (Heroic Dungeon)"),
+(34196,0,4,0,0,0,100,0,4000,7000,10000,13000,0,11,64852,0,0,0,0,0,5,0,0,0,0,0,0,0,0,"Rune Etched Sentry - In Combat - Cast 'Flaming Rune'"),
+
+-- Chamber Overseer
+-- 1 17:51:10.000
+-- 1 17:51:21.000 17:51:40.000 17:51:57.000 17:52:13.000 17:52:32.000
+(34197,0,0,0,0,0,100,2,10000,10000,16000,19000,0,11,64820,0,0,0,0,0,5,0,0,0,0,0,0,0,0,"Chamber Overseer - In Combat - Cast 'Devastating Leap' (Normal Dungeon)"),
+(34197,0,1,0,0,0,100,4,10000,10000,16000,19000,0,11,64943,0,0,0,0,0,5,0,0,0,0,0,0,0,0,"Chamber Overseer - In Combat - Cast 'Devastating Leap' (Heroic Dungeon)"),
+-- 1 17:51:19.000 17:51:34.000 17:51:52.000 17:52:10.000 17:52:28.000
+(34197,0,2,0,0,0,100,2,9000,9000,15000,22000,0,11,64825,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Chamber Overseer - In Combat - Cast 'Stagering Roar' (Normal Dungeon)"),
+(34197,0,3,0,0,0,100,4,9000,9000,15000,22000,0,11,64944,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Chamber Overseer - In Combat - Cast 'Stagering Roar' (Heroic Dungeon)"),
+-- 1 17:51:25.000 17:51:41.000 17:52:02.000 17:52:22.000
+(34197,0,4,0,0,0,100,0,15000,15000,16000,21000,0,11,64783,0,0,0,0,0,5,0,0,0,0,0,0,0,0,"Chamber Overseer - In Combat - Cast 'Displacement Device'"),
+
+-- Iron Mender
+(34198,0,0,0,1,0,100,2,10000,20000,34000,34000,0,11,64768,0,0,0,0,0,19,34190,20,0,0,0,0,0,0,"Iron Mender - Out of Combat - Cast 'Lightning Channel' (Normal Dungeon)"),
+(34198,0,1,0,0,0,100,2,5000,8000,8000,12000,0,11,64918,0,0,0,0,0,5,0,0,0,0,0,0,0,0,"Iron Mender - In Combat - Cast 'Electro Shock' (Normal Dungeon)"),
+(34198,0,2,0,0,0,100,4,5000,8000,8000,12000,0,11,64971,0,0,0,0,0,5,0,0,0,0,0,0,0,0,"Iron Mender - In Combat - Cast 'Electro Shock' (Heroic Dungeon)"),
+(34198,0,3,0,0,0,100,2,7000,12000,15000,20000,0,11,64903,0,0,0,0,0,5,0,0,0,0,0,0,0,0,"Iron Mender - In Combat - Cast 'Fuse Lightning' (Normal Dungeon)"),
+(34198,0,4,0,0,0,100,4,7000,12000,15000,20000,0,11,64970,0,0,0,0,0,5,0,0,0,0,0,0,0,0,"Iron Mender - In Combat - Cast 'Fuse Lightning' (Heroic Dungeon)"),
+-- Probably used on friends with low HP
+(34198,0,5,0,0,0,100,2,10000,15000,20000,30000,0,11,64897,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Iron Mender - In Combat - Cast 'Fuse Metal' (Normal Dungeon)"),
+(34198,0,6,0,0,0,100,4,10000,15000,20000,30000,0,11,64968,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Iron Mender - In Combat - Cast 'Fuse Metal' (Heroic Dungeon)"),
+
+-- Lightning Charged Iron Dwarf
+(34199,0,0,0,0,0,100,2,8000,12000,60000,65000,0,11,64889,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lightning Charged Iron Dwarf - In Combat - Cast 'Lightning Charged' (Normal Dungeon)"),
+(34199,0,1,0,0,0,100,4,8000,12000,30000,35000,0,11,64975,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lightning Charged Iron Dwarf - In Combat - Cast 'Lightning Charged' (Heroic Dungeon)"),
+
+-- Displacement Device
+-- Seems like they're supposed to add threat to random targets but in sniffs every time they adds threat to one target
+-- More info https://www.youtube.com/watch?v=5lqHdMwXHKM&feature=youtu.be&t=97
+(34203,0,0,1,54,0,100,0,0,0,0,0,0,11,64785,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Displacement Device - On Just Summoned - Cast 'Random Lightning Visual'"),
+(34203,0,1,2,61,0,100,0,0,0,0,0,0,11,64793,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Displacement Device - On Link - Cast 'Displacement'"),
+(34203,0,2,0,61,0,100,0,0,0,0,0,0,20,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Displacement Device - On Link - Stop Attacking"),
+
+-- Sapper Explosion
+(34223,0,0,0,54,0,100,0,0,0,0,0,0,11,64875,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Sapper Explosion - On Just Summoned - Cast 'Sapper Explosion'"),
+(34223,0,1,0,54,0,100,0,0,0,0,0,0,8,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Sapper Explosion - On Just Summoned - Set Reactstate Passive"),
+(34223,0,2,0,60,0,100,1,5500,5500,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Sapper Explosion - On Update - Despawn (5500)");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_06_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_06_world.sql
new file mode 100644
index 00000000000..dfbd82e8920
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_06_world.sql
@@ -0,0 +1,68 @@
+-- Kaya Flathoof SAI (https://www.youtube.com/watch?v=axY4vXGm7Q4)
+SET @ID := 11856;
+UPDATE `creature_template` SET `AIName` = "SmartAI", `ScriptName` = "" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` BETWEEN @ID*100+0 AND @ID*100+2 AND `source_type` = 9;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 11910 AND `source_type` = 0 AND `id` = 1;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 11912 AND `source_type` = 0 AND `id` = 2;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 11913 AND `source_type` = 0 AND `id` = 3;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ID,0,0,0,19,0,100,0,6523,0,0,0,0,80,@ID*100+0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Kaya Flathoof - On Quest 'Protect Kaya' Taken - Run Script"),
+(@ID,0,1,0,40,0,100,0,17,0,0,0,0,80,@ID*100+1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Kaya Flathoof - On Waypoint 17 Reached - Run Script"),
+(@ID,0,2,0,40,0,100,0,19,0,0,0,0,80,@ID*100+2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Kaya Flathoof - On Waypoint 19 Reached - Run Script"),
+(@ID,0,3,0,6,0,100,0,0,0,0,0,0,6,6523,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Kaya Flathoof - On Death - Fail Quest 'Protect Kaya'"),
+
+(@ID*100+0,9,0,0,0,0,100,0,0,0,0,0,0,64,1,0,0,0,0,0,16,0,0,0,0,0,0,0,0,"Kaya Flathoof - On Script - Store Targetlist"),
+(@ID*100+0,9,1,0,0,0,100,0,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Kaya Flathoof - On Script - Remove NPC Flag Questgiver"),
+(@ID*100+0,9,2,0,0,0,100,0,0,0,0,0,0,1,0,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Kaya Flathoof - On Script - Say Line 0"),
+(@ID*100+0,9,3,0,0,0,100,0,5000,5000,0,0,0,53,0,11856,0,0,0,2,1,0,0,0,0,0,0,0,0,"Kaya Flathoof - On Script - Start Waypoint"),
+(@ID*100+0,9,4,0,0,0,100,0,0,0,0,0,0,19,512,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Kaya Flathoof - On Script - Remove Flag Immune To NPC's"),
+(@ID*100+0,9,5,0,0,0,100,0,0,0,0,0,0,2,113,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Kaya Flathoof - On Script - Set Faction 113"),
+
+(@ID*100+1,9,0,0,0,0,100,0,0,0,0,0,0,54,7000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Kaya Flathoof - On Script - Pause Waypoint"),
+-- She should not be attacked instantly, probably it's done by another way
+(@ID*100+1,9,1,0,0,0,100,0,0,0,0,0,0,18,512,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Kaya Flathoof - On Script - Add Flag Immune To NPC's"),
+(@ID*100+1,9,2,0,0,0,100,0,2000,2000,0,0,0,107,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Kaya Flathoof - On Script - Summon Group 0"),
+(@ID*100+1,9,3,0,0,0,100,0,2000,2000,0,0,0,1,1,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Kaya Flathoof - On Script - Say Line 1"),
+(@ID*100+1,9,4,0,0,0,100,0,3000,3000,0,0,0,19,512,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Kaya Flathoof - On Script - Remove Flag Immune To NPC's"),
+
+(@ID*100+2,9,0,0,0,0,100,0,0,0,0,0,0,54,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Kaya Flathoof - On Script - Pause Waypoint"),
+(@ID*100+2,9,1,0,0,0,100,0,1000,1000,0,0,0,66,0,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Kaya Flathoof - On Script - Set Orientation Stored Target 1"),
+(@ID*100+2,9,2,0,0,0,100,0,0,0,0,0,0,1,2,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Kaya Flathoof - On Script - Say Line 2"),
+(@ID*100+2,9,3,0,0,0,100,0,5000,5000,0,0,0,26,6523,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Kaya Flathoof - On Script - Quest Credit 'Protect Kaya'"),
+(@ID*100+2,9,4,0,0,0,100,0,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Kaya Flathoof - On Script - Despawn (0)"),
+
+(11910,0,1,0,54,0,100,0,0,0,0,0,0,49,0,0,0,0,0,0,21,30,0,0,0,0,0,0,0,"Grimtotem Ruffian - On Just Summoned - Start Attacking Closest Player"),
+(11912,0,2,0,54,0,100,0,0,0,0,0,0,49,0,0,0,0,0,0,21,30,0,0,0,0,0,0,0,"Grimtotem Brute - On Just Summoned - Start Attacking Closest Player"),
+(11913,0,3,0,54,0,100,0,0,0,0,0,0,49,0,0,0,0,0,0,21,30,0,0,0,0,0,0,0,"Grimtotem Sorcerer - On Just Summoned - Start Attacking Closest Player");
+
+UPDATE `creature_text` SET `comment` = "Kaya Flathoof" WHERE `CreatureID` = @ID;
+
+DELETE FROM `creature_summon_groups` WHERE `summonerId` = @ID;
+INSERT INTO `creature_summon_groups` (`summonerId`,`summonerType`,`groupId`,`entry`,`position_x`,`position_y`,`position_z`,`orientation`,`summonType`,`summonTime`,`Comment`) VALUES
+(@ID,0,0,11910,-50.75,-500.77,-46.13,0.4,4,60000,"Kaya Flathoof - Group 0 - Grimtotem Ruffian"),
+(@ID,0,0,11912,-40.05,-510.89,-46.05,1.7,4,60000,"Kaya Flathoof - Group 0 - Grimtotem Brute"),
+(@ID,0,0,11913,-32.21,-499.20,-45.35,2.8,4,60000,"Kaya Flathoof - Group 0 - Grimtotem Sorcerer");
+
+DELETE FROM `script_waypoint` WHERE `entry` = 11856;
+DELETE FROM `waypoints` WHERE `entry` = 11856;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(11856,1,113.91,-350.13,4.55,"Kaya Flathoof"),
+(11856,2,109.54,-350.08,3.74,"Kaya Flathoof"),
+(11856,3,106.95,-353.4,3.6,"Kaya Flathoof"),
+(11856,4,100.28,-338.89,2.97,"Kaya Flathoof"),
+(11856,5,110.11,-320.26,3.47,"Kaya Flathoof"),
+(11856,6,109.78,-287.8,5.3,"Kaya Flathoof"),
+(11856,7,105.02,-269.71,4.71,"Kaya Flathoof"),
+(11856,8,86.71,-251.81,5.34,"Kaya Flathoof"),
+(11856,9,64.1,-246.38,5.91,"Kaya Flathoof"),
+(11856,10,-2.55,-243.58,6.3,"Kaya Flathoof"),
+(11856,11,-27.78,-267.53,-1.08,"Kaya Flathoof"),
+(11856,12,-31.27,-283.54,-4.36,"Kaya Flathoof"),
+(11856,13,-28.96,-322.44,-9.19,"Kaya Flathoof"),
+(11856,14,-35.63,-360.03,-16.59,"Kaya Flathoof"),
+(11856,15,-58.3,-412.26,-30.6,"Kaya Flathoof"),
+(11856,16,-58.88,-474.17,-44.54,"Kaya Flathoof"),
+(11856,17,-45.92,-496.57,-46.26,"Kaya Flathoof"),
+(11856,18,-40.25,-510.07,-46.05,"Kaya Flathoof"),
+(11856,19,-38.88,-520.72,-46.06,"Kaya Flathoof");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_07_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_07_world.sql
new file mode 100644
index 00000000000..ed1f1dac5ab
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_07_world.sql
@@ -0,0 +1,181 @@
+-- Lakota Windsong SAI (https://www.youtube.com/watch?v=WY1mdBgs9iE)
+SET @ID := 10646;
+UPDATE `creature_template` SET `AIName` = "SmartAI", `ScriptName` = "" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` BETWEEN @ID*100+0 AND @ID*100+4 AND `source_type` = 9;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 10758 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`,`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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ID,0,0,0,19,0,100,0,4904,0,0,0,0,80,@ID*100+0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lakota Windsong - On Quest 'Free at Last' Taken - Run Script"),
+(@ID,0,1,0,40,0,100,0,9,0,0,0,0,80,@ID*100+1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lakota Windsong - On Waypoint 9 Reached - Run Script"),
+(@ID,0,2,0,40,0,100,0,15,0,0,0,0,80,@ID*100+2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lakota Windsong - On Waypoint 15 Reached - Run Script"),
+(@ID,0,3,0,40,0,100,0,22,0,0,0,0,80,@ID*100+3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lakota Windsong - On Waypoint 22 Reached - Run Script"),
+(@ID,0,4,0,40,0,100,0,46,0,0,0,0,80,@ID*100+4,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lakota Windsong - On Waypoint 46 Reached - Run Script"),
+(@ID,0,5,0,6,0,100,0,0,0,0,0,0,6,4904,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Lakota Windsong - On Death - Fail Quest 'Protect Kaya'"),
+
+(@ID*100+0,9,0,0,0,0,100,0,0,0,0,0,0,64,1,0,0,0,0,0,16,0,0,0,0,0,0,0,0,"Lakota Windsong - On Script - Store Targetlist"),
+(@ID*100+0,9,1,0,0,0,100,0,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lakota Windsong - On Script - Remove NPC Flag Questgiver"),
+(@ID*100+0,9,2,0,0,0,100,0,0,0,0,0,0,1,0,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Lakota Windsong - On Script - Say Line 0"),
+(@ID*100+0,9,3,0,0,0,100,0,3000,3000,0,0,0,53,0,10646,0,0,0,2,1,0,0,0,0,0,0,0,0,"Lakota Windsong - On Script - Start Waypoint"),
+(@ID*100+0,9,4,0,0,0,100,0,0,0,0,0,0,19,512,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lakota Windsong - On Script - Remove Flag Immune To NPC's"),
+-- Was 232 but 232 makes her agressive and in video she's passive
+(@ID*100+0,9,5,0,0,0,100,0,0,0,0,0,0,2,113,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lakota Windsong - On Script - Set Faction 113"),
+
+(@ID*100+1,9,0,0,0,0,100,0,0,0,0,0,0,54,3000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lakota Windsong - On Script - Pause Waypoint"),
+-- She should not be attacked instantly, probably it's done by another way
+(@ID*100+1,9,1,0,0,0,100,0,0,0,0,0,0,18,512,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lakota Windsong - On Script - Add Flag Immune To NPC's"),
+(@ID*100+1,9,2,0,0,0,100,0,1000,1000,0,0,0,1,1,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Lakota Windsong - On Script - Say Line 1"),
+(@ID*100+1,9,3,0,0,0,100,0,1000,1000,0,0,0,107,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lakota Windsong - On Script - Summon Group 0"),
+(@ID*100+1,9,4,0,0,0,100,0,1000,1000,0,0,0,19,512,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lakota Windsong - On Script - Remove Flag Immune To NPC's"),
+
+(@ID*100+2,9,0,0,0,0,100,0,0,0,0,0,0,54,3000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lakota Windsong - On Script - Pause Waypoint"),
+(@ID*100+2,9,1,0,0,0,100,0,0,0,0,0,0,18,512,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lakota Windsong - On Script - Add Flag Immune To NPC's"),
+(@ID*100+2,9,2,0,0,0,100,0,1000,1000,0,0,0,1,2,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Lakota Windsong - On Script - Say Line 2"),
+(@ID*100+2,9,3,0,0,0,100,0,1000,1000,0,0,0,107,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lakota Windsong - On Script - Summon Group 1"),
+(@ID*100+2,9,4,0,0,0,100,0,1000,1000,0,0,0,19,512,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lakota Windsong - On Script - Remove Flag Immune To NPC's"),
+
+(@ID*100+3,9,0,0,0,0,100,0,0,0,0,0,0,54,3000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lakota Windsong - On Script - Pause Waypoint"),
+(@ID*100+3,9,1,0,0,0,100,0,0,0,0,0,0,18,512,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lakota Windsong - On Script - Add Flag Immune To NPC's"),
+(@ID*100+3,9,2,0,0,0,100,0,1000,1000,0,0,0,1,3,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Lakota Windsong - On Script - Say Line 3"),
+(@ID*100+3,9,3,0,0,0,100,0,1000,1000,0,0,0,107,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lakota Windsong - On Script - Summon Group 2"),
+(@ID*100+3,9,4,0,0,0,100,0,1000,1000,0,0,0,19,512,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lakota Windsong - On Script - Remove Flag Immune To NPC's"),
+
+(@ID*100+4,9,0,0,0,0,100,0,0,0,0,0,0,54,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lakota Windsong - On Script - Pause Waypoint"),
+(@ID*100+4,9,1,0,0,0,100,0,1000,1000,0,0,0,66,0,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Lakota Windsong - On Script - Set Orientation Stored Target 1"),
+(@ID*100+4,9,2,0,0,0,100,0,0,0,0,0,0,1,4,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Lakota Windsong - On Script - Say Line 4"),
+(@ID*100+4,9,3,0,0,0,100,0,0,0,0,0,0,15,4904,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Lakota Windsong - On Script - Quest Credit 'Free at Last'"),
+(@ID*100+4,9,4,0,0,0,100,0,0,0,0,0,0,41,5000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Lakota Windsong - On Script - Despawn (5000)"),
+
+(10758,0,2,0,54,0,100,0,0,0,0,0,0,49,0,0,0,0,0,0,21,30,0,0,0,0,0,0,0,"Grimtotem Bandit - On Just Summoned - Start Attacking Closest Player");
+
+UPDATE `creature_text` SET `comment` = "Lakota Windsong" WHERE `CreatureID` = @ID;
+UPDATE `creature_text` SET `Emote` = 1 WHERE `CreatureID` = @ID AND `GroupID` IN (0,1,2);
+UPDATE `creature_text` SET `Emote` = 22 WHERE `CreatureID` = @ID AND `GroupID` = 3;
+UPDATE `creature_text` SET `Emote` = 3 WHERE `CreatureID` = @ID AND `GroupID` = 4;
+
+DELETE FROM `creature_summon_groups` WHERE `summonerId` = @ID;
+INSERT INTO `creature_summon_groups` (`summonerId`,`summonerType`,`groupId`,`entry`,`position_x`,`position_y`,`position_z`,`orientation`,`summonType`,`summonTime`,`Comment`) VALUES
+(@ID,0,0,10758,-4905.479492,-2062.732666,84.352,0,4,60000,"Lakota Windsong - Group 0 - Grimtotem Bandit"),
+(@ID,0,0,10758,-4915.201172,-2073.528320,84.733,0,4,60000,"Lakota Windsong - Group 0 - Grimtotem Bandit"),
+(@ID,0,1,10758,-4878.883301,-1986.947876,91.966,0,4,60000,"Lakota Windsong - Group 1 - Grimtotem Bandit"),
+(@ID,0,1,10758,-4877.503906,-1966.113403,91.859,0,4,60000,"Lakota Windsong - Group 1 - Grimtotem Bandit"),
+(@ID,0,2,10758,-4767.985352,-1873.169189,90.192,0,4,60000,"Lakota Windsong - Group 2 - Grimtotem Bandit"),
+(@ID,0,2,10758,-4788.861328,-1888.007813,89.888,0,4,60000,"Lakota Windsong - Group 2 - Grimtotem Bandit");
+
+DELETE FROM `script_waypoint` WHERE `entry` = 10646;
+DELETE FROM `waypoints` WHERE `entry` = 10646;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(10646,1,-4792.4,-2137.78,82.423,"Lakota Windsong"),
+(10646,2,-4813.51,-2141.54,80.774,"Lakota Windsong"),
+(10646,3,-4828.63,-2154.31,82.074,"Lakota Windsong"),
+(10646,4,-4833.77,-2149.18,81.676,"Lakota Windsong"),
+(10646,5,-4846.42,-2136.05,77.871,"Lakota Windsong"),
+(10646,6,-4865.08,-2116.55,76.483,"Lakota Windsong"),
+(10646,7,-4888.43,-2090.73,80.907,"Lakota Windsong"),
+(10646,8,-4893.07,-2085.47,82.094,"Lakota Windsong"),
+(10646,9,-4907.26,-2074.93,84.437,"Lakota Windsong"),
+(10646,10,-4899.9,-2062.14,83.78,"Lakota Windsong"),
+(10646,11,-4897.76,-2056.52,84.184,"Lakota Windsong"),
+(10646,12,-4888.33,-2033.18,83.654,"Lakota Windsong"),
+(10646,13,-4876.34,-2003.92,90.887,"Lakota Windsong"),
+(10646,14,-4872.23,-1994.17,91.513,"Lakota Windsong"),
+(10646,15,-4879.57,-1976.99,92.185,"Lakota Windsong"),
+(10646,16,-4879.05,-1964.35,92.001,"Lakota Windsong"),
+(10646,17,-4874.72,-1956.94,90.737,"Lakota Windsong"),
+(10646,18,-4869.47,-1952.61,89.206,"Lakota Windsong"),
+(10646,19,-4842.47,-1929,84.147,"Lakota Windsong"),
+(10646,20,-4804.44,-1897.3,89.362,"Lakota Windsong"),
+(10646,21,-4798.07,-1892.38,89.368,"Lakota Windsong"),
+(10646,22,-4779.45,-1882.76,90.169,"Lakota Windsong"),
+(10646,23,-4762.08,-1866.53,89.481,"Lakota Windsong"),
+(10646,24,-4766.27,-1861.87,87.847,"Lakota Windsong"),
+(10646,25,-4782.93,-1852.17,78.354,"Lakota Windsong"),
+(10646,26,-4793.61,-1850.96,77.658,"Lakota Windsong"),
+(10646,27,-4803.32,-1855.1,78.958,"Lakota Windsong"),
+(10646,28,-4807.97,-1854.5,77.743,"Lakota Windsong"),
+(10646,29,-4837.21,-1848.49,64.488,"Lakota Windsong"),
+(10646,30,-4884.62,-1840.4,56.219,"Lakota Windsong"),
+(10646,31,-4889.71,-1839.62,54.417,"Lakota Windsong"),
+(10646,32,-4893.9,-1843.69,53.012,"Lakota Windsong"),
+(10646,33,-4903.14,-1872.38,32.266,"Lakota Windsong"),
+(10646,34,-4910.94,-1879.86,29.94,"Lakota Windsong"),
+(10646,35,-4920.05,-1880.94,30.597,"Lakota Windsong"),
+(10646,36,-4924.46,-1881.45,29.292,"Lakota Windsong"),
+(10646,37,-4966.12,-1886.03,10.977,"Lakota Windsong"),
+(10646,38,-4999.37,-1890.85,4.43,"Lakota Windsong"),
+(10646,39,-5007.27,-1891.67,2.771,"Lakota Windsong"),
+(10646,40,-5013.33,-1879.59,-1.947,"Lakota Windsong"),
+(10646,41,-5023.33,-1855.96,-17.103,"Lakota Windsong"),
+(10646,42,-5038.51,-1825.99,-35.821,"Lakota Windsong"),
+(10646,43,-5048.73,-1809.8,-46.457,"Lakota Windsong"),
+(10646,44,-5053.19,-1791.68,-57.186,"Lakota Windsong"),
+(10646,45,-5062.09,-1794.4,-56.515,"Lakota Windsong"),
+(10646,46,-5052.66,-1797.04,-54.734,"Lakota Windsong");
+
+-- Pao'ka Swiftmountain SAI (https://www.youtube.com/watch?v=u_Lr-cbBmKU)
+SET @ID := 10427;
+UPDATE `creature_template` SET `AIName` = "SmartAI", `ScriptName` = "" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` BETWEEN @ID*100+0 AND @ID*100+2 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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ID,0,0,0,19,0,100,0,4770,0,0,0,0,80,@ID*100+0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Pao'ka Swiftmountain - On Quest 'Homeward Bound' Taken - Run Script"),
+(@ID,0,1,0,40,0,100,0,16,0,0,0,0,80,@ID*100+1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Pao'ka Swiftmountain - On Waypoint 16 Reached - Run Script"),
+(@ID,0,2,0,40,0,100,0,27,0,0,0,0,80,@ID*100+2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Pao'ka Swiftmountain - On Waypoint 27 Reached - Run Script"),
+(@ID,0,3,0,6,0,100,0,0,0,0,0,0,6,4770,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Pao'ka Swiftmountain - On Death - Fail Quest 'Homeward Bound'"),
+
+(@ID*100+0,9,0,0,0,0,100,0,0,0,0,0,0,64,1,0,0,0,0,0,16,0,0,0,0,0,0,0,0,"Pao'ka Swiftmountain - On Script - Store Targetlist"),
+(@ID*100+0,9,1,0,0,0,100,0,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Pao'ka Swiftmountain - On Script - Remove NPC Flag Questgiver"),
+(@ID*100+0,9,2,0,0,0,100,0,0,0,0,0,0,1,0,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Pao'ka Swiftmountain - On Script - Say Line 0"),
+(@ID*100+0,9,3,0,0,0,100,0,6000,6000,0,0,0,53,0,10427,0,0,0,2,1,0,0,0,0,0,0,0,0,"Pao'ka Swiftmountain - On Script - Start Waypoint"),
+(@ID*100+0,9,4,0,0,0,100,0,0,0,0,0,0,19,512,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Pao'ka Swiftmountain - On Script - Remove Flag Immune To NPC's"),
+-- Was 232 but 232 makes him agressive and in video he's passive
+(@ID*100+0,9,5,0,0,0,100,0,0,0,0,0,0,2,113,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Pao'ka Swiftmountain - On Script - Set Faction 113"),
+
+(@ID*100+1,9,0,0,0,0,100,0,0,0,0,0,0,54,5000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Pao'ka Swiftmountain - On Script - Pause Waypoint"),
+(@ID*100+1,9,1,0,0,0,100,0,0,0,0,0,0,1,1,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Pao'ka Swiftmountain - On Script - Say Line 1"),
+(@ID*100+1,9,2,0,0,0,100,0,5000,5000,0,0,0,107,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Pao'ka Swiftmountain - On Script - Summon Group 0"),
+
+(@ID*100+2,9,0,0,0,0,100,0,0,0,0,0,0,54,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Pao'ka Swiftmountain - On Script - Pause Waypoint"),
+(@ID*100+2,9,1,0,0,0,100,0,1000,1000,0,0,0,1,2,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Pao'ka Swiftmountain - On Script - Say Line 2"),
+(@ID*100+2,9,2,0,0,0,100,0,5000,5000,0,0,0,15,4770,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Pao'ka Swiftmountain - On Script - Quest Credit 'Homeward Bound'"),
+(@ID*100+2,9,3,0,0,0,100,0,0,0,0,0,0,5,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Pao'ka Swiftmountain - On Script - Play Emote 1"),
+(@ID*100+2,9,4,0,0,0,100,0,1000,1000,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Pao'ka Swiftmountain - On Script - Despawn (0)");
+
+UPDATE `creature_text` SET `comment` = "Pao'ka Swiftmountain" WHERE `CreatureID` = @ID;
+UPDATE `creature_text` SET `Emote` = 1 WHERE `CreatureID` = @ID AND `GroupID` IN (0,1);
+
+DELETE FROM `creature_summon_groups` WHERE `summonerId` = @ID;
+INSERT INTO `creature_summon_groups` (`summonerId`,`summonerType`,`groupId`,`entry`,`position_x`,`position_y`,`position_z`,`orientation`,`summonType`,`summonTime`,`Comment`) VALUES
+(@ID,0,0,4107,-4990.606,-906.057,-5.343,0,4,60000,"Pao'ka Swiftmountain - Group 0 - Highperch Wyvern"),
+(@ID,0,0,4107,-4970.241,-927.378,-4.951,0,4,60000,"Pao'ka Swiftmountain - Group 0 - Highperch Wyvern"),
+(@ID,0,0,4107,-4985.364,-952.528,-5.199,0,4,60000,"Pao'ka Swiftmountain - Group 0 - Highperch Wyvern");
+
+DELETE FROM `script_waypoint` WHERE `entry` = 10427;
+DELETE FROM `waypoints` WHERE `entry` = 10427;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(10427,1,-5185.46,-1185.93,45.951,"Pao'ka Swiftmountain"),
+(10427,2,-5184.88,-1154.21,45.035,"Pao'ka Swiftmountain"),
+(10427,3,-5175.88,-1126.53,43.701,"Pao'ka Swiftmountain"),
+(10427,4,-5138.65,-1111.87,44.024,"Pao'ka Swiftmountain"),
+(10427,5,-5134.73,-1104.8,47.365,"Pao'ka Swiftmountain"),
+(10427,6,-5129.68,-1097.88,49.449,"Pao'ka Swiftmountain"),
+(10427,7,-5125.3,-1080.57,47.033,"Pao'ka Swiftmountain"),
+(10427,8,-5146.67,-1053.69,28.415,"Pao'ka Swiftmountain"),
+(10427,9,-5147.46,-1027.54,13.818,"Pao'ka Swiftmountain"),
+(10427,10,-5139.24,-1018.89,8.22,"Pao'ka Swiftmountain"),
+(10427,11,-5121.17,-1013.13,-0.619,"Pao'ka Swiftmountain"),
+(10427,12,-5091.92,-1014.21,-4.902,"Pao'ka Swiftmountain"),
+(10427,13,-5069.24,-994.299,-4.631,"Pao'ka Swiftmountain"),
+(10427,14,-5059.98,-944.112,-5.377,"Pao'ka Swiftmountain"),
+(10427,15,-5013.55,-906.184,-5.49,"Pao'ka Swiftmountain"),
+(10427,16,-4992.46,-920.983,-4.98,"Pao'ka Swiftmountain"),
+(10427,17,-4976.35,-1003,-5.38,"Pao'ka Swiftmountain"),
+(10427,18,-4958.48,-1033.19,-5.433,"Pao'ka Swiftmountain"),
+(10427,19,-4953.35,-1052.21,-10.836,"Pao'ka Swiftmountain"),
+(10427,20,-4937.45,-1056.35,-22.139,"Pao'ka Swiftmountain"),
+(10427,21,-4908.46,-1050.43,-33.458,"Pao'ka Swiftmountain"),
+(10427,22,-4905.53,-1056.89,-33.722,"Pao'ka Swiftmountain"),
+(10427,23,-4920.83,-1073.28,-45.515,"Pao'ka Swiftmountain"),
+(10427,24,-4933.37,-1082.7,-50.186,"Pao'ka Swiftmountain"),
+(10427,25,-4935.31,-1092.35,-52.785,"Pao'ka Swiftmountain"),
+(10427,26,-4929.55,-1101.27,-50.637,"Pao'ka Swiftmountain"),
+(10427,27,-4920.68,-1100.03,-51.944,"Pao'ka Swiftmountain");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_08_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_08_world.sql
new file mode 100644
index 00000000000..281ff72f1ef
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_08_world.sql
@@ -0,0 +1,97 @@
+--
+ALTER TABLE `creature_text_locale` DROP INDEX `PRIMARY`, ADD PRIMARY KEY (`CreatureID`,`GroupID`,`ID`,`Locale`);
+
+-- A-Me 01 SAI (https://www.youtube.com/watch?v=or8qY6uId0w)
+-- No summons here
+SET @ID := 9623;
+DELETE FROM `creature_addon` WHERE `guid` IN (SELECT `guid` FROM `creature` WHERE `id` = 9623);
+UPDATE `creature_template` SET `AIName` = "SmartAI", `ScriptName` = "" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` BETWEEN @ID*100+0 AND @ID*100+3 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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ID,0,0,0,11,0,100,0,0,0,0,0,0,90,7,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"A-Me 01 - On Respawn - Set Flag Standstate Dead"),
+(@ID,0,1,0,4,0,50,0,0,0,0,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"A-Me 01 - On Aggro - Say Line 3"),
+(@ID,0,2,0,0,0,100,256,5800,11800,14500,35600,0,11,13730,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"A-Me 01 - In Combat - Cast 'Demoralizing Shout' (No Reset)"),
+(@ID,0,3,0,19,0,100,0,4245,0,0,0,0,80,@ID*100+0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"A-Me 01 - On Quest 'Chasing A-Me 01' Taken - Run Script"),
+(@ID,0,4,0,40,0,100,0,20,0,0,0,0,80,@ID*100+2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"A-Me 01 - On Waypoint 20 Reached - Run Script"),
+(@ID,0,5,0,40,0,100,0,38,0,0,0,0,80,@ID*100+3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"A-Me 01 - On Waypoint 38 Reached - Run Script"),
+(@ID,0,6,0,40,0,100,0,40,0,0,0,0,41,5000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"A-Me 01 - On Waypoint 40 Reached - Despawn (5000)"),
+(@ID,0,7,0,6,0,100,0,0,0,0,0,0,6,4245,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"A-Me 01 - On Death - Fail Quest 'Chasing A-Me 01'"),
+(@ID*100+0,9,0,0,0,0,100,0,0,0,0,0,0,64,1,0,0,0,0,0,16,0,0,0,0,0,0,0,0,"A-Me 01 - On Script - Store Targetlist"),
+(@ID*100+0,9,1,0,0,0,100,0,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"A-Me 01 - On Script - Remove NPC Flag Questgiver"),
+-- Guessed timers, I didn't found video with this part
+(@ID*100+0,9,2,0,0,0,100,0,0,0,0,0,0,91,7,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"A-Me 01 - On Script - Remove Flag Standstate Dead"),
+(@ID*100+0,9,3,0,0,0,100,0,0,0,0,0,0,1,0,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"A-Me 01 - On Script - Say Line 0"),
+(@ID*100+0,9,4,0,0,0,100,0,2000,2000,0,0,0,53,0,9623,0,0,0,1,1,0,0,0,0,0,0,0,0,"A-Me 01 - On Script - Start Waypoint"),
+(@ID*100+0,9,5,0,0,0,100,0,0,0,0,0,0,19,512,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"A-Me 01 - On Script - Remove Flag Immune To NPC's"),
+(@ID*100+0,9,6,0,0,0,100,0,0,0,0,0,0,2,250,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"A-Me 01 - On Script - Set Faction 250"),
+
+(@ID*100+2,9,0,0,0,0,100,0,0,0,0,0,0,54,4000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"A-Me 01 - On Script - Pause Waypoint"),
+(@ID*100+2,9,1,0,0,0,100,0,1000,1000,0,0,0,1,1,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"A-Me 01 - On Script - Say Line 1"),
+
+(@ID*100+3,9,0,0,0,0,100,0,0,0,0,0,0,54,1000,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"A-Me 01 - On Script - Pause Waypoint"),
+(@ID*100+3,9,1,0,0,0,100,0,1000,1000,0,0,0,1,2,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"A-Me 01 - On Script - Say Line 2"),
+(@ID*100+3,9,2,0,0,0,100,0,0,0,0,0,0,15,4245,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"A-Me 01 - On Script - Quest Credit 'Chasing A-Me 01'");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"A-Me good. Good, A-Me. Follow... follow A-Me. Home. A-Me go home.",12,0,100,0,0,0,0,0,"A-Me 01"), -- 5062
+(@ID,1,0,(SELECT `Text` FROM `broadcast_text` WHERE `ID`=5063),12,0,100,0,0,0,5063,0,"A-Me 01"), -- Good... good, A-Me. A-Me good. Home. Find home.
+(@ID,2,0,(SELECT `Text` FROM `broadcast_text` WHERE `ID`=5156),12,0,100,0,0,0,5156,0,"A-Me 01"), -- A-Me home! A-Me, good! Good A-Me. Home. Home. Home.
+(@ID,3,0,(SELECT `Text` FROM `broadcast_text` WHERE `ID`=5157),12,0,100,0,0,0,5157,0,"A-Me 01"), -- Bad, $n. $n, bad!
+(@ID,3,1,(SELECT `Text` FROM `broadcast_text` WHERE `ID`=5158),12,0,100,0,0,0,5158,0,"A-Me 01"), -- $n, no hurt A-Me. A-Me, good.
+(@ID,3,2,(SELECT `Text` FROM `broadcast_text` WHERE `ID`=5159),12,0,100,0,0,0,5159,0,"A-Me 01"), -- Danger. Danger! $n try hurt A-Me.
+(@ID,3,3,(SELECT `Text` FROM `broadcast_text` WHERE `ID`=5160),12,0,100,0,0,0,5160,0,"A-Me 01"); -- A-Me, home. A-Me go home! $n, no stop A-Me.
+
+-- "ptBR", "A-Me boa. Boa, A-Me. Seguir... seguir A-Me. Casa. A-Me, minha casa."
+DELETE FROM `creature_text_locale` WHERE `CreatureID` = @ID AND `GroupID` = 0;
+INSERT INTO `creature_text_locale` (`CreatureID`,`GroupID`,`ID`,`Locale`,`Text`) VALUES
+(@ID,0,0,"deDE","A-Me gut. Gut, A-Me. Folgen... A-Me folgen. Heim. A-Me geht heim."), -- 5062
+(@ID,0,0,"esES","Memo bueno. Bueno, Memo. Seguir... seguir a Memo. Casa. Memo ir a casa."), -- 5062
+(@ID,0,0,"esMX","Memo bueno. Bueno, Memo. Seguir... seguir a Memo. Casa. Memo ir a casa."), -- 5062
+(@ID,0,0,"frFR","A-mi bonne. Bonne, A-mi. Suivre... Suivre A-mi. Maison. A-mi va maison."), -- 5062
+(@ID,0,0,"ruRU","Чи-Та хорошо. Все хорошо, Чи-Та. Идти… Идти за Чи-Та. Домой. Чи-Та идти домой."); -- 5062
+
+DELETE FROM `script_waypoint` WHERE `entry` = 9623;
+DELETE FROM `waypoints` WHERE `entry` = 9623;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(9623,1,-6383.07,-1964.37,-258.709,"A-Me 01"),
+(9623,2,-6393.65,-1949.57,-261.449,"A-Me 01"),
+(9623,3,-6397.85,-1931.1,-263.366,"A-Me 01"),
+(9623,4,-6397.5,-1921.47,-263.876,"A-Me 01"),
+(9623,5,-6389.63,-1910,-259.601,"A-Me 01"),
+(9623,6,-6380.07,-1905.45,-255.858,"A-Me 01"),
+(9623,7,-6373.44,-1900.28,-254.774,"A-Me 01"),
+(9623,8,-6372.87,-1893.5,-255.678,"A-Me 01"),
+(9623,9,-6379.73,-1877.63,-259.654,"A-Me 01"),
+(9623,10,-6380.26,-1871.14,-260.617,"A-Me 01"),
+(9623,11,-6373.83,-1855.62,-259.566,"A-Me 01"),
+(9623,12,-6368.82,-1847.77,-259.246,"A-Me 01"),
+(9623,13,-6370.9,-1835.04,-260.212,"A-Me 01"),
+(9623,14,-6376.59,-1821.59,-260.856,"A-Me 01"),
+(9623,15,-6381.93,-1810.43,-266.18,"A-Me 01"),
+(9623,16,-6396.71,-1807.12,-269.329,"A-Me 01"),
+(9623,17,-6400.27,-1795.05,-269.744,"A-Me 01"),
+(9623,18,-6402.68,-1747.51,-272.961,"A-Me 01"),
+(9623,19,-6397,-1710.05,-273.719,"A-Me 01"),
+(9623,20,-6388.11,-1676.33,-272.133,"A-Me 01"),
+(9623,21,-6370.71,-1638.64,-272.031,"A-Me 01"),
+(9623,22,-6366.71,-1592.65,-272.201,"A-Me 01"),
+(9623,23,-6333.87,-1534.6,-270.493,"A-Me 01"),
+(9623,24,-6305.36,-1477.91,-269.518,"A-Me 01"),
+(9623,25,-6311.59,-1419.02,-267.622,"A-Me 01"),
+(9623,26,-6330.01,-1400.06,-266.425,"A-Me 01"),
+(9623,27,-6356.02,-1392.61,-267.123,"A-Me 01"),
+(9623,28,-6370.86,-1386.18,-270.218,"A-Me 01"),
+(9623,29,-6381.53,-1369.78,-272.11,"A-Me 01"),
+(9623,30,-6405.38,-1321.52,-271.699,"A-Me 01"),
+(9623,31,-6406.58,-1307.57,-271.802,"A-Me 01"),
+(9623,32,-6386.33,-1286.85,-272.074,"A-Me 01"),
+(9623,33,-6364.25,-1264.71,-269.075,"A-Me 01"),
+(9623,34,-6343.64,-1239.84,-268.364,"A-Me 01"),
+(9623,35,-6335.57,-1202.45,-271.515,"A-Me 01"),
+(9623,36,-6325.62,-1184.46,-270.461,"A-Me 01"),
+(9623,37,-6317.8,-1177.67,-269.792,"A-Me 01"),
+(9623,38,-6303.02,-1180.25,-269.332,"A-Me 01"),
+(9623,39,-6301.98,-1184.79,-269.371,"A-Me 01"),
+(9623,40,-6297.58,-1186.41,-268.962,"A-Me 01");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_09_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_09_world.sql
new file mode 100644
index 00000000000..c9beaace5e3
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_09_world.sql
@@ -0,0 +1,2 @@
+--
+DELETE FROM `smart_scripts` WHERE `event_type`=36 AND `action_type`=48;
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_10_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_10_world.sql
new file mode 100644
index 00000000000..5003b3c0827
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_05_10_world.sql
@@ -0,0 +1,2 @@
+--
+DELETE FROM `gameobject_addon` WHERE `guid`=28367;
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_07_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_07_00_world.sql
new file mode 100644
index 00000000000..080e1421c97
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_07_00_world.sql
@@ -0,0 +1,12 @@
+ALTER TABLE `game_event_battleground_holiday`
+ CHANGE `eventEntry` `EventEntry` TINYINT(3) UNSIGNED NOT NULL COMMENT 'game_event EventEntry identifier',
+ CHANGE `bgflag` `BattlegroundID` INT(3) UNSIGNED DEFAULT 0 NOT NULL;
+
+TRUNCATE TABLE `game_event_battleground_holiday`;
+INSERT INTO `game_event_battleground_holiday` (`EventEntry`, `BattlegroundID`) VALUES
+(18, 1),
+(19, 2),
+(20, 3),
+(21, 7),
+(53, 9),
+(54, 30);
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_00_world.sql
new file mode 100644
index 00000000000..96240f33a57
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_00_world.sql
@@ -0,0 +1,4 @@
+-- Path and formation added but aren't used
+UPDATE `creature` SET `MovementType` = 2 WHERE `id` = 1437;
+-- Creatures will never use dist and angle without movement(these shouldn't move)
+UPDATE `creature_formations` SET `dist` = 0, `angle` = 0 WHERE `leaderGUID` IN (54579,138249,138252);
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_01_world.sql
new file mode 100644
index 00000000000..d35b7ed2801
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_01_world.sql
@@ -0,0 +1,4 @@
+--
+ALTER TABLE `spell_scripts` ADD COLUMN `Comment` varchar(255) NOT NULL DEFAULT '';
+ALTER TABLE `event_scripts` ADD COLUMN `Comment` varchar(255) NOT NULL DEFAULT '';
+ALTER TABLE `waypoint_scripts` ADD COLUMN `Comment` varchar(255) NOT NULL DEFAULT '';
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_02_world.sql
new file mode 100644
index 00000000000..f5b4879e786
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_02_world.sql
@@ -0,0 +1,30 @@
+-- Source: Sniffs & https://www.youtube.com/watch?v=F-oYzmB7-84
+UPDATE `creature_template` SET `ScriptName` = "" WHERE `entry` = 25862;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 4894 AND `source_type` = 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`,`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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(4894,2,0,1,46,0,100,0,4894,0,0,0,0,86,46231,0,19,25862,0,0,7,0,0,0,0,0,0,0,0,"Areatrigger (Borean Tundra) - On Trigger - Cross Cast 'Mammoth Calf Escort Credit' (Khu'nok the Behemoth)"),
+-- Will not work because is called instantly after spell cast with another emote
+(4894,2,1,2,61,0,100,0,0,0,0,0,0,5,377,0,0,0,0,0,19,25862,0,0,0,0,0,0,0,"Areatrigger (Borean Tundra) - On Link - Play Emote 377 (Khu'nok the Behemoth)"),
+(4894,2,2,0,61,0,100,0,0,0,0,0,0,4,9917,0,1,0,0,0,19,25862,0,0,0,0,0,0,0,"Areatrigger (Borean Tundra) - On Link - Play Sound 9917 (Khu'nok the Behemoth)");
+
+DELETE FROM `areatrigger_scripts` WHERE `entry` = 4894;
+INSERT INTO `areatrigger_scripts` (`entry`,`ScriptName`) VALUES
+(4894,"SmartTrigger");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 22 AND `SourceEntry` = 4894 AND `SourceId` = 2;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+-- We don't need to check if Calf is nearby https://www.wowhead.com/quest=11878/khunok-will-know#comments:id=1053786
+(22,1,4894,2,0,9,0,11878,0,0,0,0,0,"","Group 0: Execute SAI (Action 0) if player has taken quest 'Khu'nok Will Know'"),
+(22,1,4894,2,0,28,0,11878,0,0,1,0,0,"","Group 0: Execute SAI (Action 0) if quest 'Khu'nok Will Know' is not completed");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 13 AND `SourceEntry` = 46237;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,1,46237,0,0,31,0,3,25861,0,0,0,0,"","Group 0: Spell 'Dismiss Orphaned Mammoth' targets creature 'Orphaned Mammoth Calf'"),
+-- I don't know if it's needed
+(13,1,46237,0,0,33,0,1,3,0,0,0,0,"","Group 0: Spell 'Dismiss Orphaned Mammoth' targets creature 'Orphaned Mammoth Calf' if owned by spell caster");
+
+DELETE FROM `spell_scripts` WHERE `id` = 46237;
+INSERT INTO `spell_scripts` (`id`,`effIndex`,`delay`,`command`,`datalong`,`datalong2`,`dataint`,`x`,`y`,`z`,`o`,`Comment`) VALUES
+(46237,0,0,18,3000,0,0,0,0,0,0,"Dismiss Orphaned Mammoth - On Effect Hit (Dummy) - Despawn (3000) (Orphaned Mammoth Calf)"),
+-- Probably must be better syncronized by calling only when Calf despawns
+(46237,0,3,14,46233,1,0,0,0,0,0,"Dismiss Orphaned Mammoth - On Effect Hit (Dummy) - Remove Aura 'Call Mammoth Orphan'");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_03_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_03_world.sql
new file mode 100644
index 00000000000..d09d10235e4
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_03_world.sql
@@ -0,0 +1,35 @@
+--
+SET @ID := 5391;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID*100+0 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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ID*100+0,9,0,0,0,0,100,0,0,0,0,0,0,64,1,0,0,0,0,0,16,0,0,0,0,0,0,0,0,"Galen Goodward - On Script - Store Targetlist"),
+(@ID*100+0,9,1,0,0,0,100,0,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Galen Goodward - On Script - Set Event Phase 0"),
+(@ID*100+0,9,2,0,0,0,100,0,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Galen Goodward - On Script - Remove NPC Flag Questgiver"),
+(@ID*100+0,9,3,0,0,0,100,0,0,0,0,0,0,1,2,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Galen Goodward - On Script - Say Line 2"),
+(@ID*100+0,9,4,0,0,0,100,0,3000,3000,0,0,0,9,0,0,0,0,0,0,20,37118,0,0,0,0,0,0,0,"Galen Goodward - On Script - Activate Closest Gameobject 'Galen's Cage'"),
+(@ID*100+0,9,5,0,0,0,100,0,0,0,0,0,0,53,0,5391,0,0,0,2,1,0,0,0,0,0,0,0,0,"Galen Goodward - On Script - Start Waypoint"),
+(@ID*100+0,9,6,0,0,0,100,0,0,0,0,0,0,19,256,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Galen Goodward - On Script - Remove Flags Immune To Players"),
+(@ID*100+0,9,7,0,0,0,100,0,0,0,0,0,0,2,250,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Galen Goodward - On Script - Set Faction 250");
+
+SET @ID := 16295;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID*100+0 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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ID*100+0,9,0,0,0,0,100,0,0,0,0,0,0,64,1,0,0,0,0,0,16,0,0,0,0,0,0,0,0,"Ranger Lilatha - On Script - Store Targetlist"),
+(@ID*100+0,9,1,0,0,0,100,0,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Ranger Lilatha - On Script - Set Event Phase 0"),
+(@ID*100+0,9,2,0,0,0,100,0,0,0,0,0,0,83,3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Ranger Lilatha - On Script - Remove NPC Flags Gossip & Questgiver"),
+(@ID*100+0,9,3,0,0,0,100,0,2000,2000,0,0,0,91,8,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Ranger Lilatha - On Script - Remove Flag Standstate Kneel"),
+(@ID*100+0,9,4,0,0,0,100,0,0,0,0,0,0,9,0,0,0,0,0,0,20,181152,0,0,0,0,0,0,0,"Ranger Lilatha - On Script - Activate Closest Gameobject (Cage)"),
+(@ID*100+0,9,5,0,0,0,100,0,0,0,0,0,0,1,0,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Ranger Lilatha - On Script - Say Line 0"),
+(@ID*100+0,9,6,0,0,0,100,0,2000,2000,0,0,0,53,0,16295,0,0,0,2,1,0,0,0,0,0,0,0,0,"Ranger Lilatha - On Script - Start Waypoint"),
+(@ID*100+0,9,7,0,0,0,100,0,0,0,0,0,0,19,768,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Ranger Lilatha - On Script - Remove Flags Immune To Players & Immune To NPC's"),
+(@ID*100+0,9,8,0,0,0,100,0,0,0,0,0,0,2,1603,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Ranger Lilatha - On Script - Set Faction 1603");
+
+SET @ID := 17969;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID*100+0 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_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@ID*100+0,9,0,0,0,0,100,0,0,0,0,0,0,64,1,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Kayra Longmane - On Script - Store Targetlist"),
+(@ID*100+0,9,1,0,0,0,100,0,0,0,0,0,0,1,0,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Kayra Longmane - On Script - Say Line 0"),
+(@ID*100+0,9,2,0,0,0,100,0,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Kayra Longmane - On Script - Remove NPC Flag Questgiver"),
+(@ID*100+0,9,3,0,0,0,100,0,3000,3000,0,0,0,91,8,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Kayra Longmane - On Script - Remove Flag Standstate Kneel"),
+(@ID*100+0,9,4,0,0,0,100,0,0,0,0,0,0,53,0,17969,0,0,0,2,1,0,0,0,0,0,0,0,0,"Kayra Longmane - On Script - Start Waypoint"),
+(@ID*100+0,9,5,0,0,0,100,0,0,0,0,0,0,2,495,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Kayra Longmane - On Script - Set Faction 495");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_04_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_04_world.sql
new file mode 100644
index 00000000000..18d1c5bded2
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_04_world.sql
@@ -0,0 +1,3 @@
+--
+UPDATE `creature_summon_groups` SET `Comment` = "Ranger Lilatha - Group 0 - Shadowpine Oracle" WHERE `summonerId` = 16295 AND `entry` = 16343;
+UPDATE `creature_summon_groups` SET `Comment` = "Ranger Lilatha - Group 0 - Mummified Headhunter" WHERE `summonerId` = 16295 AND `entry` = 16342;
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_05_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_05_world.sql
new file mode 100644
index 00000000000..ae65b9565a4
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_05_world.sql
@@ -0,0 +1,11 @@
+--
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `spawntimesecs` = 180 AND `id` IN (25882,25885,25981,26007,26012,26075,26307,26309,26324,26325,26326,26327,26328,26329,26330,26331,26332,26426,26451,26483,26496,26521,26546,26547,26548,26606,26607,26724,26738,26739,26740,26741,26742,26743,26744,26745,26747,26748,26749,26751,26752,26753,26754,26755,26756,26757,26758,26759,26760,26765);
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `spawntimesecs` = 120 AND `id` IN (347,349,620,721,857,907,1231,1293,1379,1420,2302,2804,2914,3287,3300,3890,4049,4075,5118,5403,5406,5674,5890,5891,5951,6073,6115,6145,6271,6368,6491,7395,11697,11942,12197,12198,12341,12342,12343,12346,12349,12350,12372,12373,12374,12864,13321,14543,14544,14545,14546,14547,14548,14558,14822,14823,14827,14828,14829,14832,14833,14841,14844,14845,14846,14847,14849,14860,14864,14865,14866,14867,14868,14869,14871,14881,14942,14981,14982,14990,14991,15006,15007,15008,15102,15103,15105,15106,15186,15214,15218,15241,15303,15350,15351,15353,15724,15730,15732,15891,15892,15893,15894,15895,15897,15898,16030,16069,16183,16192,16196,16204,16221,16226,16232,16239,16240,16253,16291,16348,16349,16352,16354,16355,16358,16404,16405,16465,16466,16480,16499,16500,16503,16509,16541,16553,16592,16626,16632,16657,16693,16694,16695,16696,16705,16707,16709,16710,16724,16725,16726,16727,16728,16731,16733,16735,16736,16739,16743,16745,16746,16747,16751,16755,16756,16763,16765,16766,16771,16773,16774,16781,16817,16818,16852,16904,16906,16920,16977,17002,17004,17008,17039,17060,17062,17071,17101,17117,17120,17146,17147,17222,17242,17404,17405,17417,17418,17425,17436,17483,17485,17488,17510,17511,17530,17538,17600,7584,10360,10445,11156,17714,17773,17794,17795,17849,17929,17930,18034,18183,18204,18209,18230,18233,18237,18240,18348,18349,18350,18729,18733,18800,18815,18896,18915,18927,19028,19029,19032,19076,19163,19164,19169,19171,19443,19672,19673,19674,19677,19687,19698,19757,19760,19778,20114,20118,20119,20120,20158,20227,20269,20271,20272,20273,20274,20276,20339,20362,20374,20381,20382,20383,20384,20385,20386,20388,20390,20395,20604,20677,20678,20679,20847,20850,20872,21008,21173,21235,21292,21307,21347,21501,21699,21788,21795,21879,21971,22013,22015,22829,22831,22838,22839,22842,22843,22866,22934,23033,23040,23081,23101,23102,23106,23107,23108,23131,23143,23286,23291,23308,23311,23340,23342,23344,23345,23346,23348,23370,23376,23381,23427,23433,23437,23461,23462,23463,23464,23465,23466,23482,23488,23489,23507,23510,23511,23527,23528,23529,23530,23531,23537,23619,23623,23624,23625,23626,23699,23700,23702,23703,23706,23730,23740,23745,23746,23747,23749,23755,23766,23771,23784,23785,23808,23830,23837,23839,23840,23842,23845,23850,23852,23853,23854,23855,23888,24014,24018,24021,24029,24038,24042,24048,24050,24052,24053,24054,24055,24056,24057,24058,24066,24076,24109,24110,24174,24177,24186,24195,24209,24226,24228,24229,24250,24253,24254,24255,24270,24277,24282,24328,24364,24369,24370,24372,24373,24437,24439,24456,24484,24495,24501);
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `spawntimesecs` != 300 AND `id` IN (68,332,525,678,679,680,709,710,721,822,871,873,875,877,879,883,1095,1412,1976,2110,2330,2331,2635,2914,3504,4075,4076);
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `spawntimesecs` != 300 AND `id` IN (27666,27703,27705,27707,27711,27806,27810,27811,27812,27813,27814,27815,27816,27817,27818,27819,27820,28049,28050,28051,28052,28058,28060,28126,28329,28347,28355,28481,28486,28573,29093,29095,29141,29142,29143,29144,29145,29152,29154,29203,29205,29207,29208,29212,29239,29287,29288,29289,29290,29291,29292,29293,29294,29295,29296,29297,29298,29299,29300,29588,29589,29712,29865,29866,29868,29873,30217,30566,30567,30611,30627,30706,30709,30710,30711,30713,30715,30716,30717,30723,30724,30727,30729,30730,30731,30732,30733,30734,31144,32380,32381,32383,32405,32407,32542,32543,32545,32546,32666,32667,32832,32834,33068,33608,33609,33610,33611,33612,33613,33614,33615,33616,33617,33618,33619,33621,33623,33631,33633,33634,33635,33636,33637,33640,33641,33674,33675,33676,33677,33678,33680,33681,33682,33683,33684,33712,33713,33915,33916,33917,33918,33919,33920,33924,33928,33929,33930,33931,33932,33933,33934,33935,33939,33940,33941,33996,34038,34043,34063,34075,34078,34081,34088,34089,34090,34091,34093,34094,34158,34238,34281,34382,34383,34476,34477,34478,34479,34480,34481,34482,34483,34484,34526,34766,34948,34949,34950,34951,35068,35093,35100,35168,35169,35243,35244,35246,35247,35248,35250,35251,35252,35253,35258,35259,35260,35261,35281,35364,35365,35477,36208,36213,36217,36479,36481,36817,37512,37523,37543,37574,37707,37915,37964,37981,40184,40187,40204,40218,40222,40253,40256,40257,40301,40352,40356,40392,40405,40441,40607);
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `spawntimesecs` != 300 AND `id` IN (23233,23253,23256,23263,23268,23272,23280,23300,23310,23316,23334,23335,23347,23362,23363,23373,23392,23413,23428,23473,23724,23761,23830,23858,23948,23988,24393,24416,24436,24437,24545,24728,24851,24866,24881,24885,24905,24920,24921,24922,24925,24928,24936,24974,24980,24991,25034,25035,25036,25037,25045,25046,25063,25088,25108,25133,25134,25135,25136,25137,25138,25140,25141,25142,25143,25153,25155,25192,25195,25196,25200,25202,25207,25223,25225,25580,25931,25933,25953,25975,25991,25994,26113,26123);
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `spawntimesecs` != 300 AND `id` IN (6491,15351,19227,19169,20086,20431,21180,21505,21725,21727,21743,22014,22026,22097,22098,22101,22237,22266,22270,22271,22819,22823,22836,22922,22940,22995,23110,23112,23120,23560);
+
+-- Wrong spawns, summoned or spawns only after specific events
+DELETE FROM `creature` WHERE `id` IN (15241,17039);
+DELETE FROM `spawn_group` WHERE `spawnId` = 86010 AND `spawnType`=0;
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_06_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_06_world.sql
new file mode 100644
index 00000000000..cf9409f9cca
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_06_world.sql
@@ -0,0 +1,141 @@
+--
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (13358,13359,14390,14715,14733,14753,15641,16344,16403,17439,18113,18452,18457,19707,19779,20207,21650,21719,22331,23339,24082,24696,26295,26356,26434,26779,26801,26802,27117,27351,27560,27576,27588,27633,27844) AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(13358,0,0,0,0,0,100,0,0,0,2300,3900,0,11,22121,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Stormpike Bowman - In Combat CMC - Cast 'Shoot'"),
+
+(13359,0,0,0,0,0,100,0,0,0,2300,3900,0,11,22121,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Frostwolf Bowman - In Combat CMC - Cast 'Shoot'"),
+
+(14390,0,0,0,0,0,100,0,0,0,2300,3900,0,11,6660,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Expeditionary Mountaineer - In Combat CMC - Cast 'Shoot'"),
+
+(14715,0,0,0,0,0,100,0,0,0,2300,4800,0,11,15620,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Silverwing Elite - In Combat CMC - Cast 'Shoot'"),
+(14715,0,1,0,9,0,100,0,0,5,6100,15900,0,11,15496,0,0,0,0,0,2,0,0,0,0,0,0,0,0,"Silverwing Elite - Within 0-5 Range - Cast 'Cleave'"),
+(14715,0,2,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,0,"Silverwing Elite - Between 0-15% Health - Flee For Assist (No Repeat)"),
+
+(14733,0,0,0,0,0,100,0,0,0,2300,3900,0,11,15620,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Sentinel Farsong - In Combat CMC - Cast 'Shoot'"),
+(14733,0,1,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,0,"Sentinel Farsong - Between 0-15% Health - Flee For Assist (No Repeat)"),
+
+(14753,0,0,0,0,0,100,0,0,0,2300,3900,0,11,22907,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Illiyana Moonblaze - In Combat CMC - Cast 'Shoot'"),
+(14753,0,1,0,9,0,100,0,0,20,12000,15000,0,11,6533,1,0,0,0,0,2,0,0,0,0,0,0,0,0,"Illiyana Moonblaze - Within 0-20 Range - Cast 'Net'"),
+(14753,0,2,0,2,0,100,0,0,30,40000,40000,0,11,3019,1,0,0,0,0,1,0,0,0,0,0,0,0,0,"Illiyana Moonblaze - Between 0-30% Health - Cast 'Frenzy'"),
+(14753,0,3,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,0,"Illiyana Moonblaze - Between 0-15% Health - Flee For Assist (No Repeat)"),
+
+(15641,0,0,0,0,0,100,0,0,0,2300,3900,0,11,10277,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Amani Axe Thrower - In Combat CMC - Cast 'Throw'"),
+
+(16344,0,0,0,0,0,100,0,0,0,2300,3900,0,11,10277,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Shadowpine Headhunter - In Combat CMC - Cast 'Throw'"),
+(16344,0,1,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,0,"Shadowpine Headhunter - Between 0-15% Health - Flee For Assist (No Repeat)"),
+
+(16403,0,0,0,0,0,100,0,0,0,2300,3900,0,11,10277,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Withered Grimscale - In Combat CMC - Cast 'Throw'"),
+(16403,0,1,0,9,0,100,0,0,5,16000,28000,0,11,7901,32,0,0,0,0,5,0,0,0,0,0,0,0,0,"Withered Grimscale - Within 0-5 Range - Cast 'Decayed Agility'"),
+(16403,0,2,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,0,"Withered Grimscale - Between 0-15% Health - Flee For Assist (No Repeat)"),
+
+(17439,0,0,0,0,0,100,0,0,0,2300,3900,0,11,6660,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Stillpine Hunter - In Combat CMC - Cast 'Shoot'"),
+(17439,0,1,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,0,"Stillpine Hunter - Between 0-15% Health - Flee For Assist (No Repeat)"),
+
+(18113,0,0,0,1,0,100,1,1000,1000,0,0,0,11,32060,1,0,0,0,0,1,0,0,0,0,0,0,0,0,"Feralfen Hunter - Out of Combat - Cast 'Summon Sporebat' (No Repeat)"),
+(18113,0,1,0,0,0,100,0,0,0,2300,3900,0,11,6660,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Feralfen Hunter - In Combat CMC - Cast 'Shoot'"),
+(18113,0,2,0,0,0,100,0,4000,8000,18000,24000,0,11,31975,0,0,0,0,0,2,0,0,0,0,0,0,0,0,"Feralfen Hunter - In Combat - Cast 'Serpent Sting'"),
+(18113,0,3,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,0,"Feralfen Hunter - Between 0-15% Health - Flee For Assist (No Repeat)"),
+
+(18452,0,0,0,0,0,100,0,0,0,2300,3900,0,11,10277,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Skithian Dreadhawk - In Combat CMC - Cast 'Throw'"),
+(18452,0,1,0,0,0,100,0,5000,8000,14000,18000,0,11,32908,0,0,0,0,0,2,0,0,0,0,0,0,0,0,"Skithian Dreadhawk - In Combat - Cast 'Wing Clip'"),
+(18452,0,2,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,0,"Skithian Dreadhawk - Between 0-15% Health - Flee For Assist (No Repeat)"),
+
+(18457,0,0,0,0,0,100,0,0,0,2300,3900,0,11,6660,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Tuurem Hunter - In Combat CMC - Cast 'Shoot'"),
+(18457,0,1,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,0,"Tuurem Hunter - Between 0-15% Health - Flee For Assist (No Repeat)"),
+
+(19707,0,0,0,0,0,100,0,0,0,2300,3900,0,11,6660,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Sunfury Archer - In Combat CMC - Cast 'Shoot'"),
+(19707,0,1,0,9,0,100,0,10,40,9000,12000,0,11,37847,1,0,0,0,0,2,0,0,0,0,0,0,0,0,"Sunfury Archer - Within 10-40 Range - Cast 'Immolation Arrow'"),
+(19707,0,2,0,9,0,100,0,0,20,12000,15000,0,11,12024,1,0,0,0,0,2,0,0,0,0,0,0,0,0,"Sunfury Archer - Within 0-20 Range - Cast 'Net'"),
+(19707,0,3,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,0,"Sunfury Archer - Between 0-15% Health - Flee For Assist (No Repeat)"),
+
+(19779,0,0,0,0,0,100,0,0,0,2300,3900,0,11,36645,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Sunfury Geologist - In Combat CMC - Cast 'Throw Rock'"),
+(19779,0,1,0,9,0,100,0,0,5,5000,9000,0,11,35918,32,0,0,0,0,2,0,0,0,0,0,0,0,0,"Sunfury Geologist - Within 0-5 Range - Cast 'Puncture Armor'"),
+(19779,0,2,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,0,"Sunfury Geologist - Between 0-15% Health - Flee For Assist (No Repeat)"),
+
+(20207,0,0,0,1,0,100,0,5000,5000,10000,70000,0,11,33796,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Sunfury Bowman - Out of Combat - Cast 'Shoot Bow'"),
+(20207,0,1,0,0,0,100,0,0,0,2300,3900,0,11,6660,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Sunfury Bowman - In Combat CMC - Cast 'Shoot'"),
+(20207,0,2,0,9,0,100,0,10,40,7000,9000,0,11,37847,1,0,0,0,0,2,0,0,0,0,0,0,0,0,"Sunfury Bowman - Within 10-40 Range - Cast 'Immolation Arrow'"),
+(20207,0,3,0,9,0,100,0,0,20,12000,15000,0,11,12024,1,0,0,0,0,2,0,0,0,0,0,0,0,0,"Sunfury Bowman - Within 0-20 Range - Cast 'Net'"),
+(20207,0,4,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,0,"Sunfury Bowman - Between 0-15% Health - Flee For Assist (No Repeat)"),
+
+(21650,0,0,0,0,0,100,0,0,0,2300,3900,0,11,10277,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Skettis Talonite - In Combat CMC - Cast 'Throw'"),
+(21650,0,1,0,0,0,100,0,6000,10000,9000,14000,0,11,11428,1,0,0,0,0,2,0,0,0,0,0,0,0,0,"Skettis Talonite - In Combat - Cast 'Knockdown'"),
+
+(21719,0,0,0,0,0,100,0,0,0,2200,3800,0,11,6660,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Dragonmaw Drake-Rider - In Combat CMC - Cast 'Shoot'"),
+(21719,0,1,0,0,0,100,0,4000,6000,12000,16000,0,11,38859,32,0,0,0,0,5,0,0,0,0,0,0,0,0,"Dragonmaw Drake-Rider - In Combat - Cast 'Serpent Sting'"),
+(21719,0,2,0,6,0,100,0,0,0,0,0,0,11,38341,2,0,0,0,0,1,0,0,0,0,0,0,0,0,"Dragonmaw Drake-Rider - On Death - Cast 'Summon Enslaved Netherdrake'"),
+
+(22331,0,0,0,0,0,100,0,0,0,2300,3900,0,11,38858,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Dragonmaw Elite - In Combat CMC - Cast 'Shoot'"),
+(22331,0,1,0,0,0,100,0,6000,9000,12000,16000,0,11,38861,1,0,0,0,0,5,0,0,0,0,0,0,0,0,"Dragonmaw Elite - In Combat - Cast 'Aimed Shot'"),
+(22331,0,2,0,0,0,100,0,4000,6000,12000,16000,0,11,38859,32,0,0,0,0,5,0,0,0,0,0,0,0,0,"Dragonmaw Elite - In Combat - Cast 'Serpent Sting'"),
+(22331,0,3,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,0,"Dragonmaw Elite - Between 0-15% Health - Flee For Assist (No Repeat)"),
+
+(23339,0,0,0,0,0,100,0,0,0,3900,5900,0,11,41169,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Illidari Heartseeker - In Combat CMC - Cast 'Shoot'"),
+(23339,0,1,0,0,0,100,0,7000,11000,19000,25000,0,11,41173,1,0,0,0,0,1,0,0,0,0,0,0,0,0,"Illidari Heartseeker - In Combat - Cast 'Rapid Shot'"),
+(23339,0,2,0,0,0,100,0,45000,60000,60000,75000,0,11,41171,1,0,0,0,0,2,0,0,0,0,0,0,0,0,"Illidari Heartseeker - In Combat - Cast 'Skeleton Shot'"),
+(23339,0,3,0,2,0,100,1,0,50,0,0,0,11,41170,1,0,0,0,0,2,0,0,0,0,0,0,0,0,"Illidari Heartseeker - Between 0-50% Health - Cast 'Curse of the Bleakheart' (No Repeat)"),
+
+(24082,0,0,0,0,0,100,2,0,0,2300,5000,0,11,54983,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Proto-Drake Handler - In Combat CMC - Cast 'Throw' (Normal Dungeon)"),
+(24082,0,1,0,0,0,100,4,0,0,2300,5000,0,11,59696,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Proto-Drake Handler - In Combat CMC - Cast 'Throw' (Heroic Dungeon)"),
+(24082,0,2,0,0,0,100,2,2000,3000,8000,9500,0,11,38621,1,0,0,0,0,2,0,0,0,0,0,0,0,0,"Proto-Drake Handler - In Combat - Cast 'Debilitating Strike' (Normal Dungeon)"),
+(24082,0,3,0,0,0,100,4,2000,3000,8000,9500,0,11,59695,1,0,0,0,0,2,0,0,0,0,0,0,0,0,"Proto-Drake Handler - In Combat - Cast 'Debilitating Strike' (Heroic Dungeon)"),
+(24082,0,4,0,16,0,100,2,43664,100,15000,21000,0,11,43664,32,0,0,0,0,7,0,0,0,0,0,0,0,0,"Proto-Drake Handler - On Friendly Unit Missing Buff 'Unholy Rage' - Cast 'Unholy Rage' (Normal Dungeon)"),
+(24082,0,5,0,16,0,100,4,59694,100,15000,21000,0,11,59694,32,0,0,0,0,7,0,0,0,0,0,0,0,0,"Proto-Drake Handler - On Friendly Unit Missing Buff 'Unholy Rage' - Cast 'Unholy Rage' (Heroic Dungeon)"),
+
+(24696,0,0,0,0,0,100,2,0,0,2300,5000,0,11,35946,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Coilskar Witch - In Combat CMC - Cast 'Shoot' (Normal Dungeon)"),
+(24696,0,1,0,0,0,100,4,0,0,2300,5000,0,11,22907,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Coilskar Witch - In Combat CMC - Cast 'Shoot' (Heroic Dungeon)"),
+(24696,0,2,0,0,0,100,2,3700,7000,15000,20000,0,11,20299,0,0,0,0,0,5,0,0,0,0,0,0,0,0,"Coilskar Witch - In Combat - Cast 'Forked Lightning' (Normal Dungeon)"),
+(24696,0,3,0,0,0,100,4,3700,7000,15000,20000,0,11,46150,0,0,0,0,0,5,0,0,0,0,0,0,0,0,"Coilskar Witch - In Combat - Cast 'Forked Lightning' (Heroic Dungeon)"),
+(24696,0,4,0,2,0,100,2,0,50,70000,85000,0,11,17741,1,0,0,0,0,1,0,0,0,0,0,0,0,0,"Coilskar Witch - Between 0-50% Health - Cast 'Mana Shield' (Normal Dungeon)"),
+(24696,0,5,0,2,0,100,4,0,50,62000,70000,0,11,46151,1,0,0,0,0,1,0,0,0,0,0,0,0,0,"Coilskar Witch - Between 0-50% Health - Cast 'Mana Shield' (Heroic Dungeon)"),
+(24696,0,6,0,9,0,100,0,0,50,8000,15000,0,11,44639,1,0,0,0,0,2,0,0,0,0,0,0,0,0,"Coilskar Witch - Within 0-50 Range - Cast 'Frost Arrow'"),
+
+(26295,0,0,0,0,0,100,0,0,0,2300,3900,0,11,38556,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Magnataur Patriarch - In Combat CMC - Cast 'Throw'"),
+
+(26356,0,0,0,0,0,100,0,0,0,2300,3900,0,11,6660,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Redfang Hunter - In Combat CMC - Cast 'Shoot'"),
+(26356,0,1,0,9,0,100,0,0,20,11000,16000,0,11,12024,1,0,0,0,0,2,0,0,0,0,0,0,0,0,"Redfang Hunter - Within 0-20 Range - Cast 'Net'"),
+(26356,0,2,0,9,0,100,0,0,5,4000,7000,0,11,30639,0,0,0,0,0,2,0,0,0,0,0,0,0,0,"Redfang Hunter - Within 0-5 Range - Cast 'Carnivorous Bite'"),
+(26356,0,3,0,6,0,100,0,0,0,0,0,0,11,47034,39,0,0,0,0,2,0,0,0,0,0,0,0,0,"Redfang Hunter - On Death - Cast 'Frostpaw Ally'"),
+
+(26434,0,0,0,0,0,100,0,0,0,2300,3900,0,11,6660,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Frostpaw Trapper - In Combat CMC - Cast 'Shoot'"),
+(26434,0,1,0,0,0,100,0,9000,14000,9000,14000,0,11,30614,1,0,0,0,0,5,0,0,0,0,0,0,0,0,"Frostpaw Trapper - In Combat - Cast 'Aimed Shot'"),
+(26434,0,2,0,9,0,100,0,0,5,11000,15000,0,11,32908,1,0,0,0,0,2,0,0,0,0,0,0,0,0,"Frostpaw Trapper - Within 0-5 Range - Cast 'Wing Clip'"),
+(26434,0,3,0,6,0,100,0,0,0,0,0,0,11,47033,39,0,0,0,0,2,0,0,0,0,0,0,0,0,"Frostpaw Trapper - On Death - Cast 'Redfang Ally'"),
+
+(26779,0,0,0,0,0,100,0,0,0,2300,3900,0,11,15620,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"7th Legion Wyrm Hunter - In Combat CMC - Cast 'Shoot'"),
+
+(26801,0,0,0,4,0,100,0,0,0,0,0,0,28,47543,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Horde Ranger - On Aggro - Remove Aura 'Frozen Prison'"),
+(26801,0,1,0,0,0,100,2,0,0,2300,3800,0,11,15620,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Horde Ranger - In Combat CMC - Cast 'Shoot' (Normal Dungeon)"),
+(26801,0,2,0,0,0,100,4,0,0,2300,3800,0,11,22907,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Horde Ranger - In Combat CMC - Cast 'Shoot' (Heroic Dungeon)"),
+(26801,0,3,0,9,0,100,2,5,45,9500,10000,0,11,47777,1,0,0,0,0,2,0,0,0,0,0,0,0,0,"Horde Ranger - Within 5-45 Range - Cast 'Incendiary Shot' (Normal Dungeon)"),
+(26801,0,4,0,9,0,100,4,5,45,9500,10000,0,11,56933,1,0,0,0,0,2,0,0,0,0,0,0,0,0,"Horde Ranger - Within 5-45 Range - Cast 'Incendiary Shot' (Heroic Dungeon)"),
+(26801,0,5,0,0,0,100,0,12000,15000,16100,19000,0,11,48191,5,0,0,0,0,1,0,0,0,0,0,0,0,0,"Horde Ranger - In Combat - Cast 'Rapid Shot'"),
+
+(26802,0,0,0,4,0,100,0,0,0,0,0,0,28,47543,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Alliance Ranger - On Aggro - Remove Aura 'Frozen Prison'"),
+(26802,0,1,0,0,0,100,2,0,0,2300,3800,0,11,15620,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Alliance Ranger - In Combat CMC - Cast 'Shoot' (Normal Dungeon)"),
+(26802,0,2,0,0,0,100,4,0,0,2300,3800,0,11,22907,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Alliance Ranger - In Combat CMC - Cast 'Shoot' (Heroic Dungeon)"),
+(26802,0,3,0,9,0,100,2,5,45,9500,10000,0,11,47777,1,0,0,0,0,2,0,0,0,0,0,0,0,0,"Alliance Ranger - Within 5-45 Range - Cast 'Incendiary Shot' (Normal Dungeon)"),
+(26802,0,4,0,9,0,100,4,5,45,9500,10000,0,11,56933,1,0,0,0,0,2,0,0,0,0,0,0,0,0,"Alliance Ranger - Within 5-45 Range - Cast 'Incendiary Shot' (Heroic Dungeon)"),
+(26802,0,5,0,0,0,100,0,12000,15000,16100,19000,0,11,48191,5,0,0,0,0,1,0,0,0,0,0,0,0,0,"Alliance Ranger - In Combat - Cast 'Rapid Shot'"),
+
+(27117,0,0,0,0,0,100,0,0,0,2300,3900,0,11,15547,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Amberpine Scout - In Combat CMC - Cast 'Shoot'"),
+(27117,0,1,0,9,0,100,0,0,5,9000,12000,0,11,35918,33,0,0,0,0,2,0,0,0,0,0,0,0,0,"Amberpine Scout - Within 0-5 Range - Cast 'Puncture Armor'"),
+(27117,0,2,0,2,0,100,0,0,30,12000,20000,0,11,31567,1,0,0,0,0,1,0,0,0,0,0,0,0,0,"Amberpine Scout - Between 0-30% Health - Cast 'Deterrence'"),
+
+(27351,0,0,0,0,0,100,0,0,0,2300,3900,0,11,15547,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Argent Crusade Rifleman - In Combat CMC - Cast 'Shoot'"),
+
+(27560,0,0,0,0,0,100,0,0,0,2300,3900,0,11,6660,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Darkspear Spear Thrower - In Combat CMC - Cast 'Shoot'"),
+(27560,0,1,0,9,0,100,0,0,20,9000,14000,0,11,12024,1,0,0,0,0,2,0,0,0,0,0,0,0,0,"Darkspear Spear Thrower - Within 0-20 Range - Cast 'Net'"),
+
+(27576,0,0,0,0,0,100,0,0,0,2300,3900,0,11,15547,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Fordragon Sentinel - In Combat CMC - Cast 'Shoot'"),
+(27576,0,1,0,0,0,100,0,9000,16000,18000,24000,0,11,49481,1,0,0,0,0,5,0,0,0,0,0,0,0,0,"Fordragon Sentinel - In Combat - Cast 'Glaive Throw'"),
+
+(27588,0,0,0,0,0,100,0,0,0,2300,3900,0,11,50092,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"7th Legion Elite - In Combat CMC - Cast 'Shoot'"),
+(27588,0,1,0,9,0,100,0,0,20,9000,12000,0,11,62312,1,0,0,0,0,2,0,0,0,0,0,0,0,0,"7th Legion Elite - Within 0-20 Range - Cast 'Net'"),
+
+(27633,0,0,0,0,0,100,2,0,0,5000,7000,0,11,51454,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Azure Inquisitor - In Combat CMC - Cast 'Throw' (Normal Dungeon)"),
+(27633,0,1,0,0,0,100,4,0,0,5000,7000,0,11,59209,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Azure Inquisitor - In Combat CMC - Cast 'Throw' (Heroic Dungeon)"),
+(27633,0,2,0,0,0,100,0,4000,7000,9000,12000,0,11,50573,1,0,0,0,0,2,0,0,0,0,0,0,0,0,"Azure Inquisitor - In Combat - Cast 'Arcane Cleave'"),
+(27633,0,3,0,9,0,100,0,0,10,14000,20000,0,11,50690,1,0,0,0,0,1,0,0,0,0,0,0,0,0,"Azure Inquisitor - Within 0-10 Range - Cast 'Immobilizing Field'"),
+
+(27844,0,0,0,0,0,100,0,0,0,2300,3900,0,11,15620,64,0,0,0,0,2,0,0,0,0,0,0,0,0,"Legion Commander Tyralion - In Combat CMC - Cast 'Shoot'");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_07_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_07_world.sql
new file mode 100644
index 00000000000..c72665b5e30
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_07_world.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `smart_scripts` SET `action_param3` = 1 WHERE `event_type` IN (4, 6) AND `action_type` = 1 AND `target_type` = 7;
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_08_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_08_world.sql
new file mode 100644
index 00000000000..c207e053ac2
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_08_world.sql
@@ -0,0 +1,7 @@
+-- (Source: ACID & Wowhead)
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` IN (25200,25202,25207);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (25200,25202,25207) AND `source_type` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(25200,0,0,0,11,0,100,0,0,0,0,0,0,42,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Steven Thomas - On Respawn - Set Invincibility HP 1"),
+(25202,0,0,0,11,0,100,0,0,0,0,0,0,42,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Arcanist Myndimendez - On Respawn - Set Invincibility HP 1"),
+(25207,0,0,0,11,0,100,0,0,0,0,0,0,42,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Roitau - On Respawn - Set Invincibility HP 1");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_09_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_09_world.sql
new file mode 100644
index 00000000000..aee97f32fc6
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_09_world.sql
@@ -0,0 +1,34 @@
+-- First quests are not repeatable
+DELETE FROM `quest_template_addon` WHERE `ID` IN (7223,7224);
+
+-- Smith Regzar SAI (Source: https://www.youtube.com/watch?v=vwtWwBraRbE)
+SET @ID := 13176;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,20,0,100,0,6741,15000,15000,0,1,3,0,0,0,0,0,7,0,0,0,0,0,0,0,"Smith Regzar - On Quest 'More Booty!' Finished - Say Line 3"),
+(@ID,0,1,0,20,0,100,0,7224,15000,15000,0,1,3,0,0,0,0,0,7,0,0,0,0,0,0,0,"Smith Regzar - On Quest 'Enemy Booty' Finished - Say Line 3");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"Seasoned units are taking to the field!",14,1,100,0,0,0,8754,0,"Smith Regzar"),
+(@ID,1,0,"Our veterans are entering the field!",14,1,100,0,0,0,8755,0,"Smith Regzar"),
+(@ID,2,0,"Our champion units are equipped! Beware, alliance!",14,1,100,0,0,0,8756,0,"Smith Regzar"),
+(@ID,3,0,"Thank you for the armor scraps, $n!",12,1,100,0,0,0,8981,0,"Smith Regzar"),
+(@ID,3,1,"Our cache of equipment grows!",12,1,100,0,0,0,8982,0,"Smith Regzar");
+
+-- Murgot Deepforge SAI (Source: https://www.youtube.com/watch?v=vwtWwBraRbE)
+SET @ID := 13257;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,20,0,100,0,6781,15000,15000,0,1,3,0,0,0,0,0,7,0,0,0,0,0,0,0,"Murgot Deepforge - On Quest 'More Armor Scraps' Finished - Say Line 3"),
+(@ID,0,1,0,20,0,100,0,7223,15000,15000,0,1,3,0,0,0,0,0,7,0,0,0,0,0,0,0,"Murgot Deepforge - On Quest 'Armor Scraps' Finished - Say Line 3");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"Seasoned units are entering the battle!",14,7,100,0,0,0,8744,0,"Murgot Deepforge"),
+(@ID,1,0,"Veteran units are entering the battle!",14,7,100,0,0,0,8745,0,"Murgot Deepforge"),
+(@ID,2,0,"Champion units are entering the battle!",14,7,100,0,0,0,8746,0,"Murgot Deepforge"),
+(@ID,3,0,"Great! Let's keep those supplies coming, people!",12,7,100,0,0,0,8975,0,"Murgot Deepforge"),
+(@ID,3,1,"Thanks for the supplies, $n!",12,7,100,0,0,0,8976,0,"Murgot Deepforge");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_10_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_10_world.sql
new file mode 100644
index 00000000000..137d6db8588
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_10_world.sql
@@ -0,0 +1,89 @@
+-- Source: https://www.wowhead.com/item=17909/frostwolf-insignia-rank-6#comments:id=6412:reply=45710
+-- Still valid https://www.wowhead.com/item=17904/stormpike-insignia-rank-6#comments:id=200026:reply=664433
+DELETE FROM `gossip_menu_option` WHERE `MenuID` IN (5441,5442);
+INSERT INTO `gossip_menu_option` (`MenuID`,`OptionID`,`OptionIcon`,`OptionText`,`OptionBroadcastTextID`,`OptionType`,`OptionNpcFlag`,`ActionMenuID`,`ActionPoiID`,`BoxCoded`,`BoxMoney`,`BoxText`,`BoxBroadcastTextID`,`VerifiedBuild`) VALUES
+(5441,0,0,"Warmaster, I have lost my insignia. Could you supply me with a replacement?",9001,1,1,0,0,0,0,"",0,0),
+(5441,1,0,"Warmaster, I have lost my insignia. Could you supply me with a replacement?",9001,1,1,0,0,0,0,"",0,0),
+(5441,2,0,"Warmaster, I have lost my insignia. Could you supply me with a replacement?",9001,1,1,0,0,0,0,"",0,0),
+(5441,3,0,"Warmaster, I have lost my insignia. Could you supply me with a replacement?",9001,1,1,0,0,0,0,"",0,0),
+(5441,4,0,"Warmaster, I have lost my insignia. Could you supply me with a replacement?",9001,1,1,0,0,0,0,"",0,0),
+(5441,5,0,"Warmaster, I have lost my insignia. Could you supply me with a replacement?",9001,1,1,0,0,0,0,"",0,0),
+
+(5442,0,0,"Lieutenant, I have lost my insignia. Could you please supply me with a replacement?",9003,1,1,0,0,0,0,"",0,0),
+(5442,1,0,"Lieutenant, I have lost my insignia. Could you please supply me with a replacement?",9003,1,1,0,0,0,0,"",0,0),
+(5442,2,0,"Lieutenant, I have lost my insignia. Could you please supply me with a replacement?",9003,1,1,0,0,0,0,"",0,0),
+(5442,3,0,"Lieutenant, I have lost my insignia. Could you please supply me with a replacement?",9003,1,1,0,0,0,0,"",0,0),
+(5442,4,0,"Lieutenant, I have lost my insignia. Could you please supply me with a replacement?",9003,1,1,0,0,0,0,"",0,0),
+(5442,5,0,"Lieutenant, I have lost my insignia. Could you please supply me with a replacement?",9003,1,1,0,0,0,0,"",0,0);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 15 AND `SourceGroup` IN (5441,5442);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,5441,0,0,0,8,0,7161,0,0,0,0,0,"","Group 0: Show Gossip Option 0 if quest 'Proving Grounds' is rewarded"),
+(15,5441,1,0,0,8,0,7163,0,0,0,0,0,"","Group 0: Show Gossip Option 1 if quest 'Rise and Be Recognized' is rewarded"),
+(15,5441,2,0,0,8,0,7164,0,0,0,0,0,"","Group 0: Show Gossip Option 2 if quest 'Honored Amongst the Clan' is rewarded"),
+(15,5441,3,0,0,8,0,7165,0,0,0,0,0,"","Group 0: Show Gossip Option 3 if quest 'Earned Reverence' is rewarded"),
+(15,5441,4,0,0,8,0,7166,0,0,0,0,0,"","Group 0: Show Gossip Option 4 if quest 'Legendary Heroes' is rewarded"),
+(15,5441,5,0,0,8,0,7167,0,0,0,0,0,"","Group 0: Show Gossip Option 5 if quest 'The Eye of Command' is rewarded"),
+
+(15,5441,0,0,0,8,0,7163,0,0,1,0,0,"","Group 0: Show Gossip Option 0 if quest 'Rise and Be Recognized' is not rewarded"),
+(15,5441,1,0,0,8,0,7164,0,0,1,0,0,"","Group 0: Show Gossip Option 1 if quest 'Honored Amongst the Clan' is not rewarded"),
+(15,5441,2,0,0,8,0,7165,0,0,1,0,0,"","Group 0: Show Gossip Option 2 if quest 'Earned Reverence' is not rewarded"),
+(15,5441,3,0,0,8,0,7166,0,0,1,0,0,"","Group 0: Show Gossip Option 3 if quest 'Legendary Heroes' is not rewarded"),
+(15,5441,4,0,0,8,0,7167,0,0,1,0,0,"","Group 0: Show Gossip Option 4 if quest 'The Eye of Command' is not rewarded"),
+
+(15,5441,0,0,0,2,0,17690,1,1,1,0,0,"","Group 0: Show Gossip Option 0 if player does not have item 'Frostwolf Insignia Rank 1'"),
+(15,5441,1,0,0,2,0,17905,1,1,1,0,0,"","Group 0: Show Gossip Option 1 if player does not have item 'Frostwolf Insignia Rank 2'"),
+(15,5441,2,0,0,2,0,17906,1,1,1,0,0,"","Group 0: Show Gossip Option 2 if player does not have item 'Frostwolf Insignia Rank 3'"),
+(15,5441,3,0,0,2,0,17907,1,1,1,0,0,"","Group 0: Show Gossip Option 3 if player does not have item 'Frostwolf Insignia Rank 4'"),
+(15,5441,4,0,0,2,0,17908,1,1,1,0,0,"","Group 0: Show Gossip Option 4 if player does not have item 'Frostwolf Insignia Rank 5'"),
+(15,5441,5,0,0,2,0,17909,1,1,1,0,0,"","Group 0: Show Gossip Option 5 if player does not have item 'Frostwolf Insignia Rank 6'"),
+
+(15,5442,0,0,0,8,0,7162,0,0,0,0,0,"","Group 0: Show Gossip Option 0 if quest 'Proving Grounds' is rewarded"),
+(15,5442,1,0,0,8,0,7168,0,0,0,0,0,"","Group 0: Show Gossip Option 1 if quest 'Rise and Be Recognized' is rewarded"),
+(15,5442,2,0,0,8,0,7169,0,0,0,0,0,"","Group 0: Show Gossip Option 2 if quest 'Honored Amongst the Guard' is rewarded"),
+(15,5442,3,0,0,8,0,7170,0,0,0,0,0,"","Group 0: Show Gossip Option 3 if quest 'Earned Reverence' is rewarded"),
+(15,5442,4,0,0,8,0,7171,0,0,0,0,0,"","Group 0: Show Gossip Option 4 if quest 'Legendary Heroes' is rewarded"),
+(15,5442,5,0,0,8,0,7172,0,0,0,0,0,"","Group 0: Show Gossip Option 5 if quest 'The Eye of Command' is rewarded"),
+
+(15,5442,0,0,0,8,0,7168,0,0,1,0,0,"","Group 0: Show Gossip Option 0 if quest 'Rise and Be Recognized' is not rewarded"),
+(15,5442,1,0,0,8,0,7169,0,0,1,0,0,"","Group 0: Show Gossip Option 1 if quest 'Honored Amongst the Guard' is not rewarded"),
+(15,5442,2,0,0,8,0,7170,0,0,1,0,0,"","Group 0: Show Gossip Option 2 if quest 'Earned Reverence' is not rewarded"),
+(15,5442,3,0,0,8,0,7171,0,0,1,0,0,"","Group 0: Show Gossip Option 3 if quest 'Legendary Heroes' is not rewarded"),
+(15,5442,4,0,0,8,0,7172,0,0,1,0,0,"","Group 0: Show Gossip Option 4 if quest 'The Eye of Command' is not rewarded"),
+
+(15,5442,0,0,0,2,0,17691,1,1,1,0,0,"","Group 0: Show Gossip Option 0 if player does not have item 'Stormpike Insignia Rank 1'"),
+(15,5442,1,0,0,2,0,17900,1,1,1,0,0,"","Group 0: Show Gossip Option 1 if player does not have item 'Stormpike Insignia Rank 2'"),
+(15,5442,2,0,0,2,0,17901,1,1,1,0,0,"","Group 0: Show Gossip Option 2 if player does not have item 'Stormpike Insignia Rank 3'"),
+(15,5442,3,0,0,2,0,17902,1,1,1,0,0,"","Group 0: Show Gossip Option 3 if player does not have item 'Stormpike Insignia Rank 4'"),
+(15,5442,4,0,0,2,0,17903,1,1,1,0,0,"","Group 0: Show Gossip Option 4 if player does not have item 'Stormpike Insignia Rank 5'"),
+(15,5442,5,0,0,2,0,17904,1,1,1,0,0,"","Group 0: Show Gossip Option 5 if player does not have item 'Stormpike Insignia Rank 6'");
+
+-- Warmaster Laggrond SAI
+SET @ID := 13840;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,0,0,100,0,6200,12100,9800,13400,11,15284,0,0,0,0,0,2,0,0,0,0,0,0,0,"Warmaster Laggrond - In Combat - Cast 'Cleave'"),
+(@ID,0,1,0,0,0,100,0,8400,14600,9800,15100,11,16856,0,0,0,0,0,2,0,0,0,0,0,0,0,"Warmaster Laggrond - In Combat - Cast 'Mortal Strike'"),
+(@ID,0,2,8,62,0,100,0,5441,0,0,0,11,22108,0,0,0,0,0,7,0,0,0,0,0,0,0,"Warmaster Laggrond - On Gossip Option 0 Selected - Cast 'Conjure Frostwolf Rank 1 Insignia'"),
+(@ID,0,3,8,62,0,100,0,5441,1,0,0,11,22109,0,0,0,0,0,7,0,0,0,0,0,0,0,"Warmaster Laggrond - On Gossip Option 1 Selected - Cast 'Conjure Frostwolf Rank 2 Insignia'"),
+(@ID,0,4,8,62,0,100,0,5441,2,0,0,11,22110,0,0,0,0,0,7,0,0,0,0,0,0,0,"Warmaster Laggrond - On Gossip Option 2 Selected - Cast 'Conjure Frostwolf Rank 3 Insignia'"),
+(@ID,0,5,8,62,0,100,0,5441,3,0,0,11,22111,0,0,0,0,0,7,0,0,0,0,0,0,0,"Warmaster Laggrond - On Gossip Option 3 Selected - Cast 'Conjure Frostwolf Rank 4 Insignia'"),
+(@ID,0,6,8,62,0,100,0,5441,4,0,0,11,22112,0,0,0,0,0,7,0,0,0,0,0,0,0,"Warmaster Laggrond - On Gossip Option 4 Selected - Cast 'Conjure Frostwolf Rank 5 Insignia'"),
+(@ID,0,7,8,62,0,100,0,5441,5,0,0,11,22113,0,0,0,0,0,7,0,0,0,0,0,0,0,"Warmaster Laggrond - On Gossip Option 5 Selected - Cast 'Conjure Frostwolf Rank 6 Insignia'"),
+(@ID,0,8,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Warmaster Laggrond - On Link - Close Gossip");
+
+-- Lieutenant Haggerdin SAI
+SET @ID := 13841;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+(@ID,0,0,0,0,0,100,0,1200,6300,10200,15500,11,12169,0,0,0,0,0,1,0,0,0,0,0,0,0,"Lieutenant Haggerdin - In Combat - Cast 'Shield Block'"),
+(@ID,0,1,0,0,0,100,0,5300,9800,13200,18600,11,19130,0,0,0,0,0,2,0,0,0,0,0,0,0,"Lieutenant Haggerdin - In Combat - Cast 'Revenge'"),
+(@ID,0,2,8,62,0,100,0,5442,0,0,0,11,22114,0,0,0,0,0,7,0,0,0,0,0,0,0,"Lieutenant Haggerdin - On Gossip Option 0 Selected - Cast 'Conjure Stormpike Rank 1 Insignia'"),
+(@ID,0,3,8,62,0,100,0,5442,1,0,0,11,22115,0,0,0,0,0,7,0,0,0,0,0,0,0,"Lieutenant Haggerdin - On Gossip Option 1 Selected - Cast 'Conjure Stormpike Rank 2 Insignia'"),
+(@ID,0,4,8,62,0,100,0,5442,2,0,0,11,22116,0,0,0,0,0,7,0,0,0,0,0,0,0,"Lieutenant Haggerdin - On Gossip Option 2 Selected - Cast 'Conjure Stormpike Rank 3 Insignia'"),
+(@ID,0,5,8,62,0,100,0,5442,3,0,0,11,22117,0,0,0,0,0,7,0,0,0,0,0,0,0,"Lieutenant Haggerdin - On Gossip Option 3 Selected - Cast 'Conjure Stormpike Rank 4 Insignia'"),
+(@ID,0,6,8,62,0,100,0,5442,4,0,0,11,22118,0,0,0,0,0,7,0,0,0,0,0,0,0,"Lieutenant Haggerdin - On Gossip Option 4 Selected - Cast 'Conjure Stormpike Rank 5 Insignia'"),
+(@ID,0,7,8,62,0,100,0,5442,5,0,0,11,22119,0,0,0,0,0,7,0,0,0,0,0,0,0,"Lieutenant Haggerdin - On Gossip Option 5 Selected - Cast 'Conjure Stormpike Rank 6 Insignia'"),
+(@ID,0,8,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Lieutenant Haggerdin - On Link - Close Gossip");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_11_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_11_world.sql
new file mode 100644
index 00000000000..cf57044294b
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_11_world.sql
@@ -0,0 +1,117 @@
+-- All three quests can be shown at once, we don't have to add such conditions to check if player has ring
+-- https://youtu.be/7ag6xbC_Yrk?t=771
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 19 AND `SourceEntry` BETWEEN 8764 AND 8766;
+
+-- Source: https://www.wowhead.com/quest=8752/the-path-of-the-conqueror#comments:id=1160265
+-- I don't know if valid for 8.x.x
+DELETE FROM `gossip_menu_option` WHERE `MenuID` = 6539 AND `OptionID` BETWEEN 1 AND 15;
+INSERT INTO `gossip_menu_option` (`MenuID`,`OptionID`,`OptionIcon`,`OptionText`,`OptionBroadcastTextID`,`OptionType`,`OptionNpcFlag`,`ActionMenuID`,`ActionPoiID`,`BoxCoded`,`BoxMoney`,`BoxText`,`BoxBroadcastTextID`,`VerifiedBuild`) VALUES
+(6539,1,0,"Anachronos, I have lost the signet ring. Could you supply me with a replacement?",11348,1,1,0,0,0,0,"",0,0),
+(6539,2,0,"Anachronos, I have lost the signet ring. Could you supply me with a replacement?",11348,1,1,0,0,0,0,"",0,0),
+(6539,3,0,"Anachronos, I have lost the signet ring. Could you supply me with a replacement?",11348,1,1,0,0,0,0,"",0,0),
+(6539,4,0,"Anachronos, I have lost the signet ring. Could you supply me with a replacement?",11348,1,1,0,0,0,0,"",0,0),
+(6539,5,0,"Anachronos, I have lost the signet ring. Could you supply me with a replacement?",11348,1,1,0,0,0,0,"",0,0),
+(6539,6,0,"Anachronos, I have lost the signet ring. Could you supply me with a replacement?",11348,1,1,0,0,0,0,"",0,0),
+(6539,7,0,"Anachronos, I have lost the signet ring. Could you supply me with a replacement?",11348,1,1,0,0,0,0,"",0,0),
+(6539,8,0,"Anachronos, I have lost the signet ring. Could you supply me with a replacement?",11348,1,1,0,0,0,0,"",0,0),
+(6539,9,0,"Anachronos, I have lost the signet ring. Could you supply me with a replacement?",11348,1,1,0,0,0,0,"",0,0),
+(6539,10,0,"Anachronos, I have lost the signet ring. Could you supply me with a replacement?",11348,1,1,0,0,0,0,"",0,0),
+(6539,11,0,"Anachronos, I have lost the signet ring. Could you supply me with a replacement?",11348,1,1,0,0,0,0,"",0,0),
+(6539,12,0,"Anachronos, I have lost the signet ring. Could you supply me with a replacement?",11348,1,1,0,0,0,0,"",0,0),
+(6539,13,0,"Anachronos, I have lost the signet ring. Could you supply me with a replacement?",11348,1,1,0,0,0,0,"",0,0),
+(6539,14,0,"Anachronos, I have lost the signet ring. Could you supply me with a replacement?",11348,1,1,0,0,0,0,"",0,0),
+(6539,15,0,"Anachronos, I have lost the signet ring. Could you supply me with a replacement?",11348,1,1,0,0,0,0,"",0,0);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 15 AND `SourceGroup` = 6539 AND `SourceEntry` BETWEEN 1 AND 15;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,6539,1,0,0,5,0,910,8,0,0,0,0,"","Group 0: Show Gossip Option 1 if player is Neutral with Brood of Nozdormu"),
+(15,6539,2,0,0,5,0,910,16,0,0,0,0,"","Group 0: Show Gossip Option 2 if player is Friendly with Brood of Nozdormu"),
+(15,6539,3,0,0,5,0,910,32,0,0,0,0,"","Group 0: Show Gossip Option 3 if player is Honored with Brood of Nozdormu"),
+(15,6539,4,0,0,5,0,910,64,0,0,0,0,"","Group 0: Show Gossip Option 4 if player is Revered with Brood of Nozdormu"),
+(15,6539,5,0,0,5,0,910,128,0,0,0,0,"","Group 0: Show Gossip Option 5 if player is Exalted with Brood of Nozdormu"),
+
+(15,6539,6,0,0,5,0,910,8,0,0,0,0,"","Group 0: Show Gossip Option 6 if player is Neutral with Brood of Nozdormu"),
+(15,6539,7,0,0,5,0,910,16,0,0,0,0,"","Group 0: Show Gossip Option 7 if player is Friendly with Brood of Nozdormu"),
+(15,6539,8,0,0,5,0,910,32,0,0,0,0,"","Group 0: Show Gossip Option 8 if player is Honored with Brood of Nozdormu"),
+(15,6539,9,0,0,5,0,910,64,0,0,0,0,"","Group 0: Show Gossip Option 9 if player is Revered with Brood of Nozdormu"),
+(15,6539,10,0,0,5,0,910,128,0,0,0,0,"","Group 0: Show Gossip Option 10 if player is Exalted with Brood of Nozdormu"),
+
+(15,6539,11,0,0,5,0,910,8,0,0,0,0,"","Group 0: Show Gossip Option 11 if player is Neutral with Brood of Nozdormu"),
+(15,6539,12,0,0,5,0,910,16,0,0,0,0,"","Group 0: Show Gossip Option 12 if player is Friendly with Brood of Nozdormu"),
+(15,6539,13,0,0,5,0,910,32,0,0,0,0,"","Group 0: Show Gossip Option 13 if player is Honored with Brood of Nozdormu"),
+(15,6539,14,0,0,5,0,910,64,0,0,0,0,"","Group 0: Show Gossip Option 14 if player is Revered with Brood of Nozdormu"),
+(15,6539,15,0,0,5,0,910,128,0,0,0,0,"","Group 0: Show Gossip Option 15 if player is Exalted with Brood of Nozdormu"),
+
+(15,6539,1,0,0,2,0,21196,1,1,1,0,0,"","Group 0: Show Gossip Option 1 if player does not have item 'Signet Ring of the Bronze Dragonflight'"),
+(15,6539,2,0,0,2,0,21197,1,1,1,0,0,"","Group 0: Show Gossip Option 2 if player does not have item 'Signet Ring of the Bronze Dragonflight'"),
+(15,6539,3,0,0,2,0,21198,1,1,1,0,0,"","Group 0: Show Gossip Option 3 if player does not have item 'Signet Ring of the Bronze Dragonflight'"),
+(15,6539,4,0,0,2,0,21199,1,1,1,0,0,"","Group 0: Show Gossip Option 4 if player does not have item 'Signet Ring of the Bronze Dragonflight'"),
+(15,6539,5,0,0,2,0,21200,1,1,1,0,0,"","Group 0: Show Gossip Option 5 if player does not have item 'Signet Ring of the Bronze Dragonflight'"),
+(15,6539,5,0,0,2,0,21205,1,1,1,0,0,"","Group 0: Show Gossip Option 5 if player does not have item 'Signet Ring of the Bronze Dragonflight'"),
+(15,6539,5,0,0,2,0,21210,1,1,1,0,0,"","Group 0: Show Gossip Option 5 if player does not have item 'Signet Ring of the Bronze Dragonflight'"),
+
+(15,6539,6,0,0,2,0,21201,1,1,1,0,0,"","Group 0: Show Gossip Option 6 if player does not have item 'Signet Ring of the Bronze Dragonflight'"),
+(15,6539,7,0,0,2,0,21202,1,1,1,0,0,"","Group 0: Show Gossip Option 7 if player does not have item 'Signet Ring of the Bronze Dragonflight'"),
+(15,6539,8,0,0,2,0,21203,1,1,1,0,0,"","Group 0: Show Gossip Option 8 if player does not have item 'Signet Ring of the Bronze Dragonflight'"),
+(15,6539,9,0,0,2,0,21204,1,1,1,0,0,"","Group 0: Show Gossip Option 9 if player does not have item 'Signet Ring of the Bronze Dragonflight'"),
+(15,6539,10,0,0,2,0,21205,1,1,1,0,0,"","Group 0: Show Gossip Option 10 if player does not have item 'Signet Ring of the Bronze Dragonflight'"),
+(15,6539,10,0,0,2,0,21200,1,1,1,0,0,"","Group 0: Show Gossip Option 10 if player does not have item 'Signet Ring of the Bronze Dragonflight'"),
+(15,6539,10,0,0,2,0,21210,1,1,1,0,0,"","Group 0: Show Gossip Option 10 if player does not have item 'Signet Ring of the Bronze Dragonflight'"),
+
+(15,6539,11,0,0,2,0,21206,1,1,1,0,0,"","Group 0: Show Gossip Option 11 if player does not have item 'Signet Ring of the Bronze Dragonflight'"),
+(15,6539,12,0,0,2,0,21207,1,1,1,0,0,"","Group 0: Show Gossip Option 12 if player does not have item 'Signet Ring of the Bronze Dragonflight'"),
+(15,6539,13,0,0,2,0,21208,1,1,1,0,0,"","Group 0: Show Gossip Option 13 if player does not have item 'Signet Ring of the Bronze Dragonflight'"),
+(15,6539,14,0,0,2,0,21209,1,1,1,0,0,"","Group 0: Show Gossip Option 14 if player does not have item 'Signet Ring of the Bronze Dragonflight'"),
+(15,6539,15,0,0,2,0,21210,1,1,1,0,0,"","Group 0: Show Gossip Option 15 if player does not have item 'Signet Ring of the Bronze Dragonflight'"),
+(15,6539,15,0,0,2,0,21200,1,1,1,0,0,"","Group 0: Show Gossip Option 15 if player does not have item 'Signet Ring of the Bronze Dragonflight'"),
+(15,6539,15,0,0,2,0,21205,1,1,1,0,0,"","Group 0: Show Gossip Option 15 if player does not have item 'Signet Ring of the Bronze Dragonflight'"),
+
+(15,6539,1,0,0,8,0,8747,0,0,0,0,0,"","Group 0: Show Gossip Option 1 if quest 'The Path of the Protector' is rewarded"),
+(15,6539,2,0,0,8,0,8748,0,0,0,0,0,"","Group 0: Show Gossip Option 2 if quest 'The Path of the Protector' is rewarded"),
+(15,6539,3,0,0,8,0,8749,0,0,0,0,0,"","Group 0: Show Gossip Option 3 if quest 'The Path of the Protector' is rewarded"),
+(15,6539,4,0,0,8,0,8750,0,0,0,0,0,"","Group 0: Show Gossip Option 4 if quest 'The Path of the Protector' is rewarded"),
+(15,6539,5,0,0,8,0,8751,0,0,0,0,0,"","Group 0: Show Gossip Option 5 if quest 'The Protector of Kalimdor' is rewarded"),
+
+(15,6539,6,0,0,8,0,8752,0,0,0,0,0,"","Group 0: Show Gossip Option 6 if quest 'The Path of the Conqueror' is rewarded"),
+(15,6539,7,0,0,8,0,8753,0,0,0,0,0,"","Group 0: Show Gossip Option 7 if quest 'The Path of the Conqueror' is rewarded"),
+(15,6539,8,0,0,8,0,8754,0,0,0,0,0,"","Group 0: Show Gossip Option 8 if quest 'The Path of the Conqueror' is rewarded"),
+(15,6539,9,0,0,8,0,8755,0,0,0,0,0,"","Group 0: Show Gossip Option 9 if quest 'The Path of the Conqueror' is rewarded"),
+(15,6539,10,0,0,8,0,8756,0,0,0,0,0,"","Group 0: Show Gossip Option 10 if quest 'The Qiraji Conqueror' is rewarded"),
+
+(15,6539,11,0,0,8,0,8757,0,0,0,0,0,"","Group 0: Show Gossip Option 11 if quest 'The Path of the Invoker' is rewarded"),
+(15,6539,12,0,0,8,0,8758,0,0,0,0,0,"","Group 0: Show Gossip Option 12 if quest 'The Path of the Invoker' is rewarded"),
+(15,6539,13,0,0,8,0,8759,0,0,0,0,0,"","Group 0: Show Gossip Option 13 if quest 'The Path of the Invoker' is rewarded"),
+(15,6539,14,0,0,8,0,8760,0,0,0,0,0,"","Group 0: Show Gossip Option 14 if quest 'The Path of the Invoker' is rewarded"),
+(15,6539,15,0,0,8,0,8761,0,0,0,0,0,"","Group 0: Show Gossip Option 15 if quest 'The Grand Invoker' is rewarded");
+
+SET @ID := 15192;
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID 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
+-- Source: https://www.youtube.com/watch?v=0ExXIlU4EYM
+(@ID,0,0,1,2,0,100,1,0,20,0,0,41,3000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Anachronos - Between 0-20% Health - Despawn (3000) (No Repeat)"),
+(@ID,0,1,2,61,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Anachronos - On Link - Say Line 0"),
+(@ID,0,2,0,61,0,100,0,0,0,0,0,8,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Anachronos - On Link - Set Reactstate Passive"),
+-- Source: https://youtu.be/7ag6xbC_Yrk?t=771
+(@ID,0,3,19,62,0,100,0,6539,0,0,0,11,25861,0,0,0,0,0,7,0,0,0,0,0,0,0,"Anachronos - On Gossip Option 0 Selected - Cast 'Call Scepter'"),
+
+(@ID,0,4,19,62,0,100,0,6539,1,0,0,11,25932,0,0,0,0,0,7,0,0,0,0,0,0,0,"Anachronos - On Gossip Option 1 Selected - Cast 'Signet Ring of the Bronze Dragonflight TANK R1'"),
+(@ID,0,5,19,62,0,100,0,6539,2,0,0,11,25933,0,0,0,0,0,7,0,0,0,0,0,0,0,"Anachronos - On Gossip Option 2 Selected - Cast 'Signet Ring of the Bronze Dragonflight TANK R2'"),
+(@ID,0,6,19,62,0,100,0,6539,3,0,0,11,25934,0,0,0,0,0,7,0,0,0,0,0,0,0,"Anachronos - On Gossip Option 3 Selected - Cast 'Signet Ring of the Bronze Dragonflight TANK R3'"),
+(@ID,0,7,19,62,0,100,0,6539,4,0,0,11,25935,0,0,0,0,0,7,0,0,0,0,0,0,0,"Anachronos - On Gossip Option 4 Selected - Cast 'Signet Ring of the Bronze Dragonflight TANK R4'"),
+(@ID,0,8,19,62,0,100,0,6539,5,0,0,11,25936,0,0,0,0,0,7,0,0,0,0,0,0,0,"Anachronos - On Gossip Option 5 Selected - Cast 'Signet Ring of the Bronze Dragonflight TANK R5'"),
+(@ID,0,9,19,62,0,100,0,6539,6,0,0,11,25927,0,0,0,0,0,7,0,0,0,0,0,0,0,"Anachronos - On Gossip Option 6 Selected - Cast 'Signet Ring of the Bronze Dragonflight DPS R1'"),
+(@ID,0,10,19,62,0,100,0,6539,7,0,0,11,25928,0,0,0,0,0,7,0,0,0,0,0,0,0,"Anachronos - On Gossip Option 7 Selected - Cast 'Signet Ring of the Bronze Dragonflight DPS R2'"),
+(@ID,0,11,19,62,0,100,0,6539,8,0,0,11,25929,0,0,0,0,0,7,0,0,0,0,0,0,0,"Anachronos - On Gossip Option 8 Selected - Cast 'Signet Ring of the Bronze Dragonflight DPS R3'"),
+(@ID,0,12,19,62,0,100,0,6539,9,0,0,11,25930,0,0,0,0,0,7,0,0,0,0,0,0,0,"Anachronos - On Gossip Option 9 Selected - Cast 'Signet Ring of the Bronze Dragonflight DPS R4'"),
+(@ID,0,13,19,62,0,100,0,6539,10,0,0,11,25931,0,0,0,0,0,7,0,0,0,0,0,0,0,"Anachronos - On Gossip Option 10 Selected - Cast 'Signet Ring of the Bronze Dragonflight DPS R5'"),
+(@ID,0,14,19,62,0,100,0,6539,11,0,0,11,25921,0,0,0,0,0,7,0,0,0,0,0,0,0,"Anachronos - On Gossip Option 11 Selected - Cast 'Signet Ring of the Bronze Dragonflight CASTER R1'"),
+(@ID,0,15,19,62,0,100,0,6539,12,0,0,11,25922,0,0,0,0,0,7,0,0,0,0,0,0,0,"Anachronos - On Gossip Option 12 Selected - Cast 'Signet Ring of the Bronze Dragonflight CASTER R2'"),
+(@ID,0,16,19,62,0,100,0,6539,13,0,0,11,25923,0,0,0,0,0,7,0,0,0,0,0,0,0,"Anachronos - On Gossip Option 13 Selected - Cast 'Signet Ring of the Bronze Dragonflight CASTER R3'"),
+(@ID,0,17,19,62,0,100,0,6539,14,0,0,11,25924,0,0,0,0,0,7,0,0,0,0,0,0,0,"Anachronos - On Gossip Option 14 Selected - Cast 'Signet Ring of the Bronze Dragonflight CASTER R4'"),
+(@ID,0,18,19,62,0,100,0,6539,15,0,0,11,25925,0,0,0,0,0,7,0,0,0,0,0,0,0,"Anachronos - On Gossip Option 15 Selected - Cast 'Signet Ring of the Bronze Dragonflight CASTER R5'"),
+(@ID,0,19,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Anachronos - On Link - Close Gossip");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = @ID;
+INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES
+(@ID,0,0,"A terrible and costly mistake you have made. It is not my time, mortals.",12,0,100,0,0,0,10658,0,"Anachronos");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_12_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_12_world.sql
new file mode 100644
index 00000000000..9c414c7e189
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_12_world.sql
@@ -0,0 +1,18 @@
+--
+UPDATE `creature_text` SET `Text` = "I SAID GOOD DAY!", `BroadcastTextId` = 11060 WHERE `CreatureID` = 15481 AND `GroupID` = 0 AND `ID` = 0;
+-- Someone forgot to add BroadcastTextId? No difference between current text and broadcast text & locales
+UPDATE `creature_text` SET `BroadcastTextId` = 29523 WHERE `CreatureID` = 27692 AND `GroupID` = 10 AND `ID` = 0;
+UPDATE `creature_text` SET `BroadcastTextId` = 29523 WHERE `CreatureID` = 27755 AND `GroupID` = 10 AND `ID` = 0;
+UPDATE `creature_text` SET `BroadcastTextId` = 29523 WHERE `CreatureID` = 27756 AND `GroupID` = 10 AND `ID` = 0;
+
+UPDATE `creature_text` SET `Text` = "Oh yes. Immensely. The pain will probably render you unconscious - hence the vat of slime you're floating in!", `BroadcastTextId` = 29647 WHERE `CreatureID` = 29112 AND `GroupID` = 2 AND `ID` = 0;
+-- The text is slightly different https://youtu.be/hGtfsKWCmoE?t=333
+UPDATE `creature_text` SET `Text` = "We will triumph. It is only a matter... of time.", `BroadcastTextId` = 16830 WHERE `CreatureID` = 17881 AND `GroupID` = 4 AND `ID` = 0;
+
+UPDATE `creature_text` SET `Text` = "No more meddling for you!", `BroadcastTextId` = 16662 WHERE `CreatureID` = 17848 AND `GroupID` = 2 AND `ID` = 0;
+UPDATE `creature_text` SET `Text` = "Go ahead and take forty winks.", `BroadcastTextId` = 15131 WHERE `CreatureID` = 17546 AND `GroupID` = 2 AND `ID` = 0;
+-- Why not used? Because of ,,, istead of ...?
+UPDATE `creature_text` SET `Text` = "I'm so tired. We really shouldn't have stayed up so late last night,,, well this morning. But it was fun! You do throw the best soirees milord.", `BroadcastTextId` = 11994 WHERE `CreatureID` = 16147 AND `GroupID` = 0 AND `ID` = 4;
+
+UPDATE `creature_text` SET `Text` = "All of your efforts have been in vain, for the draining of the World Tree has already begun! Soon the heart of your world will beat no more!", `BroadcastTextId` = 20432 WHERE `CreatureID` = 13083 AND `GroupID` = 0 AND `ID` = 0;
+UPDATE `creature_text` SET `Text` = "Anu'dorini Talah. Ru shallora enudoril.", `BroadcastTextId` = 7416 WHERE `CreatureID` = 12152 AND `GroupID` = 20 AND `ID` = 0;
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_13_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_13_world.sql
new file mode 100644
index 00000000000..639b812971e
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_13_world.sql
@@ -0,0 +1,20 @@
+-- Warug
+DELETE FROM `creature_text` WHERE `CreatureID`=5398;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(5398,0,0,"Hah! Let us see the wooden human wave!",12,0,100,0,0,0,2045,0,"Warug"),
+(5398,1,0,"%s laughs.",16,0,100,0,0,0,2047,0,"Warug"),
+(5398,2,0,"Hahah! That was funny! Funny wooden human!",12,0,100,0,0,0,2046,0,"Warug");
+
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=5398;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=5398 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=539800 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
+(5398,0,0,0,20,0,100,0,1371,0,0,0,80,539800,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warug - On Quest 'Gizmo for Warug' Finished - Run Script"),
+(539800,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,"Warug - On Script - Remove Npc Flag Questgiver"),
+(539800,9,1,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warug - On Script - Say Line 0"),
+(539800,9,2,0,0,0,100,0,3000,3000,0,0,12,5723,3,10000,0,0,0,8,0,0,0,-1589.69,864.716,112.684,0.829376,"Warug - On Script - Summon Creature 'Warug's Target Dummy'"),
+(539800,9,3,0,0,0,100,0,2000,2000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warug - On Script - Say Line 1"),
+(539800,9,4,0,0,0,100,0,4000,4000,0,0,5,35,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warug - On Script - Play Emote 'Attack Unarmed'"),
+(539800,9,5,0,0,0,100,0,1000,1000,0,0,51,0,0,0,0,0,0,19,5723,0,0,0,0,0,0,"Warug - On Script - Kill Creature 'Warug's Target Dummy'"),
+(539800,9,6,0,0,0,100,0,2500,2500,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warug - On Script - Say Line 2"),
+(539800,9,7,0,0,0,100,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warug - On Script - Add Npc Flag Questgiver");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_14_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_14_world.sql
new file mode 100644
index 00000000000..c3ca2104f31
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_14_world.sql
@@ -0,0 +1,70 @@
+-- Antonio Perelli
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=844;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=844 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (84400,84401,84402) 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_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(844,0,0,0,34,0,100,0,2,45,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Antonio Perelli - On Reached Point 46 - Say Line 0"),
+(844,0,1,0,34,0,100,0,2,59,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Antonio Perelli - On Reached Point 60 - Say Line 1"),
+(844,0,2,0,34,0,100,0,2,130,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Antonio Perelli - On Reached Point 131 - Say Line 2"),
+(844,0,3,0,34,0,100,0,2,147,0,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Antonio Perelli - On Reached Point 148 - Say Line 3"),
+(844,0,4,0,34,0,100,0,2,148,0,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Antonio Perelli - On Reached Point 149 - Say Line 4"),
+(844,0,5,0,34,0,100,0,2,173,0,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Antonio Perelli - On Reached Point 174 - Say Line 5"),
+(844,0,6,0,34,0,100,0,2,173,0,0,0,1,6,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Antonio Perelli - On Reached Point 174 - Say Line 6"),
+(844,0,7,0,34,0,100,0,2,250,0,0,0,1,7,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Antonio Perelli - On Reached Point 251 - Say Line 7"),
+(844,0,8,0,34,0,100,0,2,251,0,0,0,1,8,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Antonio Perelli - On Reached Point 252 - Say Line 8"),
+(844,0,9,0,34,0,100,0,2,287,0,0,0,1,9,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Antonio Perelli - On Reached Point 288 - Say Line 9"),
+(844,0,10,0,34,0,100,0,2,322,0,0,0,80,84400,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Antonio Perelli - On Reached Point 323 - Run Script"),
+(844,0,11,0,34,0,100,0,2,341,0,0,0,80,84401,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Antonio Perelli - On Reached Point 342 - Run Script"),
+(844,0,12,0,34,0,100,0,2,6,0,0,0,80,84402,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Antonio Perelli - On Reached Point 7 - Run Script"),
+(844,0,13,0,34,0,100,0,2,79,0,0,0,1,16,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Antonio Perelli - On Reached Point 80 - Say Line 16"),
+(844,0,14,0,34,0,100,0,2,204,0,0,0,1,16,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Antonio Perelli - On Reached Point 205 - Say Line 16"),
+(844,0,15,0,34,0,100,0,2,296,0,0,0,1,16,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Antonio Perelli - On Reached Point 297 - Say Line 16"),
+(844,0,16,0,25,0,100,0,0,0,0,0,0,48,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Antonio Perelli - On Reset - Set Active On"),
+(84400,9,0,0,0,0,100,0,0,0,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,"Antonio Perelli - On Script - Set Orientation"),
+(84400,9,1,0,0,0,100,0,500,500,0,0,0,1,10,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Antonio Perelli - On Script - Say Line 10"),
+(84400,9,2,0,0,0,100,0,5000,5000,0,0,0,1,0,0,0,0,0,0,19,777,0,0,0,0,0,0,0,"Antonio Perelli - On Script - Say Line 0 (Amy Davenport)"),
+(84400,9,3,0,0,0,100,0,5000,5000,0,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,0,3.10625,"Antonio Perelli - On Script - Set Orientation"),
+(84400,9,4,0,0,0,100,0,500,500,0,0,0,1,11,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Antonio Perelli - On Script - Say Line 11"),
+(84401,9,0,0,0,0,100,0,0,0,0,0,0,1,12,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Antonio Perelli - On Script - Say Line 12"),
+(84401,9,1,0,0,0,100,0,4000,4000,0,0,0,1,1,0,0,0,0,0,19,777,0,0,0,0,0,0,0,"Antonio Perelli - On Script - Say Line 1 (Amy Davenport)"),
+(84402,9,0,0,0,0,100,0,0,0,0,0,0,1,13,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Antonio Perelli - On Script - Say Line 13"),
+(84402,9,1,0,0,0,100,0,6000,6000,0,0,0,1,0,0,0,0,0,0,19,1423,0,0,0,0,0,0,0,"Antonio Perelli - On Script - Say Line 0 (Stormwind Guard)"),
+(84402,9,2,0,0,0,100,0,5000,5000,0,0,0,1,14,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Antonio Perelli - On Script - Say Line 14"),
+(84402,9,3,0,0,0,100,0,4000,4000,0,0,0,1,1,0,0,0,0,0,19,1423,0,0,0,0,0,0,0,"Antonio Perelli - On Script - Say Line 1 (Stormwind Guard)"),
+(84402,9,4,0,0,0,100,0,2000,2000,0,0,0,1,15,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Antonio Perelli - On Script - Say Line 15");
+
+DELETE FROM `creature_text` WHERE `CreatureID` IN (844,777,1423);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(844,0,0,"Wares for sale! Wares for sale! Come browse Antonio's wares before I must take my leave, citizens of Goldshire.",12,7,100,22,0,0,721,0,"Antonio Perelli"),
+(844,0,1,"Come one, come all! Antonio's wares are for sale. I may not return for a great deal of time, so come one, come all.",12,7,100,22,0,0,722,0,"Antonio Perelli"),
+(844,0,2,"Good people of Goldshire, come take advantage of my incredible prices on rare goods. I shall not return for some time!",12,7,100,22,0,0,723,0,"Antonio Perelli"),
+(844,1,0,"Good bye, Goldshire. I'll be back soon enough-- perhaps a week's time.",12,7,100,3,0,0,724,0,"Antonio Perelli"),
+(844,2,0,"Known throughout the lands, Antonio Perelli's goods now for sale near Sentinel Hill! I must move on soon, so make haste.",12,7,100,22,0,0,726,0,"Antonio Perelli"),
+(844,2,1,"Long-lasting, well-crafted items for sale near the Hill! Come one, come all! Time is short, so make haste.",12,7,100,22,0,0,727,0,"Antonio Perelli"),
+(844,2,2,"The time has come for me to once again make my wares available to all who travel near Sentinel Hill! Come one, come all!",12,7,100,22,0,0,728,0,"Antonio Perelli"),
+(844,3,0,"Thank you, all. I shall return again in about a week.",12,7,100,3,0,0,729,0,"Antonio Perelli"),
+(844,4,0,"Off to Darkshire then, I suppose.",12,7,100,0,0,0,730,0,"Antonio Perelli"),
+(844,5,0,"%s lets out a deep sigh.",16,0,100,0,0,0,683,0,"Antonio Perelli"),
+(844,6,0,"I hate this part of my job. Oh Duskwood, be gentle with poor Antonio.",12,7,100,0,0,0,684,0,"Antonio Perelli"),
+(844,7,0,"Travelers and adventurers make haste to the town circle and take advantage of Antonio's wonderful prices! Come one, come all!",12,7,100,22,0,0,688,0,"Antonio Perelli"),
+(844,7,1,"Well met, travelers of Duskwood! My incredible wares are on sale for a short time in Darkshire. Make haste!",12,7,100,22,0,0,689,0,"Antonio Perelli"),
+(844,7,2,"Leave your battles or errands, and browse my incredible wares! Only in Darkshire for a short time... praise the Light for that.",12,7,100,22,0,0,690,0,"Antonio Perelli"),
+(844,8,0,"Farewell, citizens of Darkshire. Until next time...",12,7,100,3,0,0,691,0,"Antonio Perelli"),
+(844,9,0,"Finally, Redridge. A pleasant change from the dark, cold fog of Duskwood.",12,7,100,0,0,0,692,0,"Antonio Perelli"),
+(844,10,0,"Hello, hello, Amy. It's good to be back in Lakeshire and to see you, milady.",12,7,100,3,0,0,702,0,"Antonio Perelli"),
+(844,11,0,"I've finally reached Lakeshire-- come one, come all, and take advantage of Antonio Perelli's wonderful deals.",12,7,100,22,0,0,712,0,"Antonio Perelli"),
+(844,11,1,"Items powerful enough to help make the journey through Duskwood, Antonio Perelli's goods are now for sale here in Lakeshire.",12,7,100,22,0,0,713,0,"Antonio Perelli"),
+(844,11,2,"Hear ye, hear ye! I'll pause to sell my wares for only a short time here in Lakeshire. Come to the town hall with haste!",12,7,100,22,0,0,704,0,"Antonio Perelli"),
+(844,12,0,"Good to see you again, Amy. Be safe, luv. I'm off to Goldshire now.",12,7,100,0,0,0,714,0,"Antonio Perelli"),
+(844,13,0,"Hello, my friends. It is good to see you again. Still keeping our borders free I see. Antonio appreciates your hard work.",12,7,100,3,0,0,716,0,"Antonio Perelli"),
+(844,14,0,"You're very welcome! I must be on my way... be safe, all of you.",12,7,100,1,0,0,717,0,"Antonio Perelli"),
+(844,15,0,"Oh, I will, my friend. I will indeed. You, too, be safe.",12,7,100,0,0,0,720,0,"Antonio Perelli"),
+(844,16,0,"Items of antiquity, weapons of war, armor or rarity. Who knows what Antonio will be carrying this week if you do not come look.",12,7,100,22,0,0,685,0,"Antonio Perelli"),
+(844,16,1,"This week it could be eye of newt, or perhaps a treasure map. You'll never know unless you look. What could Antonio have?",12,7,100,22,0,0,686,0,"Antonio Perelli"),
+(844,16,2,"Adventurers from all over sell things to Antonio-- come look for yourselves what little treasures he has for you this week.",12,7,100,22,0,0,687,0,"Antonio Perelli"),
+(777,0,0,"Hello, Antonio. It's good to see you safely made it here again. Let me know if you need anything.",12,7,100,1,0,0,703,0,"Amy Davenport"),
+(777,1,0,"Take care of yourself, Antonio. I'll see you in another week.",12,7,100,3,0,0,715,0,"Amy Davenport"),
+(1423,0,0,"Hello again, Antonio. Thank you again for the hat for my wife. She adored it.",12,7,100,0,0,0,718,0,"Stormwind Guard"),
+(1423,1,0,"Be safe, Antonio.",12,7,100,0,0,0,719,0,"Stormwind Guard");
+
+UPDATE `waypoint_data` SET `delay`=15000 WHERE `id`=811810 AND `point`=7;
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_15_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_15_world.sql
new file mode 100644
index 00000000000..d4a7364e4b9
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_15_world.sql
@@ -0,0 +1,334 @@
+-- Quest "You Survived!"
+UPDATE `quest_offer_reward` SET `Emote1`=2, `Emote2`=1 WHERE `ID`=9279;
+
+-- Quest "Replenishing the Healing Crystals"
+DELETE FROM `quest_details` WHERE `ID`=9280;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9280,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6, `EmoteOnIncomplete`=6 WHERE `ID`=9280;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=9280;
+
+-- Quest "Urgent Delivery!"
+DELETE FROM `quest_details` WHERE `ID`=9409;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9409,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6, `EmoteOnIncomplete`=6 WHERE `ID`=9409;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=9409;
+
+-- Quest "Rescue the Survivors!"
+DELETE FROM `quest_details` WHERE `ID`=9283;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9283,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=4 WHERE `ID`=9283;
+
+-- Quest "Botanist Taerix"
+DELETE FROM `quest_details` WHERE `ID`=9371;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9371,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=9371;
+
+-- Quest "Volatile Mutations"
+DELETE FROM `quest_details` WHERE `ID`=10302;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(10302,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1 WHERE `ID`=10302;
+
+-- Quest "What Must Be Done..."
+DELETE FROM `quest_details` WHERE `ID`=9293;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9293,6,1,18,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=1, `EmoteOnIncomplete`=1 WHERE `ID`=9293;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=9293;
+
+-- Quest "Botanical Legwork"
+DELETE FROM `quest_details` WHERE `ID`=9799;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9799,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6, `EmoteOnIncomplete`=6 WHERE `ID`=9799;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=9799;
+
+-- Quest "Spare Parts"
+DELETE FROM `quest_details` WHERE `ID`=9305;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9305,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=1, `EmoteOnIncomplete`=1 WHERE `ID`=9305;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=9305;
+
+-- Quest "Inoculation"
+DELETE FROM `quest_details` WHERE `ID`=9303;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9303,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=1, `EmoteOnIncomplete`=1 WHERE `ID`=9303;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=9303;
+
+-- Quest "The Missing Scout"
+DELETE FROM `quest_details` WHERE `ID`=9309;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9309,1,0,0,0,0,0,0,0,0);
+
+-- Quest "Healing the Lake"
+DELETE FROM `quest_details` WHERE `ID`=9294;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9294,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=4 WHERE `ID`=9294;
+
+-- Quest "Vindicator Aldar"
+DELETE FROM `quest_details` WHERE `ID`=10304;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(10304,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=6 WHERE `ID`=10304;
+
+-- Quest "Blood Elf Spy"
+UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1 WHERE `ID`=9311;
+
+-- Quest "Blood Elf Plans"
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6, `EmoteOnIncomplete`=6 WHERE `ID`=9798;
+
+-- Quest "The Emitter"
+DELETE FROM `quest_details` WHERE `ID`=9312;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9312,1,6,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=5 WHERE `ID`=9312;
+
+-- Quest "Travel to Azure Watch"
+DELETE FROM `quest_details` WHERE `ID`=9313;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9313,1,1,2,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1, `Emote3`=2 WHERE `ID`=9313;
+
+-- Quest "Red Snapper - Very Tasty!"
+DELETE FROM `quest_details` WHERE `ID`=9452;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9452,5,6,1,25,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=1, `EmoteOnIncomplete`=1 WHERE `ID`=9452;
+UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1 WHERE `ID`=9452;
+
+-- Quest "Find Acteon!"
+DELETE FROM `quest_details` WHERE `ID`=9453;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9453,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnComplete`=6, `EmoteOnIncomplete`=6 WHERE `ID`=9453;
+UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1, `Emote3`=1 WHERE `ID`=9453;
+
+-- Quest "Shaman Training"
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=9421;
+
+-- Quest "Call of Earth (Part 1)"
+DELETE FROM `quest_details` WHERE `ID`=9449;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9449,1,0,0,0,0,0,0,0,0);
+
+-- Quest "Call of Earth (Part 3)"
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=9451;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=9451;
+
+-- Quest "Warrior Training"
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=9289;
+
+-- Quest "Strength of One"
+DELETE FROM `quest_details` WHERE `ID`=9582;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9582,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=9582;
+UPDATE `quest_offer_reward` SET `Emote1`=273 WHERE `ID`=9582;
+
+-- Quest "Behomat"
+DELETE FROM `quest_details` WHERE `ID`=10350;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(10350,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=10350;
+
+-- Quest "Paladin Training"
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=9287;
+
+-- Quest "Jol"
+DELETE FROM `quest_details` WHERE `ID`=10366;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(10366,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=10366;
+
+-- Quest "Redemption"
+DELETE FROM `quest_details` WHERE `ID`=9598;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9598,2,1,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=1 WHERE `ID`=9598;
+
+-- Quest "Redemption (Part 2)"
+DELETE FROM `quest_details` WHERE `ID`=9600;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9600,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=274, `Emote2`=1 WHERE `ID`=9600;
+
+-- Quest "Hunter Training"
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=9288;
+
+-- Quest "Seek Huntress Kella Nightbow"
+DELETE FROM `quest_details` WHERE `ID`=9757;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9757,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=5 WHERE `ID`=9757;
+
+-- Quest "Taming the Beast"
+DELETE FROM `quest_details` WHERE `ID`=9591;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9591,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=9591;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=9591;
+
+-- Quest "Taming the Beast (Part 2)"
+DELETE FROM `quest_details` WHERE `ID`=9592;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9592,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1, `EmoteOnComplete`=1 WHERE `ID`=9592;
+UPDATE `quest_offer_reward` SET `Emote1`=6 WHERE `ID`=9592;
+
+-- Quest "Taming the Beast (Part 3)"
+DELETE FROM `quest_details` WHERE `ID`=9593;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9593,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1, `EmoteOnComplete`=1 WHERE `ID`=9593;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=9593;
+
+-- Quest "Beast Training"
+DELETE FROM `quest_details` WHERE `ID`=9675;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9675,1,0,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=9675;
+
+-- Quest "Mage Training"
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=9290;
+
+-- Quest "Control"
+DELETE FROM `quest_details` WHERE `ID`=9595;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9595,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=9595;
+
+-- Quest "The Great Moongraze Hunt"
+DELETE FROM `quest_details` WHERE `ID`=9454;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9454,1,1,1,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1, `EmoteOnComplete`=1 WHERE `ID`=9454;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=9454;
+
+-- Quest "The Great Moongraze Hunt (Part 2)"
+DELETE FROM `quest_details` WHERE `ID`=10324;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(10324,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1, `EmoteOnComplete`=1 WHERE `ID`=10324;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=10324;
+
+-- Quest "Learning the Language"
+DELETE FROM `quest_details` WHERE `ID`=9538;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9538,5,1,1,5,0,0,0,0,0);
+
+-- Quest "The Missing Fisherman"
+DELETE FROM `quest_details` WHERE `ID`=10428;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(10428,1,6,0,0,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=10428;
+
+-- Quest "All That Remains"
+DELETE FROM `quest_details` WHERE `ID`=9527;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9527,1,1,1,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1, `EmoteOnComplete`=1 WHERE `ID`=9527;
+
+-- Quest "Medicinal Purpose"
+DELETE FROM `quest_details` WHERE `ID`=9463;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9463,1,1,1,1,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1, `EmoteOnComplete`=1 WHERE `ID`=9463;
+UPDATE `quest_offer_reward` SET `Emote1`=5 WHERE `ID`=9463;
+
+-- Quest "An Alternative Alternative"
+DELETE FROM `quest_details` WHERE `ID`=9473;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9473,1,1,1,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1, `EmoteOnComplete`=1 WHERE `ID`=9473;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=9473;
+
+-- Quest "The Prophecy of Velen"
+DELETE FROM `quest_details` WHERE `ID`=9505;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9505,1,1,1,0,0,0,0,0,0);
+
+-- Quest "Word from Azure Watch"
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=9314;
+
+-- Quest "Strange Findings"
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=9455;
+UPDATE `quest_offer_reward` SET `Emote1`=6 WHERE `ID`=9455;
+
+-- Quest "Bandits!"
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=9616;
+UPDATE `quest_offer_reward` SET `Emote1`=5 WHERE `ID`=9616;
+
+-- Quest "Nightstalker Clean Up, Isle 2..."
+DELETE FROM `quest_details` WHERE `ID`=9456;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9456,1,1,1,25,0,0,0,0,0);
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=9456;
+
+-- Quest "A Small Start"
+DELETE FROM `quest_details` WHERE `ID`=9506;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9506,1,1,1,6,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=9506;
+UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1, `Emote3`=1 WHERE `ID`=9506;
+
+-- Quest "Cookie's Jumbo Gumbo"
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1, `EmoteOnComplete`=1 WHERE `ID`=9512;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=9512;
+
+-- Quest "Reclaiming the Ruins"
+UPDATE `quest_offer_reward` SET `Emote1`=4 WHERE `ID`=9513;
+
+-- Quest "Rune Covered Tablet"
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=9514;
+UPDATE `quest_offer_reward` SET `Emote1`=1 WHERE `ID`=9514;
+
+-- Quest "Warlord Sriss'tiz"
+UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1 WHERE `ID`=9515;
+
+-- Quest "I've Got a Plant"
+DELETE FROM `quest_details` WHERE `ID`=9530;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9530,1,1,1,1,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1, `EmoteOnComplete`=1 WHERE `ID`=9530;
+UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1 WHERE `ID`=9530;
+
+-- Quest "Precious and Fragile Things Need Special Handling"
+DELETE FROM `quest_details` WHERE `ID`=9523;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9523,6,6,1,5,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=25, `EmoteOnComplete`=25 WHERE `ID`=9523;
+UPDATE `quest_offer_reward` SET `Emote1`=4, `Emote2`=1, `Emote3`=1, `Emote4`=273 WHERE `ID`=9523;
+
+-- Quest "Tree's Company"
+DELETE FROM `quest_details` WHERE `ID`=9531;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9531,1,1,1,1,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=1, `EmoteOnComplete`=1 WHERE `ID`=9531;
+UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=5 WHERE `ID`=9531;
+
+-- Quest "Show Gnomercy"
+DELETE FROM `quest_details` WHERE `ID`=9537;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9537,5,1,1,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=9537;
+UPDATE `quest_offer_reward` SET `Emote1`=5, `Emote2`=5, `Emote3`=1 WHERE `ID`=9537;
+
+-- Quest "Deliver Them From Evil..."
+DELETE FROM `quest_details` WHERE `ID`=9602;
+INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES
+(9602,1,1,0,0,0,0,0,0,0);
+UPDATE `quest_request_items` SET `EmoteOnIncomplete`=5, `EmoteOnComplete`=5 WHERE `ID`=9602;
+UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1 WHERE `ID`=9602;
+
+-- Quest "The Prophecy of Akida"
+UPDATE `quest_offer_reward` SET `Emote1`=1, `Emote2`=1 WHERE `ID`=9544;
+
+-- Quest "Warn Your People"
+UPDATE `quest_offer_reward` SET `Emote1`=6, `Emote2`=1, `Emote3`=1 WHERE `ID`=9622;
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_16_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_16_world.sql
new file mode 100644
index 00000000000..b1ba7495635
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_16_world.sql
@@ -0,0 +1,11 @@
+-- Argent Skytalon
+DELETE FROM `creature_template_movement` WHERE `CreatureId` IN(30228);
+INSERT INTO `creature_template_movement` (`CreatureId`, `Ground`, `Swim`, `Flight`, `Rooted`, `Chase`, `Random`) VALUES
+(30228, 1, 0, 2, 0, 0, 0);
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=16 AND `SourceEntry`=30228 AND `ConditionTypeOrReference`=23;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(16,0,30228,0,0,23,0,4501,0,0,0,0,0,'','Argent Skytalon Dismount player when not in intended zone'),
+(16,0,30228,0,1,23,0,4506,0,0,0,0,0,'','Argent Skytalon Dismount player when not in intended zone'),
+(16,0,30228,0,2,23,0,4504,0,0,0,0,0,'','Argent Skytalon Dismount player when not in intended zone'),
+(16,0,30228,0,3,23,0,4505,0,0,0,0,0,'','Argent Skytalon Dismount player when not in intended zone'),
+(16,0,30228,0,4,23,0,4580,0,0,0,0,0,'','Argent Skytalon Dismount player when not in intended zone');
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_17_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_17_world.sql
new file mode 100644
index 00000000000..2dd7c31cc9b
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_17_world.sql
@@ -0,0 +1,31 @@
+-- If Grethok the Controller and Blackwing Guardsman are supposed to respawn after wipe,
+-- respawntime means nothing here until the encounter is finished
+-- Since they're part of encounter and are in formation with the boss, they should not respawn after being killed
+UPDATE `creature` SET `spawntimesecs` = 604800 WHERE `id` IN (12557,14456);
+-- Archbishop Benedictus, https://www.wowhead.com/npc=1284/archbishop-benedictus#comments
+-- Seems correct since all racial leaders have the same respawn time
+UPDATE `creature` SET `spawntimesecs` = 600 WHERE `id` IN (1284);
+-- Doom Lord Kazzak, https://www.mmo-champion.com/threads/720835-Doom-Lord-Kazzak
+-- https://wowwiki.fandom.com/wiki/World_boss
+-- Let's change it to 2 days for now
+UPDATE `creature` SET `spawntimesecs` = 172800 WHERE `id` IN (18728);
+-- Brutallus, unkillable means default respawn time for us https://www.wowhead.com/npc=25158/brutallus#comments:id=943294
+-- https://www.wowhead.com/npc=25158/brutallus#comments:id=330465
+-- Since he does not use spells and can't kill Madrigosa, she too shares default respawn time
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `id` IN (25158,25160);
+-- Bosses
+UPDATE `creature` SET `spawntimesecs` = 86400 WHERE `spawntimesecs` = 1000000;
+-- Let's update Mulgore start area from 155 to 120 like in some other start areas
+UPDATE `creature` SET `spawntimesecs` = 120 WHERE `id` IN (2955,2961,2966);
+
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `id` IN (14724,16013,3505,3507,3508,3510,3511,3512,3513,23481,23482,23486,23510,23511,23521,23522,23525,23533,23558,23603,23604,23605,23606,23627,23628,23683,23684,23685,23696,23698,23710,24108,24462,24463,24468,24492,24493,24497,24498,24499,24501,24510,24657,24710,24711,5403,11278,11286,11815,11816,11817,11819,11857,12788,12789,12790,12791,12793,12794,12795,12796,12797,12798,13321,14833,16033,18528,19850,9699) AND `map` != 450;
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `id` IN (15218,16123,17613,18253,18255,24729,24766,25058,25109,25946,27215,28650,29016,29019,29088,29728,34645,34682,34683,34708,34710,34712,35337,35340,35341,37674,39263,39275,39349,39368,39386,39396,39675,39678,39711,39715,39716,39717,7562,7565,7567,7772,8518,10988,25899,25929,24766,27216,27489,28601,28602,34681,34684,34685,34711,34713,34714,35338,35342,35343,15218,18687,21027,23142,23565,23705,23716,23718,23746,23748,23762,23764,24813,24965,24967,24975,25032,25043,25057,25061,25069,25112,25114,25163,25950,28343,28344,34783,34785,34786,34787,35099,35340,35342,37674);
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `id` IN (4772,7410,28048,30578,30579,30583,31146,35021,35024,35025,36224,36225,36226,36273,36517,37888);
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `id` IN (27928,28489,28491,28500,29194,29195,29196,29202,29246,29480,29587,32547,38065);
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `id` IN (7427,29867,30580,30582,30590,30610,34955,35008,35017,35020,35023,40391,28092,24932,25167,25174,25992,25145,27946,30581,30584,30586,30587,35019,35022,35026,35027,37527,37552,11560,37509,37510);
+
+-- Thrall is summoned after turning in quest
+DELETE FROM `creature_addon` WHERE `guid` IN (SELECT `guid` FROM `creature` WHERE `id` = 19556);
+DELETE FROM `spawn_group` WHERE `spawnId` IN (SELECT `guid` FROM `creature` WHERE `id` = 19556);
+DELETE FROM `creature` WHERE `id` IN (19556);
+DELETE FROM `waypoint_data` WHERE `id` = 867510;
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_18_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_18_world.sql
new file mode 100644
index 00000000000..2af0c883e94
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_18_world.sql
@@ -0,0 +1,9 @@
+--
+UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` IN (18528,25158);
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 18528 AND `source_type` = 0 AND `id` = 3;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 25158 AND `source_type` = 0 AND `id` = 0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+-- https://www.wowhead.com/npc=18528/xiri#comments:id=298805
+(18528,0,3,0,11,0,100,0,0,0,0,0,0,42,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Xi'ri - On Respawn - Set Invincibility HP 1"),
+-- https://www.wowhead.com/npc=25158/brutallus#comments:id=943294
+(25158,0,0,0,11,0,100,0,0,0,0,0,0,42,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Brutallus - On Respawn - Set Invincibility HP 1");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_19_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_19_world.sql
new file mode 100644
index 00000000000..965598599dd
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_19_world.sql
@@ -0,0 +1,22 @@
+-- https://wow.gamepedia.com/Lost_Soul
+UPDATE `creature` SET `spawntimesecs` = 3600 WHERE `id` = 1531;
+-- https://wow.gamepedia.com/Deeb
+UPDATE `creature` SET `spawntimesecs` = 5400 WHERE `id` = 1911;
+-- https://wow.gamepedia.com/Farmer_Solliden
+UPDATE `creature` SET `spawntimesecs` = 3600 WHERE `id` = 1936;
+-- https://wow.gamepedia.com/Bayne
+UPDATE `creature` SET `spawntimesecs` = 3600 WHERE `id` = 10356;
+-- https://wow.gamepedia.com/Ressan_the_Needler
+UPDATE `creature` SET `spawntimesecs` = 5400 WHERE `id` = 10357;
+-- https://wow.gamepedia.com/Fellicent%27s_Shade
+UPDATE `creature` SET `spawntimesecs` = 5400 WHERE `id` = 10358;
+-- https://www.wowhead.com/npc=14231/drogoth-the-roamer#comments:id=358223
+UPDATE `creature` SET `spawntimesecs` = 18000 WHERE `id` = 14231;
+-- https://www.wowhead.com/npc=14236/lord-angler#comments:id=358224
+UPDATE `creature` SET `spawntimesecs` = 75600 WHERE `id` = 14236;
+-- Marticar CMaNGOS
+UPDATE `creature` SET `spawntimesecs` = 82800 WHERE `id` = 18680;
+-- Doomsayer Jurim CMaNGOS
+UPDATE `creature` SET `spawntimesecs` = 21600 WHERE `id` = 18686;
+-- Morcrush CMaNGOS
+UPDATE `creature` SET `spawntimesecs` = 21600 WHERE `id` = 18690;
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_20_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_20_world.sql
new file mode 100644
index 00000000000..c7e33a1353a
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_08_20_world.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature_loot_template` SET `Chance`=20 WHERE `Item` IN (23797,23777,20310);
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_00_world_335.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_00_world_335.sql
new file mode 100644
index 00000000000..7c05d6fc2b1
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_00_world_335.sql
@@ -0,0 +1,9 @@
+--
+UPDATE `npc_text` SET `text0_1`="From this dock, The Bravery travels back and forth between Stormwind and Auberdine.", `BroadcastTextID0`=0 WHERE `ID`=13321;
+
+DELETE FROM `npc_text_locale` WHERE `ID`=13321;
+INSERT INTO `npc_text_locale` (`ID`, `Locale`, `Text0_0`, `Text0_1`) VALUES
+(13321,"frFR","","Depuis ce quai, la Bravoure fait l'aller-retour entre Hurlevent et Auberdine."),
+(13321,"esES","","Desde este muelle, El Valentía hace el viaje de ida y vuelta entre Ventormenta y Auberdine."),
+(13321,"esMX","","Desde este muelle, El Valentía hace el viaje de ida y vuelta entre Ventormenta y Auberdine."),
+(13321,"deDE","","Von diesem Dock aus fährt die Bravado zwischen Sturmwind und Auberdine hin und her.");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_01_world.sql
new file mode 100644
index 00000000000..c70f0386e9b
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_01_world.sql
@@ -0,0 +1,38 @@
+-- Warmaul Chef Bufferlo
+UPDATE `creature_template` SET `AIName`="SmartAI", `speed_walk`=1 WHERE `entry`=18440;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=18440 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (1844000,1844001,1844002) 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
+(18440,0,0,0,4,0,100,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warmaul Chef Bufferlo - On Aggro - Say Line 0"),
+(18440,0,1,0,1,0,100,0,10000,30000,80000,100000,0,87,1844000,1844001,1844002,0,0,0,1,0,0,0,0,0,0,0,"Warmaul Chef Bufferlo - Out of Combat - Run Random Script"),
+(18440,0,2,0,0,0,100,0,7000,12000,7000,12000,0,11,32376,0,0,0,0,0,2,0,0,0,0,0,0,0,"Warmaul Chef Bufferlo - In Combat - Cast 'Tenderize'"),
+(18440,0,3,0,0,0,100,0,4000,6000,14000,18000,0,11,32378,0,0,0,0,0,2,0,0,0,0,0,0,0,"Warmaul Chef Bufferlo - In Combat - Cast 'Filet'"),
+(18440,0,4,0,4,0,100,0,0,0,0,0,0,11,31994,0,0,0,0,0,2,0,0,0,0,0,0,0,"Warmaul Chef Bufferlo - On Aggro - Cast 'Shoulder Charge'"),
+(1844000,9,0,0,0,0,100,0,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warmaul Chef Bufferlo - On Script - Say Line 1"),
+(1844000,9,1,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,"Warmaul Chef Bufferlo - On Script - Say Line 2"),
+(1844001,9,0,0,0,0,100,0,0,0,0,0,0,5,36,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warmaul Chef Bufferlo - On Script - Play Emote 36"),
+(1844001,9,1,0,0,0,100,0,2000,2000,0,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warmaul Chef Bufferlo - On Script - Say Line 3"),
+(1844002,9,0,0,0,0,100,0,0,0,0,0,0,5,35,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warmaul Chef Bufferlo - On Script - Play Emote 35"),
+(1844002,9,1,0,0,0,100,0,2000,2000,0,0,0,1,4,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warmaul Chef Bufferlo - On Script - Say Line 4"),
+(1844002,9,2,0,0,0,100,0,5000,5000,0,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warmaul Chef Bufferlo - On Script - Say Line 5"),
+(1844002,9,3,0,0,0,100,0,4000,4000,0,0,0,1,6,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warmaul Chef Bufferlo - On Script - Say Line 6"),
+(1844002,9,4,0,0,0,100,0,4000,4000,0,0,0,1,7,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warmaul Chef Bufferlo - On Script - Say Line 7"),
+(1844002,9,5,0,0,0,100,0,2000,2000,0,0,0,5,35,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warmaul Chef Bufferlo - On Script - Play Emote 35"),
+(1844002,9,6,0,0,0,100,0,2000,2000,0,0,0,1,8,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warmaul Chef Bufferlo - On Script - Say Line 8"),
+(1844002,9,7,0,0,0,100,0,8000,8000,0,0,0,1,9,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warmaul Chef Bufferlo - On Script - Say Line 9"),
+(1844002,9,8,0,0,0,100,0,3000,3000,0,0,0,5,153,0,0,0,0,0,1,0,0,0,0,0,0,0,"Warmaul Chef Bufferlo - On Script - Play Emote 153");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=18440;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(18440,0,0,"IT DUZ WUT IT'S TOLD!",12,0,100,0,0,0,15419,0,"Warmaul Chef Bufferlo"),
+(18440,0,1,"GET IN DA STEW!",12,0,100,0,0,0,15420,0,"Warmaul Chef Bufferlo"),
+(18440,0,2,"YOU GUD IN DA BELLY!",12,0,100,0,0,0,15421,0,"Warmaul Chef Bufferlo"),
+(18440,1,0,"Your daddy pay Warmaul and maybe we no eat you.",12,0,100,1,0,0,15426,0,"Warmaul Chef Bufferlo"),
+(18440,2,0,"Ha-ha! Just kidding. We eat you for shure anyway!",12,0,100,11,0,0,15427,0,"Warmaul Chef Bufferlo"),
+(18440,3,0,"BAM! Look at dat gristle sizzle!",12,0,100,1,0,0,15430,0,"Warmaul Chef Bufferlo"),
+(18440,4,0,"And dis is da recipe for da bestest Broken chowder!",12,0,100,1,0,0,15431,0,"Warmaul Chef Bufferlo"),
+(18440,5,0,"First you need da spices.",12,0,100,1,0,0,15432,0,"Warmaul Chef Bufferlo"),
+(18440,6,0,"Da salt goes into da pot...",12,0,100,35,0,0,15433,0,"Warmaul Chef Bufferlo"),
+(18440,7,0,"Den you put da pepper in da pot...",12,0,100,0,0,0,15434,0,"Warmaul Chef Bufferlo"),
+(18440,8,0,"Now we gonna kick it up a notch wit da secret ingra... ingor... inrag... da secret sauce!",12,0,100,43,0,0,15435,0,"Warmaul Chef Bufferlo"),
+(18440,9,0,"And last, we put in da Corki!",12,0,100,1,0,0,15436,0,"Warmaul Chef Bufferlo");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_02_world.sql
new file mode 100644
index 00000000000..f75708bf4d5
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_02_world.sql
@@ -0,0 +1,18 @@
+-- Thadius Grimshade
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=8022;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=8022 AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=802200 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
+(8022,0,0,0,19,0,100,0,2992,0,0,0,80,802200,0,0,0,0,0,1,0,0,0,0,0,0,0,"Thadius Grimshade - On Quest 'The Divination' Taken - Run Script"),
+(802200,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,"Thadius Grimshade - On Script - Remove Npc Flag Questgiver"),
+(802200,9,1,0,0,0,100,0,1000,1000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Thadius Grimshade - On Script - Say Line 0"),
+(802200,9,2,0,0,0,100,0,6000,6000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Thadius Grimshade - On Script - Say Line 1"),
+(802200,9,3,0,0,0,100,0,0,0,0,0,50,144069,10,0,0,0,0,8,0,0,0,-10999,-3484.47,103.122,2.52228,"Thadius Grimshade - On Script - Summon Gameobject Grimshade's Vision"),
+(802200,9,4,0,0,0,100,0,10000,10000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Thadius Grimshade - On Script - Say Line 2"),
+(802200,9,5,0,0,0,100,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Thadius Grimshade - On Script - Add Npc Flag Questgiver");
+
+DELETE FROM `creature_text` WHERE `CreatureID`=8022;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(8022,0,0,"Make no sound during the ritual. One misstep could spell our doom...",12,0,100,0,0,0,4126,0,"Thadius Grimshade"),
+(8022,1,0,"Now, watch...",12,0,100,0,0,0,4127,0,"Thadius Grimshade"),
+(8022,2,0,"There. It is done.",12,0,100,0,0,0,4128,0,"Thadius Grimshade");
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_03_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_03_world.sql
new file mode 100644
index 00000000000..4fb41ff6525
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_03_world.sql
@@ -0,0 +1,5 @@
+--
+DELETE FROM `spawn_group` WHERE `spawnType` = 1 AND `spawnId` IN (86751,86010);
+INSERT INTO `spawn_group` (`groupId`,`spawnType`,`spawnId`) VALUES
+(4,1,86751),
+(4,1,86010);
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_04_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_04_world.sql
new file mode 100644
index 00000000000..7266e9d577f
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_04_world.sql
@@ -0,0 +1,5 @@
+--
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `id` IN (1750,1751,1891,1892,1893,1894,1895,1896,2106,3528,3529,3530,3531,3532,3533,11285,11406,23011,23012);
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `id` IN (24938,24960,24966,24976,24978,25060,25073,25084,25087,25115) AND `spawntimesecs` = 600;
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `id` IN (1750,1751,1891,1892,1893,1894,1895,1896,2106,3528,3529,3530,3531,3532,3533,11285,11406,23011,23012);
+UPDATE `creature` SET `spawntimesecs` = 300 WHERE `id` IN (1420,6827,890,1933,3300,3835,6145,6368,14361,14881,15475,16030,16068,17213,26525,28093,28407,29328,30140,31685,32258,32261,32498);
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_05_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_05_world.sql
new file mode 100644
index 00000000000..91b422d95dd
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_09_05_world.sql
@@ -0,0 +1,5 @@
+--
+UPDATE `creature_template` SET `AIName` = "" WHERE `entry` IN (2711,9978,2382,3543,2379,2378,3540,2383,2380,3541,2381,288,3542,3880,3901,3956,3960,3961,3962,3963,3964,3965,3967,3969,3970,3996,4079,10052,11137,15199,24736);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (2711,9978,2382,3543,2379,2378,3540,2383,2380,3541,2381,288,3542,3880,3901,3956,3960,3961,3962,3963,3964,3965,3967,3969,3970,3996,4079,10052,11137,15199,24736) AND `source_type` = 0;
+DELETE FROM `creature_text` WHERE `CreatureID` IN (2711,9978,2382,3543,2379,2378,3540,2383,2380,3541,2381);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (3847,3848,3980,24734,24735) AND `source_type` = 0 AND `id` = 0;
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_14_00_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_14_00_world.sql
new file mode 100644
index 00000000000..7cad542b909
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_14_00_world.sql
@@ -0,0 +1,6 @@
+--
+ALTER TABLE `gameobject_template_addon`
+ ADD COLUMN `artkit0` INT NOT NULL DEFAULT 0 AFTER `maxgold`,
+ ADD COLUMN `artkit1` INT NOT NULL DEFAULT 0 AFTER `artkit0`,
+ ADD COLUMN `artkit2` INT NOT NULL DEFAULT 0 AFTER `artkit1`,
+ ADD COLUMN `artkit3` INT NOT NULL DEFAULT 0 AFTER `artkit2`;
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_14_01_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_14_01_world.sql
new file mode 100644
index 00000000000..db20c22ace8
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_14_01_world.sql
@@ -0,0 +1,35 @@
+--
+-- Note: All of these should be targetable by spells 46904 and 46903, but conditions are only set for Stormwind (damn Horde fanatics)
+UPDATE gameobject_template_addon SET artkit0 = 121, artkit1 = 122 WHERE entry IN (
+ 188352, -- Flame of Shattrath
+ 188129, -- Flame of Silvermoon
+ 188128, -- Flame of the Exodar
+ 181567, -- Flame of the Wetlands
+ 181566, -- Flame of Hillsbrad
+ 181565, -- Flame of Westfall
+ 181564, -- Flame of Silverpine
+ 181563, -- Flame of Darkshore
+ 181562, -- Flame of Stonetalon
+ 181561, -- Flame of Ashenvale
+ 181560, -- Flame of the Barrens
+ 181349, -- Flame of the Scholomance
+ 181348, -- Flame of Stratholme
+ 181347, -- Flame of Blackrock Spire
+ 181346, -- Flame of Dire Maul
+ 181345, -- Flame of the Hinterlands
+ 181344, -- Flame of the Blasted Lands
+ 181343, -- Flame of Un'Goro
+ 181342, -- Flame of Azshara
+ 181341, -- Flame of Searing Gorge
+ 181340, -- Flame of Winterspring
+ 181339, -- Flame of Silithus
+ 181338, -- Flame of the Plaguelands
+ 181337, -- Flame of Thunder Bluff
+ 181336, -- Flame of Orgrimmar
+ 181335, -- Flame of the Undercity
+ 181334, -- Flame of Darnassus
+ 181333, -- Flame of Ironforge
+ 181332 -- Flame of Stormwind
+);
+
+DELETE FROM `spell_script_names` WHERE `ScriptName`= "spell_banging_the_gong";
diff --git a/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_14_02_world.sql b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_14_02_world.sql
new file mode 100644
index 00000000000..dd8e0412d63
--- /dev/null
+++ b/sql/old/3.3.5a/world/20061_2020_07_15/2020_07_14_02_world.sql
@@ -0,0 +1 @@
+ALTER TABLE `pool_members` CHANGE `chance` `chance` float NOT NULL;