From 7e182804e3b6cd9c7dd993555e5cb28d49dd8d37 Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 12:47:23 +0200
Subject: [PATCH 01/39] moved aq_gate code to zone_silithus

---
 sql/world/base/zone_silithus.sql | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sql/world/base/zone_silithus.sql b/sql/world/base/zone_silithus.sql
index b629ae6..f4437ff 100644
--- a/sql/world/base/zone_silithus.sql
+++ b/sql/world/base/zone_silithus.sql
@@ -16,6 +16,9 @@ DELETE FROM `gameobject` WHERE `id`=180322;
 
 -- Gate of Ahn'Qiraj
 UPDATE `gameobject_template_addon` SET `flags`=4 WHERE `entry`=176146;
+UPDATE `gameobject_template` SET `ScriptName`='aq_gate' WHERE  `entry`=176148;
+UPDATE `gameobject_template` SET `ScriptName`='aq_gate' WHERE  `entry`=176147;
+UPDATE `gameobject_template` SET `ScriptName`='aq_gate' WHERE  `entry`=176146;
 
 -- Ahn'Qiraj Gate Roots
 UPDATE `gameobject_template_addon` SET `flags`=4 WHERE `entry`=176147;

From 3c1866374295abe5849ad3a08695d75d6d3274d1 Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 12:48:48 +0200
Subject: [PATCH 02/39] Delete sql/world/base/aq_gate.sql

content moved to zone_silithus
---
 sql/world/base/aq_gate.sql | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 sql/world/base/aq_gate.sql

diff --git a/sql/world/base/aq_gate.sql b/sql/world/base/aq_gate.sql
deleted file mode 100644
index cc24194..0000000
--- a/sql/world/base/aq_gate.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-UPDATE `gameobject_template` SET `ScriptName`='aq_gate' WHERE  `entry`=176148;
-UPDATE `gameobject_template` SET `ScriptName`='aq_gate' WHERE  `entry`=176147;
-UPDATE `gameobject_template` SET `ScriptName`='aq_gate' WHERE  `entry`=176146;

From 12518ccba61335a84ff1bc5df90cc4b31b6f01ee Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 13:03:55 +0200
Subject: [PATCH 03/39] Update and rename zone_silithus.sql to
 aq_gate_quest.sql

zone_silithus was all about the aq gate opening.

moved related code to the same file.
---
 sql/world/base/{zone_silithus.sql => aq_gate_quest.sql} | 8 ++++++++
 1 file changed, 8 insertions(+)
 rename sql/world/base/{zone_silithus.sql => aq_gate_quest.sql} (87%)

diff --git a/sql/world/base/zone_silithus.sql b/sql/world/base/aq_gate_quest.sql
similarity index 87%
rename from sql/world/base/zone_silithus.sql
rename to sql/world/base/aq_gate_quest.sql
index f4437ff..1fe7dbc 100644
--- a/sql/world/base/zone_silithus.sql
+++ b/sql/world/base/aq_gate_quest.sql
@@ -39,3 +39,11 @@ SET @STRING_ENTRY := 41100;
 DELETE FROM `acore_string` WHERE `entry` IN  (@STRING_ENTRY);
 INSERT INTO `acore_string` (`entry`, `content_default`) VALUES
 (@STRING_ENTRY, '%s, Champion of the Bronze Dragonflight, has rung the Scarab Gong. The ancient gates of Ahn''Qiraj open, revealing the horrors of a forgotten war...');
+
+-- Fix drop rate for Nightmare_corruption
+UPDATE `creature_loot_template` SET `Chance` = 5 WHERE `Item` = 21146;
+UPDATE `creature_loot_template` SET `Chance` = 5 WHERE `Item` = 21147;
+UPDATE `creature_loot_template` SET `Chance` = 5 WHERE `Item` = 21148;
+
+-- FIx drop rate for Narain's Scrying Goggles
+UPDATE `creature_loot_template` SET `Chance` = 2 WHERE `Item` = 20951;

From 68ab3c87a91a2f35c36af9344fe389bb2b6e4140 Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 13:04:46 +0200
Subject: [PATCH 04/39] Delete sql/world/base/aq_attunement_drops.sql

moved code to aq_gate_quest
---
 sql/world/base/aq_attunement_drops.sql | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 sql/world/base/aq_attunement_drops.sql

diff --git a/sql/world/base/aq_attunement_drops.sql b/sql/world/base/aq_attunement_drops.sql
deleted file mode 100644
index 8139baf..0000000
--- a/sql/world/base/aq_attunement_drops.sql
+++ /dev/null
@@ -1,7 +0,0 @@
--- Fix drop rate for Nightmare_corruption
-UPDATE `creature_loot_template` SET `Chance` = 5 WHERE `Item` = 21146;
-UPDATE `creature_loot_template` SET `Chance` = 5 WHERE `Item` = 21147;
-UPDATE `creature_loot_template` SET `Chance` = 5 WHERE `Item` = 21148;
-
--- FIx drop rate for Narain's Scrying Goggles
-UPDATE `creature_loot_template` SET `Chance` = 2 WHERE `Item` = 20951;
\ No newline at end of file

From c904a242e82f94fc3db868f92363af8bbcd91554 Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 13:48:27 +0200
Subject: [PATCH 05/39] moved ammo stack size changes

moved ammo stack size changes from ammo_stacks to item_changes

set WotLK ammo back to stackable 1000
---
 sql/world/base/item_changes.sql | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sql/world/base/item_changes.sql b/sql/world/base/item_changes.sql
index 06acd3e..0a4737e 100644
--- a/sql/world/base/item_changes.sql
+++ b/sql/world/base/item_changes.sql
@@ -10,6 +10,10 @@ ALTER TABLE item_template MODIFY arcane_res SMALLINT;
 UPDATE item_template SET RequiredReputationFaction=529, RequiredReputationRank=6 WHERE entry IN (18169, 18170, 18171, 18172, 18173);
 UPDATE item_template SET RequiredReputationFaction=529, RequiredReputationRank=7 WHERE entry=18182;
 
+-- In 3.1 all ammo was changed to stack to 1000. This reduced the usefulness of quivers and ammo pouches
+UPDATE `item_template` SET `stackable` = 200 WHERE `stackable` = 1000 AND `InventoryType` = 24;
+UPDATE `item_template` SET `stackable` = 1000 WHERE `entry` IN (41164, 41165, 41584, 41586, 52020, 52021); -- WotLK ammo
+
 /*  Martin Fury  */
 UPDATE `item_template` SET `SellPrice` = 0, `spellcooldown_2` = -1, `spellcategorycooldown_2` = -1, `spellcooldown_3` = -1, `spellcategorycooldown_3` = -1, `spellcooldown_4` = -1, `spellcategorycooldown_4` = -1, `spellcooldown_5` = -1, `spellcategorycooldown_5` = -1 WHERE entry=17;
 

From d7664a47c39c8137cadeac2f5c04bab9a5a56516 Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 13:49:11 +0200
Subject: [PATCH 06/39] Delete sql/world/base/ammo_stacks.sql

content moved to item_changes.sql
---
 sql/world/base/ammo_stacks.sql | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 sql/world/base/ammo_stacks.sql

diff --git a/sql/world/base/ammo_stacks.sql b/sql/world/base/ammo_stacks.sql
deleted file mode 100644
index ddcba0f..0000000
--- a/sql/world/base/ammo_stacks.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-/* In 3.1 all ammo was changed to stack to 1000. This reduced the usefulness of quivers and ammo pouches, so it is more than just a QoL change, unlike other stack size changes. */
-UPDATE `item_template` SET `stackable` = 200 WHERE `stackable` = 1000 AND `InventoryType` = 24;

From 935e92a0e933598ebe79125fe9415c92d08b2c52 Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 13:53:53 +0200
Subject: [PATCH 07/39] Rename item_changes.sql to vanilla_item_changes.sql

consistency

just like we have vanilla_vendors and tbc_vendors
---
 sql/world/base/{item_changes.sql => vanilla_item_changes.sql} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename sql/world/base/{item_changes.sql => vanilla_item_changes.sql} (100%)

diff --git a/sql/world/base/item_changes.sql b/sql/world/base/vanilla_item_changes.sql
similarity index 100%
rename from sql/world/base/item_changes.sql
rename to sql/world/base/vanilla_item_changes.sql

From b354e594dde868e4df12b5fd1c368c0a69a0592a Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 14:00:07 +0200
Subject: [PATCH 08/39] Rename optional_remove_heirlooms.sql to
 zz_optional_remove_heirlooms.sql

consistency
---
 ...al_remove_heirlooms.sql => zz_optional_remove_heirlooms.sql} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename sql/world/base/{optional_remove_heirlooms.sql => zz_optional_remove_heirlooms.sql} (93%)

diff --git a/sql/world/base/optional_remove_heirlooms.sql b/sql/world/base/zz_optional_remove_heirlooms.sql
similarity index 93%
rename from sql/world/base/optional_remove_heirlooms.sql
rename to sql/world/base/zz_optional_remove_heirlooms.sql
index b28aa1b..765b3c9 100644
--- a/sql/world/base/optional_remove_heirlooms.sql
+++ b/sql/world/base/zz_optional_remove_heirlooms.sql
@@ -9,4 +9,4 @@ DELETE FROM `npc_vendor` WHERE `item` IN ( 38691, 42943, 42944, 42945, 42946,
 44102, 44103, 44105, 44107, 48677, 48683, 48685, 48687, 48689, 48691, 48716,
 48718, 50255);
 UPDATE `quest_template` SET `RewardChoiceItemID1` = 0, `RewardChoiceItemQuantity1` = 0, `RewardChoiceItemID2` = 0, `RewardChoiceItemQuantity2` = 0,
-`RewardItem1` = 50287, `RewardAmount1` = 1 WHERE `id` = 24803;
\ No newline at end of file
+`RewardItem1` = 50287, `RewardAmount1` = 1 WHERE `id` = 24803;

From d607f3d2702eae03295125d8245b6aba811860a3 Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 14:00:36 +0200
Subject: [PATCH 09/39] Rename optional_item_stack_sizes.sql to
 zz_optional_item_stack_sizes.sql

consistency
---
 ...onal_item_stack_sizes.sql => zz_optional_item_stack_sizes.sql} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename sql/world/base/{optional_item_stack_sizes.sql => zz_optional_item_stack_sizes.sql} (100%)

diff --git a/sql/world/base/optional_item_stack_sizes.sql b/sql/world/base/zz_optional_item_stack_sizes.sql
similarity index 100%
rename from sql/world/base/optional_item_stack_sizes.sql
rename to sql/world/base/zz_optional_item_stack_sizes.sql

From 0c184993737296bfb03ee6b72df0e9c5c4c2b3cf Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 14:01:02 +0200
Subject: [PATCH 10/39] Rename optional_attunements.sql to
 zz_optional_attunements.sql

consistency
---
 .../{optional_attunements.sql => zz_optional_attunements.sql}     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename sql/world/base/{optional_attunements.sql => zz_optional_attunements.sql} (100%)

diff --git a/sql/world/base/optional_attunements.sql b/sql/world/base/zz_optional_attunements.sql
similarity index 100%
rename from sql/world/base/optional_attunements.sql
rename to sql/world/base/zz_optional_attunements.sql

From 17c04ab101d5317d974ac63554558a6c299ef158 Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 14:01:55 +0200
Subject: [PATCH 11/39] Rename optional_pvp_brackets.sql to
 zz_optional_pvp_brackets.sql

consistency
---
 .../{optional_pvp_brackets.sql => zz_optional_pvp_brackets.sql}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename sql/world/base/{optional_pvp_brackets.sql => zz_optional_pvp_brackets.sql} (100%)

diff --git a/sql/world/base/optional_pvp_brackets.sql b/sql/world/base/zz_optional_pvp_brackets.sql
similarity index 100%
rename from sql/world/base/optional_pvp_brackets.sql
rename to sql/world/base/zz_optional_pvp_brackets.sql

From fb70823ae7f2a2cb8eca446b43869b7ec1029fcb Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 14:02:28 +0200
Subject: [PATCH 12/39] Rename optional_pvp_items.sql to
 zz_optional_pvp_items.sql

consistency
---
 .../base/{optional_pvp_items.sql => zz_optional_pvp_items.sql}    | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename sql/world/base/{optional_pvp_items.sql => zz_optional_pvp_items.sql} (100%)

diff --git a/sql/world/base/optional_pvp_items.sql b/sql/world/base/zz_optional_pvp_items.sql
similarity index 100%
rename from sql/world/base/optional_pvp_items.sql
rename to sql/world/base/zz_optional_pvp_items.sql

From d052927522a3343fc5b8b06eb0e2b6c45655de72 Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 14:03:04 +0200
Subject: [PATCH 13/39] Rename optional_remove_quest_markers.sql to
 zz_optional_remove_quest_markers.sql

consistency
---
 ...ove_quest_markers.sql => zz_optional_remove_quest_markers.sql} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename sql/world/base/{optional_remove_quest_markers.sql => zz_optional_remove_quest_markers.sql} (100%)

diff --git a/sql/world/base/optional_remove_quest_markers.sql b/sql/world/base/zz_optional_remove_quest_markers.sql
similarity index 100%
rename from sql/world/base/optional_remove_quest_markers.sql
rename to sql/world/base/zz_optional_remove_quest_markers.sql

From 67be615ce299820fe54bec0b3197277077ee5017 Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 14:03:29 +0200
Subject: [PATCH 14/39] Rename optional_restore_crafting_cd_timers.sql to
 zz_optional_restore_crafting_cd_timers.sql

---
 ...g_cd_timers.sql => zz_optional_restore_crafting_cd_timers.sql} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename sql/world/base/{optional_restore_crafting_cd_timers.sql => zz_optional_restore_crafting_cd_timers.sql} (100%)

diff --git a/sql/world/base/optional_restore_crafting_cd_timers.sql b/sql/world/base/zz_optional_restore_crafting_cd_timers.sql
similarity index 100%
rename from sql/world/base/optional_restore_crafting_cd_timers.sql
rename to sql/world/base/zz_optional_restore_crafting_cd_timers.sql

From 29ccacbcf6d74a088a0ccff7a8f24de7dbed2326 Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 14:04:34 +0200
Subject: [PATCH 15/39] Rename optional_restore_potion_cooldown.sql to
 zz_optional_restore_potion_cd.sql

consistency
---
 ...tore_potion_cooldown.sql => zz_optional_restore_potion_cd.sql} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename sql/world/base/{optional_restore_potion_cooldown.sql => zz_optional_restore_potion_cd.sql} (100%)

diff --git a/sql/world/base/optional_restore_potion_cooldown.sql b/sql/world/base/zz_optional_restore_potion_cd.sql
similarity index 100%
rename from sql/world/base/optional_restore_potion_cooldown.sql
rename to sql/world/base/zz_optional_restore_potion_cd.sql

From 35d71de7438f372118b332fcf016a2e6456ee143 Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 14:04:58 +0200
Subject: [PATCH 16/39] Rename optional_restore_rogue_poisons.sql to
 zz_optional_restore_rogue_poisons.sql

consistency
---
 ..._rogue_poisons.sql => zz_optional_restore_rogue_poisons.sql} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename sql/world/base/{optional_restore_rogue_poisons.sql => zz_optional_restore_rogue_poisons.sql} (99%)

diff --git a/sql/world/base/optional_restore_rogue_poisons.sql b/sql/world/base/zz_optional_restore_rogue_poisons.sql
similarity index 99%
rename from sql/world/base/optional_restore_rogue_poisons.sql
rename to sql/world/base/zz_optional_restore_rogue_poisons.sql
index d8c2364..baf288b 100644
--- a/sql/world/base/optional_restore_rogue_poisons.sql
+++ b/sql/world/base/zz_optional_restore_rogue_poisons.sql
@@ -316,4 +316,4 @@ INSERT INTO `spell_ranks` (`first_spell_id`, `spell_id`, `rank`) VALUES
 (8681, 26892, 7),
 (5763, 5763, 1),
 (5763, 8694, 2),
-(5763, 11400, 3);
\ No newline at end of file
+(5763, 11400, 3);

From 6e6294fdb698624682cc781ab2a87725dbaaf4fd Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 14:05:35 +0200
Subject: [PATCH 17/39] Rename optional_small_group_adjustments.sql to
 zz_optional_small_group_adjustments.sql

consistency
---
 ...up_adjustments.sql => zz_optional_small_group_adjustments.sql} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename sql/world/base/{optional_small_group_adjustments.sql => zz_optional_small_group_adjustments.sql} (100%)

diff --git a/sql/world/base/optional_small_group_adjustments.sql b/sql/world/base/zz_optional_small_group_adjustments.sql
similarity index 100%
rename from sql/world/base/optional_small_group_adjustments.sql
rename to sql/world/base/zz_optional_small_group_adjustments.sql

From f917d5f2a15ade05728d7536e005295c4b42f41a Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 14:06:42 +0200
Subject: [PATCH 18/39] Rename optional_stackable_buff_scrolls.sql to
 zz_optional_stackable_buff_scrolls.sql

consistency
---
 ...scrolls.sql => zz_optional_stackable_buff_scrolls.sql} | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
 rename sql/world/base/{optional_stackable_buff_scrolls.sql => zz_optional_stackable_buff_scrolls.sql} (63%)

diff --git a/sql/world/base/optional_stackable_buff_scrolls.sql b/sql/world/base/zz_optional_stackable_buff_scrolls.sql
similarity index 63%
rename from sql/world/base/optional_stackable_buff_scrolls.sql
rename to sql/world/base/zz_optional_stackable_buff_scrolls.sql
index 712a33f..d4c129b 100644
--- a/sql/world/base/optional_stackable_buff_scrolls.sql
+++ b/sql/world/base/zz_optional_stackable_buff_scrolls.sql
@@ -1,7 +1,9 @@
-/* These changes remove exclusivity from the buff scrolls, and make them stackable.
-This restores behavior to vanilla where players were able to buff themselves with multiple buff scrolls
-This should not be possible in TBC and WoTLK. No solution yet to have this work correctly all the time.
+/* 
+    These changes remove exclusivity from the buff scrolls, and make them stackable.
+    This restores behavior to vanilla where players were able to buff themselves with multiple buff scrolls
+    This should not be possible in TBC and WoTLK. No solution yet to have this work correctly all the time.
 */
+
 -- Set first_spell_id as rank 2 to bypass core check for exclusivity
 UPDATE `spell_ranks` SET `first_spell_id`=8094 WHERE `first_spell_id`=8091;
 UPDATE `spell_ranks` SET `first_spell_id`=8097 WHERE `first_spell_id`=8096;

From 502704efcd481d723199936dd9c95a48711fb82d Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 14:08:28 +0200
Subject: [PATCH 19/39] Rename optional_tbc_heroic_dungeon_keys_nerf.sql to
 zz_optional_tbc_heroic_dungeon_keys_nerf.sql

consistency
---
 ...ql => zz_optional_tbc_heroic_dungeon_keys_nerf.sql} | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
 rename sql/world/base/{optional_tbc_heroic_dungeon_keys_nerf.sql => zz_optional_tbc_heroic_dungeon_keys_nerf.sql} (58%)

diff --git a/sql/world/base/optional_tbc_heroic_dungeon_keys_nerf.sql b/sql/world/base/zz_optional_tbc_heroic_dungeon_keys_nerf.sql
similarity index 58%
rename from sql/world/base/optional_tbc_heroic_dungeon_keys_nerf.sql
rename to sql/world/base/zz_optional_tbc_heroic_dungeon_keys_nerf.sql
index f48363d..6227e74 100644
--- a/sql/world/base/optional_tbc_heroic_dungeon_keys_nerf.sql
+++ b/sql/world/base/zz_optional_tbc_heroic_dungeon_keys_nerf.sql
@@ -1,7 +1,9 @@
-/* Optional change. Obtaining keys for heroic dungeons in The Burning Crusade is conditional on having corresponding reputation at Revered rank.
-   This reduces the reputation requirements to obtain keys to Honored and thus allows you to go to heroic dungeons more quickly. 
-   This rep nerf was officially implemented in patch 2.3 (Zul'Aman raid content, 2008). 
-   Sql edit example: RequiredReputationRank = 6 for Revered, 5 for Honored, 4 for Friendly */
+/* 
+    Optional change. Obtaining keys for heroic dungeons in The Burning Crusade is conditional on having corresponding reputation at Revered rank.
+    This reduces the reputation requirements to obtain keys to Honored and thus allows you to go to heroic dungeons more quickly. 
+    This rep nerf was officially implemented in patch 2.3 (Zul'Aman raid content, 2008). 
+    Sql edit example: RequiredReputationRank = 6 for Revered, 5 for Honored, 4 for Friendly 
+*/
 
 UPDATE `item_template` SET `RequiredReputationRank` = 5 WHERE `entry` = 30622; -- Honor Hold, Flamewrought Key
 UPDATE `item_template` SET `RequiredReputationRank` = 5 WHERE `entry` = 30623; -- Cenarion Expedition, Reservoir Key

From f54446c8fdf1889ea9f2ded977566a59a67e550b Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 14:09:30 +0200
Subject: [PATCH 20/39] Rename optional_unobtainable_items.sql to
 zz_optional_unobtainable_items.sql

consistency
---
 ...e_items.sql => zz_optional_unobtainable_items.sql} | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
 rename sql/world/base/{optional_unobtainable_items.sql => zz_optional_unobtainable_items.sql} (60%)

diff --git a/sql/world/base/optional_unobtainable_items.sql b/sql/world/base/zz_optional_unobtainable_items.sql
similarity index 60%
rename from sql/world/base/optional_unobtainable_items.sql
rename to sql/world/base/zz_optional_unobtainable_items.sql
index c6868b2..8a4cb55 100644
--- a/sql/world/base/optional_unobtainable_items.sql
+++ b/sql/world/base/zz_optional_unobtainable_items.sql
@@ -1,9 +1,10 @@
-/* These changes add otherwise unobtainable items to appropriate places in the world, with suitable levels of challenge to obtain them.
-   This is in line with the module's intent to allow each player to experience all of the available content in WoW - in this case,
-   it removes reliance on out-of-game events, real money purchases, or cheating via GM commands.
+/* 
+    These changes add otherwise unobtainable items to appropriate places in the world, with suitable levels of challenge to obtain them.
+    This is in line with the module's intent to allow each player to experience all of the available content in WoW - in this case,
+    it removes reliance on out-of-game events, real money purchases, or cheating via GM commands.
 
-   These items are almost entirely cosmetic and were available to players through external means - debug or cheat items not intended for player use are not added.
- */
+    These items are almost entirely cosmetic and were available to players through external means - debug or cheat items not intended for player use are not added.
+*/
 
 /* Tabard of Flame (WoW TCG Promotional Item) - added as a 3% drop from Ragnaros */
 DELETE FROM `creature_loot_template` WHERE `Entry`=11502 AND `Item`=23705 AND `Reference`=0 AND `GroupId`=0;

From c2c498318376a3335523d8e497dd78f436433ba1 Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 14:33:44 +0200
Subject: [PATCH 21/39] Update and rename
 optional_vanilla_crafting_requirements.sql to
 zz_optional_vanilla_crafting_requirements.sql

consistency

removed duplicate update
---
 ...ptional_vanilla_crafting_requirements.sql} | 349 ++++++------------
 1 file changed, 112 insertions(+), 237 deletions(-)
 rename sql/world/base/{optional_vanilla_crafting_requirements.sql => zz_optional_vanilla_crafting_requirements.sql} (57%)

diff --git a/sql/world/base/optional_vanilla_crafting_requirements.sql b/sql/world/base/zz_optional_vanilla_crafting_requirements.sql
similarity index 57%
rename from sql/world/base/optional_vanilla_crafting_requirements.sql
rename to sql/world/base/zz_optional_vanilla_crafting_requirements.sql
index bb69feb..6aea99f 100644
--- a/sql/world/base/optional_vanilla_crafting_requirements.sql
+++ b/sql/world/base/zz_optional_vanilla_crafting_requirements.sql
@@ -1,253 +1,128 @@
-/* This will restore specialization requirements for vanilla crafting recipes. */
-/* This may require a reset of the item WDB cache files. */
-
+/* 
+    This will restore specialization requirements for vanilla crafting recipes.
+    This may require a reset of the item WDB cache files. 
+*/
 
 /* Dragonscale Leatherworking (10656) */
-
-/* Dragonscale Gauntlets */
-UPDATE `npc_trainer` SET `ReqSpell` = 10656 WHERE SpellID=10619;
-/* Dragonscale Breastplate */
-UPDATE `npc_trainer` SET `ReqSpell` = 10656 WHERE SpellID=10650;
-/* Blue Dragonscale Leggings */
-UPDATE `npc_trainer` SET `ReqSpell` = 10656 WHERE SpellID=24654;
-/* Green Dragonscale Gauntlets */
-UPDATE `npc_trainer` SET `ReqSpell` = 10656 WHERE SpellID=24655;
-/* Dragonstrike Leggings */
-UPDATE `npc_trainer` SET `ReqSpell` = 10656 WHERE SpellID=36076;
-/* Pattern: Green Dragonscale Breastplate */
-UPDATE `item_template` SET `requiredspell` = 10656 WHERE entry=15726;
-/* Pattern: Red Dragonscale Breastplate */
-UPDATE `item_template` SET `requiredspell` = 10656 WHERE entry=15730;
-/* Pattern: Green Dragonscale Leggings */
-UPDATE `item_template` SET `requiredspell` = 10656 WHERE entry=15733;
-/* Pattern: Blue Dragonscale Breastplate */
-UPDATE `item_template` SET `requiredspell` = 10656 WHERE entry=15751;
-/* Pattern: Black Dragonscale Breastplate */
-UPDATE `item_template` SET `requiredspell` = 10656 WHERE entry=15759;
-/* Pattern: Blue Dragonscale Shoulders */
-UPDATE `item_template` SET `requiredspell` = 10656 WHERE entry=15763;
-/* Pattern: Black Dragonscale Shoulders */
-UPDATE `item_template` SET `requiredspell` = 10656 WHERE entry=15770;
-/* Pattern: Black Dragonscale Leggings */
-UPDATE `item_template` SET `requiredspell` = 10656 WHERE entry=15781;
-/* Pattern: Black Dragonscale Boots */
-UPDATE `item_template` SET `requiredspell` = 10656 WHERE entry=17025;
-/* Pattern: Chromatic Gauntlets */
-UPDATE `item_template` SET `requiredspell` = 10656 WHERE entry=19331;
-/* Pattern: Dreamscale Breastplate */
-UPDATE `item_template` SET `requiredspell` = 10656 WHERE entry=20382;
-
+UPDATE `npc_trainer` SET `ReqSpell` = 10656 WHERE SpellID=10619;      -- Dragonscale Gauntlets
+UPDATE `npc_trainer` SET `ReqSpell` = 10656 WHERE SpellID=10650;      -- Dragonscale Breastplate
+UPDATE `npc_trainer` SET `ReqSpell` = 10656 WHERE SpellID=24654;      -- Blue Dragonscale Leggings
+UPDATE `npc_trainer` SET `ReqSpell` = 10656 WHERE SpellID=24655;      -- Green Dragonscale Gauntlets
+UPDATE `npc_trainer` SET `ReqSpell` = 10656 WHERE SpellID=36076;      -- Dragonstrike Leggings
+UPDATE `item_template` SET `requiredspell` = 10656 WHERE entry=15726; -- Pattern: Green Dragonscale Breastplate
+UPDATE `item_template` SET `requiredspell` = 10656 WHERE entry=15730; -- Pattern: Red Dragonscale Breastplate
+UPDATE `item_template` SET `requiredspell` = 10656 WHERE entry=15733; -- Pattern: Green Dragonscale Leggings
+UPDATE `item_template` SET `requiredspell` = 10656 WHERE entry=15751; -- Pattern: Blue Dragonscale Breastplate
+UPDATE `item_template` SET `requiredspell` = 10656 WHERE entry=15759; -- Pattern: Black Dragonscale Breastplate
+UPDATE `item_template` SET `requiredspell` = 10656 WHERE entry=15763; -- Pattern: Blue Dragonscale Shoulders
+UPDATE `item_template` SET `requiredspell` = 10656 WHERE entry=15770; -- Pattern: Black Dragonscale Shoulders
+UPDATE `item_template` SET `requiredspell` = 10656 WHERE entry=15781; -- Pattern: Black Dragonscale Leggings
+UPDATE `item_template` SET `requiredspell` = 10656 WHERE entry=17025; -- Pattern: Black Dragonscale Boots
+UPDATE `item_template` SET `requiredspell` = 10656 WHERE entry=19331; -- Pattern: Chromatic Gauntlets
+UPDATE `item_template` SET `requiredspell` = 10656 WHERE entry=20382; -- Pattern: Dreamscale Breastplate
 
 /* Elemental Leatherworking (10658) */
-
-/* Gauntlets of the Sea */
-UPDATE `npc_trainer` SET `ReqSpell` = 10658 WHERE SpellID=10630;
-/* Helm of Fire */
-UPDATE `npc_trainer` SET `ReqSpell` = 10658 WHERE SpellID=10632;
-/* Blackstorm Leggings */
-UPDATE `npc_trainer` SET `ReqSpell` = 10658 WHERE SpellID=36074;
-/* Pattern: Volcanic Leggings */
-UPDATE `item_template` SET `requiredspell` = 10658 WHERE entry=15732;
-/* Pattern: Living Shoulders */
-UPDATE `item_template` SET `requiredspell` = 10658 WHERE entry=15734;
-/* Pattern: Stormshroud Pants */
-UPDATE `item_template` SET `requiredspell` = 10658 WHERE entry=15741;
-/* Pattern: Volcanic Breastplate */
-UPDATE `item_template` SET `requiredspell` = 10658 WHERE entry=15749;
-/* Pattern: Living Leggings */
-UPDATE `item_template` SET `requiredspell` = 10658 WHERE entry=15752;
-/* Pattern: Stormshroud Armor */
-UPDATE `item_template` SET `requiredspell` = 10658 WHERE entry=15753;
-/* Pattern: Stormshroud Shoulders */
-UPDATE `item_template` SET `requiredspell` = 10658 WHERE entry=15764;
-/* Pattern: Living Breastplate */
-UPDATE `item_template` SET `requiredspell` = 10658 WHERE entry=15771;
-/* Pattern: Volcanic Shoulders */
-UPDATE `item_template` SET `requiredspell` = 10658 WHERE entry=15775;
-/* Pattern: Molten Helm */
-UPDATE `item_template` SET `requiredspell` = 10658 WHERE entry=17023;
-/* Pattern: Shifting Cloak */
-UPDATE `item_template` SET `requiredspell` = 10658 WHERE entry=18519;
-/* Pattern: Molten Belt */
-UPDATE `item_template` SET `requiredspell` = 10658 WHERE entry=19333;
-/* Pattern: Stormshroud Gloves */
-UPDATE `item_template` SET `requiredspell` = 10658 WHERE entry=21548;
-
+UPDATE `npc_trainer` SET `ReqSpell` = 10658 WHERE SpellID=10630;      -- Gauntlets of the Sea
+UPDATE `npc_trainer` SET `ReqSpell` = 10658 WHERE SpellID=10632;      -- Helm of Fire
+UPDATE `npc_trainer` SET `ReqSpell` = 10658 WHERE SpellID=36074;      -- Blackstorm Leggings
+UPDATE `item_template` SET `requiredspell` = 10658 WHERE entry=15732; -- Pattern: Volcanic Leggings
+UPDATE `item_template` SET `requiredspell` = 10658 WHERE entry=15734; -- Pattern: Living Shoulders
+UPDATE `item_template` SET `requiredspell` = 10658 WHERE entry=15741; -- Pattern: Stormshroud Pants
+UPDATE `item_template` SET `requiredspell` = 10658 WHERE entry=15749; -- Pattern: Volcanic Breastplate
+UPDATE `item_template` SET `requiredspell` = 10658 WHERE entry=15752; -- Pattern: Living Leggings
+UPDATE `item_template` SET `requiredspell` = 10658 WHERE entry=15753; -- Pattern: Stormshroud Armor
+UPDATE `item_template` SET `requiredspell` = 10658 WHERE entry=15764; -- Pattern: Stormshroud Shoulders
+UPDATE `item_template` SET `requiredspell` = 10658 WHERE entry=15771; -- Pattern: Living Breastplate
+UPDATE `item_template` SET `requiredspell` = 10658 WHERE entry=15775; -- Pattern: Volcanic Shoulders
+UPDATE `item_template` SET `requiredspell` = 10658 WHERE entry=17023; -- Pattern: Molten Helm
+UPDATE `item_template` SET `requiredspell` = 10658 WHERE entry=18519; -- Pattern: Shifting Cloak
+UPDATE `item_template` SET `requiredspell` = 10658 WHERE entry=19333; -- Pattern: Molten Belt
+UPDATE `item_template` SET `requiredspell` = 10658 WHERE entry=21548; -- Pattern: Stormshroud Gloves
 
 /* Tribal Leatherworking (10660) */
-
-/* Wolfshead Helm */
-UPDATE `npc_trainer` SET `ReqSpell` = 10660 WHERE SpellID=10621;
-/* Feathered Breastplate */
-UPDATE `npc_trainer` SET `ReqSpell` = 10660 WHERE SpellID=10647;
-/* Wildfeather Leggings */
-UPDATE `npc_trainer` SET `ReqSpell` = 10660 WHERE SpellID=36075;
-/* Pattern: Chimeric Gloves */
-UPDATE `item_template` SET `requiredspell` = 10660 WHERE entry=15729;
-/* Pattern: Ironfeather Shoulders */
-UPDATE `item_template` SET `requiredspell` = 10660 WHERE entry=15735;
-/* Pattern: Chimeric Boots */
-UPDATE `item_template` SET `requiredspell` = 10660 WHERE entry=15737;
-/* Pattern: Frostsaber Boots */
-UPDATE `item_template` SET `requiredspell` = 10660 WHERE entry=15740;
-/* Pattern: Chimeric Leggings */
-UPDATE `item_template` SET `requiredspell` = 10660 WHERE entry=15746;
-/* Pattern: Frostsaber Leggings */
-UPDATE `item_template` SET `requiredspell` = 10660 WHERE entry=15747;
-/* Pattern: Chimeric Vest */
-UPDATE `item_template` SET `requiredspell` = 10660 WHERE entry=15755;
-/* Pattern: Devilsaur Gauntlets */
-UPDATE `item_template` SET `requiredspell` = 10660 WHERE entry=15758;
-/* Pattern: Ironfeather Breastplate */
-UPDATE `item_template` SET `requiredspell` = 10660 WHERE entry=15760;
-/* Pattern: Frostsaber Gloves */
-UPDATE `item_template` SET `requiredspell` = 10660 WHERE entry=15761;
-/* Pattern: Devilsaur Leggings */
-UPDATE `item_template` SET `requiredspell` = 10660 WHERE entry=15772;
-/* Pattern: Frostsaber Tunic */
-UPDATE `item_template` SET `requiredspell` = 10660 WHERE entry=15779;
-/* Pattern: Corehound Boots */
-UPDATE `item_template` SET `requiredspell` = 10660 WHERE entry=17022;
-/* Pattern: Hide of the Wild */
-UPDATE `item_template` SET `requiredspell` = 10660 WHERE entry=18518;
-/* Pattern: Corehound Belt */
-UPDATE `item_template` SET `requiredspell` = 10660 WHERE entry=19332;
-/* Pattern: Warbear Harness */
-UPDATE `item_template` SET `requiredspell` = 10660 WHERE entry=20253;
-/* Pattern: Warbear Woolies */
-UPDATE `item_template` SET `requiredspell` = 10660 WHERE entry=20254;
-
+UPDATE `npc_trainer` SET `ReqSpell` = 10660 WHERE SpellID=10621;      -- Wolfshead Helm
+UPDATE `npc_trainer` SET `ReqSpell` = 10660 WHERE SpellID=10647;      -- Feathered Breastplate
+UPDATE `npc_trainer` SET `ReqSpell` = 10660 WHERE SpellID=36075;      -- Wildfeather Leggings
+UPDATE `item_template` SET `requiredspell` = 10660 WHERE entry=15729; -- Pattern: Chimeric Gloves
+UPDATE `item_template` SET `requiredspell` = 10660 WHERE entry=15735; -- Pattern: Ironfeather Shoulders
+UPDATE `item_template` SET `requiredspell` = 10660 WHERE entry=15737; -- Pattern: Chimeric Boots
+UPDATE `item_template` SET `requiredspell` = 10660 WHERE entry=15740; -- Pattern: Frostsaber Boots
+UPDATE `item_template` SET `requiredspell` = 10660 WHERE entry=15746; -- Pattern: Chimeric Leggings
+UPDATE `item_template` SET `requiredspell` = 10660 WHERE entry=15747; -- Pattern: Frostsaber Leggings
+UPDATE `item_template` SET `requiredspell` = 10660 WHERE entry=15755; -- Pattern: Chimeric Vest
+UPDATE `item_template` SET `requiredspell` = 10660 WHERE entry=15758; -- Pattern: Devilsaur Gauntlets
+UPDATE `item_template` SET `requiredspell` = 10660 WHERE entry=15760; -- Pattern: Ironfeather Breastplate
+UPDATE `item_template` SET `requiredspell` = 10660 WHERE entry=15761; -- Pattern: Frostsaber Gloves
+UPDATE `item_template` SET `requiredspell` = 10660 WHERE entry=15772; -- Pattern: Devilsaur Leggings
+UPDATE `item_template` SET `requiredspell` = 10660 WHERE entry=15779; -- Pattern: Frostsaber Tunic
+UPDATE `item_template` SET `requiredspell` = 10660 WHERE entry=17022; -- Pattern: Corehound Boots
+UPDATE `item_template` SET `requiredspell` = 10660 WHERE entry=18518; -- Pattern: Hide of the Wild
+UPDATE `item_template` SET `requiredspell` = 10660 WHERE entry=19332; -- Pattern: Corehound Belt
+UPDATE `item_template` SET `requiredspell` = 10660 WHERE entry=20253; -- Pattern: Warbear Harness
+UPDATE `item_template` SET `requiredspell` = 10660 WHERE entry=20254; -- Pattern: Warbear Woolies
 
 /* Armorsmith (9788) */
-
-/* Truesilver Breastplate */
-UPDATE `npc_trainer` SET `ReqSpell` = 9788 WHERE SpellID=9974;
-/* Truesilver Gauntlets */
-UPDATE `npc_trainer` SET `ReqSpell` = 9788 WHERE SpellID=9954;
-/* Earthforged Leggings */
-UPDATE `npc_trainer` SET `ReqSpell` = 9788 WHERE SpellID=36122;
-/* Windforged Leggings */
-UPDATE `npc_trainer` SET `ReqSpell` = 9788 WHERE SpellID=36124;
-/* Plans: Dark Iron Bracers */
-UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=17051;
-/* Plans: Dark Iron Gauntlets */
-UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=19207;
-/* Plans: Dark Iron Helm */
-UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=19206;
-/* Plans: Dark Iron Leggings */
-UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=17052;
-/* Plans: Dark Iron Boots */
-UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=20040;
-/* Plans: Dark Iron Plate */
-UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=11612;
-/* Plans: Dawnbringer Shoulders */
-UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=12698;
-/* Plans: Demon Forged Breastplate */
-UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=12696;
-/* Plans: Enchanted Thorium Breastplate */
-UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=12727;
-/* Plans: Enchanted Thorium Helm */
-UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=12725;
-/* Plans: Enchanted Thorium Leggings */
-UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=12726;
-/* Plans: Fiery Chain Girdle */
-UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=17049;
-/* Plans: Fiery Chain Shoulders */
-UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=17053;
-/* Plans: Fiery Plate Gauntlets */
-UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=12699;
-/* Plans: Helm of the Great Chief */
-UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=12716;
-/* Plans: Invulnerable Mail */
-UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=12728;
-/* Plans: Fiery Chain Girdle */
-UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=17049;
-/* Plans: Lionheart Helm */
-UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=12717;
-/* Plans: Storm Gauntlets */
-UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=12703;
-/* Plans: Stronghold Gauntlets */
-UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=12720;
-/* Plans: Titanic Leggings */
-UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=22388;
-/* Plans: Whitesoul Helm */
-UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=12711;
-/* Plans: Wildthorn Mail */
-UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=12691;
-
+UPDATE `npc_trainer` SET `ReqSpell` = 9788 WHERE SpellID=9974;       -- Truesilver Breastplate
+UPDATE `npc_trainer` SET `ReqSpell` = 9788 WHERE SpellID=9954;       -- Truesilver Gauntlets
+UPDATE `npc_trainer` SET `ReqSpell` = 9788 WHERE SpellID=36122;      -- Earthforged Leggings
+UPDATE `npc_trainer` SET `ReqSpell` = 9788 WHERE SpellID=36124;      -- Windforged Leggings
+UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=17051; -- Plans: Dark Iron Bracers
+UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=19207; -- Plans: Dark Iron Gauntlets
+UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=19206; -- Plans: Dark Iron Helm
+UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=17052; -- Plans: Dark Iron Leggings
+UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=20040; -- Plans: Dark Iron Boots
+UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=11612; -- Plans: Dark Iron Plate
+UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=12698; -- Plans: Dawnbringer Shoulders
+UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=12696; -- Plans: Demon Forged Breastplate
+UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=12727; -- Plans: Enchanted Thorium Breastplate
+UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=12725; -- Plans: Enchanted Thorium Helm
+UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=12726; -- Plans: Enchanted Thorium Leggings
+UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=17049; -- Plans: Fiery Chain Girdle
+UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=17053; -- Plans: Fiery Chain Shoulders
+UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=12699; -- Plans: Fiery Plate Gauntlets
+UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=12716; -- Plans: Helm of the Great Chief
+UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=12728; -- Plans: Invulnerable Mail
+UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=12717; -- Plans: Lionheart Helm
+UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=12703; -- Plans: Storm Gauntlets
+UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=12720; -- Plans: Stronghold Gauntlets
+UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=22388; -- Plans: Titanic Leggings
+UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=12711; -- Plans: Whitesoul Helm
+UPDATE `item_template` SET `requiredspell` = 9788 WHERE entry=12691; -- Plans: Wildthorn Mail
 
 /* Weaponsmith (9787) */
-
-/* The Shatterer */
-UPDATE `npc_trainer` SET `ReqSpell` = 9787 WHERE SpellID=10003;
-/* Phantom Blade */
-UPDATE `npc_trainer` SET `ReqSpell` = 9787 WHERE SpellID=10007;
-/* Blight */
-UPDATE `npc_trainer` SET `ReqSpell` = 9787 WHERE SpellID=10011;
-/* Truesilver Champion */
-UPDATE `npc_trainer` SET `ReqSpell` = 9787 WHERE SpellID=10015;
-/* Light Earthforged Blade */
-UPDATE `npc_trainer` SET `ReqSpell` = 9787 WHERE SpellID=36125;
-/* Light Skyforged Axe */
-UPDATE `npc_trainer` SET `ReqSpell` = 9787 WHERE SpellID=36126;
-/* Light Emberforged Hammer */
-UPDATE `npc_trainer` SET `ReqSpell` = 9787 WHERE SpellID=36128;
-/* Plans: Dark Iron Pulverizer */
-UPDATE `item_template` SET `requiredspell` = 9787 WHERE entry=11610;
-/* Plans: Dark Iron Sunderer */
-UPDATE `item_template` SET `requiredspell` = 9787 WHERE entry=11611;
-/* Plans: Heartseeker */
-UPDATE `item_template` SET `requiredspell` = 9787 WHERE entry=12839;
-/* Plans: Black Amnesty */
-UPDATE `item_template` SET `requiredspell` = 9787 WHERE entry=19208;
-/* Plans: Blackfury */
-UPDATE `item_template` SET `requiredspell` = 9787 WHERE entry=19209;
-
+UPDATE `npc_trainer` SET `ReqSpell` = 9787 WHERE SpellID=10003;      -- The Shatterer
+UPDATE `npc_trainer` SET `ReqSpell` = 9787 WHERE SpellID=10007;      -- Phantom Blade
+UPDATE `npc_trainer` SET `ReqSpell` = 9787 WHERE SpellID=10011;      -- Blight
+UPDATE `npc_trainer` SET `ReqSpell` = 9787 WHERE SpellID=10015;      -- Truesilver Champion
+UPDATE `npc_trainer` SET `ReqSpell` = 9787 WHERE SpellID=36125;      -- Light Earthforged Blade
+UPDATE `npc_trainer` SET `ReqSpell` = 9787 WHERE SpellID=36126;      -- Light Skyforged Axe
+UPDATE `npc_trainer` SET `ReqSpell` = 9787 WHERE SpellID=36128;      -- Light Emberforged Hammer
+UPDATE `item_template` SET `requiredspell` = 9787 WHERE entry=11610; -- Plans: Dark Iron Pulverizer
+UPDATE `item_template` SET `requiredspell` = 9787 WHERE entry=11611; -- Plans: Dark Iron Sunderer
+UPDATE `item_template` SET `requiredspell` = 9787 WHERE entry=12839; -- Plans: Heartseeker
+UPDATE `item_template` SET `requiredspell` = 9787 WHERE entry=19208; -- Plans: Black Amnesty
+UPDATE `item_template` SET `requiredspell` = 9787 WHERE entry=19209; -- Plans: Blackfury
 
 /* Master Swordsmith (17039) */
-
-/* Plans: Blazing Rapier */
-UPDATE `item_template` SET `requiredspell` = 17039 WHERE entry=12825;
-/* Plans: Arcanite Champion */
-UPDATE `item_template` SET `requiredspell` = 17039 WHERE entry=12834;
-/* Plans: Frostguard */
-UPDATE `item_template` SET `requiredspell` = 17039 WHERE entry=12836;
-/* Plans: Corruption */
-UPDATE `item_template` SET `requiredspell` = 17039 WHERE entry=12830;
-/* Plans: Dark Iron Reaver */
-UPDATE `item_template` SET `requiredspell` = 17039 WHERE entry=17059;
-/* Plans: Blackguard */
-UPDATE `item_template` SET `requiredspell` = 17039 WHERE entry=19211;
-/* Plans: Sageblade */
-UPDATE `item_template` SET `requiredspell` = 17039 WHERE entry=22389;
-
+UPDATE `item_template` SET `requiredspell` = 17039 WHERE entry=12825; -- Plans: Blazing Rapier
+UPDATE `item_template` SET `requiredspell` = 17039 WHERE entry=12834; -- Plans: Arcanite Champion
+UPDATE `item_template` SET `requiredspell` = 17039 WHERE entry=12836; -- Plans: Frostguard
+UPDATE `item_template` SET `requiredspell` = 17039 WHERE entry=12830; -- Plans: Corruption
+UPDATE `item_template` SET `requiredspell` = 17039 WHERE entry=17059; -- Plans: Dark Iron Reaver
+UPDATE `item_template` SET `requiredspell` = 17039 WHERE entry=19211; -- Plans: Blackguard
+UPDATE `item_template` SET `requiredspell` = 17039 WHERE entry=22389; -- Plans: Sageblade
 
 /* Master Hammersmith (17040) */
-
-/* Plans: Enchanted Battlehammer */
-UPDATE `item_template` SET `requiredspell` = 17040 WHERE entry=12824;
-/* Plans: Serenity */
-UPDATE `item_template` SET `requiredspell` = 17040 WHERE entry=12827;
-/* Plans: Hammer of the Titans */
-UPDATE `item_template` SET `requiredspell` = 17040 WHERE entry=12833;
-/* Plans: Masterwork Stormhammer */
-UPDATE `item_template` SET `requiredspell` = 17040 WHERE entry=12837;
-/* Plans: Ebon Hand */
-UPDATE `item_template` SET `requiredspell` = 17040 WHERE entry=19210;
-/* Plans: Persuader */
-UPDATE `item_template` SET `requiredspell` = 17040 WHERE entry=22390;
-
+UPDATE `item_template` SET `requiredspell` = 17040 WHERE entry=12824; -- Plans: Enchanted Battlehammer
+UPDATE `item_template` SET `requiredspell` = 17040 WHERE entry=12827; -- Plans: Serenity
+UPDATE `item_template` SET `requiredspell` = 17040 WHERE entry=12833; -- Plans: Hammer of the Titans
+UPDATE `item_template` SET `requiredspell` = 17040 WHERE entry=12837; -- Plans: Masterwork Stormhammer
+UPDATE `item_template` SET `requiredspell` = 17040 WHERE entry=19210; -- Plans: Ebon Hand
+UPDATE `item_template` SET `requiredspell` = 17040 WHERE entry=22390; -- Plans: Persuader
 
 /* Master Axesmith (17041) */
-
-/* Plans: Annihilator */
-UPDATE `item_template` SET `requiredspell` = 17041 WHERE entry=12835;
-/* Plans: Arcanite Reaper */
-UPDATE `item_template` SET `requiredspell` = 17041 WHERE entry=12838;
-/* Plans: Dark Iron Destroyer */
-UPDATE `item_template` SET `requiredspell` = 17041 WHERE entry=17060;
-/* Plans: Dawn's Edge */
-UPDATE `item_template` SET `requiredspell` = 17041 WHERE entry=12821;
-/* Plans: Nightfall */
-UPDATE `item_template` SET `requiredspell` = 17041 WHERE entry=19212;
-
+UPDATE `item_template` SET `requiredspell` = 17041 WHERE entry=12835; -- Plans: Annihilator
+UPDATE `item_template` SET `requiredspell` = 17041 WHERE entry=12838; -- Plans: Arcanite Reaper
+UPDATE `item_template` SET `requiredspell` = 17041 WHERE entry=17060; -- Plans: Dark Iron Destroyer
+UPDATE `item_template` SET `requiredspell` = 17041 WHERE entry=12821; -- Plans: Dawn's Edge
+UPDATE `item_template` SET `requiredspell` = 17041 WHERE entry=19212; -- Plans: Nightfall

From 3ea00f7dfd217b5ba6c3d5705a687b91467c52aa Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 14:34:56 +0200
Subject: [PATCH 22/39] Rename optional_vanilla_models.sql to
 zz_optional_vanilla_models.sql

consistency
---
 ...l_vanilla_models.sql => zz_optional_vanilla_models.sql} | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
 rename sql/world/base/{optional_vanilla_models.sql => zz_optional_vanilla_models.sql} (99%)

diff --git a/sql/world/base/optional_vanilla_models.sql b/sql/world/base/zz_optional_vanilla_models.sql
similarity index 99%
rename from sql/world/base/optional_vanilla_models.sql
rename to sql/world/base/zz_optional_vanilla_models.sql
index f93aa49..4954207 100644
--- a/sql/world/base/optional_vanilla_models.sql
+++ b/sql/world/base/zz_optional_vanilla_models.sql
@@ -1,6 +1,7 @@
-/* Reverts creatures that had model changes post-Vanilla to their original models.
-   There are a few exceptions due to some Vanilla models being removed from the game files.
- */
+/*
+    Reverts creatures that had model changes post-Vanilla to their original models.
+    There are a few exceptions due to some Vanilla models being removed from the game files.
+*/
 
 UPDATE `creature_template_model` SET `CreatureDisplayID`=143 WHERE `CreatureID`=29 AND `Idx`=0;
 UPDATE `creature_template_model` SET `CreatureDisplayID`=604 WHERE `CreatureID`=69 AND `Idx`=0;

From 644f5c34050dc55216a94f56efa285a4bea87627 Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 14:46:23 +0200
Subject: [PATCH 23/39] Update and rename optional_vanilla_phasing.sql to
 zz_optional_vanilla_phasing.sql

consistency

commented out the phasing of the flight masters at Ratchet and Marshal's Refuge
Most player will expect these npcs to be there.
---
 ...ng.sql => zz_optional_vanilla_phasing.sql} | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)
 rename sql/world/base/{optional_vanilla_phasing.sql => zz_optional_vanilla_phasing.sql} (66%)

diff --git a/sql/world/base/optional_vanilla_phasing.sql b/sql/world/base/zz_optional_vanilla_phasing.sql
similarity index 66%
rename from sql/world/base/optional_vanilla_phasing.sql
rename to sql/world/base/zz_optional_vanilla_phasing.sql
index 041201d..1bfc1a4 100644
--- a/sql/world/base/optional_vanilla_phasing.sql
+++ b/sql/world/base/zz_optional_vanilla_phasing.sql
@@ -1,4 +1,5 @@
-/*  This will phase Vanilla/TBC npcs & objects placed in vanilla areas until they were originally added to the game.
+/*  
+    This will phase Vanilla/TBC npcs & objects placed in vanilla areas until they were originally added to the game.
     This includes quest givers and flight paths. 
 */
 
@@ -15,17 +16,20 @@ UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_tbc' WHERE `entry` IN (
 17194, -- Anchorite Delan, Darkshire
 17218, -- Huraan, Southshore
 17223, -- Ambassador Rualeth, Aerie Peak
-22931, -- Gorrim, Emerald Sanctuary
-24366, -- Nizzle, Rebel Camp
+22931, -- Gorrim, Emerald Sanctuary, Flight Master
+24366, -- Nizzle, Rebel Camp, Flight Master
 27705, -- Lorrin Foxfire, Stonard
-37888, -- Frax Bucketdrop, Thondroril River
-37915 -- Timothy Cunningham, The Bulwark
+37888, -- Frax Bucketdrop, Thondroril River, Flight Master
+37915 -- Timothy Cunningham, The Bulwark, Flight Master
 );
 
+/* the flight masters at Ratchet and Marshal's Refuge were originally added in patch 1.11
 UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_naxx40' WHERE `entry` IN (
-10583, -- Gryfe, Marshal's Refuge
-16227 -- Bragok, Ratchet
-);
+10583, -- Gryfe, Marshal's Refuge, Flight Master
+16227 -- Bragok, Ratchet, Flight Master); 
+*/
 
 -- remove interactions between Cersei, Lorrin and the orcs in Stonard 
 UPDATE `creature_template` SET `AIName` = '' WHERE `entry` IN (12807, 17109, 27705);
+
+-- to do: mail boxes

From 6edcf57fdc903ca6af9ad94416ffab34ff217d52 Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 14:49:26 +0200
Subject: [PATCH 24/39] Rename optional_vanilla_transports.sql to
 zz_optional_vanilla_transports.sql

consistency
---
 ...orts.sql => zz_optional_vanilla_transports.sql} | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
 rename sql/world/base/{optional_vanilla_transports.sql => zz_optional_vanilla_transports.sql} (76%)

diff --git a/sql/world/base/optional_vanilla_transports.sql b/sql/world/base/zz_optional_vanilla_transports.sql
similarity index 76%
rename from sql/world/base/optional_vanilla_transports.sql
rename to sql/world/base/zz_optional_vanilla_transports.sql
index d1121c7..e74e4e9 100644
--- a/sql/world/base/optional_vanilla_transports.sql
+++ b/sql/world/base/zz_optional_vanilla_transports.sql
@@ -1,6 +1,9 @@
-/* Re-route The Bravery to follow the pre-WotLK path to Menethil Harbor - fix associated text */
-/* This restores the original separate between Kalimdor and Eastern Kingdom starting areas, and the notorious 'Wetlands run' for players trying to change continents early. */
-/* If not run, The Bravery will go directly to Stormwind Harbor, allowing players to skip to the other continent immediately any time */
+/*
+    Re-route The Bravery to follow the pre-WotLK path to Menethil Harbor - fix associated text
+    This restores the original separate between Kalimdor and Eastern Kingdom starting areas, and the notorious 'Wetlands run' for players trying to change continents early.
+    If not run, The Bravery will go directly to Stormwind Harbor, allowing players to skip to the other continent immediately any time 
+*/
+
 UPDATE `gameobject_template` SET `Data0` = 295 WHERE `entry` = 176310;
 UPDATE `transports` SET `name` = 'Menethil Harbor and Auberdine, Darkshore ("Ship (The Bravery)")' WHERE `guid` = 2;
 UPDATE `npc_text` SET `text0_1` = 'We\'ve sworn to do our very best to protect the passengers of The Bravery. The sea lane between Auberdine and Menethil Harbor must remain safe.' WHERE `ID` = 12270;
@@ -13,6 +16,5 @@ UPDATE `broadcast_text` SET `MaleText` = 'On the northern dock, you can board a
 UPDATE `broadcast_text` SET `FemaleText` = 'No ship currently sails from this dock. If you''d like to reach Auberdine, The Bravery sails from Menethil Harbor.' WHERE `ID` = 28636;
 
 
-/* Like the above, removes a transport added in late WotLK (3.2.0) that remove intended separation between the continents in early game. */
--- From Orgrimmar to Thunder Bluff
-DELETE FROM `transports` WHERE `guid`=20;
\ No newline at end of file
+/* Like the above, removes a transport added in late WotLK (3.2.0) */
+DELETE FROM `transports` WHERE `guid`=20; -- From Orgrimmar to Thunder Bluff

From 3335c15033ce252bf97e868e53020d6f3a0795a1 Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 15:09:13 +0200
Subject: [PATCH 25/39] making it easier to enable/disable

making it easier to enable/disable the phasing of the flight masters at Ratchet and Marshal's Refuge
---
 sql/world/base/zz_optional_vanilla_phasing.sql | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sql/world/base/zz_optional_vanilla_phasing.sql b/sql/world/base/zz_optional_vanilla_phasing.sql
index 1bfc1a4..6d3302d 100644
--- a/sql/world/base/zz_optional_vanilla_phasing.sql
+++ b/sql/world/base/zz_optional_vanilla_phasing.sql
@@ -23,13 +23,13 @@ UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_tbc' WHERE `entry` IN (
 37915 -- Timothy Cunningham, The Bulwark, Flight Master
 );
 
-/* the flight masters at Ratchet and Marshal's Refuge were originally added in patch 1.11
-UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_naxx40' WHERE `entry` IN (
+-- the flight masters at Ratchet and Marshal's Refuge were originally added in patch 1.11 - disabled by default, because most players will expect these npcs to be there
+/* UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_naxx40' WHERE `entry` IN (
 10583, -- Gryfe, Marshal's Refuge, Flight Master
-16227 -- Bragok, Ratchet, Flight Master); 
-*/
+16227 -- Bragok, Ratchet, Flight Master
+); */
 
 -- remove interactions between Cersei, Lorrin and the orcs in Stonard 
 UPDATE `creature_template` SET `AIName` = '' WHERE `entry` IN (12807, 17109, 27705);
 
--- to do: mail boxes
+-- to do: mail boxes in cities and anvil + furnace at Orgrimmar entrance

From 3b1d92725895945c17093be9b855859ed21b8e19 Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 16:48:37 +0200
Subject: [PATCH 26/39] move quiver_haste to vanilla_item_changes

this does include tbc and wotlk quivers,
but I rather have these updates together
---
 sql/world/base/vanilla_item_changes.sql | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/sql/world/base/vanilla_item_changes.sql b/sql/world/base/vanilla_item_changes.sql
index 0a4737e..98a529b 100644
--- a/sql/world/base/vanilla_item_changes.sql
+++ b/sql/world/base/vanilla_item_changes.sql
@@ -14,6 +14,20 @@ UPDATE item_template SET RequiredReputationFaction=529, RequiredReputationRank=7
 UPDATE `item_template` SET `stackable` = 200 WHERE `stackable` = 1000 AND `InventoryType` = 24;
 UPDATE `item_template` SET `stackable` = 1000 WHERE `entry` IN (41164, 41165, 41584, 41586, 52020, 52021); -- WotLK ammo
 
+-- Restore quiver functionality
+UPDATE `item_template` SET `spellid_1` = 29418 WHERE `entry` IN (2101, 3573, 5439, 7278, 11362); 
+UPDATE `item_template` SET `spellid_1` = 14824 WHERE `entry` IN (2102, 3574, 5441, 7279, 11363);
+UPDATE `item_template` SET `spellid_1` = 29414 WHERE `entry` IN (18714, 19319, 29143, 29144, 34100, 34105, 44448);
+UPDATE `item_template` SET `spellid_1` = 14829 WHERE `entry` IN (19320, 29118, 34099, 34106, 44447);
+UPDATE `item_template` SET `spellid_1` = 29415 WHERE `entry` = 2662;
+UPDATE `item_template` SET `spellid_1` = 14828 WHERE `entry` = 2663;
+UPDATE `item_template` SET `spellid_1` = 14825 WHERE `entry` = 3604;
+UPDATE `item_template` SET `spellid_1` = 29417 WHERE `entry` = 3605;
+UPDATE `item_template` SET `spellid_1` = 29416 WHERE `entry` = 7371;
+UPDATE `item_template` SET `spellid_1` = 14826 WHERE `entry` = 7372;
+UPDATE `item_template` SET `spellid_1` = 29413 WHERE `entry` = 8217;
+UPDATE `item_template` SET `spellid_1` = 14827 WHERE `entry` = 8218;
+
 /*  Martin Fury  */
 UPDATE `item_template` SET `SellPrice` = 0, `spellcooldown_2` = -1, `spellcategorycooldown_2` = -1, `spellcooldown_3` = -1, `spellcategorycooldown_3` = -1, `spellcooldown_4` = -1, `spellcategorycooldown_4` = -1, `spellcooldown_5` = -1, `spellcategorycooldown_5` = -1 WHERE entry=17;
 

From 03b942c8fc891f0ff9aa1950333056295cf6d5b8 Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 16:49:43 +0200
Subject: [PATCH 27/39] Delete sql/world/base/quiver_haste.sql

content moved to vanilla_item_changes
---
 sql/world/base/quiver_haste.sql | 89 ---------------------------------
 1 file changed, 89 deletions(-)
 delete mode 100644 sql/world/base/quiver_haste.sql

diff --git a/sql/world/base/quiver_haste.sql b/sql/world/base/quiver_haste.sql
deleted file mode 100644
index d56adf7..0000000
--- a/sql/world/base/quiver_haste.sql
+++ /dev/null
@@ -1,89 +0,0 @@
-/*  Light Quiver  */
-UPDATE `item_template` SET `spellid_1` = 29418 WHERE entry=2101;
-
-/*  Small Ammo Pouch  */
-UPDATE `item_template` SET `spellid_1` = 14824 WHERE entry=2102;
-
-/*  Ribbly's Quiver  */
-UPDATE `item_template` SET `spellid_1` = 29415 WHERE entry=2662;
-
-/*  Ribbly's Bandolier  */
-UPDATE `item_template` SET `spellid_1` = 14828 WHERE entry=2663;
-
-/*  Hunting Quiver  */
-UPDATE `item_template` SET `spellid_1` = 29418 WHERE entry=3573;
-
-/*  Hunting Ammo Sack  */
-UPDATE `item_template` SET `spellid_1` = 14824 WHERE entry=3574;
-
-/*  Bandolier of the Night Watch  */
-UPDATE `item_template` SET `spellid_1` = 14825 WHERE entry=3604;
-
-/*  Quiver of the Night Watch  */
-UPDATE `item_template` SET `spellid_1` = 29417 WHERE entry=3605;
-
-/*  Small Quiver  */
-UPDATE `item_template` SET `spellid_1` = 29418 WHERE entry=5439;
-
-/*  Small Shot Pouch  */
-UPDATE `item_template` SET `spellid_1` = 14824 WHERE entry=5441;
-
-/*  Light Leather Quiver  */
-UPDATE `item_template` SET `spellid_1` = 29418 WHERE entry=7278;
-
-/*  Small Leather Ammo Pouch  */
-UPDATE `item_template` SET `spellid_1` = 14824 WHERE entry=7279;
-
-/*  Heavy Quiver  */
-UPDATE `item_template` SET `spellid_1` = 29416 WHERE entry=7371;
-
-/*  Heavy Leather Ammo Pouch  */
-UPDATE `item_template` SET `spellid_1` = 14826 WHERE entry=7372;
-
-/*  Quickdraw Quiver  */
-UPDATE `item_template` SET `spellid_1` = 29413 WHERE entry=8217;
-
-/*  Thick Leather Ammo Pouch  */
-UPDATE `item_template` SET `spellid_1` = 14827 WHERE entry=8218;
-
-/*  Medium Quiver  */
-UPDATE `item_template` SET `spellid_1` = 29418 WHERE entry=11362;
-
-/*  Medium Shot Pouch  */
-UPDATE `item_template` SET `spellid_1` = 14824 WHERE entry=11363;
-
-/*  Ancient Sinew Wrapped Lamina  */
-UPDATE `item_template` SET `spellid_1` = 29414 WHERE entry=18714;
-
-/*  Harpy Hide Quiver  */
-UPDATE `item_template` SET `BuyPrice` = 350000, `SellPrice` = 87500, `spellid_1` = 29414 WHERE entry=19319;
-
-/*  Gnoll Skin Bandolier  */
-UPDATE `item_template` SET `BuyPrice` = 350000, `SellPrice` = 87500, `spellid_1` = 14829 WHERE entry=19320;
-
-/*  Smuggler's Ammo Pouch  */
-UPDATE `item_template` SET `spellid_1` = 14829 WHERE entry=29118;
-
-/*  Clefthoof Hide Quiver  */
-UPDATE `item_template` SET `spellid_1` = 29414 WHERE entry=29143;
-
-/*  Worg Hide Quiver  */
-UPDATE `item_template` SET `spellid_1` = 29414 WHERE entry=29144;
-
-/*  Knothide Ammo Pouch  */
-UPDATE `item_template` SET `spellid_1` = 14829 WHERE entry=34099;
-
-/*  Knothide Quiver  */
-UPDATE `item_template` SET `spellid_1` = 29414 WHERE entry=34100;
-
-/*  Quiver of a Thousand Feathers  */
-UPDATE `item_template` SET `spellid_1` = 29414 WHERE entry=34105;
-
-/*  Netherscale Ammo Pouch  */
-UPDATE `item_template` SET `spellid_1` = 14829 WHERE entry=34106;
-
-/*  Nerubian Reinforced Quiver  */
-UPDATE `item_template` SET `spellid_1` = 29414 WHERE entry=44448;
-
-/*  Dragonscale Ammo Pouch  */
-UPDATE `item_template` SET `spellid_1` = 14829 WHERE entry=44447;

From b69accb413bdbf4531c9e575fc38f3ae26353b27 Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 17:14:18 +0200
Subject: [PATCH 28/39] Delete sql/world/base/creature_template_spell.sql

these updates get overwritten in naxx40_creatures.sql

file is redundant
---
 sql/world/base/creature_template_spell.sql | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 sql/world/base/creature_template_spell.sql

diff --git a/sql/world/base/creature_template_spell.sql b/sql/world/base/creature_template_spell.sql
deleted file mode 100644
index 4c2836d..0000000
--- a/sql/world/base/creature_template_spell.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-DELETE FROM `creature_template_spell` WHERE `CreatureID`=351084 AND `Index`=0;
-INSERT INTO `creature_template_spell` (`CreatureID`, `Index`, `Spell`, `VerifiedBuild`) VALUES (351084, 0, 29060, 0);
-DELETE FROM `creature_template_spell` WHERE `CreatureID`=351084 AND `Index`=1;
-INSERT INTO `creature_template_spell` (`CreatureID`, `Index`, `Spell`, `VerifiedBuild`) VALUES (351084, 1, 29061, 0);

From ad739797a9ac2ad773ce6ffff8e171acf80b9fce Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 18:36:21 +0200
Subject: [PATCH 29/39] Update and rename zone_the_barrens.sql to
 zone_barrens.sql

renamed file

updated Plainstrider SmartAI
these creatures do not have any abilties in vanilla.
they do flee at 15% health.
---
 sql/world/base/{zone_the_barrens.sql => zone_barrens.sql} | 8 ++++++++
 1 file changed, 8 insertions(+)
 rename sql/world/base/{zone_the_barrens.sql => zone_barrens.sql} (91%)

diff --git a/sql/world/base/zone_the_barrens.sql b/sql/world/base/zone_barrens.sql
similarity index 91%
rename from sql/world/base/zone_the_barrens.sql
rename to sql/world/base/zone_barrens.sql
index 6b9b2f8..503279a 100644
--- a/sql/world/base/zone_the_barrens.sql
+++ b/sql/world/base/zone_barrens.sql
@@ -34,6 +34,14 @@ INSERT INTO `creature_queststarter` (`id`, `quest`) VALUES (5765, 1485);
 DELETE FROM `creature_queststarter` WHERE `id`=6251 AND `quest`=4490;
 INSERT INTO `creature_queststarter` (`id`, `quest`) VALUES (6251, 4490);
 
+-- update SmartAI
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (3244, 3245, 3246);
+INSERT INTO `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`, `event_param6`, `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 
+(3244, 0, 4, 0, 2, 0, 100, 1, 0, 15, 0, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Greater Plainstrider - Between 0-15% Health - Flee For Assist (No Repeat)'),
+(3245, 0, 4, 0, 2, 0, 100, 1, 0, 15, 0, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Ornery Plainstrider - Between 0-15% Health - Flee For Assist (No Repeat)'),
+(3246, 0, 4, 0, 2, 0, 100, 1, 0, 15, 0, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Fleeting Plainstrider - Between 0-15% Health - Flee For Assist (No Repeat)');
+
+
 -- Grub
 UPDATE `creature_template` SET `gossip_menu_id`=0, `npcflag`=2 WHERE `entry`=3443;
 

From 411321257d88680f777f88313262c812884d3c2f Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 18:41:43 +0200
Subject: [PATCH 30/39] Update zone_barrens.sql

wrong id
it's only entry, so should be 0
---
 sql/world/base/zone_barrens.sql | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sql/world/base/zone_barrens.sql b/sql/world/base/zone_barrens.sql
index 503279a..f33119e 100644
--- a/sql/world/base/zone_barrens.sql
+++ b/sql/world/base/zone_barrens.sql
@@ -37,9 +37,9 @@ INSERT INTO `creature_queststarter` (`id`, `quest`) VALUES (6251, 4490);
 -- update SmartAI
 DELETE FROM `smart_scripts` WHERE `entryorguid` IN (3244, 3245, 3246);
 INSERT INTO `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`, `event_param6`, `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 
-(3244, 0, 4, 0, 2, 0, 100, 1, 0, 15, 0, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Greater Plainstrider - Between 0-15% Health - Flee For Assist (No Repeat)'),
-(3245, 0, 4, 0, 2, 0, 100, 1, 0, 15, 0, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Ornery Plainstrider - Between 0-15% Health - Flee For Assist (No Repeat)'),
-(3246, 0, 4, 0, 2, 0, 100, 1, 0, 15, 0, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Fleeting Plainstrider - Between 0-15% Health - Flee For Assist (No Repeat)');
+(3244, 0, 0, 0, 2, 0, 100, 1, 0, 15, 0, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Greater Plainstrider - Between 0-15% Health - Flee For Assist (No Repeat)'),
+(3245, 0, 0, 0, 2, 0, 100, 1, 0, 15, 0, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Ornery Plainstrider - Between 0-15% Health - Flee For Assist (No Repeat)'),
+(3246, 0, 0, 0, 2, 0, 100, 1, 0, 15, 0, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Fleeting Plainstrider - Between 0-15% Health - Flee For Assist (No Repeat)');
 
 
 -- Grub

From d29cf2fcefdb4c82d57372dc2efd445a77765dbf Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 18:54:18 +0200
Subject: [PATCH 31/39] Update dungeon_molten_core.sql

content from molten_core_trash_items_fix.sql added to dungeon_molten_core.sql
---
 sql/world/base/dungeon_molten_core.sql | 127 +++++++++++++++++++++++++
 1 file changed, 127 insertions(+)

diff --git a/sql/world/base/dungeon_molten_core.sql b/sql/world/base/dungeon_molten_core.sql
index e6a9ef1..c8f5808 100644
--- a/sql/world/base/dungeon_molten_core.sql
+++ b/sql/world/base/dungeon_molten_core.sql
@@ -64,3 +64,130 @@ INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionTex
 
 -- MC - Require dusing the runes
 UPDATE `gameobject_template` SET `ScriptName` = 'go_firelord_rune' WHERE `entry` IN (176956, 176957, 176955, 176953, 176952, 176954, 176951);
+
+/* Loot Template Fixes */
+
+-- Ancient Core Hound
+DELETE FROM `creature_loot_template` WHERE (`Entry` = 11673) AND (`Item` IN (16838, 16840, 16857, 16858));
+INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
+(11673, 16838, 0, 0.34, 0, 1, 0, 1, 1, 'Ancient Core Hound - Earthfury Belt'),
+(11673, 16840, 0, 0.32, 0, 1, 0, 1, 1, 'Ancient Core Hound - Earthfury Bracers'),
+(11673, 16857, 0, 0.32, 0, 1, 0, 1, 1, 'Ancient Core Hound - Lawbringer Bracers'),
+(11673, 16858, 0, 0.34, 0, 1, 0, 1, 1, 'Ancient Core Hound - Lawbringer Belt');
+
+-- Firelord
+DELETE FROM `creature_loot_template` WHERE (`Entry` = 11668) AND (`Item` IN (16838, 16840, 16858));
+INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
+(11668, 16838, 0, 0.34, 0, 1, 0, 1, 1, 'Firelord - Earthfury Belt'),
+(11668, 16840, 0, 0.32, 0, 1, 0, 1, 1, 'Firelord - Earthfury Bracers'),
+(11668, 16858, 0, 0.34, 0, 1, 0, 1, 1, 'Firelord - Lawbringer Belt');
+
+-- Firewalker
+DELETE FROM `creature_loot_template` WHERE (`Entry` = 11666) AND (`Item` IN (16838, 16840, 16857, 16858, 16861, 16864));
+INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
+(11666, 16838, 0, 0.34, 0, 1, 0, 1, 1, 'Firewalker - Earthfury Belt'),
+(11666, 16840, 0, 0.32, 0, 1, 0, 1, 1, 'Firewalker - Earthfury Bracers'),
+(11666, 16857, 0, 0.32, 0, 1, 0, 1, 1, 'Firewalker - Lawbringer Bracers'),
+(11666, 16858, 0, 0.34, 0, 1, 0, 1, 1, 'Firewalker - Lawbringer Belt'),
+(11666, 16861, 0, 0.34, 0, 1, 0, 1, 1, 'Firewalker - Bracers of Might'),
+(11666, 16864, 0, 0.34, 0, 1, 0, 1, 1, 'Firewalker - Belt of Might');
+
+-- Flameguard
+DELETE FROM `creature_loot_template` WHERE (`Entry` = 11667) AND (`Item` IN (16819, 16838, 16840, 16857));
+INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
+(11667, 16819, 0, 0.32, 0, 1, 0, 1, 1, 'Flameguard - Vambraces of Prophecy'),
+(11667, 16838, 0, 0.34, 0, 1, 0, 1, 1, 'Flameguard - Earthfury Belt'),
+(11667, 16840, 0, 0.32, 0, 1, 0, 1, 1, 'Flameguard - Earthfury Bracers'),
+(11667, 16857, 0, 0.32, 0, 1, 0, 1, 1, 'Flameguard - Lawbringer Bracers');
+
+-- Flamewaker
+DELETE FROM `creature_loot_template` WHERE (`Entry` = 11661) AND (`Item` IN (16804, 16838, 16840, 16857, 16858, 16864));
+INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
+(11661, 16804, 0, 0.32, 0, 1, 0, 1, 1, 'Flamewaker - Felheart Bracers'),
+(11661, 16838, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker - Earthfury Belt'),
+(11661, 16840, 0, 0.32, 0, 1, 0, 1, 1, 'Flamewaker - Earthfury Bracers'),
+(11661, 16857, 0, 0.32, 0, 1, 0, 1, 1, 'Flamewaker - Lawbringer Bracers'),
+(11661, 16858, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker - Lawbringer Belt'),
+(11661, 16864, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker - Belt of Might');
+
+-- Flamewaker Priest
+DELETE FROM `creature_loot_template` WHERE (`Entry` = 11662) AND (`Item` IN (16802, 16806, 16827, 16828, 16830, 16838, 16840, 16857, 16858, 16861, 16864));
+INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
+(11662, 16802, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Priest - Arcanist Belt'),
+(11662, 16806, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Priest - Felheart Belt'),
+(11662, 16827, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Priest - Nightslayer Belt'),
+(11662, 16828, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Priest - Cenarion Belt'),
+(11662, 16830, 0, 0.32, 0, 1, 0, 1, 1, 'Flamewaker Priest - Cenarion Bracers'),
+(11662, 16838, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Priest - Earthfury Belt'),
+(11662, 16840, 0, 0.32, 0, 1, 0, 1, 1, 'Flamewaker Priest - Earthfury Bracers'),
+(11662, 16857, 0, 0.32, 0, 1, 0, 1, 1, 'Flamewaker Priest - Lawbringer Bracers'),
+(11662, 16858, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Priest - Lawbringer Belt'),
+(11662, 16861, 0, 0.32, 0, 1, 0, 1, 1, 'Flamewaker Priest - Bracers of Might'),
+(11662, 16864, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Priest - Belt of Might');
+
+-- Flamewaker Healer
+DELETE FROM `creature_loot_template` WHERE (`Entry` = 11663) AND (`Item` IN (16799, 16828, 16838, 16840, 16851, 16858));
+INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
+(11663, 16799, 0, 0.32, 0, 1, 0, 1, 1, 'Flamewaker Healer - Arcanist Bindings'),
+(11663, 16828, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Healer - Cenarion Belt'),
+(11663, 16838, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Healer - Earthfury Belt'),
+(11663, 16840, 0, 0.32, 0, 1, 0, 1, 1, 'Flamewaker Healer - Earthfury Bracers'),
+(11663, 16851, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Healer - Giantstalker\'s Belt'),
+(11663, 16858, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Healer - Lawbringer Belt');
+
+-- Flamewaker Elite
+DELETE FROM `creature_loot_template` WHERE (`Entry` = 11664) AND (`Item` IN (16817, 16838, 16840, 16851, 16857, 16858, 16861));
+INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
+(11664, 16817, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Elite - Girdle of Prophecy'),
+(11664, 16838, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Elite - Earthfury Belt'),
+(11664, 16840, 0, 0.32, 0, 1, 0, 1, 1, 'Flamewaker Elite - Earthfury Bracers'),
+(11664, 16851, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Elite - Giantstalker\'s Belt'),
+(11664, 16857, 0, 0.32, 0, 1, 0, 1, 1, 'Flamewaker Elite - Lawbringer Bracers'),
+(11664, 16858, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Elite - Lawbringer Belt'),
+(11664, 16861, 0, 0.32, 0, 1, 0, 1, 1, 'Flamewaker Elite - Bracers of Might');
+
+-- Flamewaker Protector
+DELETE FROM `creature_loot_template` WHERE (`Entry` = 12119) AND (`Item` IN (16802, 16804, 16806, 16817, 16827, 16840));
+INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
+(12119, 16802, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Protector - Arcanist Belt'),
+(12119, 16804, 0, 0.32, 0, 1, 0, 1, 1, 'Flamewaker Protector - Felheart Bracers'),
+(12119, 16806, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Protector - Felheart Belt'),
+(12119, 16817, 0, 0.32, 0, 1, 0, 1, 1, 'Flamewaker Protector - Girdle of Prophecy'),
+(12119, 16827, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Protector - Nightslayer Belt'),
+(12119, 16840, 0, 0.32, 0, 1, 0, 1, 1, 'Flamewaker Protector - Earthfury Bracers');
+
+-- Lava Elemental
+DELETE FROM `creature_loot_template` WHERE (`Entry` = 12076) AND (`Item` IN (16838, 16840, 16858));
+INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
+(12076, 16838, 0, 0.2, 0, 1, 0, 1, 1, 'Lava Elemental - Earthfury Belt'),
+(12076, 16840, 0, 0.2, 0, 1, 0, 1, 1, 'Lava Elemental - Earthfury Bracers'),
+(12076, 16858, 0, 0.2, 0, 1, 0, 1, 1, 'Lava Elemental - Lawbringer Belt');
+
+-- Lava Reaver
+DELETE FROM `creature_loot_template` WHERE (`Entry` = 12100) AND (`Item` IN (16806, 16838, 16840, 16857, 16858));
+INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
+(12100, 16806, 0, 0.34, 0, 1, 0, 1, 1, 'Lava Reaver - Felheart Belt'),
+(12100, 16838, 0, 0.34, 0, 1, 0, 1, 1, 'Lava Reaver - Earthfury Belt'),
+(12100, 16840, 0, 0.32, 0, 1, 0, 1, 1, 'Lava Reaver - Earthfury Bracers'),
+(12100, 16857, 0, 0.32, 0, 1, 0, 1, 1, 'Lava Reaver - Lawbringer Bracers'),
+(12100, 16858, 0, 0.34, 0, 1, 0, 1, 1, 'Lava Reaver - Lawbringer Belt');
+
+-- Lava Surger
+DELETE FROM `creature_loot_template` WHERE (`Entry` = 12101) AND (`Item` IN (16838, 16840, 16857, 16858, 16864));
+INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
+(12101, 16838, 0, 0.34, 0, 1, 0, 1, 1, 'Lava Surger - Earthfury Belt'),
+(12101, 16840, 0, 0.32, 0, 1, 0, 1, 1, 'Lava Surger - Earthfury Bracers'),
+(12101, 16857, 0, 0.32, 0, 1, 0, 1, 1, 'Lava Surger - Lawbringer Bracers'),
+(12101, 16858, 0, 0.34, 0, 1, 0, 1, 1, 'Lava Surger - Lawbringer Belt'),
+(12101, 16864, 0, 0.3, 0, 1, 0, 1, 1, 'Lava Surger - Belt of Might');
+
+-- Molten Destroyer
+DELETE FROM `creature_loot_template` WHERE (`Entry` = 11659) AND (`Item` IN (16840));
+INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
+(11659, 16840, 0, 0.32, 0, 1, 0, 1, 1, 'Molten Destroyer - Earthfury Bracers');
+
+-- Molten Giant
+DELETE FROM `creature_loot_template` WHERE (`Entry` = 11658) AND (`Item` IN (16838, 16840));
+INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
+(11658, 16838, 0, 0.34, 0, 1, 0, 1, 1, 'Molten Giant - Earthfury Belt'),
+(11658, 16840, 0, 0.32, 0, 1, 0, 1, 1, 'Molten Giant - Earthfury Bracers');

From 1372c7d62c124de91ecec5bc6a3d4651f5d0fd73 Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 18:55:16 +0200
Subject: [PATCH 32/39] Delete sql/world/base/molten_core_trash_items_fix.sql

content moved to dungeon_molten_core.sql
---
 .../base/molten_core_trash_items_fix.sql      | 125 ------------------
 1 file changed, 125 deletions(-)
 delete mode 100644 sql/world/base/molten_core_trash_items_fix.sql

diff --git a/sql/world/base/molten_core_trash_items_fix.sql b/sql/world/base/molten_core_trash_items_fix.sql
deleted file mode 100644
index 452256c..0000000
--- a/sql/world/base/molten_core_trash_items_fix.sql
+++ /dev/null
@@ -1,125 +0,0 @@
-
--- Ancient Core Hound
-DELETE FROM `creature_loot_template` WHERE (`Entry` = 11673) AND (`Item` IN (16838, 16840, 16857, 16858));
-INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
-(11673, 16838, 0, 0.34, 0, 1, 0, 1, 1, 'Ancient Core Hound - Earthfury Belt'),
-(11673, 16840, 0, 0.32, 0, 1, 0, 1, 1, 'Ancient Core Hound - Earthfury Bracers'),
-(11673, 16857, 0, 0.32, 0, 1, 0, 1, 1, 'Ancient Core Hound - Lawbringer Bracers'),
-(11673, 16858, 0, 0.34, 0, 1, 0, 1, 1, 'Ancient Core Hound - Lawbringer Belt');
-
--- Firelord
-DELETE FROM `creature_loot_template` WHERE (`Entry` = 11668) AND (`Item` IN (16838, 16840, 16858));
-INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
-(11668, 16838, 0, 0.34, 0, 1, 0, 1, 1, 'Firelord - Earthfury Belt'),
-(11668, 16840, 0, 0.32, 0, 1, 0, 1, 1, 'Firelord - Earthfury Bracers'),
-(11668, 16858, 0, 0.34, 0, 1, 0, 1, 1, 'Firelord - Lawbringer Belt');
-
--- Firewalker
-DELETE FROM `creature_loot_template` WHERE (`Entry` = 11666) AND (`Item` IN (16838, 16840, 16857, 16858, 16861, 16864));
-INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
-(11666, 16838, 0, 0.34, 0, 1, 0, 1, 1, 'Firewalker - Earthfury Belt'),
-(11666, 16840, 0, 0.32, 0, 1, 0, 1, 1, 'Firewalker - Earthfury Bracers'),
-(11666, 16857, 0, 0.32, 0, 1, 0, 1, 1, 'Firewalker - Lawbringer Bracers'),
-(11666, 16858, 0, 0.34, 0, 1, 0, 1, 1, 'Firewalker - Lawbringer Belt'),
-(11666, 16861, 0, 0.34, 0, 1, 0, 1, 1, 'Firewalker - Bracers of Might'),
-(11666, 16864, 0, 0.34, 0, 1, 0, 1, 1, 'Firewalker - Belt of Might');
-
--- Flameguard
-DELETE FROM `creature_loot_template` WHERE (`Entry` = 11667) AND (`Item` IN (16819, 16838, 16840, 16857));
-INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
-(11667, 16819, 0, 0.32, 0, 1, 0, 1, 1, 'Flameguard - Vambraces of Prophecy'),
-(11667, 16838, 0, 0.34, 0, 1, 0, 1, 1, 'Flameguard - Earthfury Belt'),
-(11667, 16840, 0, 0.32, 0, 1, 0, 1, 1, 'Flameguard - Earthfury Bracers'),
-(11667, 16857, 0, 0.32, 0, 1, 0, 1, 1, 'Flameguard - Lawbringer Bracers');
-
--- Flamewaker
-DELETE FROM `creature_loot_template` WHERE (`Entry` = 11661) AND (`Item` IN (16804, 16838, 16840, 16857, 16858, 16864));
-INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
-(11661, 16804, 0, 0.32, 0, 1, 0, 1, 1, 'Flamewaker - Felheart Bracers'),
-(11661, 16838, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker - Earthfury Belt'),
-(11661, 16840, 0, 0.32, 0, 1, 0, 1, 1, 'Flamewaker - Earthfury Bracers'),
-(11661, 16857, 0, 0.32, 0, 1, 0, 1, 1, 'Flamewaker - Lawbringer Bracers'),
-(11661, 16858, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker - Lawbringer Belt'),
-(11661, 16864, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker - Belt of Might');
-
--- Flamewaker Priest
-DELETE FROM `creature_loot_template` WHERE (`Entry` = 11662) AND (`Item` IN (16802, 16806, 16827, 16828, 16830, 16838, 16840, 16857, 16858, 16861, 16864));
-INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
-(11662, 16802, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Priest - Arcanist Belt'),
-(11662, 16806, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Priest - Felheart Belt'),
-(11662, 16827, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Priest - Nightslayer Belt'),
-(11662, 16828, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Priest - Cenarion Belt'),
-(11662, 16830, 0, 0.32, 0, 1, 0, 1, 1, 'Flamewaker Priest - Cenarion Bracers'),
-(11662, 16838, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Priest - Earthfury Belt'),
-(11662, 16840, 0, 0.32, 0, 1, 0, 1, 1, 'Flamewaker Priest - Earthfury Bracers'),
-(11662, 16857, 0, 0.32, 0, 1, 0, 1, 1, 'Flamewaker Priest - Lawbringer Bracers'),
-(11662, 16858, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Priest - Lawbringer Belt'),
-(11662, 16861, 0, 0.32, 0, 1, 0, 1, 1, 'Flamewaker Priest - Bracers of Might'),
-(11662, 16864, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Priest - Belt of Might');
-
--- Flamewaker Healer
-DELETE FROM `creature_loot_template` WHERE (`Entry` = 11663) AND (`Item` IN (16799, 16828, 16838, 16840, 16851, 16858));
-INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
-(11663, 16799, 0, 0.32, 0, 1, 0, 1, 1, 'Flamewaker Healer - Arcanist Bindings'),
-(11663, 16828, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Healer - Cenarion Belt'),
-(11663, 16838, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Healer - Earthfury Belt'),
-(11663, 16840, 0, 0.32, 0, 1, 0, 1, 1, 'Flamewaker Healer - Earthfury Bracers'),
-(11663, 16851, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Healer - Giantstalker\'s Belt'),
-(11663, 16858, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Healer - Lawbringer Belt');
-
--- Flamewaker Elite
-DELETE FROM `creature_loot_template` WHERE (`Entry` = 11664) AND (`Item` IN (16817, 16838, 16840, 16851, 16857, 16858, 16861));
-INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
-(11664, 16817, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Elite - Girdle of Prophecy'),
-(11664, 16838, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Elite - Earthfury Belt'),
-(11664, 16840, 0, 0.32, 0, 1, 0, 1, 1, 'Flamewaker Elite - Earthfury Bracers'),
-(11664, 16851, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Elite - Giantstalker\'s Belt'),
-(11664, 16857, 0, 0.32, 0, 1, 0, 1, 1, 'Flamewaker Elite - Lawbringer Bracers'),
-(11664, 16858, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Elite - Lawbringer Belt'),
-(11664, 16861, 0, 0.32, 0, 1, 0, 1, 1, 'Flamewaker Elite - Bracers of Might');
-
--- Flamewaker Protector
-DELETE FROM `creature_loot_template` WHERE (`Entry` = 12119) AND (`Item` IN (16802, 16804, 16806, 16817, 16827, 16840));
-INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
-(12119, 16802, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Protector - Arcanist Belt'),
-(12119, 16804, 0, 0.32, 0, 1, 0, 1, 1, 'Flamewaker Protector - Felheart Bracers'),
-(12119, 16806, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Protector - Felheart Belt'),
-(12119, 16817, 0, 0.32, 0, 1, 0, 1, 1, 'Flamewaker Protector - Girdle of Prophecy'),
-(12119, 16827, 0, 0.34, 0, 1, 0, 1, 1, 'Flamewaker Protector - Nightslayer Belt'),
-(12119, 16840, 0, 0.32, 0, 1, 0, 1, 1, 'Flamewaker Protector - Earthfury Bracers');
-
--- Lava Elemental
-DELETE FROM `creature_loot_template` WHERE (`Entry` = 12076) AND (`Item` IN (16838, 16840, 16858));
-INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
-(12076, 16838, 0, 0.2, 0, 1, 0, 1, 1, 'Lava Elemental - Earthfury Belt'),
-(12076, 16840, 0, 0.2, 0, 1, 0, 1, 1, 'Lava Elemental - Earthfury Bracers'),
-(12076, 16858, 0, 0.2, 0, 1, 0, 1, 1, 'Lava Elemental - Lawbringer Belt');
-
--- Lava Reaver
-DELETE FROM `creature_loot_template` WHERE (`Entry` = 12100) AND (`Item` IN (16806, 16838, 16840, 16857, 16858));
-INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
-(12100, 16806, 0, 0.34, 0, 1, 0, 1, 1, 'Lava Reaver - Felheart Belt'),
-(12100, 16838, 0, 0.34, 0, 1, 0, 1, 1, 'Lava Reaver - Earthfury Belt'),
-(12100, 16840, 0, 0.32, 0, 1, 0, 1, 1, 'Lava Reaver - Earthfury Bracers'),
-(12100, 16857, 0, 0.32, 0, 1, 0, 1, 1, 'Lava Reaver - Lawbringer Bracers'),
-(12100, 16858, 0, 0.34, 0, 1, 0, 1, 1, 'Lava Reaver - Lawbringer Belt');
-
--- Lava Surger
-DELETE FROM `creature_loot_template` WHERE (`Entry` = 12101) AND (`Item` IN (16838, 16840, 16857, 16858, 16864));
-INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
-(12101, 16838, 0, 0.34, 0, 1, 0, 1, 1, 'Lava Surger - Earthfury Belt'),
-(12101, 16840, 0, 0.32, 0, 1, 0, 1, 1, 'Lava Surger - Earthfury Bracers'),
-(12101, 16857, 0, 0.32, 0, 1, 0, 1, 1, 'Lava Surger - Lawbringer Bracers'),
-(12101, 16858, 0, 0.34, 0, 1, 0, 1, 1, 'Lava Surger - Lawbringer Belt'),
-(12101, 16864, 0, 0.3, 0, 1, 0, 1, 1, 'Lava Surger - Belt of Might');
-
--- Molten Destroyer
-DELETE FROM `creature_loot_template` WHERE (`Entry` = 11659) AND (`Item` IN (16840));
-INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
-(11659, 16840, 0, 0.32, 0, 1, 0, 1, 1, 'Molten Destroyer - Earthfury Bracers');
-
--- Molten Giant
-DELETE FROM `creature_loot_template` WHERE (`Entry` = 11658) AND (`Item` IN (16838, 16840));
-INSERT INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
-(11658, 16838, 0, 0.34, 0, 1, 0, 1, 1, 'Molten Giant - Earthfury Belt'),
-(11658, 16840, 0, 0.32, 0, 1, 0, 1, 1, 'Molten Giant - Earthfury Bracers');

From 0e83c52cb7b1eeb4899deb6e80a55200e74e9928 Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 19:09:05 +0200
Subject: [PATCH 33/39] copy code from spell_restorations to class_trainers

---
 sql/world/base/class_trainers.sql | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/sql/world/base/class_trainers.sql b/sql/world/base/class_trainers.sql
index 9b92344..41e88ab 100644
--- a/sql/world/base/class_trainers.sql
+++ b/sql/world/base/class_trainers.sql
@@ -7,7 +7,13 @@ UPDATE `quest_template` SET `RewardSpell` = 1446 WHERE `ID` IN (31, 5061);
 /* Remove Conjure Water (Rank 7) from Mage Trainers - it is a quest reward instead */
 DELETE FROM `npc_trainer` WHERE `SpellID` = 10140;
 
-/* Correct Vanilla level for Druid Travel Form */
+/* Restore Ghost Wolf level requirement to 20 */
+UPDATE `npc_trainer` SET `ReqLevel` = 20 WHERE `SpellID` = 2645;
+
+/* Restore Aspect of the Cheetah level requirement to 20 */
+UPDATE `npc_trainer` SET `ReqLevel` = 20 WHERE `SpellID` = 5118;
+
+/* Restore Travel Form level requirement to 30 */
 UPDATE `npc_trainer` SET `ReqLevel` = 30 WHERE `SpellID` = 783;
 
 /* Remove Summon Imp from Trainer - it is a quest reward instead */

From cbbd86666bc5b41f8165fec1ac7ccf30878e6817 Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 19:15:07 +0200
Subject: [PATCH 34/39] Moving code

---
 sql/world/base/spell_restorations.sql | 50 +++++----------------------
 1 file changed, 8 insertions(+), 42 deletions(-)

diff --git a/sql/world/base/spell_restorations.sql b/sql/world/base/spell_restorations.sql
index 842d37f..bc1bb51 100644
--- a/sql/world/base/spell_restorations.sql
+++ b/sql/world/base/spell_restorations.sql
@@ -58,50 +58,16 @@ INSERT INTO `spell_dbc` (`ID`, `Category`, `DispelType`, `Mechanic`, `Attributes
 
 (8137, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 31, 0, 0, 0, 101, 0, 0, 20, 20, 30, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
     -1, 0, 0, 6, 0, 0, 1, 0, 0, 1, 0, 0, 9, 0, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0, 87, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 837, 0, 264, 0, 0, 
-    'Silithid Pox', '', '', '', '异种蝎群天灾', '異種蠍群瘟疫', '', '', '', 0, 0, 0, 0, 0, 0, 0, 16712190, '', '', '', '', '', '', '', '', '', 0, 0, 0, 0, 0, 0, 0, 16712188, 
-    'Increases the Physical damage taken by an enemy by $s1% for $d.', '', '', '', '受到物理攻击时所承受的伤害提高$s1%，$d。', '使敵人受到物理攻擊時所承受的傷害提高$s1%，持續$d。', 
-    '', '', '', 0, 0, 0, 0, 0, 0, 0, 16712190, 'Physical damage taken is increased by $s1%.', '', '', '', '受到物理攻击时所承受的伤害提高$s1%。', '受到物理攻擊時所承受的傷害提高$s1%。', 
-    '', '', '', 0, 0, 0, 0, 0, 0, 0, 16712190, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0),
+    'Silithid Pox', '', '', '', '', '', '', '', '', 0, 0, 0, 0, 0, 0, 0, 16712190, '', '', '', '', '', '', '', '', '', 0, 0, 0, 0, 0, 0, 0, 16712188, 
+    'Increases the Physical damage taken by an enemy by $s1% for $d.', '', '', '', '', '', '', '', '', 0, 0, 0, 0, 0, 0, 0, 16712190, 'Physical damage taken is increased by $s1%.',
+    '', '', '', '', '', '', '', '', 0, 0, 0, 0, 0, 0, 0, 16712190, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0),
 
-(16449, 0, 3, 0, 327696, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 101, 0, 0, 0, 0, 30, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, -1, 0, 0, 6, 6, 0, 1, 1, 0, 0, 0, 0, -51, -51, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 99, 124, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 854, 0, 1468, 0, 0, 
-    'Maggot Slime', '', '', '', '蛆虫粘液', '蛆蟲粘液', '', '', '', 0, 0, 0, 0, 0, 0, 0, 16712190, '', '', '', '', '', '', '', '', '', 0, 0, 0, 0, 0, 0, 0, 16712188, 
-    'Reduces an enemy\'s melee attack power by $s1 and its ranged attack power by $s2 for $d.', '', '', '', 
-    '使敌人的近战攻击强度降低$s1点，远程攻击强度降低$s2点，持续$d。', '使敵人的近戰攻擊強度降低$s1點，遠程攻擊強度降低$s2點，持續$d。', '', '', '', 0, 0, 0, 0, 0, 0, 0, 16712190, 
-    'Melee attack power reduced by $s1.\nRanged attack power reduced by $s2.', '', '', '', '使敌人的近战攻击强度降低$s1点，远程攻击强度降低$s2点，持续$d。', '近戰攻擊強度降低$s1點。遠程攻擊強度降低$s2點。', 
-    '', '', '', 0, 0, 0, 0, 0, 0, 0, 16712190, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 1, 1, 1, 0, 0);
+(16449, 0, 3, 0, 327696, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 101, 0, 0, 0, 0, 30, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    -1, 0, 0, 6, 6, 0, 1, 1, 0, 0, 0, 0, -51, -51, 0, 0, 0, 0, 6, 6, 0, 0, 0, 0, 0, 0, 0, 99, 124, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 854, 0, 1468, 0, 0, 
+    'Maggot Slime', '', '', '', '', '', '', '', '', 0, 0, 0, 0, 0, 0, 0, 16712190, '', '', '', '', '', '', '', '', '', 0, 0, 0, 0, 0, 0, 0, 16712188, 
+    'Reduces an enemy\'s melee attack power by $s1 and its ranged attack power by $s2 for $d.', '', '', '', '', '', '', '', '', 0, 0, 0, 0, 0, 0, 0, 16712190, 'Melee attack power reduced by $s1.\nRanged attack power reduced by $s2.',
+    '', '', '', '', '', '', '', '', 0, 0, 0, 0, 0, 0, 0, 16712190, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 1, 1, 1, 0, 0);
 
     
-/* Restore Ghost Wolf level requirement to 20 */
-UPDATE `npc_trainer` SET `ReqLevel` = 20 WHERE `SpellID` = 2645;
 
-/* Restore Aspect of the Cheetah level requirement to 20 */
-UPDATE `npc_trainer` SET `ReqLevel` = 20 WHERE `SpellID` = 5118;
-
-/* Highborne undead in Winterspring missing smart AI */
-DELETE FROM `smart_scripts` WHERE `entryorguid` = 7523 AND `action_param1` = 14868;
-DELETE FROM `smart_scripts` WHERE `entryorguid` = 7524 AND `action_param1` = 13860;
-DELETE FROM `smart_scripts` WHERE `entryorguid` = 10684 AND `action_param1` = 13860;
-INSERT INTO `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`, `event_param6`, `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
-/* Suffering Highborne (7523) */
-(7523, 0, 4, 0, 0, 0, 100, 0, 3000, 6000, 13000, 19000, 0, 0, 11, 14868, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 'Suffering Highborne - In Combat - Cast Curse of Agony'),
-/* Anguished Highborne (7524) */
-(7524, 0, 4, 0, 0, 0, 100, 0, 2200, 3400, 9800, 12700, 0, 0, 11, 13860, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Anguished Highborne - In Combat - Cast \'13860\''),
-/* Remorseful Highborne (10684) */
-(10684, 0, 1, 0, 0, 0, 100, 0, 2200, 3400, 9800, 12700, 0, 0, 11, 13860, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Remorseful Highborne - In Combat - Cast \'13860\'');
-
-/* Twilight cultists in Searing Gorge missing smart AI */
-UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` IN (5860, 5861, 5862);
-DELETE FROM `smart_scripts` WHERE `entryorguid` IN (5860, 5861, 5862);
-INSERT INTO `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`, `event_param6`, `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 
-/* Twilight Dark Shaman (5860) */
-(5860, 0, 0, 0, 0, 0, 100, 0, 0, 0, 3400, 4800, 0, 0, 11, 15500, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Twilight Dark Shaman - In Combat CMC - Cast \'Shock\''),
-(5860, 0, 1, 0, 0, 0, 100, 0, 2500, 10000, 35000, 40000, 0, 0, 11, 7289, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Twilight Dark Shaman - In Combat - Cast Shrink'),
-(5860, 0, 2, 0, 14, 0, 100, 0, 1000, 30, 8000, 11000, 0, 0, 11, 12491, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Twilight Dark Shaman - Friendly Missing Health - Cast Healing Wave'),
-/* Twilight Fire Guard (5861) */
-(5861, 0, 0, 0, 0, 0, 100, 0, 4000, 9000, 18000, 26000, 0, 0, 11, 15243, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Twilight Fire Guard - In Combat - Cast \'Fireball Volley\''),
-/* Twilight Geomancer (5862) */
-(5862, 0, 0, 0, 0, 0, 100, 0, 0, 0, 3400, 4800, 0, 0, 11, 9053, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Twilight Geomancer - In Combat CMC - Cast \'Fireball\''),
-(5862, 0, 1, 0, 0, 0, 100, 0, 4000, 9000, 18000, 26000, 0, 0, 11, 11436, 1, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Twilight Geomancer - In Combat - Cast \'Slow\''),
-(5862, 0, 2, 0, 2, 0, 100, 1, 30, 60, 0, 0, 0, 0, 11, 11990, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Twilight Geomancer - Between 30-60% Health - Cast \'11990\' (No Repeat)');
 

From 7954c9e0428319ac0d7077d3b712c0942098ea63 Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 19:33:02 +0200
Subject: [PATCH 35/39] Create zone_winterspring.sql

moved code here from spell_restorations.sql

also corrected the code to avoid possible issues.
---
 sql/world/base/zone_winterspring.sql | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 sql/world/base/zone_winterspring.sql

diff --git a/sql/world/base/zone_winterspring.sql b/sql/world/base/zone_winterspring.sql
new file mode 100644
index 0000000..cd7dbc0
--- /dev/null
+++ b/sql/world/base/zone_winterspring.sql
@@ -0,0 +1,14 @@
+/* Highborne undead in Winterspring missing smart AI */
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (7523, 7524, 10684);
+INSERT INTO `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`, `event_param6`, `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
+/* Suffering Highborne (7523) */
+(7523, 0, 2, 0, 38, 0, 100, 512, 1, 1, 0, 0, 0, 0, 2, 124, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Suffering Highborne - On Data Set 1 1 - Set Faction 124'),
+(7523, 0, 3, 0, 38, 0, 100, 512, 2, 2, 0, 0, 0, 0, 2, 21, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Suffering Highborne - On Data Set 2 2 - Set Faction 21'),
+(7523, 0, 4, 0, 0, 0, 100, 0, 3000, 6000, 13000, 19000, 0, 0, 11, 14868, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 'Suffering Highborne - In Combat - Cast Curse of Agony'),
+/* Anguished Highborne (7524) */
+(7524, 0, 2, 0, 38, 0, 100, 512, 1, 1, 0, 0, 0, 0, 2, 124, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Anguished Highborne - On Data Set 1 1 - Set Faction 124'),
+(7524, 0, 3, 0, 38, 0, 100, 512, 2, 2, 0, 0, 0, 0, 2, 21, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Anguished Highborne - On Data Set 2 2 - Set Faction 21'),
+(7524, 0, 4, 0, 0, 0, 100, 0, 2200, 3400, 9800, 12700, 0, 0, 11, 13860, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Anguished Highborne - In Combat - Cast \'13860\''),
+/* Remorseful Highborne (10684) */
+(10684, 0, 0, 0, 20, 0, 100, 0, 5248, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Remorseful Highborne - On Quest \'Tormented by the Past\' Finished - Say Line 0'),
+(10684, 0, 1, 0, 0, 0, 100, 0, 2200, 3400, 9800, 12700, 0, 0, 11, 13860, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Remorseful Highborne - In Combat - Cast \'13860\'');

From 048df7af48293b0f8ef9bf532cb86701196d508c Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 19:36:15 +0200
Subject: [PATCH 36/39] Update zone_searing_gorge.sql

moved code here from spell_restorations.sql
---
 sql/world/base/zone_searing_gorge.sql | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/sql/world/base/zone_searing_gorge.sql b/sql/world/base/zone_searing_gorge.sql
index dcec06d..6d1d5af 100644
--- a/sql/world/base/zone_searing_gorge.sql
+++ b/sql/world/base/zone_searing_gorge.sql
@@ -11,7 +11,8 @@ UPDATE `creature` SET `id1` = 8504 WHERE `guid` = 6832;
 UPDATE `creature` SET `id1` = 8504 WHERE `guid` = 5846;
 
 DELETE FROM `creature` WHERE `guid` = 608504;
-INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`, `CreateObject`, `Comment`) VALUES 
+INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, 
+`wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`, `CreateObject`, `Comment`) VALUES 
 (608504, 8504, 0, 0, 0, 0, 0, 1, 1, 1, -6630.98, -1233.1, 209.809, 1.29509, 300, 0, 0, 2578, 0, 0, 0, 0, 0, '', NULL, 0, NULL);
 
 /* Group Maltorius together with the 2 sentries */
@@ -20,3 +21,19 @@ INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`,
 (5845, 5845, 0, 0, 3, 0, 0),
 (5845, 5846, 0, 0, 3, 0, 0),
 (5845, 608504, 0, 0, 3, 0, 0);
+
+/* Twilight cultists in Searing Gorge missing smart AI */
+UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` IN (5860, 5861, 5862);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (5860, 5861, 5862);
+INSERT INTO `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`, `event_param6`, 
+`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 
+-- Twilight Dark Shaman (5860)
+(5860, 0, 0, 0, 0, 0, 100, 0, 0, 0, 3400, 4800, 0, 0, 11, 15500, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Twilight Dark Shaman - In Combat CMC - Cast \'Shock\''),
+(5860, 0, 1, 0, 0, 0, 100, 0, 2500, 10000, 35000, 40000, 0, 0, 11, 7289, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Twilight Dark Shaman - In Combat - Cast Shrink'),
+(5860, 0, 2, 0, 14, 0, 100, 0, 1000, 30, 8000, 11000, 0, 0, 11, 12491, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Twilight Dark Shaman - Friendly Missing Health - Cast Healing Wave'),
+-- Twilight Fire Guard (5861)
+(5861, 0, 0, 0, 0, 0, 100, 0, 4000, 9000, 18000, 26000, 0, 0, 11, 15243, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Twilight Fire Guard - In Combat - Cast \'Fireball Volley\''),
+-- Twilight Geomancer (5862)
+(5862, 0, 0, 0, 0, 0, 100, 0, 0, 0, 3400, 4800, 0, 0, 11, 9053, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Twilight Geomancer - In Combat CMC - Cast \'Fireball\''),
+(5862, 0, 1, 0, 0, 0, 100, 0, 4000, 9000, 18000, 26000, 0, 0, 11, 11436, 1, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Twilight Geomancer - In Combat - Cast \'Slow\''),
+(5862, 0, 2, 0, 2, 0, 100, 1, 30, 60, 0, 0, 0, 0, 11, 11990, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Twilight Geomancer - Between 30-60% Health - Cast \'11990\' (No Repeat)');

From 67c67068099345e4bc6f92598130fb852fd1ed0c Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 19:42:06 +0200
Subject: [PATCH 37/39] Create zone_hinterlands.sql

moved code here from spell_restorations.sql

also now inserting all rows to avoid issues.
---
 sql/world/base/zone_hinterlands.sql | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 sql/world/base/zone_hinterlands.sql

diff --git a/sql/world/base/zone_hinterlands.sql b/sql/world/base/zone_hinterlands.sql
new file mode 100644
index 0000000..0787168
--- /dev/null
+++ b/sql/world/base/zone_hinterlands.sql
@@ -0,0 +1,6 @@
+/* Silvermane Stalker (2926) should have sneak spell 22766 */
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 2926;
+INSERT INTO `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`, `event_param6`, 
+`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 
+(2926, 0, 0, 0, 0, 0, 100, 0, 4000, 5000, 17000, 19000, 0, 0, 11, 7367, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Silvermane Stalker - In Combat - Cast Infected Bite'), 
+(2926, 0, 1, 0, 1, 0, 100, 1, 1000, 1000, 0, 0, 0, 0, 11, 22766, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Silvermane Stalker - Out of Combat - Cast \'Sneak\'');

From d234abcbbb8d0ab98df52582c3a047a6997063f4 Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 19:44:35 +0200
Subject: [PATCH 38/39] Update spell_restorations.sql

moving Deviate Stalker smart_scripts changes to zone_barrens.sql
---
 sql/world/base/spell_restorations.sql | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/sql/world/base/spell_restorations.sql b/sql/world/base/spell_restorations.sql
index bc1bb51..a37ffa0 100644
--- a/sql/world/base/spell_restorations.sql
+++ b/sql/world/base/spell_restorations.sql
@@ -18,17 +18,6 @@ INSERT INTO `npc_trainer` (`ID`, `SpellID`, `MoneyCost`, `ReqSkillLine`, `ReqSki
 DELETE FROM `spell_script_names` WHERE `spell_id`=2855 AND `ScriptName`='spell_detect_magic';
 INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES (2855, 'spell_detect_magic');
 
-/* Silvermane Stalker (2926) should have sneak spell 22766 */
-DELETE FROM `smart_scripts` WHERE `entryorguid` = 2926 AND `action_param1` = 22766;
-INSERT INTO `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`, `event_param6`, `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 
-(2926, 0, 1, 0, 1, 0, 100, 1, 1000, 1000, 0, 0, 0, 0, 11, 22766, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Silvermane Stalker - Out of Combat - Cast \'Sneak\'');
-
-/* Deviate Stalker (3634) should have sneak spell 22766 */
-UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 3634;
-DELETE FROM `smart_scripts` WHERE `entryorguid` = 3634 AND `action_param1` = 22766;
-INSERT INTO `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`, `event_param6`, `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 
-(3634, 0, 0, 0, 1, 0, 100, 1, 1000, 1000, 0, 0, 0, 0, 11, 22766, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Deviate Stalker - Out of Combat - Cast \'Sneak\'');
-
 /* Restore Maggot Slime and Silithid Pox to 30 Minutes */
 DELETE FROM `spell_dbc` WHERE `ID` IN (8137, 16449);
 INSERT INTO `spell_dbc` (`ID`, `Category`, `DispelType`, `Mechanic`, `Attributes`, `AttributesEx`, `AttributesEx2`, `AttributesEx3`, `AttributesEx4`, `AttributesEx5`, `AttributesEx6`, `AttributesEx7`, `ShapeshiftMask`, 

From 910676015ac3ad32a536634a28592622be73fcfa Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Sun, 11 May 2025 19:49:37 +0200
Subject: [PATCH 39/39] Update zone_barrens.sql

code moved from spell_restorations.sql
---
 sql/world/base/zone_barrens.sql | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/sql/world/base/zone_barrens.sql b/sql/world/base/zone_barrens.sql
index f33119e..1d1dff2 100644
--- a/sql/world/base/zone_barrens.sql
+++ b/sql/world/base/zone_barrens.sql
@@ -34,13 +34,19 @@ INSERT INTO `creature_queststarter` (`id`, `quest`) VALUES (5765, 1485);
 DELETE FROM `creature_queststarter` WHERE `id`=6251 AND `quest`=4490;
 INSERT INTO `creature_queststarter` (`id`, `quest`) VALUES (6251, 4490);
 
--- update SmartAI
+/* Plainstriders flee at 15% health. They have no other abilities during vanilla */
 DELETE FROM `smart_scripts` WHERE `entryorguid` IN (3244, 3245, 3246);
 INSERT INTO `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`, `event_param6`, `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 
 (3244, 0, 0, 0, 2, 0, 100, 1, 0, 15, 0, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Greater Plainstrider - Between 0-15% Health - Flee For Assist (No Repeat)'),
 (3245, 0, 0, 0, 2, 0, 100, 1, 0, 15, 0, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Ornery Plainstrider - Between 0-15% Health - Flee For Assist (No Repeat)'),
 (3246, 0, 0, 0, 2, 0, 100, 1, 0, 15, 0, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Fleeting Plainstrider - Between 0-15% Health - Flee For Assist (No Repeat)');
 
+/* Deviate Stalker (3634) should have sneak spell 22766 */
+UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 3634;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 3634;
+INSERT INTO `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`, `event_param6`, 
+`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 
+(3634, 0, 0, 0, 1, 0, 100, 1, 1000, 1000, 0, 0, 0, 0, 11, 22766, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Deviate Stalker - Out of Combat - Cast \'Sneak\'');
 
 -- Grub
 UPDATE `creature_template` SET `gossip_menu_id`=0, `npcflag`=2 WHERE `entry`=3443;