Merge branch 'Grimfeather:master' into fix/war-effort-recruiter-quests

sql/world/base/ammo_stacks.sql

@@ -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;

sql/world/base/aq_attunement_drops.sql

@@ -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;

sql/world/base/aq_gate.sql

@@ -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;

sql/world/base/aq_gate_quest.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;
@@ -36,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;

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 */

sql/world/base/creature_template_spell.sql

@@ -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);

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');

sql/world/base/molten_core_trash_items_fix.sql

@@ -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');

sql/world/base/quiver_haste.sql

@@ -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;

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`, 
@@ -58,50 +47,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, 
+    '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。', 
+    '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, '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),
-    '', '', '', 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, 
+(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, 
-    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, 
+    -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, 
+    '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.', '', '', '', 
+    '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.',
-    '使敌人的近战攻击强度降低$s1点，远程攻击强度降低$s2点，持续$d。', '使敵人的近戰攻擊強度降低$s1點，遠程攻擊強度降低$s2點，持續$d。', '', '', '', 0, 0, 0, 0, 0, 0, 0, 16712190, 
+    '', '', '', '', '', '', '', '', 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);
-    '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);
 
     
-/* 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)');
 

sql/world/base/vanilla_item_changes.sql

@@ -10,6 +10,24 @@ 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
+
+-- 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;
 

sql/world/base/zone_barrens.sql

@@ -34,6 +34,20 @@ 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);
 
+/* 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;
 

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\'');

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)');

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\'');

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
+    These changes remove exclusivity from the buff scrolls, and make them stackable.
-This should not be possible in TBC and WoTLK. No solution yet to have this work correctly all the time.
+    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;

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. 
+    Optional change. Obtaining keys for heroic dungeons in The Burning Crusade is conditional on having corresponding reputation at Revered rank.
-   This rep nerf was officially implemented in patch 2.3 (Zul'Aman raid content, 2008). 
+    This reduces the reputation requirements to obtain keys to Honored and thus allows you to go to heroic dungeons more quickly. 
-   Sql edit example: RequiredReputationRank = 6 for Revered, 5 for Honored, 4 for Friendly */
+    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

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,
+    These changes add otherwise unobtainable items to appropriate places in the world, with suitable levels of challenge to obtain them.
-   it removes reliance on out-of-game events, real money purchases, or cheating via GM commands.
+    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;

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

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;

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
+22931, -- Gorrim, Emerald Sanctuary, Flight Master
-24366, -- Nizzle, Rebel Camp
+24366, -- Nizzle, Rebel Camp, Flight Master
 27705, -- Lorrin Foxfire, Stonard
-37888, -- Frax Bucketdrop, Thondroril River
+37888, -- Frax Bucketdrop, Thondroril River, Flight Master
-37915 -- Timothy Cunningham, The Bulwark
+37915 -- Timothy Cunningham, The Bulwark, Flight Master
 );
 
-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
-10583, -- Gryfe, Marshal's Refuge
+/* UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_naxx40' WHERE `entry` IN (
-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 in cities and anvil + furnace at Orgrimmar entrance

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. */
+    Re-route The Bravery to follow the pre-WotLK path to Menethil Harbor - fix associated text
-/* If not run, The Bravery will go directly to Stormwind Harbor, allowing players to skip to the other continent immediately any time */
+    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. */
+/* Like the above, removes a transport added in late WotLK (3.2.0) */
--- From Orgrimmar to Thunder Bluff
+DELETE FROM `transports` WHERE `guid`=20; -- From Orgrimmar to Thunder Bluff
-DELETE FROM `transports` WHERE `guid`=20;