From f992ebba277f6aa19d08dc7ec670fd5936be59f4 Mon Sep 17 00:00:00 2001 From: Grimfeather <88028633+Grimfeather@users.noreply.github.com> Date: Fri, 11 Jul 2025 11:17:04 +0200 Subject: [PATCH 1/6] Update zone_darnassus.sql --- sql/world/base/zone_darnassus.sql | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sql/world/base/zone_darnassus.sql b/sql/world/base/zone_darnassus.sql index e1350fd..b9ab45c 100644 --- a/sql/world/base/zone_darnassus.sql +++ b/sql/world/base/zone_darnassus.sql @@ -94,3 +94,19 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry -- Dannelor DELETE FROM `npc_trainer` WHERE `ID`=4211; INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (4211, -350000); + + +-- Keras Wolfheart +DELETE FROM `creature` WHERE `id1`= 907; +INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES +(600907, 907, 0, 9976.16, 2314.49, 1330.87, 0.750492, 120); + +-- Aethalas +DELETE FROM `creature` WHERE `id1`= 2302; +INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES +(602302, 2302, 0, 9976.16, 2314.49, 1330.87, 0.750492, 120); + +-- Brogun Stoneshield +DELETE FROM `creature` WHERE `id1`= 5118; +INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES +(605118, 5118, 0, 9976.16, 2314.49, 1330.87, 0.750492, 120); From f038f78cc1ac188dedac663631cb11d977dc168a Mon Sep 17 00:00:00 2001 From: Grimfeather <88028633+Grimfeather@users.noreply.github.com> Date: Fri, 11 Jul 2025 11:18:54 +0200 Subject: [PATCH 2/6] Update zone_ironforge.sql --- sql/world/base/zone_ironforge.sql | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sql/world/base/zone_ironforge.sql b/sql/world/base/zone_ironforge.sql index 628a3ee..5c0e18d 100644 --- a/sql/world/base/zone_ironforge.sql +++ b/sql/world/base/zone_ironforge.sql @@ -122,3 +122,19 @@ INSERT INTO `creature_queststarter` (`id`, `quest`) VALUES (5172, 4487); -- Nissa Firestone DELETE FROM `npc_trainer` WHERE `ID`=5150; INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (5150, -350000); + + +-- Donal Osgood +DELETE FROM `creature` WHERE `id1`= 857; +INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES +(600857, 857, 0, -5038.18, -1266.1, 510.408, 3.82227, 120); + +-- Glordrum Steelbeard +DELETE FROM `creature` WHERE `id1`= 12197; +INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES +(612197, 12197, 0, -5038.18, -1266.1, 510.408, 3.82227, 120); + +-- Lylandris +DELETE FROM `creature` WHERE `id1`= 14982; +INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES +(614982, 14982, 0, -5038.18, -1266.1, 510.408, 3.82227, 120); From 80a514a3f52b64446f97d73c21de417ce92e2329 Mon Sep 17 00:00:00 2001 From: Grimfeather <88028633+Grimfeather@users.noreply.github.com> Date: Fri, 11 Jul 2025 14:49:04 +0200 Subject: [PATCH 3/6] Update zone_ironforge.sql - code cleaning - repositioning battlemasters - adding missing battlemasters - phasing wotlk battlemasters --- sql/world/base/zone_ironforge.sql | 174 +++++++++--------------------- 1 file changed, 52 insertions(+), 122 deletions(-) diff --git a/sql/world/base/zone_ironforge.sql b/sql/world/base/zone_ironforge.sql index 5c0e18d..ee573a4 100644 --- a/sql/world/base/zone_ironforge.sql +++ b/sql/world/base/zone_ironforge.sql @@ -1,140 +1,70 @@ --- Vosur Brakthel -UPDATE `creature_template` SET `subname`='Journeyman Alchemist', `npcflag`=81, `trainer_type`=2 WHERE `entry`=1246; +UPDATE `creature_template` SET `subname` = 'Journeyman Alchemist' WHERE `entry` = 1246; -- Vosur Brakthel +UPDATE `creature_template` SET `subname` = 'Journeyman Leatherworker' WHERE `entry` = 1466; -- Gretta Finespindle +UPDATE `creature_template` SET `subname` = 'Journeyman Tailor' WHERE `entry` = 1703; -- Uthrar Threx +UPDATE `creature_template` SET `subname` = 'Expert Blacksmith' WHERE `entry` = 10276; -- Rotgath Stonebeard +UPDATE `creature_template` SET `subname` = 'Journeyman Blacksmith' WHERE `entry` = 10277; -- Groum Stonebeard +UPDATE `creature_template` SET `subname` = 'Journeyman Engineer' WHERE `entry` = 11028; -- Jemma Quikswitch +UPDATE `creature_template` SET `subname` = 'Journeyman Engineer' WHERE `entry` = 11029; -- Trixie Quikswitch +UPDATE `creature_template` SET `subname` = 'Journeyman Enchanter' WHERE `entry` = 11065; -- Thonys Pillarstone --- Groum Stonebeard -UPDATE `creature_template` SET `subname`='Journeyman Blacksmith', `npcflag`=81, `trainer_type`=2 WHERE `entry`=10277; - --- Rotgath Stonebeard -UPDATE `creature_template` SET `subname`='Expert Blacksmith', `npcflag`=81, `trainer_type`=2, `type_flags`=134217728 WHERE `entry`=10276; - --- Thonys Pillarstone -UPDATE `creature_template` SET `subname`='Journeyman Enchanter', `npcflag`=81, `trainer_type`=2 WHERE `entry`=11065; - --- Gimble Thistlefuzz -UPDATE `creature_template` SET `type_flags`=134217728 WHERE `entry`=5157; - --- Jemma Quikswitch -UPDATE `creature_template` SET `subname`='Journeyman Engineer', `npcflag`=81, `trainer_type`=2 WHERE `entry`=11028; - --- Trixie Quikswitch -UPDATE `creature_template` SET `subname`='Journeyman Engineer', `npcflag`=81, `trainer_type`=2, `type_flags`=134217728 WHERE `entry`=11029; - --- Gretta Finespindle -UPDATE `creature_template` SET `subname`='Journeyman Leatherworker', `npcflag`=81, `trainer_type`=2 WHERE `entry`=1466; - --- Uthrar Threx -UPDATE `creature_template` SET `subname`='Journeyman Tailor', `npcflag`=81, `trainer_type`=2 WHERE `entry`=1703; +UPDATE `creature_template` SET `npcflag` = 81, `trainer_type` = 2 WHERE `entry` IN (1246, 1466, 1703, 10276, 10277, 11028, 11029, 11065); +UPDATE `creature_template` SET `type_flags` = 134217728 WHERE `entry` IN (5157, 10276, 11029); --- Vosur Brakthel -DELETE FROM `npc_trainer` WHERE `ID`=1246; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (1246, -300000); +DELETE FROM `npc_trainer` WHERE `ID` IN (1246, 1466, 1703, 10276, 10277, 11028, 11029, 11065); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES +(1246, -300000), -- Vosur Brakthel +(1466, -380000), -- Gretta Finespindle +(1703, -410000), -- Uthrar Threx +(10277, -310000), -- Groum Stonebeard +(10276, -310000), -- Rotgath Stonebeard +(10276, -310001), -- Rotgath Stonebeard +(11028, -340000), -- Jemma Quikswitch +(11029, -340000), -- Trixie Quikswitch +(11029, -340001), -- Trixie Quikswitch +(11065, -330000); -- Thonys Pillarstone --- Groum Stonebeard -DELETE FROM `npc_trainer` WHERE `ID`=10277; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (10277, -310000); --- Rotgath Stonebeard -DELETE FROM `npc_trainer` WHERE `ID`=10276; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (10276, -310000), (10276, -310001); - --- Thonys Pillarstone -DELETE FROM `npc_trainer` WHERE `ID`=11065; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11065, -330000); - --- Jemma Quikswitch -DELETE FROM `npc_trainer` WHERE `ID`=11028; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11028, -340000); - --- Trixie Quikswitch -DELETE FROM `npc_trainer` WHERE `ID`=11029; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11029, -340000), (11029, -340001); - --- Gretta Finespindle -DELETE FROM `npc_trainer` WHERE `ID`=1466; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (1466, -380000); - --- Uthrar Threx -DELETE FROM `npc_trainer` WHERE `ID`=1703; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (1703, -410000); - --- Rotgath Stonebeard -DELETE FROM `gossip_menu_option` WHERE `MenuID`=2761; +DELETE FROM `gossip_menu_option` WHERE `MenuID` IN (2761, 4147, 4160); INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES -(2761, 0, 3, 'Train me.', 3266, 5, 16); - --- Gimble Thistlefuzz -DELETE FROM `gossip_menu_option` WHERE `MenuID`=4160; -INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES -(4160, 0, 3, 'Train me.', 3266, 5, 16); - --- Trixie Quikswitch -DELETE FROM `gossip_menu_option` WHERE `MenuID`=4147; -INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES -(4147, 0, 3, 'Train me.', 3266, 5, 16); +(2761, 0, 3, 'Train me.', 3266, 5, 16), -- Rotgath Stonebeard +(4147, 0, 3, 'Train me.', 3266, 5, 16), -- Trixie Quikswitch +(4160, 0, 3, 'Train me.', 3266, 5, 16); -- Gimble Thistlefuzz --- Tally Berryfizz -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4123 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 15 AND `SourceEntry` = 0 AND `ConditionTypeOrReference` = 7 AND `SourceGroup` IN (593, 2761, 4123, 4147, 4150, 4160, 4205, 4345); INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES -(15, 4123, 0, 7, 171, 50, 'Show menu if alchemy is 50 or higher'); - --- Rotgath Stonebeard -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=2761 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES -(15, 2761, 0, 7, 164, 50, 'Show menu if blacksmithing is 50 or higher'); - --- Bengus Deepforge -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=593 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES -(15, 593, 0, 7, 164, 125, 'Show menu if blacksmithing is 125 or higher'); - --- Gimble Thistlefuzz -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4160 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES -(15, 4160, 0, 7, 333, 50, 'Show menu if enchanting is 50 or higher'); - --- Trixie Quikswitch -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4147 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES -(15, 4147, 0, 7, 202, 50, 'Show menu if engineering is 50 or higher'); - --- Springspindle Fizzlegear -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4150 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES -(15, 4150, 0, 7, 202, 125, 'Show menu if engineering is 125 or higher'); - --- Fimble Finespindle -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4205 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES -(15, 4205, 0, 7, 165, 50, 'Show menu if leatherworking is 50 or higher'); - --- Jormund Stonebrow -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4345 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES -(15, 4345, 0, 7, 197, 50, 'Show menu if tailoring is 50 or higher'); +(15, 593, 0, 7, 164, 125, 'Show menu if blacksmithing is 125 or higher'), -- Bengus Deepforge +(15, 2761, 0, 7, 164, 50, 'Show menu if blacksmithing is 50 or higher'), -- Rotgath Stonebeard +(15, 4123, 0, 7, 171, 50, 'Show menu if alchemy is 50 or higher'), -- Tally Berryfizz +(15, 4147, 0, 7, 202, 50, 'Show menu if engineering is 50 or higher'), -- Trixie Quikswitch +(15, 4150, 0, 7, 202, 125, 'Show menu if engineering is 125 or higher'), -- Springspindle Fizzlegear +(15, 4160, 0, 7, 333, 50, 'Show menu if enchanting is 50 or higher'), -- Gimble Thistlefuzz +(15, 4205, 0, 7, 165, 50, 'Show menu if leatherworking is 50 or higher'), -- Fimble Finespindle +(15, 4345, 0, 7, 197, 50, 'Show menu if tailoring is 50 or higher'); -- Jormund Stonebrow -- Summon Felsteed (Warlock) -DELETE FROM `creature_queststarter` WHERE `id`=5172 AND `quest`=4487; +DELETE FROM `creature_queststarter` WHERE `id` = 5172 AND `quest` = 4487; INSERT INTO `creature_queststarter` (`id`, `quest`) VALUES (5172, 4487); -- Nissa Firestone -DELETE FROM `npc_trainer` WHERE `ID`=5150; +DELETE FROM `npc_trainer` WHERE `ID` = 5150; INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (5150, -350000); +-- battlemasters +DELETE FROM `creature` WHERE `id1` IN (857, 5113, 5115, 6114, 12197, 14982, 19915, 34991, 35007, 35600) OR `guid` = 86263; +INSERT INTO `creature` (`guid`, `id1`, `map`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `curhealth`, `curmana`) VALUES +(600857, 857, 0, 1, -5039.19, -1266.88, 510.326, 3.92579, 120, 1, 0), -- Donal Osgood +(2019, 5113, 0, 1, -5047.54, -1269.69, 510.408, 6.24828, 540, 1, 0), -- Kelv Sternhammer +(2020, 5115, 0, 1, -5043.84, -1274.68, 510.324, 1.33007, 490, 1, 0), -- Daera Brightspear +(2018, 6114, 0, 1, -5046.48, -1273, 510.324, 0.693899, 430, 1, 0), -- Muren Stormpike +(612197, 12197, 0, 1, -5046.1, -1266.04, 510.325, 5.48483, 120, 1, 0), -- Glordrum Steelbeard +(614982, 14982, 0, 1, -5039.09, -1272.92, 510.324, 2.46114, 120, 1, 0), -- Lylandris +(86263, 15351, 0, 0, -5042.4, -1265.32, 510.325, 4.62873, 300, 1, 0), -- Alliance Brigadier General +(81, 19915, 0, 0, -5045.42, -1276.81, 510.325, 1.43228, 300, 1, 0), -- Max Xim +(88250, 34991, 0, 1, -5038.09, -1269.94, 510.325, 3.16003, 120, 1, 0), -- Borim Goldhammer +(88249, 35007, 0, 1, -5040.18, -1263.17, 510.325, 4.46067, 120, 1, 1), -- Lixa Felflinger +(88248, 35600, 0, 1, -5035.64, -1267.93, 510.324, 3.29044, 300, 1, 1); -- Arcanist Laniria --- Donal Osgood -DELETE FROM `creature` WHERE `id1`= 857; -INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES -(600857, 857, 0, -5038.18, -1266.1, 510.408, 3.82227, 120); - --- Glordrum Steelbeard -DELETE FROM `creature` WHERE `id1`= 12197; -INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES -(612197, 12197, 0, -5038.18, -1266.1, 510.408, 3.82227, 120); - --- Lylandris -DELETE FROM `creature` WHERE `id1`= 14982; -INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES -(614982, 14982, 0, -5038.18, -1266.1, 510.408, 3.82227, 120); +UPDATE `creature_template` SET `flags_extra` = 2, `ScriptName` = 'npc_ipp_wotlk' WHERE `entry` IN (34991, 35007, 35600); From 44bcd99a832bd69c366825b56d65a3150f3974fb Mon Sep 17 00:00:00 2001 From: Grimfeather <88028633+Grimfeather@users.noreply.github.com> Date: Fri, 11 Jul 2025 14:54:06 +0200 Subject: [PATCH 4/6] Update zz_cleanup.sql remove battlemasters in Ironforge and Darnassus from game event --- sql/world/base/zz_cleanup.sql | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sql/world/base/zz_cleanup.sql b/sql/world/base/zz_cleanup.sql index eae6aed..5ed0c1f 100644 --- a/sql/world/base/zz_cleanup.sql +++ b/sql/world/base/zz_cleanup.sql @@ -56,3 +56,7 @@ DELETE FROM `creature_equip_template` WHERE `CreatureID` IN (@Zarena, @Miles, @E DELETE FROM `npc_vendor` WHERE `entry` = @Zarena; DELETE FROM `npc_trainer` WHERE `ID` = @Elissa; DELETE FROM `battlemaster_entry` WHERE `entry` = @Deze; + +-- alliance battlemasters +DELETE FROM `game_event_creature` WHERE `guid` IN (207918, 207929, 207951, 208042, 208081, 208107); + From 77652773818f8fab11513b67e86e5c194b068bd3 Mon Sep 17 00:00:00 2001 From: Grimfeather <88028633+Grimfeather@users.noreply.github.com> Date: Fri, 11 Jul 2025 15:16:26 +0200 Subject: [PATCH 5/6] Update zone_darnassus.sql code cleaning --- sql/world/base/zone_darnassus.sql | 129 ++++++++---------------------- 1 file changed, 34 insertions(+), 95 deletions(-) diff --git a/sql/world/base/zone_darnassus.sql b/sql/world/base/zone_darnassus.sql index b9ab45c..0a60ce6 100644 --- a/sql/world/base/zone_darnassus.sql +++ b/sql/world/base/zone_darnassus.sql @@ -1,94 +1,41 @@ --- Milla Fairancora -UPDATE `creature_template` SET `subname`='Journeyman Alchemist', `npcflag`=81, `trainer_type`=2 WHERE `entry`=11041; +UPDATE `creature_template` SET `subname` = 'Journeyman Alchemist' WHERE `entry` = 11041; -- Milla Fairancora +UPDATE `creature_template` SET `subname` = 'Expert Alchemist' WHERE `entry` = 11042; -- Sylvanna Forestmoon +UPDATE `creature_template` SET `subname` = 'Journeyman Tailor' WHERE `entry` = 11050; -- Trianna +UPDATE `creature_template` SET `subname` = 'Journeyman Enchanter' WHERE `entry` = 11070; -- Lalina Summermoon +UPDATE `creature_template` SET `subname` = 'Journeyman Leatherworker' WHERE `entry` = 11083; -- Darianna +UPDATE `creature_template` SET `subname` = 'Journeyman Leatherworker' WHERE `entry` = 11081; -- Faldron --- Sylvanna Forestmoon -UPDATE `creature_template` SET `subname`='Expert Alchemist', `npcflag`=81, `trainer_type`=2, `type_flags`=134217728 WHERE `entry`=11042; - --- Lalina Summermoon -UPDATE `creature_template` SET `subname`='Journeyman Enchanter', `npcflag`=81, `trainer_type`=2 WHERE `entry`=11070; - --- Darianna -UPDATE `creature_template` SET `subname`='Journeyman Leatherworker', `npcflag`=81, `trainer_type`=2 WHERE `entry`=11083; - --- Faldron -UPDATE `creature_template` SET `subname`='Journeyman Leatherworker', `npcflag`=81, `trainer_type`=2, `type_flags`=134217728 WHERE `entry`=11081; - --- Telonis -UPDATE `creature_template` SET `type_flags`=134217728 WHERE `entry`=4212; - --- Trianna -UPDATE `creature_template` SET `subname`='Journeyman Tailor', `npcflag`=81, `trainer_type`=2 WHERE `entry`=11050; +UPDATE `creature_template` SET `npcflag` = 81, `trainer_type` = 2 WHERE `entry` IN (11041, 11042, 11050, 11070, 11081, 11083); +UPDATE `creature_template` SET `type_flags` = 134217728 WHERE `entry` IN (4212, 11042, 11081); --- Milla Fairancora -DELETE FROM `npc_trainer` WHERE `ID`=11041; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11041, -300000); +DELETE FROM `npc_trainer` WHERE `ID` IN (11041, 11042, 11050, 11070, 11081, 11083); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES +(11041, -300000), -- Milla Fairancora +(11042, -300000), -- Sylvanna Forestmoon +(11042, -300001), -- Sylvanna Forestmoon +(11050, -410000), -- Trianna +(11070, -330000), -- Lalina Summermoon +(11081, -380000), -- Faldron +(11081, -380001), -- Faldron +(11083, -380000); -- Darianna --- Sylvanna Forestmoon -DELETE FROM `npc_trainer` WHERE `ID`=11042; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11042, -300000), (11042, -300001); --- Lalina Summermoon -DELETE FROM `npc_trainer` WHERE `ID`=11070; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11070, -330000); - --- Trianna -DELETE FROM `npc_trainer` WHERE `ID`=11050; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11050, -410000); - --- Darianna -DELETE FROM `npc_trainer` WHERE `ID`=11083; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11083, -380000); - --- Faldron -DELETE FROM `npc_trainer` WHERE `ID`=11081; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11081, -380000), (11081, -380001); - --- Sylvanna Forestmoon -DELETE FROM `gossip_menu_option` WHERE `MenuID`=4125; +DELETE FROM `gossip_menu_option` WHERE `MenuID` IN (4125, 4204, 4241); INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES -(4125, 0, 3, 'Train me.', 3266, 5, 16); - --- Faldron -DELETE FROM `gossip_menu_option` WHERE `MenuID`=4204; -INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES -(4204, 0, 3, 'Train me.', 3266, 5, 16); - --- Telonis -DELETE FROM `gossip_menu_option` WHERE `MenuID`=4241; -INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES -(4241, 0, 3, 'Train me.', 3266, 5, 16); +(4125, 0, 3, 'Train me.', 3266, 5, 16), -- Sylvanna Forestmoon +(4204, 0, 3, 'Train me.', 3266, 5, 16), -- Faldron +(4241, 0, 3, 'Train me.', 3266, 5, 16); -- Telonis --- Sylvanna Forestmoon -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4125 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 15 AND `SourceEntry` = 0 AND `ConditionTypeOrReference` = 7 AND `SourceGroup` IN (4125, 4131, 4163, 4204, 4241, 4349); INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES -(15, 4125, 0, 7, 171, 50, 'Show menu if alchemy is 50 or higher'); - --- Ainethil -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4131 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES -(15, 4131, 0, 7, 171, 125, 'Show menu if alchemy is 125 or higher'); - --- Taladan -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4163 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES -(15, 4163, 0, 7, 333, 50, 'Show menu if enchanting is 50 or higher'); - --- Faldron -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4204 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES -(15, 4204, 0, 7, 165, 50, 'Show menu if leatherworking is 50 or higher'); - --- Telonis -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4241 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES -(15, 4241, 0, 7, 165, 125, 'Show menu if leatherworking is 125 or higher'); - --- Me'lynn -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4349 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES -(15, 4349, 0, 7, 197, 50, 'Show menu if tailoring is 50 or higher'); +(15, 4125, 0, 7, 171, 50, 'Show menu if alchemy is 50 or higher'), -- Sylvanna Forestmoon +(15, 4131, 0, 7, 171, 125, 'Show menu if alchemy is 125 or higher'), -- Ainethil +(15, 4163, 0, 7, 333, 50, 'Show menu if enchanting is 50 or higher'), -- Taladan +(15, 4204, 0, 7, 165, 50, 'Show menu if leatherworking is 50 or higher'), -- Faldron +(15, 4241, 0, 7, 165, 125, 'Show menu if leatherworking is 125 or higher'), -- Telonis +(15, 4349, 0, 7, 197, 50, 'Show menu if tailoring is 50 or higher'); -- Me'lynn -- Dannelor @@ -96,17 +43,9 @@ DELETE FROM `npc_trainer` WHERE `ID`=4211; INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (4211, -350000); --- Keras Wolfheart -DELETE FROM `creature` WHERE `id1`= 907; +-- Batllemasters +DELETE FROM `creature` WHERE `id1` IN (907, 2302, 5118); INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES -(600907, 907, 0, 9976.16, 2314.49, 1330.87, 0.750492, 120); - --- Aethalas -DELETE FROM `creature` WHERE `id1`= 2302; -INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES -(602302, 2302, 0, 9976.16, 2314.49, 1330.87, 0.750492, 120); - --- Brogun Stoneshield -DELETE FROM `creature` WHERE `id1`= 5118; -INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES -(605118, 5118, 0, 9976.16, 2314.49, 1330.87, 0.750492, 120); +(600907, 907, 0, 9976.16, 2314.49, 1330.87, 0.750492, 120), -- Keras Wolfheart +(602302, 2302, 0, 9976.16, 2314.49, 1330.87, 0.750492, 120), -- Aethalas +(605118, 5118, 0, 9976.16, 2314.49, 1330.87, 0.750492, 120); -- Brogun Stoneshield From 9aa6454934a8174474abd8aa5872a4d23a352d73 Mon Sep 17 00:00:00 2001 From: Grimfeather <88028633+Grimfeather@users.noreply.github.com> Date: Fri, 11 Jul 2025 16:20:54 +0200 Subject: [PATCH 6/6] Update zone_stormwind.sql code cleaning --- sql/world/base/zone_stormwind.sql | 440 ++++++++++-------------------- 1 file changed, 141 insertions(+), 299 deletions(-) diff --git a/sql/world/base/zone_stormwind.sql b/sql/world/base/zone_stormwind.sql index de8545b..6189714 100644 --- a/sql/world/base/zone_stormwind.sql +++ b/sql/world/base/zone_stormwind.sql @@ -1,173 +1,70 @@ --- Dane Lindgren -UPDATE `creature_template` SET `subname`='Journeyman Blacksmith', `npcflag`=81, `trainer_type`=2 WHERE `entry`=957; +UPDATE `creature_template` SET `subname` = 'Journeyman Blacksmith' WHERE `entry` = 957; -- Dane Lindgren +UPDATE `creature_template` SET `subname` = 'Journeyman Tailor' WHERE `entry` = 1300; -- Lawrence Schneider +UPDATE `creature_template` SET `subname` = 'Expert Enchanter' WHERE `entry` = 1317; -- Lucan Cordell +UPDATE `creature_template` SET `subname` = 'Artisan Tailor' WHERE `entry` = 1346; -- Georgio Bolero +UPDATE `creature_template` SET `subname` = 'Journeyman Engineer' WHERE `entry` = 11026; -- Sprite Jumpsprocket +UPDATE `creature_template` SET `subname` = 'Journeyman Enchanter' WHERE `entry` = 11068; -- Betty Quin +UPDATE `creature_template` SET `subname` = 'Journeyman Leatherworker' WHERE `entry` = 11096; -- Randal Worth --- Betty Quin -UPDATE `creature_template` SET `subname`='Journeyman Enchanter', `npcflag`=81, `trainer_type`=2 WHERE `entry`=11068; - --- Lucan Cordell -UPDATE `creature_template` SET `subname`='Expert Enchanter' WHERE `entry`=1317; - --- Sprite Jumpsprocket -UPDATE `creature_template` SET `subname`='Journeyman Engineer', `npcflag`=81, `trainer_type`=2 WHERE `entry`=11026; - --- Randal Worth -UPDATE `creature_template` SET `subname`='Journeyman Leatherworker', `npcflag`=81, `trainer_type`=2 WHERE `entry`=11096; - --- Lawrence Schneider -UPDATE `creature_template` SET `subname`='Journeyman Tailor', `npcflag`=81, `trainer_type`=2 WHERE `entry`=1300; - --- Sellandus -UPDATE `creature_template` SET `type_flags`=134217728 WHERE `entry`=5567; - --- Georgio Bolero -UPDATE `creature_template` SET `subname`='Artisan Tailor' WHERE `entry`=1346; +UPDATE `creature_template` SET `npcflag` = 81, `trainer_type` = 2 WHERE `entry` IN (957, 1300, 11026, 11068, 11096); +UPDATE `creature_template` SET `type_flags` = 134217728 WHERE `entry` = 5567; -- Sellandus --- Tel'Athir -DELETE FROM `npc_trainer` WHERE `ID`=5500; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (5500, -300000); - --- Lilyssia Nightbreeze -DELETE FROM `npc_trainer` WHERE `ID`=5499; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (5499, -300000), (5499, -300001); - --- Dane Lindgren -DELETE FROM `npc_trainer` WHERE `ID`=957; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (957, -310000); - --- Therum Deepforge -DELETE FROM `npc_trainer` WHERE `ID`=5511; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (5511, -310000), (5511, -310001); - --- Betty Quin -DELETE FROM `npc_trainer` WHERE `ID`=11068; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11068, -330000); - --- Lucan Cordell -DELETE FROM `npc_trainer` WHERE `ID`=1317; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (1317, -330000), (1317, -330001); - --- Sprite Jumpsprocket -DELETE FROM `npc_trainer` WHERE `ID`=11026; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11026, -340000); - --- Lilliam Sparkspindle -DELETE FROM `npc_trainer` WHERE `ID`=5518; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (5518, -340000), (5518, -340001); - --- Randal Worth -DELETE FROM `npc_trainer` WHERE `ID`=11096; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11096, -380000); - --- Simon Tanner -DELETE FROM `npc_trainer` WHERE `ID`=5564; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (5564, -380000), (5564, -380001); - --- Lawrence Schneider -DELETE FROM `npc_trainer` WHERE `ID`=1300; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (1300, -410000); - --- Sellandus -DELETE FROM `npc_trainer` WHERE `ID`=5567; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (5567, -410000), (5567, -410001); - --- Georgio Bolero -DELETE FROM `npc_trainer` WHERE `ID`=1346; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (1346, -410000), (1346, -410001), (1346, -410002); +DELETE FROM `npc_trainer` WHERE `ID` IN (957, 1300, 1317, 1346, 5499, 5500, 5511, 5518, 5564, 5567, 11026, 11068, 11096); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES +(957, -310000), -- Dane Lindgren +(1300, -410000), -- Lawrence Schneider +(1317, -330000), -- Lucan Cordell +(1317, -330001), -- Lucan Cordell +(1346, -410000), -- Georgio Bolero +(1346, -410001), -- Georgio Bolero +(1346, -410002), -- Georgio Bolero +(5499, -300000), -- Lilyssia Nightbreeze +(5499, -300001), -- Lilyssia Nightbreeze +(5500, -300000), -- Tel'Athir +(5511, -310000), -- Therum Deepforge +(5511, -310001), -- Therum Deepforge +(5518, -340000), -- Lilliam Sparkspindle +(5518, -340001), -- Lilliam Sparkspindle +(5564, -380000), -- Simon Tanner +(5564, -380001), -- Simon Tanner +(5567, -410000), -- Sellandus +(5567, -410001), -- Sellandus +(11026, -340000), -- Sprite Jumpsprocket +(11068, -330000), -- Betty Quin +(11096, -380000); -- Randal Worth --- Lucan Cordell -DELETE FROM `gossip_menu_option` WHERE `MenuID`=4161; +DELETE FROM `gossip_menu_option` WHERE `MenuID` IN (4161, 4344); INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES -(4161, 0, 3, 'Train me.', 3266, 5, 16); - --- Sellandus -DELETE FROM `gossip_menu_option` WHERE `MenuID`=4344; -INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES -(4344, 0, 3, 'Train me.', 3266, 5, 16); +(4161, 0, 3, 'Train me.', 3266, 5, 16), -- Lucan Cordell +(4344, 0, 3, 'Train me.', 3266, 5, 16); -- Sellandus --- Therum Deepforge -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=581 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 15 AND `SourceEntry` = 0 AND `ConditionTypeOrReference` = 7 AND `SourceGroup` IN (581, 4146, 4161, 4201, 4203, 4344, 4353); INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES -(15, 581, 0, 7, 164, 50, 'Show menu if blacksmithing is 50 or higher'); - --- Lilliam Sparkspindle -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4146 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES -(15, 4146, 0, 7, 202, 50, 'Show menu if engineering is 50 or higher'); - --- Lucan Cordell -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4161 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES -(15, 4161, 0, 7, 333, 50, 'Show menu if enchanting is 50 or higher'); - --- Lilyssia Nightbreeze -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4201 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES -(15, 4201, 0, 7, 171, 50, 'Show menu if alchemy is 50 or higher'); - --- Simon Tanner -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4203 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES -(15, 4203, 0, 7, 165, 50, 'Show menu if leatherworking is 50 or higher'); - --- Sellandus -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4344 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES -(15, 4344, 0, 7, 197, 50, 'Show menu if tailoring is 50 or higher'); - --- Georgio Bolero -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4353 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES -(15, 4353, 0, 7, 197, 125, 'Show menu if tailoring is 125 or higher'); +(15, 581, 0, 7, 164, 50, 'Show menu if blacksmithing is 50 or higher'), -- Therum Deepforge +(15, 4146, 0, 7, 202, 50, 'Show menu if engineering is 50 or higher'), -- Lilliam Sparkspindle +(15, 4161, 0, 7, 333, 50, 'Show menu if enchanting is 50 or higher'), -- Lucan Cordell +(15, 4201, 0, 7, 171, 50, 'Show menu if alchemy is 50 or higher'), -- Lilyssia Nightbreeze +(15, 4203, 0, 7, 165, 50, 'Show menu if leatherworking is 50 or higher'), -- Simon Tanner +(15, 4344, 0, 7, 197, 50, 'Show menu if tailoring is 50 or higher'), -- Sellandus +(15, 4353, 0, 7, 197, 125, 'Show menu if tailoring is 125 or higher'); -- Georgio Bolero --- Thelman Slatefist -DELETE FROM `creature` WHERE `id1`= 7410; +DELETE FROM `creature` WHERE `id1` IN (7410, 7798, 12778, 12779, 12780, 12805, 14981, 15008, 34078, 40607); INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES -(607410, 7410, 0, -8424.43, 342.967, 120.886, 3.82018, 300); +(607410, 7410, 0, -8424.43, 342.967, 120.886, 3.82018, 300), -- Thelman Slatefist +(607798, 7798, 0, -8422.17, 630.877, 95.8402, 5.044, 430), -- Hank the Hammer +(612778, 12778, 0, -8783.7, 423.749, 105.276, 0.651345, 300), -- Lieutenant Rachel Vaccar +(612779, 12779, 0, -8783.33, 426.686, 105.276, 5.37159, 300), -- Archmage Gaiman +(612780, 12780, 0, -8779.46, 427.206, 105.275, 3.80473, 300), -- Sergeant Major Skyshadow +(612805, 12805, 0, -8759.18, 389.112, 101.056, 0.648394, 430), -- Officer Areyn +(614981, 14981, 0, -8454.62, 318.853, 120.969, 0.698132, 180), -- Elfarran +(615008, 15008, 0, -8420.48, 328.711, 120.886, 3.06638, 180); -- Lady Hoteshem --- Hank the Hammer -DELETE FROM `creature` WHERE `id1`= 7798; -INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES -(607798, 7798, 0, -8422.17, 630.877, 95.8402, 5.044, 430); +UPDATE `creature` SET `equipment_id` = 1 WHERE `id1` = 12805; --- Lieutenant Rachel Vaccar -DELETE FROM `creature` WHERE `id1`= 12778; -INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES -(612778, 12778, 0, -8783.7, 423.749, 105.276, 0.651345, 300); - --- Archmage Gaiman -DELETE FROM `creature` WHERE `id1`= 12779; -INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES -(612779, 12779, 0, -8783.33, 426.686, 105.276, 5.37159, 300); - --- Sergeant Major Skyshadow -DELETE FROM `creature` WHERE `id1`= 12780; -INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES -(612780, 12780, 0, -8779.46, 427.206, 105.275, 3.80473, 300); - --- Knight-Lieutenant T'Maire Sydes -DELETE FROM `creature` WHERE `id1`= 40607; - --- Lieutenant Tristia -DELETE FROM `creature` WHERE `id1`= 34078; - --- Officer Areyn -DELETE FROM `creature` WHERE `id1`= 12805; -INSERT INTO `creature` (`guid`, `id1`, `map`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES -(612805, 12805, 0, 1, -8759.18, 389.112, 101.056, 0.648394, 430); - --- Elfarran -DELETE FROM `creature` WHERE `id1`= 14981; -INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES -(614981, 14981, 0, -8454.62, 318.853, 120.969, 0.698132, 180); - --- Lady Hoteshem -DELETE FROM `creature` WHERE `id1`= 15008; -INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES -(615008, 15008, 0, -8420.48, 328.711, 120.886, 3.06638, 180); -- Tome of Nobility (Paladin) DELETE FROM `creature_questender` WHERE `id`=6171 AND `quest`=1661; @@ -181,204 +78,135 @@ INSERT INTO `creature_queststarter` (`id`, `quest`) VALUES (6171, 1661); DELETE FROM `creature_queststarter` WHERE `id`=461 AND `quest`=4488; INSERT INTO `creature_queststarter` (`id`, `quest`) VALUES (461, 4488); --- Stormwind City Guard -UPDATE `creature_template` SET `minlevel`=55, `maxlevel`=55 WHERE `entry`=68; --- Dungar Longdrink -UPDATE `creature_template` SET `minlevel`=55, `maxlevel`=55 WHERE `entry`=352; +UPDATE `creature_template` SET `minlevel` = 55, `maxlevel` = 55 WHERE `entry` = 68; -- Stormwind City Guard +UPDATE `creature_template` SET `minlevel` = 55, `maxlevel` = 55 WHERE `entry` = 352; -- Dungar Longdrink +UPDATE `creature_template` SET `minlevel` = 62, `maxlevel` = 62 WHERE `entry` = 466; -- General Marcus Jonathan +UPDATE `creature_template` SET `minlevel` = 55, `maxlevel` = 55 WHERE `entry` = 1976; -- Stormwind City Patroller +UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60 WHERE `entry` = 1756; -- Stormwind Royal Guard +UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60 WHERE `entry` = 14423; -- Officer Jaxon +UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60 WHERE `entry` = 14438; -- Officer Pomeroy +UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60 WHERE `entry` = 14439; -- Officer Brady +UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60 WHERE `entry` = 15351; -- Alliance Brigadier General +UPDATE `creature_template` SET `minlevel` = 63, `maxlevel` = 63 WHERE `entry` = 29611; -- King Varian Wrynn --- General Marcus Jonathan -UPDATE `creature_template` SET `minlevel`=62, `maxlevel`=62 WHERE `entry`=466; +UPDATE `creature_template` SET `rank` = 0 WHERE `entry` IN (1756, 15351); --- Keldric Boucher -UPDATE `creature_template` SET `subname`='Arcane Goods Vendor' WHERE `entry`=1257; - --- Kyra Boucher -UPDATE `creature_template` SET `subname`='Reagent Vendor' WHERE `entry`=1275; - --- Edna Mullby -UPDATE `creature_template` SET `subname`='Trade Supplier' WHERE `entry`=1286; - --- Owen Vaughn -UPDATE `creature_template` SET `subname`='Reagent Vendor' WHERE `entry`=1308; - --- Sloan McCoy -UPDATE `creature_template` SET `subname`='Poison Supplier' WHERE `entry`=1326; - --- Brother Cassius -UPDATE `creature_template` SET `subname`='Reagent Vendor' WHERE `entry`=1351; - --- Stormwind Royal Guard -UPDATE `creature_template` SET `minlevel`=60, `maxlevel`=60, `rank`=0 WHERE `entry`=1756; - --- Stormwind City Patroller -UPDATE `creature_template` SET `minlevel`=55, `maxlevel`=55 WHERE `entry`=1976; - --- Borgus Steelhand -UPDATE `creature_template` SET `subname`='Weapon Crafter' WHERE `entry`=7232; +UPDATE `creature_template` SET `subname` = 'Arcane Goods Vendor' WHERE `entry` = 1257; -- Keldric Boucher +UPDATE `creature_template` SET `subname` = 'Reagent Vendor' WHERE `entry` = 1275; -- Kyra Boucher +UPDATE `creature_template` SET `subname` = 'Trade Supplier' WHERE `entry` = 1286; -- Edna Mullby +UPDATE `creature_template` SET `subname` = 'Reagent Vendor' WHERE `entry` = 1308; -- Owen Vaughn +UPDATE `creature_template` SET `subname` = 'Poison Supplier' WHERE `entry` = 1326; -- Sloan McCoy +UPDATE `creature_template` SET `subname` = 'Reagent Vendor' WHERE `entry` = 1351; -- Brother Cassius +UPDATE `creature_template` SET `subname` = 'Weapon Crafter' WHERE `entry` = 7232; -- Borgus Steelhand -- Lieutenant Rachel Vaccar -UPDATE `creature_template` SET `subname`=NULL, `minlevel`=55, `maxlevel`=55, `npcflag`=0 WHERE `entry`=12778; +UPDATE `creature_template` SET `subname` = NULL, `minlevel` = 55, `maxlevel` = 55, `npcflag` = 0 WHERE `entry` = 12778; UPDATE `creature_template_locale` SET `Title` = NULL WHERE `entry` = 12778; --- Officer Jaxon -UPDATE `creature_template` SET `minlevel`=60, `maxlevel`=60 WHERE `entry`=14423; --- Officer Pomeroy -UPDATE `creature_template` SET `minlevel`=60, `maxlevel`=60 WHERE `entry`=14438; - --- Officer Brady -UPDATE `creature_template` SET `minlevel`=60, `maxlevel`=60 WHERE `entry`=14439; - --- Alliance Brigadier General -UPDATE `creature_template` SET `minlevel`=60, `maxlevel`=60, `rank`=0 WHERE `entry`=15351; - --- King Varian Wrynn -UPDATE `creature_template` SET `minlevel` = 63, `maxlevel` = 63 WHERE `entry` = 29611; - --- creating copy with 'npc_king_varian_wrynn' script, to prevent AC worldserver error for not using the script -SET @Wrynn := 629611; -- copy of King Varian Wrynn - -DELETE FROM `creature_template` WHERE `entry` = @Wrynn; -INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, -`exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, -`BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, -`lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, -`RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES - -(@Wrynn, 0, 0, 0, 0, 0, 'King Varian Wrynn', 'King of Stormwind', '', 9834, 63, 63, 2, 1733, 3, 1, 1.42857, 1, 1, 20, 1, 3, 0, 35, 2000, 2000, 1, 1, 1, 0, 2048, 0, 0, 0, 0, 0, 0, 7, 76, 0, 0, 0, 0, 0, 700000, 750000, '', 0, 1, 400, 20, 1, 1, 1, 144, 1, 617299839, 0, 0, 'npc_king_varian_wrynn', 12340); - -DELETE FROM `creature_template_addon` WHERE `entry` = @Wrynn; -INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES -(@Wrynn, 0, 0, 0, 1, 0, 3, NULL); - -DELETE FROM `creature_template_locale` WHERE `entry` = @Wrynn; -INSERT INTO `creature_template_locale` (`entry`, `locale`, `Name`, `Title`, `VerifiedBuild`) VALUES -(@Wrynn, 'deDE', 'König Varian Wrynn', 'König von Sturmwind', 18019), -(@Wrynn, 'esES', 'Rey Varian Wrynn', 'Rey de Ventormenta', 18019), -(@Wrynn, 'esMX', 'Rey Varian Wrynn', 'Rey de Ventormenta', 18019), -(@Wrynn, 'frFR', 'Roi Varian Wrynn', 'Roi de Hurlevent', 18019), -(@Wrynn, 'koKR', '국왕 바리안 린', '스톰윈드 국왕', 18019), -(@Wrynn, 'ruRU', 'Король Вариан Ринн', 'Король Штормграда', 18019), -(@Wrynn, 'zhCN', '瓦里安·乌瑞恩国王', '暴风城国王', 18019), -(@Wrynn, 'zhTW', '瓦里安·烏瑞恩國王', '暴風之王', 18019); - -DELETE FROM `creature_template_model` WHERE `CreatureID` = @Wrynn; -INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES -(@Wrynn, 0, 28127, 1, 1, 12340); +DELETE FROM `npc_trainer` WHERE `ID` IN (1430, 2327, 5482, 5493, 5513); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES +(1430, -320000), -- Tomas +(2327, -350000), -- Shaina Fuller +(5482, -320000), -- Stephen Ryback +(5493, -360000), -- Arnold Leland +(5513, -390000); -- Gelman Stonehand --- Tomas -DELETE FROM `npc_trainer` WHERE `ID`=1430; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (1430, -320000); - --- Shaina Fuller -DELETE FROM `npc_trainer` WHERE `ID`=2327; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (2327, -350000); - --- Arnold Leland -DELETE FROM `npc_trainer` WHERE `ID`=5493; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (5493, -360000); - --- Stephen Ryback -DELETE FROM `npc_trainer` WHERE `ID`=5482; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (5482, -320000); - --- Gelman Stonehand -DELETE FROM `npc_trainer` WHERE `ID`=5513; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (5513, -390000); - +-- the following should perhaps go to vanilla_vendors -- Elaine Trias -DELETE FROM `npc_vendor` WHERE `entry`=483 AND `item` IN (27857, 33443, 35952); +DELETE FROM `npc_vendor` WHERE `entry` = 483 AND `item` IN (27857, 33443, 35952); -- Keldric Boucher -DELETE FROM `npc_vendor` WHERE `entry`=1257 AND `item` IN (22147, 22148, 37201, 40411); +DELETE FROM `npc_vendor` WHERE `entry` = 1257 AND `item` IN (22147, 22148, 37201, 40411); -- Kyra Boucher -DELETE FROM `npc_vendor` WHERE `entry`=1275 AND `item` IN (22147, 22148, 37201); +DELETE FROM `npc_vendor` WHERE `entry` = 1275 AND `item` IN (22147, 22148, 37201); -- Edna Mullby -DELETE FROM `npc_vendor` WHERE `entry`=1286 AND `item` IN (14341, 18256, 20856); -DELETE FROM `npc_vendor` WHERE `entry`=1286 AND `item` IN (2324, 2605, 2928, 6260, 6529); +DELETE FROM `npc_vendor` WHERE `entry` = 1286 AND `item` IN (14341, 18256, 20856); +DELETE FROM `npc_vendor` WHERE `entry` = 1286 AND `item` IN (2324, 2605, 2928, 6260, 6529); INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (1286, 2324), (1286, 2605), (1286, 2928), (1286, 6260), (1286, 6529); -- Frederick Stover -DELETE FROM `npc_vendor` WHERE `entry`=1298 AND `item` IN (11303, 11306, 11307, 28053); +DELETE FROM `npc_vendor` WHERE `entry` = 1298 AND `item` IN (11303, 11306, 11307, 28053); -- Bernard Gump -DELETE FROM `npc_vendor` WHERE `entry`=1302 AND `item` IN (785, 2449, 2453, 3355, 3356, 3357); +DELETE FROM `npc_vendor` WHERE `entry` = 1302 AND `item` IN (785, 2449, 2453, 3355, 3356, 3357); -- Charys Yserian -DELETE FROM `npc_vendor` WHERE `entry`=1307 AND `item` IN (22147, 22148, 37201); +DELETE FROM `npc_vendor` WHERE `entry` = 1307 AND `item` IN (22147, 22148, 37201); -- Owen Vaughn -DELETE FROM `npc_vendor` WHERE `entry`=1308 AND `item` IN (22147, 22148, 37201); +DELETE FROM `npc_vendor` WHERE `entry` = 1308 AND `item` IN (22147, 22148, 37201); -- Maria Lumere -DELETE FROM `npc_vendor` WHERE `entry`=1313 AND `item`=40411; +DELETE FROM `npc_vendor` WHERE `entry` = 1313 AND `item`=40411; -- Jasper Fel -DELETE FROM `npc_vendor` WHERE `entry`=1325 AND `item` IN (21835, 21927, 22053, 22054, 22055, 43230, 43231, 43232, 43233, 43234, 43235, 43237); +DELETE FROM `npc_vendor` WHERE `entry` = 1325 AND `item` IN (21835, 21927, 22053, 22054, 22055, 43230, 43231, 43232, 43233, 43234, 43235, 43237); -- Sloan McCoy -DELETE FROM `npc_vendor` WHERE `entry`=1326 AND `item` IN (21835, 21927, 22053, 22054, 22055, 43230, 43231, 43232, 43233, 43234, 43235, 43237); +DELETE FROM `npc_vendor` WHERE `entry` = 1326 AND `item` IN (21835, 21927, 22053, 22054, 22055, 43230, 43231, 43232, 43233, 43234, 43235, 43237); -- Alexandra Bolero -DELETE FROM `npc_vendor` WHERE `entry`=1347 AND `item`=38426; +DELETE FROM `npc_vendor` WHERE `entry` = 1347 AND `item`=38426; -- Brother Cassius -DELETE FROM `npc_vendor` WHERE `entry`=1351 AND `item` IN (22147, 22148, 37201); +DELETE FROM `npc_vendor` WHERE `entry` = 1351 AND `item` IN (22147, 22148, 37201); -- Thomas Miller -DELETE FROM `npc_vendor` WHERE `entry`=3518 AND `item` IN (27855, 33449, 35950); +DELETE FROM `npc_vendor` WHERE `entry` = 3518 AND `item` IN (27855, 33449, 35950); -- Bren Trias -DELETE FROM `npc_vendor` WHERE `entry`=4981 AND `item` IN (27857, 28399, 33443, 33444, 33445, 35952, 35954); +DELETE FROM `npc_vendor` WHERE `entry` = 4981 AND `item` IN (27857, 28399, 33443, 33444, 33445, 35952, 35954); -- Rebecca Laughlin -DELETE FROM `npc_vendor` WHERE `entry`=5193 AND `item` IN (15196, 15198, 19032, 19506, 23999, 31774, 31775, 31776, 31777, 31778, 31779, 31780, 31781, 31804, 32445, 32828, 35221); +DELETE FROM `npc_vendor` WHERE `entry` = 5193 AND `item` IN (15196, 15198, 19032, 19506, 23999, 31774, 31775, 31776, 31777, 31778, 31779, 31780, 31781, 31804, 32445, 32828, 35221); -- Eldraeith -DELETE FROM `npc_vendor` WHERE `entry`=5503 AND `item` IN (18256, 40411); +DELETE FROM `npc_vendor` WHERE `entry` = 5503 AND `item` IN (18256, 40411); -- Brooke Stonebraid -DELETE FROM `npc_vendor` WHERE `entry`=5514 AND `item` IN (20815, 20824); +DELETE FROM `npc_vendor` WHERE `entry` = 5514 AND `item` IN (20815, 20824); -- Billibub Cogspinner -DELETE FROM `npc_vendor` WHERE `entry`=5519 AND `item` IN (39684, 40533); +DELETE FROM `npc_vendor` WHERE `entry` = 5519 AND `item` IN (39684, 40533); -- Jillian Tanner -DELETE FROM `npc_vendor` WHERE `entry`=5565 AND `item`=38426; +DELETE FROM `npc_vendor` WHERE `entry` = 5565 AND `item`=38426; -- Innkeeper Allison -DELETE FROM `npc_vendor` WHERE `entry`=6740 AND `item` IN (4536, 4537, 4538, 4539, 4602, 8953, 27855, 27856, 28399, 33444, 33445, 33449, 35948, 35949, 35950, 35954); +DELETE FROM `npc_vendor` WHERE `entry` = 6740 AND `item` IN (4536, 4537, 4538, 4539, 4602, 8953, 27855, 27856, 28399, 33444, 33445, 33449, 35948, 35949, 35950, 35954); -- Lieutenant Rachel Vaccar -DELETE FROM `npc_vendor` WHERE `entry`=12778; +DELETE FROM `npc_vendor` WHERE `entry` = 12778; SET @Biggins := 112781; -- Master Sergeant Biggins , Vanilla SET @Clate := 112785; -- Stone Guard Zarg , Vanilla +SET @Wrynn := 629611; -- creating copy with 'npc_king_varian_wrynn' script, to prevent AC worldserver error for not using the script - -DELETE FROM `creature_template` WHERE `entry` IN (@Biggins, @Clate); +DELETE FROM `creature_template` WHERE `entry` IN (@Biggins, @Clate, @Wrynn); INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES - +-- (@Biggins, 0, 0, 0, 0, 0, 'Master Sergeant Biggins', 'Officer Accessories Quartermaster', NULL, 0, 55, 55, 0, 1078, 128, 1, 1.14286, 1, 1, 18, 1, 0, 0, 1.05, 2000, 2000, 1, 1, 1, 768, 2048, 0, 0, 0, 0, 0, 0, 7, 4096, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 2, 1, 2.6, 1, 0, 0, 1, 0, 0, 0, 'npc_ipp_pre_tbc', 12340), -(@Clate, 0, 0, 0, 0, 0, 'Sergeant Major Clate', 'Food and Drink', NULL, 0, 55, 55, 0, 123, 4224, 1, 1.14286, 1, 1, 18, 1, 0, 0, 2.15, 2000, 2000, 1, 1, 1, 768, 2048, 0, 0, 0, 0, 0, 0, 7, 4096, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 2, 1, 2.6, 1, 0, 0, 1, 0, 0, 0, 'npc_ipp_pre_tbc', 12340); +(@Clate, 0, 0, 0, 0, 0, 'Sergeant Major Clate', 'Food and Drink', NULL, 0, 55, 55, 0, 123, 4224, 1, 1.14286, 1, 1, 18, 1, 0, 0, 2.15, 2000, 2000, 1, 1, 1, 768, 2048, 0, 0, 0, 0, 0, 0, 7, 4096, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 2, 1, 2.6, 1, 0, 0, 1, 0, 0, 0, 'npc_ipp_pre_tbc', 12340), +(@Wrynn, 0, 0, 0, 0, 0, 'King Varian Wrynn', 'King of Stormwind', '', 9834, 63, 63, 2, 1733, 3, 1, 1.42857, 1, 1, 20, 1, 3, 0, 35, 2000, 2000, 1, 1, 1, 0, 2048, 0, 0, 0, 0, 0, 0, 7, 76, 0, 0, 0, 0, 0, 700000, 750000, '', 0, 1, 400, 20, 1, 1, 1, 144, 1, 617299839, 0, 0, 'npc_king_varian_wrynn', 12340); -DELETE FROM `creature_template_addon` WHERE `entry` IN (@Biggins, @Clate); +DELETE FROM `creature_template_addon` WHERE `entry` IN (@Biggins, @Clate, @Wrynn); INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES (@Biggins, 0, 0, 0, 1, 0, 0, NULL), -(@Clate, 0, 0, 0, 0, 0, 0, NULL); +(@Clate, 0, 0, 0, 0, 0, 0, NULL), +(@Wrynn, 0, 0, 0, 1, 0, 3, NULL); -DELETE FROM `creature_template_locale` WHERE `entry` IN (@Biggins, @Clate); +DELETE FROM `creature_template_locale` WHERE `entry` IN (@Biggins, @Clate, @Wrynn); INSERT INTO `creature_template_locale` (`entry`, `locale`, `Name`, `Title`, `VerifiedBuild`) VALUES --- (@Biggins, 'deDE', 'Hauptfeldwebel Biggins', 'Rüstmeister für Zubehör', 18019), (@Biggins, 'esES', 'Sargento primero Biggins', 'Intendente de accesorios', 18019), (@Biggins, 'esMX', 'Sargento primero Biggins', 'Intendente de accesorios', 18019), @@ -395,12 +223,22 @@ INSERT INTO `creature_template_locale` (`entry`, `locale`, `Name`, `Title`, `Ver (@Clate, 'koKR', '선임하사 클레이트', '식료품 상인', 18019), (@Clate, 'ruRU', 'Старший сержант Клейт', 'Еда и напитки', 18019), (@Clate, 'zhCN', '克莱特军士长', '食物和饮料', 18019), -(@Clate, 'zhTW', '士官長克萊特', '食物和飲料', 18019); +(@Clate, 'zhTW', '士官長克萊特', '食物和飲料', 18019), +-- +(@Wrynn, 'deDE', 'König Varian Wrynn', 'König von Sturmwind', 18019), +(@Wrynn, 'esES', 'Rey Varian Wrynn', 'Rey de Ventormenta', 18019), +(@Wrynn, 'esMX', 'Rey Varian Wrynn', 'Rey de Ventormenta', 18019), +(@Wrynn, 'frFR', 'Roi Varian Wrynn', 'Roi de Hurlevent', 18019), +(@Wrynn, 'koKR', '국왕 바리안 린', '스톰윈드 국왕', 18019), +(@Wrynn, 'ruRU', 'Король Вариан Ринн', 'Король Штормграда', 18019), +(@Wrynn, 'zhCN', '瓦里安·乌瑞恩国王', '暴风城国王', 18019), +(@Wrynn, 'zhTW', '瓦里安·烏瑞恩國王', '暴風之王', 18019); -DELETE FROM `creature_template_model` WHERE `CreatureID` IN (@Biggins, @Clate); +DELETE FROM `creature_template_model` WHERE `CreatureID` IN (@Biggins, @Clate, @Wrynn); INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES (@Biggins, 0, 12669, 1, 1, 12340), -(@Clate, 0, 12925, 1, 1, 12340); +(@Clate, 0, 12925, 1, 1, 12340), +(@Wrynn, 0, 28127, 1, 1, 12340); UPDATE `creature_template` SET `subname` = 'Mount Vendor' WHERE `entry` = 12783; UPDATE `creature_template` SET `subname` = 'Weapons Quartermaster' WHERE `entry` = 12784; @@ -647,25 +485,29 @@ DELETE FROM `creature` WHERE `id1` IN -- Summon Felsteed (Warlock) -DELETE FROM `quest_offer_reward` WHERE `ID`=4488; +DELETE FROM `quest_offer_reward` WHERE `ID` = 4488; INSERT INTO `quest_offer_reward` (`ID`, `RewardText`) VALUES (4488, 'So, you\'ve decided to grace my presence again. How kind of you.$b$bMy acolytes wondered if you\'d ever show up. I told them there was no doubt. When power is concerned, you are drawn in like a moth to the flame.'); -- A Meal Served Cold -UPDATE `quest_template` SET `Flags`=9, `LogDescription`='Kill a Cold Eye Basilisk, get a Chilled Basilisk Haunch, and return it to Angus Stern in the Blue Recluse.$B$B' WHERE `ID`=212; +UPDATE `quest_template` SET `Flags` = 9, +`LogDescription` = 'Kill a Cold Eye Basilisk, get a Chilled Basilisk Haunch, and return it to Angus Stern in the Blue Recluse.$B$B' +WHERE `ID` = 212; -- Chillwind Camp -UPDATE `quest_template` SET `LogTitle`='Chillwind Point' WHERE `ID`=8415; +UPDATE `quest_template` SET `LogTitle` = 'Chillwind Point' WHERE `ID` = 8415; -- Devourer of Souls (Warlock) -UPDATE `quest_template_addon` SET `PrevQuestID`=0 WHERE `ID`=1716; +UPDATE `quest_template_addon` SET `PrevQuestID` = 0 WHERE `ID` = 1716; + +-- this should probably go to vanilla_vendors -- Remove non-Vanilla food items from Stormwind vendors -DELETE FROM npc_vendor WHERE entry=6740 and item IN (27855, 27856, 28399, 33444, 33445, 33449, 35948, 35949, 35950, 35954); -DELETE FROM npc_vendor WHERE entry=3518 and item IN (27855, 33449, 35950); -DELETE FROM npc_vendor WHERE entry=3003 and item IN (27855, 33449, 35950); -DELETE FROM npc_vendor WHERE entry=4255 and item IN (27854, 27855, 27856, 27857, 27858, 27860, 28399, 29448, 29449, 29450, 29451, 29452, 33443, 33444, 33445, 33449, 33451, 33454, 35948, 35949, 35950, 35951, 35952, 35953, 35954); -DELETE FROM npc_vendor WHERE entry=10367 and item IN (27854, 27855, 27856, 27857, 27858, 27860, 28399, 29448, 29449, 29450, 29451, 29452, 33443, 33444, 33445, 33449, 33451, 33454, 35948, 35949, 35950, 35951, 35952, 35953, 35954, 27859, 29453, 33452, 35947); -DELETE FROM npc_vendor WHERE entry=5109 and item IN (27855, 33449, 35950); -DELETE FROM npc_vendor WHERE entry=4981 and item IN (27857, 28399, 33443, 33444, 33445, 35952, 35954); -DELETE FROM npc_vendor WHERE entry=483 and item IN (27857, 33443, 35952); +DELETE FROM npc_vendor WHERE entry = 483 and item IN (27857, 33443, 35952); +DELETE FROM npc_vendor WHERE entry = 3518 and item IN (27855, 33449, 35950); +DELETE FROM npc_vendor WHERE entry = 3003 and item IN (27855, 33449, 35950); +DELETE FROM npc_vendor WHERE entry = 4255 and item IN (27854, 27855, 27856, 27857, 27858, 27860, 28399, 29448, 29449, 29450, 29451, 29452, 33443, 33444, 33445, 33449, 33451, 33454, 35948, 35949, 35950, 35951, 35952, 35953, 35954); +DELETE FROM npc_vendor WHERE entry = 4981 and item IN (27857, 28399, 33443, 33444, 33445, 35952, 35954); +DELETE FROM npc_vendor WHERE entry = 5109 and item IN (27855, 33449, 35950); +DELETE FROM npc_vendor WHERE entry = 6740 and item IN (27855, 27856, 28399, 33444, 33445, 33449, 35948, 35949, 35950, 35954); +DELETE FROM npc_vendor WHERE entry = 10367 and item IN (27854, 27855, 27856, 27857, 27858, 27860, 28399, 29448, 29449, 29450, 29451, 29452, 33443, 33444, 33445, 33449, 33451, 33454, 35948, 35949, 35950, 35951, 35952, 35953, 35954, 27859, 29453, 33452, 35947);