From 90d5adc4f147109387aac855693a9fd77a8d6bf8 Mon Sep 17 00:00:00 2001 From: Grimfeather <88028633+Grimfeather@users.noreply.github.com> Date: Fri, 11 Oct 2024 18:17:22 +0200 Subject: [PATCH 01/16] Update zone_undercity.sql - Profession Trainers This restores several journeyman and expert profession trainers in the Undercity --- sql/world/base/zone_undercity.sql | 100 ++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/sql/world/base/zone_undercity.sql b/sql/world/base/zone_undercity.sql index dfc2649..f780872 100644 --- a/sql/world/base/zone_undercity.sql +++ b/sql/world/base/zone_undercity.sql @@ -6,6 +6,106 @@ INSERT INTO `creature_queststarter` (`id`, `quest`) VALUES (4563, 4489); DELETE FROM `npc_trainer` WHERE `ID`=4591; INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (4591, -350000); +-- Doctor Martin Felben +UPDATE `creature_template` SET `subname`='Journeyman Alchemist Trainer', `npcflag`=81, `trainer_type`=2 WHERE `entry`=11044; + +-- Doctor Marsh +UPDATE `creature_template` SET `subname`='Expert Alchemist', `npcflag`=81, `trainer_type`=2, `type_flags`=134217728 WHERE `entry`=4609; + +-- Basil Frye +UPDATE `creature_template` SET `subname`='Journeyman Blacksmith', `npcflag`=81, `trainer_type`=2 WHERE `entry`=4605; + +-- Malcomb Wynn +UPDATE `creature_template` SET `subname`='Journeyman Enchanter', `npcflag`=81, `trainer_type`=2 WHERE `entry`=11067; + +-- Graham Van Talen +UPDATE `creature_template` SET `subname`='Journeyman Engineer', `npcflag`=81, `trainer_type`=2 WHERE `entry`=4586; + +-- Dan Golthas +UPDATE `creature_template` SET `subname`='Journeyman Leatherworker', `npcflag`=81, `trainer_type`=2 WHERE `entry`=223; + +-- Victor Ward +UPDATE `creature_template` SET `subname`='Journeyman Tailor', `npcflag`=81, `trainer_type`=2 WHERE `entry`=11048; + +-- Rhiannon Davis +UPDATE `creature_template` SET `subname`='Expert Tailor', `npcflag`=81, `trainer_type`=2, `type_flags`=134217728 WHERE `entry`=11049; + +-- Doctor Martin Felben +DELETE FROM `npc_trainer` WHERE `ID`=11044; +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11044, -300000); + +-- Doctor Marsh +DELETE FROM `npc_trainer` WHERE `ID`=4609; +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (4609, -300000); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (4609, -300001); + +-- Basil Frye +DELETE FROM `npc_trainer` WHERE `ID`=4605; +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (4605, -310000); + +-- Malcomb Wynn +DELETE FROM `npc_trainer` WHERE `ID`=11067; +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11067, -330000); + +-- Graham Van Talen +DELETE FROM `npc_trainer` WHERE `ID`=4586; +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (4586, -340000); + +-- Dan Golthas +DELETE FROM `npc_trainer` WHERE `ID`=223; +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (223, -380000); + +-- Victor Ward +DELETE FROM `npc_trainer` WHERE `ID`=11048; +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11048, -410000); + +-- Rhiannon Davis +DELETE FROM `npc_trainer` WHERE `ID`=11049; +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11049, -410000); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11049, -410001); + +-- Doctor Marsh +DELETE FROM `gossip_menu_option` WHERE `MenuID`=4130; +INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES +(4130, 0, 3, 'Train me.', 3266, 5, 16); + +-- Rhiannon Davis +DELETE FROM `gossip_menu_option` WHERE `MenuID`=4352; +INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES +(4352, 0, 3, 'Train me.', 3266, 5, 16); + + +-- Doctor Marsh +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4130 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES +(15, 4130, 0, 7, 171, 50, 'Show menu if alchemy is 50 or higher'); + +-- James Van Brunt +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=1022 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES +(15, 1022, 0, 7, 164, 50, 'Show menu if blacksmithing is 50 or higher'); + +-- Lavinia Crowe +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4166 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES +(15, 4166, 0, 7, 333, 50, 'Show menu if enchanting is 50 or higher'); + +-- Arthur Moore +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4210 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES +(15, 4210, 0, 7, 165, 50, 'Show menu if leatherworking is 50 or higher'); + +-- Rhiannon Davis +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4352 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES +(15, 4352, 0, 7, 197, 50, 'Show menu if tailoring is 50 or higher'); + +-- Josef Gregorian +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4354 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES +(15, 4354, 0, 7, 197, 125, 'Show menu if tailoring is 125 or higher'); + + /* Replace orc guards with pre-wrathgate abomination guards */ UPDATE `creature` SET `id1`=5624, `equipment_id`=0 WHERE `id1`=36213; From 002740884d77f23d290f140fed6b71d7b09020d9 Mon Sep 17 00:00:00 2001 From: Grimfeather <88028633+Grimfeather@users.noreply.github.com> Date: Fri, 11 Oct 2024 20:00:41 +0200 Subject: [PATCH 02/16] Update zone_thunder_bluff.sql Fixed the gossip menu "train me" buttons now showing up. sorted the sql file in the same style as zone_undercity --- sql/world/base/zone_thunder_bluff.sql | 210 ++++++++++++++------------ 1 file changed, 110 insertions(+), 100 deletions(-) diff --git a/sql/world/base/zone_thunder_bluff.sql b/sql/world/base/zone_thunder_bluff.sql index 311e160..2bf8be8 100644 --- a/sql/world/base/zone_thunder_bluff.sql +++ b/sql/world/base/zone_thunder_bluff.sql @@ -1,90 +1,20 @@ --- Karn Stonehoof -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=1017 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES (15, 1017, 0, 7, 164, 50, 'Show menu if blacksmithing is 50 or higher'); - --- Bena Winterhoof -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4128 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES (15, 4128, 0, 7, 171, 50, 'Show menu if alchemy is 50 or higher'); - --- Teg Dawnstrider -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4165 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES (15, 4165, 0, 7, 333, 50, 'Show menu if enchanting is 50 or higher'); - --- Tarn -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4207 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES (15, 4207, 0, 7, 165, 50, 'Show menu if leatherworking is 50 or higher'); - --- Una -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4242 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES (15, 4242, 0, 7, 165, 125, 'Show menu if leatherworking is 125 or higher'); - --- Tepa -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4351 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES (15, 4351, 0, 7, 197, 50, 'Show menu if tailoring is 50 or higher'); - --- Taim Ragetotem -DELETE FROM `creature` WHERE `id1`=7427; -INSERT INTO `creature` (`id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES (7427, 1, -1384.29, -98.6163, 159.018, 2.87979, 300); - --- Kergul Bloodaxe -DELETE FROM `creature` WHERE `id1`=10360; -INSERT INTO `creature` (`id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES (10360, 1, -1381.29, -75.9809, 160.602, 3.19395, 300); - --- Martin Lindsey -DELETE FROM `creature` WHERE `id1`=12198; -INSERT INTO `creature` (`id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES (12198, 1, -995.143, 217.173, 104.729, 4.46804, 500); - --- Remove WotLK Battlemasters -DELETE FROM `creature` WHERE `id1`=34978; -DELETE FROM `creature` WHERE `id1`=34976; - -- Karn Stonehoof UPDATE `creature_template` SET `subname`='Expert Blacksmith' WHERE `entry`=2998; --- Kurm Stonehoof -UPDATE `creature_template` SET `subname`='Mining Supplier' WHERE `entry`=3002; - -- Tepa -UPDATE `creature_template` SET `subname`='Expert Tailor' WHERE `entry`=3004; +UPDATE `creature_template` SET `subname`='Expert Tailor', `type_flags`=134217728 WHERE `entry`=3004; -- Una -UPDATE `creature_template` SET `subname`='Artisan Leatherworker' WHERE `entry`=3007; +UPDATE `creature_template` SET `subname`='Artisan Leatherworker', `type_flags`=134217728 WHERE `entry`=3007; -- Mak UPDATE `creature_template` SET `subname`='Journeyman Leatherworker', `npcflag`=81, `trainer_type`=2 WHERE `entry`=3008; -- Bena Winterhoof -UPDATE `creature_template` SET `subname`='Expert Alchemist' WHERE `entry`=3009; +UPDATE `creature_template` SET `subname`='Expert Alchemist', `type_flags`=134217728 WHERE `entry`=3009; -- Teg Dawnstrider -UPDATE `creature_template` SET `subname`='Expert Enchanter' WHERE `entry`=3011; - --- Kard Ragetotem -UPDATE `creature_template` SET `subname`='Sword and Dagger Merchant' WHERE `entry`=3021; - --- Naal Mistrunner -UPDATE `creature_template` SET `subname`='Cooking Supplier' WHERE `entry`=3027; - --- Sewa Mistrunner -UPDATE `creature_template` SET `subname`='Fishing Supplier' WHERE `entry`=3029; - --- Cairne Bloodhoof -UPDATE `creature_template` SET `minlevel`=63, `maxlevel`=63 WHERE `entry`=3057; - --- Honor Guard -UPDATE `creature_template` SET `minlevel`=60, `maxlevel`=60, `rank`=0 WHERE `entry`=3083; - --- Bluffwatcher -UPDATE `creature_template` SET `minlevel`=55, `maxlevel`=55, `faction`=105 WHERE `entry`=3084; - --- Chepi -UPDATE `creature_template` SET `subname`='Reagent Vendor' WHERE `entry`=8361; - --- Kuruk -UPDATE `creature_template` SET `subname`='General Goods Vendor' WHERE `entry`=8362; - --- Shadi Mistrunner -UPDATE `creature_template` SET `subname`='Trade Goods Supplier' WHERE `entry`=8363; +UPDATE `creature_template` SET `subname`='Expert Enchanter', `type_flags`=134217728 WHERE `entry`=3011; -- Thrag Stonehoof UPDATE `creature_template` SET `subname`='Journeyman Blacksmith', `npcflag`=81, `trainer_type`=2 WHERE `entry`=10278; @@ -99,33 +29,8 @@ UPDATE `creature_template` SET `subname`='Journeyman Tailor', `npcflag`=81, `tra UPDATE `creature_template` SET `subname`='Journeyman Enchanter', `npcflag`=81, `trainer_type`=2 WHERE `entry`=11071; -- Tarn -UPDATE `creature_template` SET `subname`='Expert Leatherworker', `npcflag`=81, `trainer_type`=2 WHERE `entry`=11084; +UPDATE `creature_template` SET `subname`='Expert Leatherworker', `npcflag`=81, `trainer_type`=2, `type_flags`=134217728 WHERE `entry`=11084; --- Hunter Sagewind -UPDATE `creature_template` SET `minlevel`=60, `maxlevel`=60 WHERE `entry`=14440; - --- Hunter Ragetotem -UPDATE `creature_template` SET `minlevel`=60, `maxlevel`=60 WHERE `entry`=14441; - --- Bena Winterhoof -DELETE FROM `gossip_menu_option` WHERE `MenuID`=4128; -INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES (4128, 0, 3, 'Train me.', 3266, 5, 16); - --- Teg Dawnstrider -DELETE FROM `gossip_menu_option` WHERE `MenuID`=4165; -INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES (4165, 0, 3, 'Train me.', 3266, 5, 16); - --- Tarn -DELETE FROM `gossip_menu_option` WHERE `MenuID`=4207; -INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES (4207, 0, 3, 'Train me.', 3266, 5, 16); - --- Una -DELETE FROM `gossip_menu_option` WHERE `MenuID`=4242; -INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES (4242, 0, 3, 'Train me.', 3266, 5, 16); - --- Tepa -DELETE FROM `gossip_menu_option` WHERE `MenuID`=4351; -INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES (4351, 0, 3, 'Train me.', 3266, 5, 16); -- Pand Stonebinder DELETE FROM `npc_trainer` WHERE `ID`=2798; @@ -202,6 +107,111 @@ DELETE FROM `npc_trainer` WHERE `ID`=11084; INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11084, -380000); INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11084, -380001); + +-- Bena Winterhoof +DELETE FROM `gossip_menu_option` WHERE `MenuID`=4128; +INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES (4128, 0, 3, 'Train me.', 3266, 5, 16); + +-- Teg Dawnstrider +DELETE FROM `gossip_menu_option` WHERE `MenuID`=4165; +INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES (4165, 0, 3, 'Train me.', 3266, 5, 16); + +-- Tarn +DELETE FROM `gossip_menu_option` WHERE `MenuID`=4207; +INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES (4207, 0, 3, 'Train me.', 3266, 5, 16); + +-- Una +DELETE FROM `gossip_menu_option` WHERE `MenuID`=4242; +INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES (4242, 0, 3, 'Train me.', 3266, 5, 16); + +-- Tepa +DELETE FROM `gossip_menu_option` WHERE `MenuID`=4351; +INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES (4351, 0, 3, 'Train me.', 3266, 5, 16); + + +-- Karn Stonehoof +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=1017 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES +(15, 1017, 0, 7, 164, 50, 'Show menu if blacksmithing is 50 or higher'); + +-- Bena Winterhoof +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4128 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES +(15, 4128, 0, 7, 171, 50, 'Show menu if alchemy is 50 or higher'); + +-- Teg Dawnstrider +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4165 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES +(15, 4165, 0, 7, 333, 50, 'Show menu if enchanting is 50 or higher'); + +-- Tarn +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4207 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES +(15, 4207, 0, 7, 165, 50, 'Show menu if leatherworking is 50 or higher'); + +-- Una +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4242 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES +(15, 4242, 0, 7, 165, 125, 'Show menu if leatherworking is 125 or higher'); + +-- Tepa +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4351 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES +(15, 4351, 0, 7, 197, 50, 'Show menu if tailoring is 50 or higher'); + + +-- Taim Ragetotem +DELETE FROM `creature` WHERE `id1`=7427; +INSERT INTO `creature` (`id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES (7427, 1, -1384.29, -98.6163, 159.018, 2.87979, 300); + +-- Kergul Bloodaxe +DELETE FROM `creature` WHERE `id1`=10360; +INSERT INTO `creature` (`id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES (10360, 1, -1381.29, -75.9809, 160.602, 3.19395, 300); + +-- Martin Lindsey +DELETE FROM `creature` WHERE `id1`=12198; +INSERT INTO `creature` (`id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES (12198, 1, -995.143, 217.173, 104.729, 4.46804, 500); + +-- Remove WotLK Battlemasters +DELETE FROM `creature` WHERE `id1`=34978; +DELETE FROM `creature` WHERE `id1`=34976; + +-- Hunter Sagewind +UPDATE `creature_template` SET `minlevel`=60, `maxlevel`=60 WHERE `entry`=14440; + +-- Hunter Ragetotem +UPDATE `creature_template` SET `minlevel`=60, `maxlevel`=60 WHERE `entry`=14441; + +-- Kard Ragetotem +UPDATE `creature_template` SET `subname`='Sword and Dagger Merchant' WHERE `entry`=3021; + +-- Naal Mistrunner +UPDATE `creature_template` SET `subname`='Cooking Supplier' WHERE `entry`=3027; + +-- Sewa Mistrunner +UPDATE `creature_template` SET `subname`='Fishing Supplier' WHERE `entry`=3029; + +-- Cairne Bloodhoof +UPDATE `creature_template` SET `minlevel`=63, `maxlevel`=63 WHERE `entry`=3057; + +-- Honor Guard +UPDATE `creature_template` SET `minlevel`=60, `maxlevel`=60, `rank`=0 WHERE `entry`=3083; + +-- Bluffwatcher +UPDATE `creature_template` SET `minlevel`=55, `maxlevel`=55, `faction`=105 WHERE `entry`=3084; + +-- Chepi +UPDATE `creature_template` SET `subname`='Reagent Vendor' WHERE `entry`=8361; + +-- Kuruk +UPDATE `creature_template` SET `subname`='General Goods Vendor' WHERE `entry`=8362; + +-- Shadi Mistrunner +UPDATE `creature_template` SET `subname`='Trade Goods Supplier' WHERE `entry`=8363; + +-- Kurm Stonehoof +UPDATE `creature_template` SET `subname`='Mining Supplier' WHERE `entry`=3002; + -- Kurm Stonehoof DELETE FROM `npc_vendor` WHERE `entry`=3002 AND `item` IN (20815, 20824); From 9c0572243de6d2711610ebb8ddb3b482a216d326 Mon Sep 17 00:00:00 2001 From: Grimfeather <88028633+Grimfeather@users.noreply.github.com> Date: Fri, 11 Oct 2024 20:57:22 +0200 Subject: [PATCH 03/16] Update zone_orgrimmar.sql - Fixed the gossip menu "train me" buttons now showing up for a few profession trainers. - sorted the sql file in the same style as zone_undercity - batched many inserts --- sql/world/base/zone_orgrimmar.sql | 557 ++++++++++++------------------ 1 file changed, 222 insertions(+), 335 deletions(-) diff --git a/sql/world/base/zone_orgrimmar.sql b/sql/world/base/zone_orgrimmar.sql index 69cbd93..c4eb900 100644 --- a/sql/world/base/zone_orgrimmar.sql +++ b/sql/world/base/zone_orgrimmar.sql @@ -1,37 +1,199 @@ +-- Whuut +UPDATE `creature_template` SET `subname`='Journeyman Alchemist', `npcflag`=81, `trainer_type`=2 WHERE `entry`=11046; + +-- Yelmak +UPDATE `creature_template` SET `subname`='Expert Alchemist' WHERE `entry`=3347; + +-- Shayis Steelfury +UPDATE `creature_template` SET `subname`='Armor Crafter' WHERE `entry`=7230; + +-- Kelgruk Bloodaxe +UPDATE `creature_template` SET `subname`='Weapon Crafter' WHERE `entry`=7231; + +-- Ug'thok +UPDATE `creature_template` SET `subname`='Journeyman Blacksmith', `npcflag`=81, `trainer_type`=2 WHERE `entry`=10266; + +-- Snarl +UPDATE `creature_template` SET `subname`='Expert Blacksmith', `npcflag`=81, `trainer_type`=2, `type_flags`=134217728 WHERE `entry`=1383; + +-- Saru Steelfury +UPDATE `creature_template` SET `subname`='Artisan Blacksmith' WHERE `entry`=3355; + +-- Jhag +UPDATE `creature_template` SET `subname`='Journeyman Enchanter', `npcflag`=81, `trainer_type`=2 WHERE `entry`=11066; + +-- Godan +UPDATE `creature_template` SET `subname`='Expert Enchanter' WHERE `entry`=3345; + +-- Thund +UPDATE `creature_template` SET `subname`='Journeyman Engineer', `npcflag`=81, `trainer_type`=2 WHERE `entry`=2857; + +-- Nogg +UPDATE `creature_template` SET `subname`='Expert Engineer', `npcflag`=81, `trainer_type`=2, `type_flags`=134217728 WHERE `entry`=3412; + +-- Roxxik +UPDATE `creature_template` SET `subname`='Artisan Engineer', `npcflag`=81, `trainer_type`=2, `type_flags`=134217728 WHERE `entry`=11017; + +-- Kamari +UPDATE `creature_template` SET `subname`='Journeyman Leatherworker', `npcflag`=81, `trainer_type`=2 WHERE `entry`=5811; + +-- Karolek +UPDATE `creature_template` SET `subname`='Expert Leatherworker' WHERE `entry`=3365; + +-- Snang +UPDATE `creature_template` SET `subname`='Journeyman Tailor', `npcflag`=81, `trainer_type`=2 WHERE `entry`=2855; + +-- Magar +UPDATE `creature_template` SET `subname`='Expert Tailor' WHERE `entry`=3363; + + +-- Snarl +DELETE FROM `npc_trainer` WHERE `ID`=1383; +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (1383, -310000); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (1383, -310001); + +-- Snang +DELETE FROM `npc_trainer` WHERE `ID`=2855; +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (2855, -410000); + +-- Thund +DELETE FROM `npc_trainer` WHERE `ID`=2857; +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (2857, -340000); + +-- Lumak +DELETE FROM `npc_trainer` WHERE `ID`=3332; +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3332, -360000); + +-- Godan +DELETE FROM `npc_trainer` WHERE `ID`=3345; +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3345, -330000); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3345, -330001); + +-- Yelmak +DELETE FROM `npc_trainer` WHERE `ID`=3347; +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3347, -300000); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3347, -300001); + +-- Saru Steelfury +DELETE FROM `npc_trainer` WHERE `ID`=3355; +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3355, -310000); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3355, -310001); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3355, -310002); + +-- Makaru +DELETE FROM `npc_trainer` WHERE `ID`=3357; +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3357, -390000); + +-- Magar +DELETE FROM `npc_trainer` WHERE `ID`=3363; +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3363, -410000); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3363, -410001); + +-- Karolek +DELETE FROM `npc_trainer` WHERE `ID`=3365; +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3365, -380000); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3365, -380001); + +-- Arnok +DELETE FROM `npc_trainer` WHERE `ID`=3373; +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3373, -350000); + +-- Zamja +DELETE FROM `npc_trainer` WHERE `ID`=3399; +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3399, -320000); + +-- Nogg +DELETE FROM `npc_trainer` WHERE `ID`=3412; +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3412, -340000); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3412, -340001); + +-- Kildar +DELETE FROM `npc_trainer` WHERE `ID`=4752; +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (4752, -450000); + +-- Kamari +DELETE FROM `npc_trainer` WHERE `ID`=5811; +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (5811, -380000); + +-- Thuwd +DELETE FROM `npc_trainer` WHERE `ID`=7088; +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (7088, -400000); + +-- Ug'thok +DELETE FROM `npc_trainer` WHERE `ID`=10266; +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (10266, -310000); + +-- Roxxik +DELETE FROM `npc_trainer` WHERE `ID`=11017; +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11017, -340000); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11017, -340001); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11017, -340002); + +-- Whuut +DELETE FROM `npc_trainer` WHERE `ID`=11046; +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11046, -300000); + +-- Jhag +DELETE FROM `npc_trainer` WHERE `ID`=11066; +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11066, -330000); + + +-- Snarl +DELETE FROM `gossip_menu_option` WHERE `MenuID`=2782; +INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES +(2782, 0, 3, 'Train me.', 3266, 5, 16); + +-- Nogg +DELETE FROM `gossip_menu_option` WHERE `MenuID`=4148; +INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES +(4148, 0, 3, 'Train me.', 3266, 5, 16); + +-- Roxxik +DELETE FROM `gossip_menu_option` WHERE `MenuID`=4151; +INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES +(4151, 0, 3, 'Train me.', 3266, 5, 16); + + -- Saru Steelfury DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=1012 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES (15, 1012, 0, 7, 164, 125, 'Show menu if blacksmithing is 125 or higher'); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES +(15, 1012, 0, 7, 164, 125, 'Show menu if blacksmithing is 125 or higher'); -- Snarl DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=2782 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES (15, 2782, 0, 7, 164, 50, 'Show menu if blacksmithing is 50 or higher'); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES +(15, 2782, 0, 7, 164, 50, 'Show menu if blacksmithing is 50 or higher'); -- Yelmak DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4126 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES (15, 4126, 0, 7, 171, 50, 'Show menu if alchemy is 50 or higher'); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES +(15, 4126, 0, 7, 171, 50, 'Show menu if alchemy is 50 or higher'); -- Nogg DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4148 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES (15, 4148, 0, 7, 202, 50, 'Show menu if engineering is 50 or higher'); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES +(15, 4148, 0, 7, 202, 50, 'Show menu if engineering is 50 or higher'); -- Roxxik DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4151 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES (15, 4151, 0, 7, 202, 125, 'Show menu if engineering is 125 or higher'); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES +(15, 4151, 0, 7, 202, 125, 'Show menu if engineering is 125 or higher'); -- Godan DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4168 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES (15, 4168, 0, 7, 333, 50, 'Show menu if enchanting is 50 or higher'); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES +(15, 4168, 0, 7, 333, 50, 'Show menu if enchanting is 50 or higher'); -- Karolek DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4209 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES (15, 4209, 0, 7, 165, 50, 'Show menu if leatherworking is 50 or higher'); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES +(15, 4209, 0, 7, 165, 50, 'Show menu if leatherworking is 50 or higher'); -- Magar DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4347 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES (15, 4347, 0, 7, 197, 50, 'Show menu if tailoring is 50 or higher'); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES +(15, 4347, 0, 7, 197, 50, 'Show menu if tailoring is 50 or higher'); --- Vol'jin -UPDATE `creature_template` SET `subname`='King of Darkspear Trolls', `minlevel`=60, `maxlevel`=60 WHERE `entry`=10540; -- Nazgrel DELETE FROM `creature` WHERE `id1`=3230 AND `map`=1; @@ -102,14 +264,8 @@ INSERT INTO `creature_queststarter` (`id`, `quest`) VALUES (3326, 4967); DELETE FROM `creature_queststarter` WHERE `id` IN (3324, 3325, 3326, 4564, 5495, 5496) AND `quest`=8419; INSERT INTO `creature_queststarter` (`id`, `quest`) VALUES (3326, 8419); --- Snarl -UPDATE `creature_template` SET `subname`='Expert Blacksmith', `npcflag`=81, `trainer_type`=2 WHERE `entry`=1383; - --- Snang -UPDATE `creature_template` SET `subname`='Journeyman Tailor', `npcflag`=81, `trainer_type`=2 WHERE `entry`=2855; - --- Thund -UPDATE `creature_template` SET `subname`='Journeyman Engineer', `npcflag`=81, `trainer_type`=2 WHERE `entry`=2857; +-- Vol'jin +UPDATE `creature_template` SET `subname`='King of Darkspear Trolls', `minlevel`=60, `maxlevel`=60 WHERE `entry`=10540; -- Nazgrel UPDATE `creature_template` SET `scale`=0.7, `npcflag`=2, `faction`=29, `gossip_menu_id`=0 WHERE `entry`=3230; @@ -135,69 +291,30 @@ UPDATE `creature_template` SET `subname`='Poison Vendor' WHERE `entry`=3334; -- Hagrus UPDATE `creature_template` SET `subname`='Reagents Vendor' WHERE `entry`=3335; --- Godan -UPDATE `creature_template` SET `subname`='Expert Enchanter' WHERE `entry`=3345; - --- Yelmak -UPDATE `creature_template` SET `subname`='Expert Alchemist' WHERE `entry`=3347; - -- Asoran UPDATE `creature_template` SET `subname`='General Goods Vendor' WHERE `entry`=3350; -- Magenius UPDATE `creature_template` SET `subname`='Reagents Vendor' WHERE `entry`=3351; --- Saru Steelfury -UPDATE `creature_template` SET `subname`='Artisan Blacksmith' WHERE `entry`=3355; - -- Sumi UPDATE `creature_template` SET `subname`='Blacksmithing Supplier' WHERE `entry`=3356; -- Gorina UPDATE `creature_template` SET `subname`='Mining Supplier' WHERE `entry`=3358; --- Magar -UPDATE `creature_template` SET `subname`='Expert Tailor' WHERE `entry`=3363; - --- Karolek -UPDATE `creature_template` SET `subname`='Expert Leatherworker' WHERE `entry`=3365; - -- Felika UPDATE `creature_template` SET `subname`='General Trade Goods Merchant' WHERE `entry`=3367; -- Xen'to UPDATE `creature_template` SET `subname`='Cooking Supplier' WHERE `entry`=3400; --- Nogg -UPDATE `creature_template` SET `subname`='Expert Engineer', `npcflag`=81, `trainer_type`=2 WHERE `entry`=3412; - -- Thrall UPDATE `creature_template` SET `minlevel`=63, `maxlevel`=63 WHERE `entry`=4949; --- Kamari -UPDATE `creature_template` SET `subname`='Journeyman Leatherworker', `npcflag`=81, `trainer_type`=2 WHERE `entry`=5811; - -- Shimra UPDATE `creature_template` SET `subname`='General Trade Goods Merchant' WHERE `entry`=5817; --- Shayis Steelfury -UPDATE `creature_template` SET `subname`='Armor Crafter' WHERE `entry`=7230; - --- Kelgruk Bloodaxe -UPDATE `creature_template` SET `subname`='Weapon Crafter' WHERE `entry`=7231; - --- Ug'thok -UPDATE `creature_template` SET `subname`='Journeyman Blacksmith', `npcflag`=81, `trainer_type`=2 WHERE `entry`=10266; - --- Roxxik -UPDATE `creature_template` SET `subname`='Artisan Engineer', `npcflag`=81, `trainer_type`=2 WHERE `entry`=11017; - --- Whuut -UPDATE `creature_template` SET `subname`='Journeyman Alchemist', `npcflag`=81, `trainer_type`=2 WHERE `entry`=11046; - --- Jhag -UPDATE `creature_template` SET `subname`='Journeyman Enchanter', `npcflag`=81, `trainer_type`=2 WHERE `entry`=11066; - -- Snurk Bucksquick UPDATE `creature_template` SET `subname`='Zeppelin Master' WHERE `entry`=12136; @@ -243,108 +360,6 @@ UPDATE `creature_template` SET `minlevel`=60, `maxlevel`=60, `rank`=0 WHERE `ent -- Raider Bork UPDATE `creature_template_addon` SET `mount`=0 WHERE `entry`=12796; --- Snarl -DELETE FROM `gossip_menu_option` WHERE `MenuID`=2782; -INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES (2782, 0, 3, 'Train me.', 3266, 5, 16); - --- Nogg -DELETE FROM `gossip_menu_option` WHERE `MenuID`=4148; -INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES (4148, 0, 3, 'Train me.', 3266, 5, 16); - --- Roxxik -DELETE FROM `gossip_menu_option` WHERE `MenuID`=4151; -INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES (4151, 0, 3, 'Train me.', 3266, 5, 16); - --- Snarl -DELETE FROM `npc_trainer` WHERE `ID`=1383; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (1383, -310000); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (1383, -310001); - --- Snang -DELETE FROM `npc_trainer` WHERE `ID`=2855; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (2855, -410000); - --- Thund -DELETE FROM `npc_trainer` WHERE `ID`=2857; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (2857, -340000); - --- Lumak -DELETE FROM `npc_trainer` WHERE `ID`=3332; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3332, -360000); - --- Godan -DELETE FROM `npc_trainer` WHERE `ID`=3345; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3345, -330000); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3345, -330001); - --- Yelmak -DELETE FROM `npc_trainer` WHERE `ID`=3347; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3347, -300000); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3347, -300001); - --- Saru Steelfury -DELETE FROM `npc_trainer` WHERE `ID`=3355; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3355, -310000); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3355, -310001); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3355, -310002); - --- Makaru -DELETE FROM `npc_trainer` WHERE `ID`=3357; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3357, -390000); - --- Magar -DELETE FROM `npc_trainer` WHERE `ID`=3363; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3363, -410000); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3363, -410001); - --- Karolek -DELETE FROM `npc_trainer` WHERE `ID`=3365; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3365, -380000); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3365, -380001); - --- Arnok -DELETE FROM `npc_trainer` WHERE `ID`=3373; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3373, -350000); - --- Zamja -DELETE FROM `npc_trainer` WHERE `ID`=3399; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3399, -320000); - --- Nogg -DELETE FROM `npc_trainer` WHERE `ID`=3412; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3412, -340000); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3412, -340001); - --- Kildar -DELETE FROM `npc_trainer` WHERE `ID`=4752; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (4752, -450000); - --- Kamari -DELETE FROM `npc_trainer` WHERE `ID`=5811; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (5811, -380000); - --- Thuwd -DELETE FROM `npc_trainer` WHERE `ID`=7088; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (7088, -400000); - --- Ug'thok -DELETE FROM `npc_trainer` WHERE `ID`=10266; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (10266, -310000); - --- Roxxik -DELETE FROM `npc_trainer` WHERE `ID`=11017; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11017, -340000); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11017, -340001); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11017, -340002); - --- Whuut -DELETE FROM `npc_trainer` WHERE `ID`=11046; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11046, -300000); - --- Jhag -DELETE FROM `npc_trainer` WHERE `ID`=11066; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11066, -330000); - -- Olvia DELETE FROM `npc_vendor` WHERE `entry`=3312 AND `item` IN (27854, 33454, 35953); @@ -427,197 +442,69 @@ DELETE FROM `npc_vendor` WHERE `entry`=6929 AND `item` IN (27854, 28399, 33444, DELETE FROM `npc_vendor` WHERE `entry`=12788; -- Lady Palanseer -DELETE FROM `npc_vendor` WHERE `entry`=12792 AND `item` IN (16533, 16534, 16535, 16536, 16539, 16540, 16541, 16542, 16543, 16544, 16545, 16548, 16549, 16550, 16551, 16552, 16554, 16555, 16558, 16560, 16561, 16562, 16563, 16564, 16565, 16566, 16567, 16568, 16569, 16571, 16573, 16574, 16577, 16578, 16579, 16580, 17586, 17588, 17590, 17591, 17592, 17593, 17618, 17620, 17622, 17623, 17624, 17625, 22843, 22852, 22855, 22856, 22857, 22858, 22859, 22860, 22862, 22863, 22864, 22865, 22867, 22868, 22869, 22870, 22872, 22873, 22874, 22875, 22876, 22877, 22878, 22879, 22880, 22881, 22882, 22883, 22884, 22885, 22886, 22887, 23243, 23244, 23251, 23252, 23253, 23254, 23255, 23256, 23257, 23258, 23259, 23260, 23261, 23262, 23263, 23264); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16533, 464); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16534, 542); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16535, 463); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16536, 465); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16539, 465); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16540, 541); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16541, 463); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16542, 464); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16543, 542); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16544, 465); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16545, 465); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16548, 541); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16549, 463); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16550, 464); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16551, 465); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16552, 542); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16554, 465); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16555, 541); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16558, 465); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16560, 541); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16561, 464); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16562, 465); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16563, 463); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16564, 542); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16565, 463); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16566, 464); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16567, 542); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16568, 465); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16569, 465); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16571, 541); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16573, 465); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16574, 541); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16577, 463); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16578, 464); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16579, 542); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 16580, 465); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 17586, 465); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 17588, 541); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 17590, 465); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 17591, 464); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 17592, 463); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 17593, 542); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 17618, 465); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 17620, 541); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 17622, 465); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 17623, 464); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 17624, 463); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 17625, 542); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 22843, 427); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 22852, 427); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 22855, 427); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 22856, 427); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 22857, 427); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 22858, 427); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 22859, 427); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 22860, 427); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 22862, 428); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 22863, 428); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 22864, 428); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 22865, 428); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 22867, 428); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 22868, 428); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 22869, 428); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 22870, 428); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 22872, 652); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 22873, 653); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 22874, 652); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 22875, 653); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 22876, 652); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 22877, 652); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 22878, 653); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 22879, 652); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 22880, 653); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 22881, 653); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 22882, 653); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 22883, 653); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 22884, 652); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 22885, 652); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 22886, 652); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 22887, 653); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 23243, 427); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 23244, 444); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 23251, 444); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 23252, 427); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 23253, 444); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 23254, 427); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 23255, 444); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 23256, 427); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 23257, 444); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 23258, 427); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 23259, 444); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 23260, 427); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 23261, 444); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 23262, 427); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 23263, 444); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12792, 23264, 427); +DELETE FROM `npc_vendor` WHERE `entry`=12792 AND `item` IN + (16533, 16534, 16535, 16536, 16539, 16540, 16541, 16542, 16543, 16544, 16545, 16548, 16549, 16550, 16551, 16552, 16554, 16555, 16558, + 16560, 16561, 16562, 16563, 16564, 16565, 16566, 16567, 16568, 16569, 16571, 16573, 16574, 16577, 16578, 16579, 16580, 17586, 17588, + 17590, 17591, 17592, 17593, 17618, 17620, 17622, 17623, 17624, 17625, 22843, 22852, 22855, 22856, 22857, 22858, 22859, + 22860, 22862, 22863, 22864, 22865, 22867, 22868, 22869, 22870, 22872, 22873, 22874, 22875, 22876, 22877, 22878, 22879, + 22880, 22881, 22882, 22883, 22884, 22885, 22886, 22887, 23243, 23244, 23251, 23252, 23253, 23254, 23255, 23256, 23257, 23258, 23259, 23260, 23261, 23262, 23263, 23264); + +INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES + (12792, 16533, 464), (12792, 16534, 542), (12792, 16535, 463), (12792, 16536, 465), (12792, 16539, 465), (12792, 16540, 541), (12792, 16541, 463), (12792, 16542, 464), (12792, 16543, 542), + (12792, 16544, 465), (12792, 16545, 465), (12792, 16548, 541), (12792, 16549, 463), (12792, 16550, 464), (12792, 16551, 465), (12792, 16552, 542), (12792, 16554, 465), (12792, 16555, 541), + (12792, 16558, 465), (12792, 16560, 541), (12792, 16561, 464), (12792, 16562, 465), (12792, 16563, 463), (12792, 16564, 542), (12792, 16565, 463), (12792, 16566, 464), (12792, 16567, 542), + (12792, 16568, 465), (12792, 16569, 465), (12792, 16571, 541), (12792, 16573, 465), (12792, 16574, 541), (12792, 16577, 463), (12792, 16578, 464), (12792, 16579, 542), (12792, 16580, 465), + (12792, 17586, 465), (12792, 17588, 541), (12792, 17590, 465), (12792, 17591, 464), (12792, 17592, 463), (12792, 17593, 542), (12792, 17618, 465), (12792, 17620, 541), (12792, 17622, 465), + (12792, 17623, 464), (12792, 17624, 463), (12792, 17625, 542), (12792, 22843, 427), (12792, 22852, 427), (12792, 22855, 427), (12792, 22856, 427), (12792, 22857, 427), (12792, 22858, 427), + (12792, 22859, 427), (12792, 22860, 427), (12792, 22862, 428), (12792, 22863, 428), (12792, 22864, 428), (12792, 22865, 428), (12792, 22867, 428), (12792, 22868, 428), (12792, 22869, 428), + (12792, 22870, 428), (12792, 22872, 652), (12792, 22873, 653), (12792, 22874, 652), (12792, 22875, 653), (12792, 22876, 652), (12792, 22877, 652), (12792, 22878, 653), (12792, 22879, 652), + (12792, 22880, 653), (12792, 22881, 653), (12792, 22882, 653), (12792, 22883, 653), (12792, 22884, 652), (12792, 22885, 652), (12792, 22886, 652), (12792, 22887, 653), (12792, 23243, 427), + (12792, 23244, 444), (12792, 23251, 444), (12792, 23252, 427), (12792, 23253, 444), (12792, 23254, 427), (12792, 23255, 444), (12792, 23256, 427), (12792, 23257, 444), (12792, 23258, 427), + (12792, 23259, 444), (12792, 23260, 427), (12792, 23261, 444), (12792, 23262, 427), (12792, 23263, 444), (12792, 23264, 427); -- Brave Stonehide DELETE FROM `npc_vendor` WHERE `entry`=12793 AND `item` IN (15197, 15200, 16335, 16341, 16486, 16497, 16532, 18427, 18428, 18429, 18430, 18432, 18434, 18435, 18436, 18437, 18461, 18834, 18845, 18846, 18849, 18850, 18851, 18852, 18853, 24551, 28118, 28119, 28120, 28123, 28239, 28240, 28241, 28242, 28243, 28246, 28247, 28362, 28363, 28377, 28378, 29592, 30343, 30344, 30345, 30346, 31838, 31839, 31840, 31841, 31852, 31853, 31854, 31855, 32453, 32455, 37865, 38588, 44957); -- First Sergeant Hola'mahi -DELETE FROM `npc_vendor` WHERE `entry`=12795 AND `item` IN (16533, 16534, 16535, 16536, 16539, 16540, 16541, 16542, 16543, 16544, 16545, 16548, 16549, 16550, 16551, 16552, 16554, 16555, 16558, 16560, 16561, 16562, 16563, 16564, 16565, 16566, 16567, 16568, 16569, 16571, 16573, 16574, 16577, 16578, 16579, 16580, 17586, 17588, 17590, 17591, 17592, 17593, 17618, 17620, 17622, 17623, 17624, 17625, 22843, 22852, 22855, 22856, 22857, 22858, 22859, 22860, 22862, 22863, 22864, 22865, 22867, 22868, 22869, 22870, 22872, 22873, 22874, 22875, 22876, 22877, 22878, 22879, 22880, 22881, 22882, 22883, 22884, 22885, 22886, 22887, 23243, 23244, 23251, 23252, 23253, 23254, 23255, 23256, 23257, 23258, 23259, 23260, 23261, 23262, 23263, 23264, 29600, 29601, 29602, 29603, 29604, 29605, 29612, 29613, 29614, 29615, 29616, 29617); +DELETE FROM `npc_vendor` WHERE `entry`=12795 AND `item` IN + (16533, 16534, 16535, 16536, 16539, 16540, 16541, 16542, 16543, 16544, 16545, 16548, 16549, 16550, 16551, 16552, 16554, 16555, 16558, + 16560, 16561, 16562, 16563, 16564, 16565, 16566, 16567, 16568, 16569, 16571, 16573, 16574, 16577, 16578, 16579, 16580, 17586, 17588, + 17590, 17591, 17592, 17593, 17618, 17620, 17622, 17623, 17624, 17625, 22843, 22852, 22855, 22856, 22857, 22858, 22859, + 22860, 22862, 22863, 22864, 22865, 22867, 22868, 22869, 22870, 22872, 22873, 22874, 22875, 22876, 22877, 22878, 22879, + 22880, 22881, 22882, 22883, 22884, 22885, 22886, 22887, 23243, 23244, 23251, 23252, 23253, 23254, 23255, 23256, 23257, 23258, 23259, + 23260, 23261, 23262, 23263, 23264, 29600, 29601, 29602, 29603, 29604, 29605, 29612, 29613, 29614, 29615, 29616, 29617); + DELETE FROM `npc_vendor` WHERE `entry`=12795 AND `item` IN (5565, 16583, 17020, 17021, 17026, 17028, 17029, 17030, 17031, 17032, 17033, 17034, 17035, 17036, 17037, 17038); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12795, 5565); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12795, 16583); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12795, 17020); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12795, 17021); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12795, 17026); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12795, 17028); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12795, 17029); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12795, 17030); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12795, 17031); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12795, 17032); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12795, 17033); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12795, 17034); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12795, 17035); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12795, 17036); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12795, 17037); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12795, 17038); +INSERT INTO `npc_vendor` (`entry`, `item`) VALUES + (12795, 5565), (12795, 16583), (12795, 17020), (12795, 17021), (12795, 17026), (12795, 17028), (12795, 17029), (12795, 17030), + (12795, 17031), (12795, 17032), (12795, 17033), (12795, 17034), (12795, 17035), (12795, 17036), (12795, 17037), (12795, 17038); -- Stone Guard Zarg -DELETE FROM `npc_vendor` WHERE `entry`=12794 AND `item` IN (16345, 18826, 18828, 18831, 18835, 18837, 18840, 18844, 18848, 18860, 18866, 18868, 18871, 18874, 18877, 23464, 23465, 23466, 23467, 23468, 23469); -DELETE FROM `npc_vendor` WHERE `entry`=12794 AND `item` IN (117, 159, 1179, 1205, 1645, 1708, 2287, 2593, 2594, 2595, 2596, 2723, 3770, 3771, 4536, 4537, 4538, 4539, 4540, 4541, 4542, 4544, 4599, 4601, 4602, 4604, 4605, 4606, 4607, 4608, 8766, 8948, 8950, 8952, 8953); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 117); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 159); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 1179); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 1205); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 1645); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 1708); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 2287); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 2593); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 2594); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 2595); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 2596); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 2723); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 3770); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 3771); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 4536); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 4537); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 4538); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 4539); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 4540); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 4541); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 4542); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 4544); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 4599); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 4601); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 4602); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 4604); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 4605); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 4606); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 4607); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 4608); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 8766); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 8948); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 8950); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 8952); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 8953); +DELETE FROM `npc_vendor` WHERE `entry`=12794 AND `item` IN + (16345, 18826, 18828, 18831, 18835, 18837, 18840, 18844, 18848, 18860, 18866, 18868, 18871, 18874, 18877, 23464, 23465, 23466, 23467, 23468, 23469); +DELETE FROM `npc_vendor` WHERE `entry`=12794 AND `item` IN + (117, 159, 1179, 1205, 1645, 1708, 2287, 2593, 2594, 2595, 2596, 2723, 3770, 3771, 4536, 4537, 4538, 4539, 4540, 4541, 4542, 4544, 4599, 4601, 4602, 4604, 4605, 4606, 4607, 4608, 8766, 8948, 8950, 8952, 8953); + +INSERT INTO `npc_vendor` (`entry`, `item`) VALUES + (12794, 117), (12794, 159), (12794, 1179), (12794, 1205), (12794, 1645), (12794, 1708), (12794, 2287), (12794, 2593), (12794, 2594), (12794, 2595), (12794, 2596), (12794, 2723), + (12794, 3770), (12794, 3771), (12794, 4536), (12794, 4537), (12794, 4538), (12794, 4539), (12794, 4540), (12794, 4541), (12794, 4542), (12794, 4544), (12794, 4599), (12794, 4601); + (12794, 4602), (12794, 4604), (12794, 4605), (12794, 4606), (12794, 4607), (12794, 4608), (12794, 8766), (12794, 8948), (12794, 8950), (12794, 8952), (12794, 8953); -- Raider Bork DELETE FROM `npc_vendor` WHERE `entry`=12796 AND `item` IN (29466, 29469, 29470, 29472, 34129); DELETE FROM `npc_vendor` WHERE `entry`=12796 AND `item` IN (18245, 18246, 18247, 18248); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12796, 18245, 423); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12796, 18246, 423); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12796, 18247, 423); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12796, 18248, 423); +INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES + (12796, 18245, 423), + (12796, 18246, 423), + (12796, 18247, 423), + (12796, 18248, 423); -- Sergeant Thunderhorn DELETE FROM `npc_vendor` WHERE `entry`=14581 AND `item` IN (16345, 18826, 18828, 18831, 18835, 18837, 18840, 18844, 18848, 18860, 18866, 18868, 18871, 18874, 18877, 23464, 23465, 23466, 23467, 23468, 23469); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (14581, 16345, 2291); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (14581, 18826, 2291); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (14581, 18828, 2291); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (14581, 18831, 2257); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (14581, 18835, 2291); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (14581, 18837, 2291); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (14581, 18840, 2291); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (14581, 18844, 2291); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (14581, 18848, 2291); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (14581, 18860, 2291); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (14581, 18866, 2291); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (14581, 18868, 2257); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (14581, 18871, 2257); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (14581, 18874, 2257); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (14581, 18877, 2257); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (14581, 23464, 2291); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (14581, 23465, 2257); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (14581, 23466, 2291); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (14581, 23467, 2291); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (14581, 23468, 2291); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (14581, 23469, 2291); +INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES + (14581, 16345, 2291), (14581, 18826, 2291), (14581, 18828, 2291), (14581, 18831, 2257), (14581, 18835, 2291), (14581, 18837, 2291), (14581, 18840, 2291), + (14581, 18844, 2291), (14581, 18848, 2291), (14581, 18860, 2291), (14581, 18866, 2291), (14581, 18868, 2257), (14581, 18871, 2257), (14581, 18874, 2257), + (14581, 18877, 2257), (14581, 23464, 2291), (14581, 23465, 2257), (14581, 23466, 2291), (14581, 23467, 2291), (14581, 23468, 2291), (14581, 23469, 2291); -- Nogg Quest Flags fix UPDATE `creature_template` SET `npcflag` = `npcflag` | 2 WHERE `entry` = 3412; From 0f3a10443840fa14ebc5eb664e79f487c77c2b00 Mon Sep 17 00:00:00 2001 From: Grimfeather <88028633+Grimfeather@users.noreply.github.com> Date: Fri, 11 Oct 2024 23:08:22 +0200 Subject: [PATCH 04/16] Update zone_darnassus.sql This restores several journeyman and expert profession trainers in Darnassus --- sql/world/base/zone_darnassus.sql | 92 +++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/sql/world/base/zone_darnassus.sql b/sql/world/base/zone_darnassus.sql index ee0f180..9891f20 100644 --- a/sql/world/base/zone_darnassus.sql +++ b/sql/world/base/zone_darnassus.sql @@ -1,3 +1,95 @@ -- Dannelor DELETE FROM `npc_trainer` WHERE `ID`=4211; INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (4211, -350000); + +-- Milla Fairancora +UPDATE `creature_template` SET `subname`='Journeyman Alchemist', `npcflag`=81, `trainer_type`=2 WHERE `entry`=11041; + +-- 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; + + +-- Milla Fairancora +DELETE FROM `npc_trainer` WHERE `ID`=11041; +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11041, -300000); + +-- 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; +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); + + +-- Sylvanna Forestmoon +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4125 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; +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'); From e37c14956ee163f062ad4ac53b339ce88bb18ce5 Mon Sep 17 00:00:00 2001 From: Grimfeather <88028633+Grimfeather@users.noreply.github.com> Date: Sat, 12 Oct 2024 01:53:12 +0200 Subject: [PATCH 05/16] Update zone_ironforge.sql This restores several journeyman and expert profession trainers in Ironforge --- sql/world/base/zone_ironforge.sql | 116 ++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/sql/world/base/zone_ironforge.sql b/sql/world/base/zone_ironforge.sql index 3876b5b..1b082d1 100644 --- a/sql/world/base/zone_ironforge.sql +++ b/sql/world/base/zone_ironforge.sql @@ -5,3 +5,119 @@ 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); + +-- Vosur Brakthel +UPDATE `creature_template` SET `subname`='Journeyman Alchemist', `npcflag`=81, `trainer_type`=2 WHERE `entry`=1246; + +-- 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; + + +-- Vosur Brakthel +DELETE FROM `npc_trainer` WHERE `ID`=1246; +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (1246, -300000); + +-- 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; +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); + + +-- Tally Berryfizz +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4123 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; +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'); From bfde166f0f5fc96c1513a581caf497f00c7d492b Mon Sep 17 00:00:00 2001 From: Grimfeather <88028633+Grimfeather@users.noreply.github.com> Date: Sat, 12 Oct 2024 02:08:34 +0200 Subject: [PATCH 06/16] Update zone_orgrimmar.sql - syntax error fix fixed syntax error and a few more inserts batched. --- sql/world/base/zone_orgrimmar.sql | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sql/world/base/zone_orgrimmar.sql b/sql/world/base/zone_orgrimmar.sql index c4eb900..d864ecb 100644 --- a/sql/world/base/zone_orgrimmar.sql +++ b/sql/world/base/zone_orgrimmar.sql @@ -412,10 +412,11 @@ DELETE FROM `npc_vendor` WHERE `entry`=3366 AND `item`=38426; -- Felika DELETE FROM `npc_vendor` WHERE `entry`=3367 AND `item` IN (14341, 18256, 20856); DELETE FROM `npc_vendor` WHERE `entry`=3367 AND `item` IN (2324, 2605, 6260, 6529); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (3367, 2324); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (3367, 2605); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (3367, 6260); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (3367, 6529); +INSERT INTO `npc_vendor` (`entry`, `item`) VALUES + (3367, 2324), + (3367, 2605), + (3367, 6260), + (3367, 6529); -- Borstan DELETE FROM `npc_vendor` WHERE `entry`=3368 AND `item` IN (27854, 33454, 35953); @@ -487,7 +488,7 @@ DELETE FROM `npc_vendor` WHERE `entry`=12794 AND `item` IN INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12794, 117), (12794, 159), (12794, 1179), (12794, 1205), (12794, 1645), (12794, 1708), (12794, 2287), (12794, 2593), (12794, 2594), (12794, 2595), (12794, 2596), (12794, 2723), - (12794, 3770), (12794, 3771), (12794, 4536), (12794, 4537), (12794, 4538), (12794, 4539), (12794, 4540), (12794, 4541), (12794, 4542), (12794, 4544), (12794, 4599), (12794, 4601); + (12794, 3770), (12794, 3771), (12794, 4536), (12794, 4537), (12794, 4538), (12794, 4539), (12794, 4540), (12794, 4541), (12794, 4542), (12794, 4544), (12794, 4599), (12794, 4601), (12794, 4602), (12794, 4604), (12794, 4605), (12794, 4606), (12794, 4607), (12794, 4608), (12794, 8766), (12794, 8948), (12794, 8950), (12794, 8952), (12794, 8953); -- Raider Bork From 3100a574b233645f2774116e6b7abaf34959ef68 Mon Sep 17 00:00:00 2001 From: Grimfeather <88028633+Grimfeather@users.noreply.github.com> Date: Sat, 12 Oct 2024 03:06:02 +0200 Subject: [PATCH 07/16] Update zone_stormwind.sql - fixed the "train me" menu of the expert tailor - batched many inserts - sorted the sql in the same format as the other cities. --- sql/world/base/zone_stormwind.sql | 421 +++++++++++------------------- 1 file changed, 149 insertions(+), 272 deletions(-) diff --git a/sql/world/base/zone_stormwind.sql b/sql/world/base/zone_stormwind.sql index 39a22da..0d989ff 100644 --- a/sql/world/base/zone_stormwind.sql +++ b/sql/world/base/zone_stormwind.sql @@ -1,30 +1,126 @@ +-- Dane Lindgren +UPDATE `creature_template` SET `subname`='Journeyman Blacksmith', `npcflag`=81, `trainer_type`=2 WHERE `entry`=957; + +-- 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; + + +-- 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); + + +-- Lucan Cordell +DELETE FROM `gossip_menu_option` WHERE `MenuID`=4161; +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); + + -- Therum Deepforge DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=581 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; -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'); +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'); +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'); +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'); +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'); +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'); +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'); +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'); -- Thelman Slatefist @@ -111,9 +207,6 @@ UPDATE `creature_template` SET `minlevel`=55, `maxlevel`=55 WHERE `entry`=352; -- General Marcus Jonathan UPDATE `creature_template` SET `minlevel`=62, `maxlevel`=62 WHERE `entry`=466; --- Dane Lindgren -UPDATE `creature_template` SET `subname`='Journeyman Blacksmith', `npcflag`=81, `trainer_type`=2 WHERE `entry`=957; - -- Keldric Boucher UPDATE `creature_template` SET `subname`='Arcane Goods Vendor' WHERE `entry`=1257; @@ -123,21 +216,12 @@ UPDATE `creature_template` SET `subname`='Reagent Vendor' WHERE `entry`=1275; -- Edna Mullby UPDATE `creature_template` SET `subname`='Trade Supplier' WHERE `entry`=1286; --- Lawrence Schneider -UPDATE `creature_template` SET `subname`='Journeyman Tailor', `npcflag`=81, `trainer_type`=2 WHERE `entry`=1300; - -- Owen Vaughn UPDATE `creature_template` SET `subname`='Reagent Vendor' WHERE `entry`=1308; --- Lucan Cordell -UPDATE `creature_template` SET `subname`='Expert Enchanter' WHERE `entry`=1317; - -- Sloan McCoy UPDATE `creature_template` SET `subname`='Poison Supplier' WHERE `entry`=1326; --- Georgio Bolero -UPDATE `creature_template` SET `subname`='Artisan Tailor' WHERE `entry`=1346; - -- Brother Cassius UPDATE `creature_template` SET `subname`='Reagent Vendor' WHERE `entry`=1351; @@ -150,15 +234,6 @@ UPDATE `creature_template` SET `minlevel`=55, `maxlevel`=55 WHERE `entry`=1976; -- Borgus Steelhand UPDATE `creature_template` SET `subname`='Weapon Crafter' WHERE `entry`=7232; --- Sprite Jumpsprocket -UPDATE `creature_template` SET `subname`='Journeyman Engineer', `npcflag`=81, `trainer_type`=2 WHERE `entry`=11026; - --- Betty Quin -UPDATE `creature_template` SET `subname`='Journeyman Enchanter', `npcflag`=81, `trainer_type`=2 WHERE `entry`=11068; - --- Randal Worth -UPDATE `creature_template` SET `subname`='Journeyman Leatherworker', `npcflag`=81, `trainer_type`=2 WHERE `entry`=11096; - -- Lieutenant Rachel Vaccar UPDATE `creature_template` SET `subname`=NULL, `minlevel`=55, `maxlevel`=55, `npcflag`=0 WHERE `entry`=12778; @@ -192,33 +267,6 @@ UPDATE `creature_template` SET `minlevel`=63, `maxlevel`=63 WHERE `entry`=29611; -- Lieutenant Karter UPDATE `creature_template_addon` SET `mount`=0 WHERE `entry`=12783; --- Lucan Cordell -DELETE FROM `gossip_menu_option` WHERE `MenuID`=4161; -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); - --- Dane Lindgren -DELETE FROM `npc_trainer` WHERE `ID`=957; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (957, -310000); - --- Lawrence Schneider -DELETE FROM `npc_trainer` WHERE `ID`=1300; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (1300, -410000); - --- Lucan Cordell -DELETE FROM `npc_trainer` WHERE `ID`=1317; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (1317, -330000); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (1317, -330001); - --- Georgio Bolero -DELETE FROM `npc_trainer` WHERE `ID`=1346; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (1346, -410000); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (1346, -410001); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (1346, -410002); - -- Tomas DELETE FROM `npc_trainer` WHERE `ID`=1430; INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (1430, -320000); @@ -235,51 +283,10 @@ INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (5493, -360000); DELETE FROM `npc_trainer` WHERE `ID`=5482; INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (5482, -320000); --- Lilyssia Nightbreeze -DELETE FROM `npc_trainer` WHERE `ID`=5499; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (5499, -300000); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (5499, -300001); - --- Tel'Athir -DELETE FROM `npc_trainer` WHERE `ID`=5500; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (5500, -300000); - --- Therum Deepforge -DELETE FROM `npc_trainer` WHERE `ID`=5511; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (5511, -310000); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (5511, -310001); - -- Gelman Stonehand DELETE FROM `npc_trainer` WHERE `ID`=5513; INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (5513, -390000); --- Lilliam Sparkspindle -DELETE FROM `npc_trainer` WHERE `ID`=5518; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (5518, -340000); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (5518, -340001); - --- Simon Tanner -DELETE FROM `npc_trainer` WHERE `ID`=5564; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (5564, -380000); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (5564, -380001); - --- Sellandus -DELETE FROM `npc_trainer` WHERE `ID`=5567; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (5567, -410000); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (5567, -410001); - --- Sprite Jumpsprocket -DELETE FROM `npc_trainer` WHERE `ID`=11026; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11026, -340000); - --- Betty Quin -DELETE FROM `npc_trainer` WHERE `ID`=11068; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11068, -330000); - --- Randal Worth -DELETE FROM `npc_trainer` WHERE `ID`=11096; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11096, -380000); - -- Elaine Trias DELETE FROM `npc_vendor` WHERE `entry`=483 AND `item` IN (27857, 33443, 35952); @@ -292,11 +299,7 @@ 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); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (1286, 2324); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (1286, 2605); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (1286, 2928); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (1286, 6260); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (1286, 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); @@ -350,196 +353,70 @@ DELETE FROM `npc_vendor` WHERE `entry`=5565 AND `item`=38426; 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); -- Captain Dirgehammer -DELETE FROM `npc_vendor` WHERE `entry`=12777 AND `item` IN (16437, 16440, 16441, 16442, 16443, 16444, 16446, 16448, 16449, 16450, 16451, 16452, 16453, 16454, 16455, 16456, 16457, 16459, 16462, 16463, 16465, 16466, 16467, 16468, 16471, 16472, 16473, 16474, 16475, 16476, 16477, 16478, 16479, 16480, 16483, 16484, 17578, 17579, 17580, 17581, 17583, 17584, 17602, 17603, 17604, 17605, 17607, 17608, 23272, 23273, 23274, 23275, 23276, 23277, 23278, 23279, 23280, 23281, 23282, 23283, 23284, 23285, 23286, 23287, 23288, 23289, 23290, 23291, 23292, 23293, 23294, 23295, 23296, 23297, 23298, 23299, 23300, 23301, 23302, 23303, 23304, 23305, 23306, 23307, 23308, 23309, 23310, 23311, 23312, 23313, 23314, 23315, 23316, 23317, 23318, 23319); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16437, 465); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16440, 541); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16441, 464); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16442, 542); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16443, 463); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16444, 465); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16446, 465); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16448, 541); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16449, 465); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16450, 542); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16451, 464); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16452, 463); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16453, 463); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16454, 541); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16455, 464); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16456, 542); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16457, 465); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16459, 465); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16462, 465); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16463, 541); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16465, 464); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16466, 463); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16467, 542); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16468, 465); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16471, 541); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16472, 465); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16473, 463); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16474, 464); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16475, 542); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16476, 465); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16477, 463); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16478, 464); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16479, 542); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16480, 465); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16483, 465); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 16484, 541); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 17578, 464); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 17579, 542); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 17580, 465); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 17581, 463); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 17583, 465); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 17584, 541); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 17602, 464); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 17603, 542); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 17604, 465); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 17605, 463); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 17607, 465); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 17608, 541); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23272, 652); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23273, 653); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23274, 428); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23275, 427); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23276, 444); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23277, 427); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23278, 427); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23279, 428); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23280, 428); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23281, 427); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23282, 428); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23283, 427); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23284, 428); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23285, 427); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23286, 428); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23287, 427); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23288, 428); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23289, 427); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23290, 428); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23291, 427); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23292, 652); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23293, 653); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23294, 652); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23295, 653); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23296, 653); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23297, 652); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23298, 652); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23299, 653); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23300, 652); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23301, 653); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23302, 653); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23303, 652); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23304, 653); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23305, 652); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23306, 444); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23307, 427); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23308, 444); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23309, 427); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23310, 444); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23311, 427); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23312, 444); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23313, 427); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23314, 444); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23315, 427); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23316, 444); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23317, 427); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23318, 444); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12777, 23319, 427); +DELETE FROM `npc_vendor` WHERE `entry`=12777 AND `item` IN + (16437, 16440, 16441, 16442, 16443, 16444, 16446, 16448, 16449, 16450, 16451, 16452, 16453, 16454, 16455, 16456, 16457, 16459, 16462, 16463, 16465, 16466, 16467, 16468, + 16471, 16472, 16473, 16474, 16475, 16476, 16477, 16478, 16479, 16480, 16483, 16484, 17578, 17579, 17580, 17581, 17583, 17584, 17602, 17603, 17604, 17605, 17607, 17608, + 23272, 23273, 23274, 23275, 23276, 23277, 23278, 23279, 23280, 23281, 23282, 23283, 23284, 23285, 23286, 23287, 23288, 23289, 23290, 23291, 23292, 23293, 23294, 23295, 23296, 23297, 23298, 23299, + 23300, 23301, 23302, 23303, 23304, 23305, 23306, 23307, 23308, 23309, 23310, 23311, 23312, 23313, 23314, 23315, 23316, 23317, 23318, 23319); + +INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES + (12777, 16437, 465), (12777, 16440, 541), (12777, 16441, 464), (12777, 16442, 542), (12777, 16443, 463), (12777, 16444, 465), (12777, 16446, 465), (12777, 16448, 541), (12777, 16449, 465), + (12777, 16450, 542), (12777, 16451, 464), (12777, 16452, 463), (12777, 16453, 463), (12777, 16454, 541), (12777, 16455, 464), (12777, 16456, 542), (12777, 16457, 465), (12777, 16459, 465), + (12777, 16462, 465), (12777, 16463, 541), (12777, 16465, 464), (12777, 16466, 463), (12777, 16467, 542), (12777, 16468, 465), (12777, 16471, 541), (12777, 16472, 465), (12777, 16473, 463), + (12777, 16474, 464), (12777, 16475, 542), (12777, 16476, 465), (12777, 16477, 463), (12777, 16478, 464), (12777, 16479, 542), (12777, 16480, 465), (12777, 16483, 465), (12777, 16484, 541), + (12777, 17578, 464), (12777, 17579, 542), (12777, 17580, 465), (12777, 17581, 463), (12777, 17583, 465), (12777, 17584, 541), (12777, 17602, 464), (12777, 17603, 542), (12777, 17604, 465), + (12777, 17605, 463), (12777, 17607, 465), (12777, 17608, 541), (12777, 23272, 652), (12777, 23273, 653), (12777, 23274, 428), (12777, 23275, 427), (12777, 23276, 444), (12777, 23277, 427), + (12777, 23278, 427), (12777, 23279, 428), (12777, 23280, 428), (12777, 23281, 427), (12777, 23282, 428), (12777, 23283, 427), (12777, 23284, 428), (12777, 23285, 427), (12777, 23286, 428), + (12777, 23287, 427), (12777, 23288, 428), (12777, 23289, 427), (12777, 23290, 428), (12777, 23291, 427), (12777, 23292, 652), (12777, 23293, 653), (12777, 23294, 652), (12777, 23295, 653), + (12777, 23296, 653), (12777, 23297, 652), (12777, 23298, 652), (12777, 23299, 653), (12777, 23300, 652), (12777, 23301, 653), (12777, 23302, 653), (12777, 23303, 652), (12777, 23304, 653), + (12777, 23305, 652), (12777, 23306, 444), (12777, 23307, 427), (12777, 23308, 444), (12777, 23309, 427), (12777, 23310, 444), (12777, 23311, 427), (12777, 23312, 444), (12777, 23313, 427), + (12777, 23314, 444), (12777, 23315, 427), (12777, 23316, 444), (12777, 23317, 427), (12777, 23318, 444), (12777, 23319, 427); -- Lieutenant Rachel Vaccar DELETE FROM `npc_vendor` WHERE `entry`=12778; -- Master Sergeant Biggins -DELETE FROM `npc_vendor` WHERE `entry`=12781 AND `item` IN (15196, 16342, 18440, 18441, 18442, 18443, 18444, 18445, 18447, 18448, 18449, 18452, 18453, 18454, 18455, 18456, 18457, 18854, 18856, 18857, 18858, 18859, 18862, 18863, 18864, 25829, 28118, 28119, 28120, 28123, 28234, 28235, 28236, 28237, 28238, 28246, 28247, 28362, 28363, 28379, 28380, 29593, 30348, 30349, 30350, 30351, 31838, 31839, 31840, 31841, 31852, 31853, 31854, 31855, 32453, 32455, 37864, 38589, 44957); +DELETE FROM `npc_vendor` WHERE `entry`=12781 AND `item` IN + (15196, 16342, 18440, 18441, 18442, 18443, 18444, 18445, 18447, 18448, 18449, 18452, 18453, 18454, 18455, 18456, 18457, 18854, 18856, 18857, 18858, 18859, + 18862, 18863, 18864, 25829, 28118, 28119, 28120, 28123, 28234, 28235, 28236, 28237, 28238, 28246, 28247, 28362, 28363, 28379, 28380, 29593, 30348, 30349, + 30350, 30351, 31838, 31839, 31840, 31841, 31852, 31853, 31854, 31855, 32453, 32455, 37864, 38589, 44957); -- Captain O'Neal DELETE FROM `npc_vendor` WHERE `entry`=12782 AND `item` IN (12584, 18825, 18827, 18830, 18833, 18836, 18838, 18843, 18847, 18855, 18865, 18867, 18869, 18873, 18876); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12782, 12584, 2291); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12782, 18825, 2291); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12782, 18827, 2291); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12782, 18830, 2257); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12782, 18833, 2291); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12782, 18836, 2291); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12782, 18838, 2291); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12782, 18843, 2291); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12782, 18847, 2291); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12782, 18855, 2291); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12782, 18865, 2291); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12782, 18867, 2257); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12782, 18869, 2257); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12782, 18873, 2257); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12782, 18876, 2257); +INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES + (12782, 12584, 2291), (12782, 18825, 2291), (12782, 18827, 2291), (12782, 18830, 2257), (12782, 18833, 2291), (12782, 18836, 2291), (12782, 18838, 2291), + (12782, 18843, 2291), (12782, 18847, 2291), (12782, 18855, 2291), (12782, 18865, 2291), (12782, 18867, 2257), (12782, 18869, 2257), (12782, 18873, 2257), (12782, 18876, 2257); -- Lieutenant Karter DELETE FROM `npc_vendor` WHERE `entry`=12783 AND `item` IN (29465, 29467, 29468, 29471, 35906); DELETE FROM `npc_vendor` WHERE `entry`=12783 AND `item` IN (18241, 18242, 18243, 18244); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12783, 18241, 423); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12783, 18242, 423); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12783, 18243, 423); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12783, 18244, 423); +INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12783, 18241, 423), (12783, 18242, 423), (12783, 18243, 423), (12783, 18244, 423); -- Sergeant Major Clate -DELETE FROM `npc_vendor` WHERE `entry`=12785 AND `item` IN (16437, 16440, 16441, 16442, 16443, 16444, 16446, 16448, 16449, 16450, 16451, 16452, 16453, 16454, 16455, 16456, 16457, 16459, 16462, 16463, 16465, 16466, 16467, 16468, 16471, 16472, 16473, 16474, 16475, 16476, 16477, 16478, 16479, 16480, 16483, 16484, 17578, 17579, 17580, 17581, 17583, 17584, 17602, 17603, 17604, 17605, 17607, 17608, 23272, 23273, 23274, 23275, 23276, 23277, 23278, 23279, 23280, 23281, 23282, 23283, 23284, 23285, 23286, 23287, 23288, 23289, 23290, 23291, 23292, 23293, 23294, 23295, 23296, 23297, 23298, 23299, 23300, 23301, 23302, 23303, 23304, 23305, 23306, 23307, 23308, 23309, 23310, 23311, 23312, 23313, 23314, 23315, 23316, 23317, 23318, 23319, 29594, 29595, 29596, 29597, 29598, 29599, 29606, 29607, 29608, 29609, 29610, 29611); -DELETE FROM `npc_vendor` WHERE `entry`=12785 AND `item` IN (117, 159, 1179, 1205, 1645, 1708, 2287, 2593, 2594, 2595, 2596, 2723, 3770, 3771, 4536, 4537, 4538, 4539, 4540, 4541, 4542, 4544, 4599, 4601, 4602, 4604, 4605, 4606, 4607, 4608, 8766, 8948, 8950, 8952, 8953); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 117); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 159); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 1179); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 1205); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 1645); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 1708); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 2287); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 2593); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 2594); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 2595); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 2596); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 2723); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 3770); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 3771); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 4536); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 4537); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 4538); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 4539); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 4540); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 4541); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 4542); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 4544); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 4599); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 4601); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 4602); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 4604); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 4605); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 4606); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 4607); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 4608); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 8766); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 8948); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 8950); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 8952); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (12785, 8953); +DELETE FROM `npc_vendor` WHERE `entry`=12785 AND `item` IN + (16437, 16440, 16441, 16442, 16443, 16444, 16446, 16448, 16449, 16450, 16451, 16452, 16453, 16454, 16455, 16456, 16457, 16459, 16462, 16463, 16465, 16466, 16467, 16468, + 16471, 16472, 16473, 16474, 16475, 16476, 16477, 16478, 16479, 16480, 16483, 16484, 17578, 17579, 17580, 17581, 17583, 17584, 17602, 17603, 17604, 17605, 17607, 17608, + 23272, 23273, 23274, 23275, 23276, 23277, 23278, 23279, 23280, 23281, 23282, 23283, 23284, 23285, 23286, 23287, 23288, 23289, 23290, 23291, 23292, 23293, 23294, 23295, 23296, 23297, 23298, 23299, + 23300, 23301, 23302, 23303, 23304, 23305, 23306, 23307, 23308, 23309, 23310, 23311, 23312, 23313, 23314, 23315, 23316, 23317, 23318, 23319, 29594, 29595, 29596, 29597, 29598, 29599, + 29606, 29607, 29608, 29609, 29610, 29611); +DELETE FROM `npc_vendor` WHERE `entry`=12785 AND `item` IN + (117, 159, 1179, 1205, 1645, 1708, 2287, 2593, 2594, 2595, 2596, 2723, 3770, 3771, 4536, 4537, 4538, 4539, 4540, 4541, 4542, 4544, 4599, 4601, 4602, 4604, 4605, 4606, 4607, 4608, 8766, 8948, 8950, 8952, 8953); + +INSERT INTO `npc_vendor` (`entry`, `item`) VALUES + (12785, 117), (12785, 159), (12785, 1179), (12785, 1205), (12785, 1645), (12785, 1708), (12785, 2287), (12785, 2593), (12785, 2594), (12785, 2595), (12785, 2596), + (12785, 2723), (12785, 3770), (12785, 3771), (12785, 4536), (12785, 4537), (12785, 4538), (12785, 4539), (12785, 4540), (12785, 4541), (12785, 4542), (12785, 4544), (12785, 4599), + (12785, 4601), (12785, 4602), (12785, 4604), (12785, 4605), (12785, 4606), (12785, 4607), (12785, 4608), (12785, 8766), (12785, 8948), (12785, 8950), (12785, 8952), (12785, 8953); -- Officer Areyn DELETE FROM `npc_vendor` WHERE `entry`=12805 AND `item` IN (18445, 18447, 18448, 18449, 18454, 18455, 18456, 18457, 18854, 18856, 18858, 18859, 18862, 18863, 18864); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12805, 18445, 492); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12805, 18447, 931); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12805, 18448, 492); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12805, 18449, 931); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12805, 18454, 492); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12805, 18455, 931); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12805, 18456, 492); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12805, 18457, 931); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12805, 18854, 634); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12805, 18856, 634); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12805, 18858, 634); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12805, 18859, 634); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12805, 18862, 634); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12805, 18863, 634); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12805, 18864, 634); +INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES + (12805, 18445, 492), (12805, 18447, 931), (12805, 18448, 492), (12805, 18449, 931), (12805, 18454, 492), (12805, 18455, 931), (12805, 18456, 492), (12805, 18457, 931), + (12805, 18854, 634), (12805, 18856, 634), (12805, 18858, 634), (12805, 18859, 634), (12805, 18862, 634), (12805, 18863, 634), (12805, 18864, 634); -- Summon Felsteed (Warlock) 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.'); +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; @@ -558,4 +435,4 @@ DELETE FROM npc_vendor WHERE entry=4255 and item IN (27854, 27855, 27856, 27857, 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); \ No newline at end of file +DELETE FROM npc_vendor WHERE entry=483 and item IN (27857, 33443, 35952); From 117cf54c08971f78607456ce2a84cec914c6fb6f Mon Sep 17 00:00:00 2001 From: Grimfeather <88028633+Grimfeather@users.noreply.github.com> Date: Sat, 12 Oct 2024 10:52:41 +0200 Subject: [PATCH 08/16] Update zone_undercity.sql - minor corrections minor correctlions --- sql/world/base/zone_undercity.sql | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sql/world/base/zone_undercity.sql b/sql/world/base/zone_undercity.sql index f780872..8da76c2 100644 --- a/sql/world/base/zone_undercity.sql +++ b/sql/world/base/zone_undercity.sql @@ -1,11 +1,3 @@ --- Summon Felsteed (Warlock) -DELETE FROM `creature_queststarter` WHERE `id`=4563 AND `quest`=4489; -INSERT INTO `creature_queststarter` (`id`, `quest`) VALUES (4563, 4489); - --- Mary Edras -DELETE FROM `npc_trainer` WHERE `ID`=4591; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (4591, -350000); - -- Doctor Martin Felben UPDATE `creature_template` SET `subname`='Journeyman Alchemist Trainer', `npcflag`=81, `trainer_type`=2 WHERE `entry`=11044; @@ -30,14 +22,14 @@ UPDATE `creature_template` SET `subname`='Journeyman Tailor', `npcflag`=81, `tra -- Rhiannon Davis UPDATE `creature_template` SET `subname`='Expert Tailor', `npcflag`=81, `trainer_type`=2, `type_flags`=134217728 WHERE `entry`=11049; + -- Doctor Martin Felben DELETE FROM `npc_trainer` WHERE `ID`=11044; INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11044, -300000); -- Doctor Marsh DELETE FROM `npc_trainer` WHERE `ID`=4609; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (4609, -300000); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (4609, -300001); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (4609, -300000), (4609, -300001); -- Basil Frye DELETE FROM `npc_trainer` WHERE `ID`=4605; @@ -61,8 +53,7 @@ INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11048, -410000); -- Rhiannon Davis DELETE FROM `npc_trainer` WHERE `ID`=11049; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11049, -410000); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11049, -410001); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11049, -410000), (11049, -410001); -- Doctor Marsh DELETE FROM `gossip_menu_option` WHERE `MenuID`=4130; @@ -106,6 +97,15 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry (15, 4354, 0, 7, 197, 125, 'Show menu if tailoring is 125 or higher'); +-- Summon Felsteed (Warlock) +DELETE FROM `creature_queststarter` WHERE `id`=4563 AND `quest`=4489; +INSERT INTO `creature_queststarter` (`id`, `quest`) VALUES (4563, 4489); + +-- Mary Edras +DELETE FROM `npc_trainer` WHERE `ID`=4591; +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (4591, -350000); + + /* Replace orc guards with pre-wrathgate abomination guards */ UPDATE `creature` SET `id1`=5624, `equipment_id`=0 WHERE `id1`=36213; From 220f14c14aceaae9354fa86996c29f64c55ebf05 Mon Sep 17 00:00:00 2001 From: Grimfeather <88028633+Grimfeather@users.noreply.github.com> Date: Sat, 12 Oct 2024 10:56:20 +0200 Subject: [PATCH 09/16] Update zone_thunder_bluff.sql - minor corrections minor corrections --- sql/world/base/zone_thunder_bluff.sql | 34 +++++++++++++-------------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/sql/world/base/zone_thunder_bluff.sql b/sql/world/base/zone_thunder_bluff.sql index 2bf8be8..d826288 100644 --- a/sql/world/base/zone_thunder_bluff.sql +++ b/sql/world/base/zone_thunder_bluff.sql @@ -38,8 +38,7 @@ INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (2798, -350000); -- Karn Stonehoof DELETE FROM `npc_trainer` WHERE `ID`=2998; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (2998, -310000); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (2998, -310001); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (2998, -310000), (2998, -310001); -- Brek Stonehoof DELETE FROM `npc_trainer` WHERE `ID`=3001; @@ -47,14 +46,11 @@ INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3001, -390000); -- Tepa DELETE FROM `npc_trainer` WHERE `ID`=3004; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3004, -410000); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3004, -410001); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3004, -410000), (3004, -410001); -- Una DELETE FROM `npc_trainer` WHERE `ID`=3007; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3007, -380000); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3007, -380001); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3007, -380002); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3007, -380000), (3007, -380001), (3007, -380002); -- Mak DELETE FROM `npc_trainer` WHERE `ID`=3008; @@ -62,13 +58,11 @@ INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3008, -380000); -- Bena Winterhoof DELETE FROM `npc_trainer` WHERE `ID`=3009; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3009, -300000); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3009, -300001); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3009, -300000), (3009, -300001); -- Teg Dawnstrider DELETE FROM `npc_trainer` WHERE `ID`=3011; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3011, -330000); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3011, -330001); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3011, -330000), (3011, -330001); -- Komin Winterhoof DELETE FROM `npc_trainer` WHERE `ID`=3013; @@ -104,29 +98,33 @@ INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11071, -330000); -- Tarn DELETE FROM `npc_trainer` WHERE `ID`=11084; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11084, -380000); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11084, -380001); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11084, -380000), (11084, -380001); -- Bena Winterhoof DELETE FROM `gossip_menu_option` WHERE `MenuID`=4128; -INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES (4128, 0, 3, 'Train me.', 3266, 5, 16); +INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES +(4128, 0, 3, 'Train me.', 3266, 5, 16); -- Teg Dawnstrider DELETE FROM `gossip_menu_option` WHERE `MenuID`=4165; -INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES (4165, 0, 3, 'Train me.', 3266, 5, 16); +INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES +(4165, 0, 3, 'Train me.', 3266, 5, 16); -- Tarn DELETE FROM `gossip_menu_option` WHERE `MenuID`=4207; -INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES (4207, 0, 3, 'Train me.', 3266, 5, 16); +INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES +(4207, 0, 3, 'Train me.', 3266, 5, 16); -- Una DELETE FROM `gossip_menu_option` WHERE `MenuID`=4242; -INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES (4242, 0, 3, 'Train me.', 3266, 5, 16); +INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES +(4242, 0, 3, 'Train me.', 3266, 5, 16); -- Tepa DELETE FROM `gossip_menu_option` WHERE `MenuID`=4351; -INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES (4351, 0, 3, 'Train me.', 3266, 5, 16); +INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES +(4351, 0, 3, 'Train me.', 3266, 5, 16); -- Karn Stonehoof From 2a6845f317aa5d26a3d84f7c54482b1fafaff6ce Mon Sep 17 00:00:00 2001 From: Grimfeather <88028633+Grimfeather@users.noreply.github.com> Date: Sat, 12 Oct 2024 11:00:31 +0200 Subject: [PATCH 10/16] Update zone_orgrimmar.sql - minor corrections minor corrections --- sql/world/base/zone_orgrimmar.sql | 38 ++++++++----------------------- 1 file changed, 10 insertions(+), 28 deletions(-) diff --git a/sql/world/base/zone_orgrimmar.sql b/sql/world/base/zone_orgrimmar.sql index d864ecb..0d5d7c3 100644 --- a/sql/world/base/zone_orgrimmar.sql +++ b/sql/world/base/zone_orgrimmar.sql @@ -49,8 +49,7 @@ UPDATE `creature_template` SET `subname`='Expert Tailor' WHERE `entry`=3363; -- Snarl DELETE FROM `npc_trainer` WHERE `ID`=1383; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (1383, -310000); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (1383, -310001); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (1383, -310000), (1383, -310001); -- Snang DELETE FROM `npc_trainer` WHERE `ID`=2855; @@ -66,19 +65,15 @@ INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3332, -360000); -- Godan DELETE FROM `npc_trainer` WHERE `ID`=3345; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3345, -330000); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3345, -330001); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3345, -330000), (3345, -330001); -- Yelmak DELETE FROM `npc_trainer` WHERE `ID`=3347; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3347, -300000); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3347, -300001); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3347, -300000), (3347, -300001); -- Saru Steelfury DELETE FROM `npc_trainer` WHERE `ID`=3355; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3355, -310000); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3355, -310001); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3355, -310002); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3355, -310000), (3355, -310001), (3355, -310002); -- Makaru DELETE FROM `npc_trainer` WHERE `ID`=3357; @@ -86,13 +81,11 @@ INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3357, -390000); -- Magar DELETE FROM `npc_trainer` WHERE `ID`=3363; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3363, -410000); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3363, -410001); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3363, -410000), (3363, -410001); -- Karolek DELETE FROM `npc_trainer` WHERE `ID`=3365; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3365, -380000); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3365, -380001); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3365, -380000), (3365, -380001); -- Arnok DELETE FROM `npc_trainer` WHERE `ID`=3373; @@ -104,8 +97,7 @@ INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3399, -320000); -- Nogg DELETE FROM `npc_trainer` WHERE `ID`=3412; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3412, -340000); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3412, -340001); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3412, -340000), (3412, -340001); -- Kildar DELETE FROM `npc_trainer` WHERE `ID`=4752; @@ -125,9 +117,7 @@ INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (10266, -310000); -- Roxxik DELETE FROM `npc_trainer` WHERE `ID`=11017; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11017, -340000); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11017, -340001); -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11017, -340002); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11017, -340000), (11017, -340001), (11017, -340002); -- Whuut DELETE FROM `npc_trainer` WHERE `ID`=11046; @@ -412,11 +402,7 @@ DELETE FROM `npc_vendor` WHERE `entry`=3366 AND `item`=38426; -- Felika DELETE FROM `npc_vendor` WHERE `entry`=3367 AND `item` IN (14341, 18256, 20856); DELETE FROM `npc_vendor` WHERE `entry`=3367 AND `item` IN (2324, 2605, 6260, 6529); -INSERT INTO `npc_vendor` (`entry`, `item`) VALUES - (3367, 2324), - (3367, 2605), - (3367, 6260), - (3367, 6529); +INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (3367, 2324), (3367, 2605), (3367, 6260), (3367, 6529); -- Borstan DELETE FROM `npc_vendor` WHERE `entry`=3368 AND `item` IN (27854, 33454, 35953); @@ -494,11 +480,7 @@ INSERT INTO `npc_vendor` (`entry`, `item`) VALUES -- Raider Bork DELETE FROM `npc_vendor` WHERE `entry`=12796 AND `item` IN (29466, 29469, 29470, 29472, 34129); DELETE FROM `npc_vendor` WHERE `entry`=12796 AND `item` IN (18245, 18246, 18247, 18248); -INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES - (12796, 18245, 423), - (12796, 18246, 423), - (12796, 18247, 423), - (12796, 18248, 423); +INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (12796, 18245, 423), (12796, 18246, 423), (12796, 18247, 423), (12796, 18248, 423); -- Sergeant Thunderhorn DELETE FROM `npc_vendor` WHERE `entry`=14581 AND `item` IN (16345, 18826, 18828, 18831, 18835, 18837, 18840, 18844, 18848, 18860, 18866, 18868, 18871, 18874, 18877, 23464, 23465, 23466, 23467, 23468, 23469); From 337688d63ffde7071ecca3aafb8fb396cca85407 Mon Sep 17 00:00:00 2001 From: Grimfeather <88028633+Grimfeather@users.noreply.github.com> Date: Sat, 12 Oct 2024 11:03:06 +0200 Subject: [PATCH 11/16] Update zone_darnassus.sql - minor correction minor layout correction --- sql/world/base/zone_darnassus.sql | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sql/world/base/zone_darnassus.sql b/sql/world/base/zone_darnassus.sql index 9891f20..e1350fd 100644 --- a/sql/world/base/zone_darnassus.sql +++ b/sql/world/base/zone_darnassus.sql @@ -1,7 +1,3 @@ --- Dannelor -DELETE FROM `npc_trainer` WHERE `ID`=4211; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (4211, -350000); - -- Milla Fairancora UPDATE `creature_template` SET `subname`='Journeyman Alchemist', `npcflag`=81, `trainer_type`=2 WHERE `entry`=11041; @@ -93,3 +89,8 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry 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'); + + +-- Dannelor +DELETE FROM `npc_trainer` WHERE `ID`=4211; +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (4211, -350000); From 99ad26a7ff4d0b15aa1bd8ae3f5fdfe615b2ba14 Mon Sep 17 00:00:00 2001 From: Grimfeather <88028633+Grimfeather@users.noreply.github.com> Date: Sat, 12 Oct 2024 11:04:46 +0200 Subject: [PATCH 12/16] Update zone_ironforge.sql - minor correction minor layout correction --- sql/world/base/zone_ironforge.sql | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/sql/world/base/zone_ironforge.sql b/sql/world/base/zone_ironforge.sql index 1b082d1..628a3ee 100644 --- a/sql/world/base/zone_ironforge.sql +++ b/sql/world/base/zone_ironforge.sql @@ -1,11 +1,3 @@ --- Summon Felsteed (Warlock) -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; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (5150, -350000); - -- Vosur Brakthel UPDATE `creature_template` SET `subname`='Journeyman Alchemist', `npcflag`=81, `trainer_type`=2 WHERE `entry`=1246; @@ -121,3 +113,12 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry 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'); + + +-- Summon Felsteed (Warlock) +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; +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (5150, -350000); From df4878dede11064a9e3b3ad1180e6d187386fb9c Mon Sep 17 00:00:00 2001 From: Grimfeather <88028633+Grimfeather@users.noreply.github.com> Date: Sun, 13 Oct 2024 16:22:02 +0200 Subject: [PATCH 13/16] Update zone_undercity.sql Hiding alchemy artisan "train me" menu if alchemy skill is below 125 --- sql/world/base/zone_undercity.sql | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sql/world/base/zone_undercity.sql b/sql/world/base/zone_undercity.sql index 8da76c2..c1f244e 100644 --- a/sql/world/base/zone_undercity.sql +++ b/sql/world/base/zone_undercity.sql @@ -71,6 +71,11 @@ DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=41 INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES (15, 4130, 0, 7, 171, 50, 'Show menu if alchemy is 50 or higher'); +-- Doctor Herbert Halsey +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4132 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES +(15, 4132, 0, 7, 171, 125, 'Show menu if alchemy is 125 or higher'); + -- James Van Brunt DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=1022 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES From d14ae9e577c453fc464a44762c3cb1056f415895 Mon Sep 17 00:00:00 2001 From: Grimfeather <88028633+Grimfeather@users.noreply.github.com> Date: Sun, 13 Oct 2024 16:26:49 +0200 Subject: [PATCH 14/16] Update zone_undercity.sql --- sql/world/base/zone_undercity.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/world/base/zone_undercity.sql b/sql/world/base/zone_undercity.sql index c1f244e..564176d 100644 --- a/sql/world/base/zone_undercity.sql +++ b/sql/world/base/zone_undercity.sql @@ -72,9 +72,9 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry (15, 4130, 0, 7, 171, 50, 'Show menu if alchemy is 50 or higher'); -- Doctor Herbert Halsey -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4132 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=2501 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES -(15, 4132, 0, 7, 171, 125, 'Show menu if alchemy is 125 or higher'); +(15, 2501, 0, 7, 171, 125, 'Show menu if alchemy is 125 or higher'); -- James Van Brunt DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=1022 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; From 01f371013cabf837aba33930246f831072977cd4 Mon Sep 17 00:00:00 2001 From: Grimfeather <88028633+Grimfeather@users.noreply.github.com> Date: Sun, 13 Oct 2024 16:35:33 +0200 Subject: [PATCH 15/16] Update zone_undercity.sql wrong gossip_menu_id again --- sql/world/base/zone_undercity.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/world/base/zone_undercity.sql b/sql/world/base/zone_undercity.sql index 564176d..c1f244e 100644 --- a/sql/world/base/zone_undercity.sql +++ b/sql/world/base/zone_undercity.sql @@ -72,9 +72,9 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry (15, 4130, 0, 7, 171, 50, 'Show menu if alchemy is 50 or higher'); -- Doctor Herbert Halsey -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=2501 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4132 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `ConditionTypeOrReference`, `ConditionValue1`, `ConditionValue2`, `Comment`) VALUES -(15, 2501, 0, 7, 171, 125, 'Show menu if alchemy is 125 or higher'); +(15, 4132, 0, 7, 171, 125, 'Show menu if alchemy is 125 or higher'); -- James Van Brunt DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=1022 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; From 6d5be1d5f0c608401e478b109269cd5471b29bdd Mon Sep 17 00:00:00 2001 From: Grimfeather <88028633+Grimfeather@users.noreply.github.com> Date: Tue, 15 Oct 2024 15:18:18 +0200 Subject: [PATCH 16/16] Update zone_undercity.sql corrected missing quest giver flag --- sql/world/base/zone_undercity.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/world/base/zone_undercity.sql b/sql/world/base/zone_undercity.sql index c1f244e..6e7db2a 100644 --- a/sql/world/base/zone_undercity.sql +++ b/sql/world/base/zone_undercity.sql @@ -11,7 +11,7 @@ UPDATE `creature_template` SET `subname`='Journeyman Blacksmith', `npcflag`=81, UPDATE `creature_template` SET `subname`='Journeyman Enchanter', `npcflag`=81, `trainer_type`=2 WHERE `entry`=11067; -- Graham Van Talen -UPDATE `creature_template` SET `subname`='Journeyman Engineer', `npcflag`=81, `trainer_type`=2 WHERE `entry`=4586; +UPDATE `creature_template` SET `subname`='Journeyman Engineer', `npcflag`=83, `trainer_type`=2 WHERE `entry`=4586; -- Dan Golthas UPDATE `creature_template` SET `subname`='Journeyman Leatherworker', `npcflag`=81, `trainer_type`=2 WHERE `entry`=223;