diff --git a/sql/world/base/zone_orgrimmar.sql b/sql/world/base/zone_orgrimmar.sql index eae7a4f..a29bb38 100644 --- a/sql/world/base/zone_orgrimmar.sql +++ b/sql/world/base/zone_orgrimmar.sql @@ -1,220 +1,89 @@ --- Whuut -UPDATE `creature_template` SET `subname`='Journeyman Alchemist', `npcflag`=81, `trainer_type`=2 WHERE `entry`=11046; +UPDATE `creature_template` SET `subname` = 'Expert Blacksmith' WHERE `entry` = 1383; -- Snarl +UPDATE `creature_template` SET `subname` = 'Journeyman Tailor' WHERE `entry` = 2855; -- Snang +UPDATE `creature_template` SET `subname` = 'Journeyman Engineer' WHERE `entry` = 2857; -- Thund +UPDATE `creature_template` SET `subname` = 'Expert Enchanter' WHERE `entry` = 3345; -- Godan +UPDATE `creature_template` SET `subname` = 'Expert Alchemist' WHERE `entry` = 3347; -- Yelmak +UPDATE `creature_template` SET `subname` = 'Artisan Blacksmith' WHERE `entry` = 3355; -- Saru Steelfury +UPDATE `creature_template` SET `subname` = 'Expert Tailor' WHERE `entry` = 3363; -- Magar +UPDATE `creature_template` SET `subname` = 'Expert Leatherworker' WHERE `entry` = 3365; -- Karolek +UPDATE `creature_template` SET `subname` = 'Expert Engineer' WHERE `entry` = 3412; -- Nogg +UPDATE `creature_template` SET `subname` = 'Journeyman Leatherworker' WHERE `entry` = 5811; -- Kamari +UPDATE `creature_template` SET `subname` = 'Armor Crafter' WHERE `entry` = 7230; -- Shayis Steelfury +UPDATE `creature_template` SET `subname` = 'Weapon Crafter' WHERE `entry` = 7231; -- Kelgruk Bloodaxe +UPDATE `creature_template` SET `subname` = 'Journeyman Blacksmith' WHERE `entry` = 10266; -- Ug'thok +UPDATE `creature_template` SET `subname` = 'Artisan Engineer' WHERE `entry` = 11017; -- Roxxik +UPDATE `creature_template` SET `subname` = 'Journeyman Alchemist' WHERE `entry` = 11046; -- Whuut +UPDATE `creature_template` SET `subname` = 'Journeyman Enchanter' WHERE `entry` = 11066; -- Jhag --- Yelmak -UPDATE `creature_template` SET `subname`='Expert Alchemist' WHERE `entry`=3347; +UPDATE `creature_template` SET `npcflag` = 81, `trainer_type` = 2 WHERE `entry` IN (1383, 2855, 2857, 3412, 5811, 10266, 11017, 11046, 11066; +UPDATE `creature_template` SET `type_flags` = 134217728 WHERE `entry` IN (1383, 3412, 11017); --- Shayis Steelfury -UPDATE `creature_template` SET `subname`='Armor Crafter' WHERE `entry`=7230; --- Kelgruk Bloodaxe -UPDATE `creature_template` SET `subname`='Weapon Crafter' WHERE `entry`=7231; +DELETE FROM `npc_trainer` WHERE `ID` IN (1383, 2855, 2857, 3332, 3345, 3347, 3355, 3357, 3363, 3365, 3373, 3399, 3412, 4752, 5811, 7088, 10266, 11017, 11046, 11066); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES +(1383, -310000), -- Snarl +(1383, -310001), -- Snarl +(2855, -410000), -- Snang +(2857, -340000), -- Thund +(3332, -360000), -- Lumak +(3345, -330000), -- Godan +(3345, -330001), -- Godan +(3347, -300000), -- Yelmak +(3347, -300001), -- Yelmak +(3355, -310000), -- Saru Steelfury +(3355, -310001), -- Saru Steelfury +(3355, -310002), -- Saru Steelfury +(3357, -390000), -- Makaru +(3363, -410000), -- Magar +(3363, -410001), -- Magar +(3365, -380000), -- Karolek +(3365, -380001), -- Karolek +(3373, -350000), -- Arnok +(3399, -320000), -- Zamja +(3412, -340000), -- Nogg +(3412, -340001), -- Nogg +(4752, -450000), -- Kildar +(5811, -380000), -- Kamari +(7088, -400000), -- Thuwd +(10266, -310000), -- Ug'thok +(11017, -340000), -- Roxxik +(11017, -340001), -- Roxxik +(11017, -340002), -- Roxxik +(11046, -300000), -- Whuut +(11066, -330000); -- Jhag --- 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), (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), (3345, -330001); - --- Yelmak -DELETE FROM `npc_trainer` WHERE `ID`=3347; -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), (3355, -310001), (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), (3363, -410001); - --- Karolek -DELETE FROM `npc_trainer` WHERE `ID`=3365; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3365, -380000), (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), (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), (11017, -340001), (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; +DELETE FROM `gossip_menu_option` WHERE `MenuID` IN (2782, 4148, 4151); INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`) VALUES -(2782, 0, 3, 'Train me.', 3266, 5, 16); +(2782, 0, 3, 'Train me.', 3266, 5, 16), -- Snarl +(4148, 0, 3, 'Train me.', 3266, 5, 16), -- Nogg +(4151, 0, 3, 'Train me.', 3266, 5, 16); -- Roxxik --- 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; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 15 AND `SourceEntry` = 0 AND `ConditionTypeOrReference` = 7 AND `SourceGroup` IN (1012, 2782, 4126, 4148, 4151, 4168, 4209, 4347); 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'); +(15, 1012, 0, 7, 164, 125, 'Show menu if blacksmithing is 125 or higher'), -- Saru Steelfury +(15, 2782, 0, 7, 164, 50, 'Show menu if blacksmithing is 50 or higher'), -- Snarl +(15, 4126, 0, 7, 171, 50, 'Show menu if alchemy is 50 or higher'), -- Yelmak +(15, 4148, 0, 7, 202, 50, 'Show menu if engineering is 50 or higher'), -- Nogg +(15, 4151, 0, 7, 202, 125, 'Show menu if engineering is 125 or higher'), -- Roxxik +(15, 4168, 0, 7, 333, 50, 'Show menu if enchanting is 50 or higher'), -- Godan +(15, 4209, 0, 7, 165, 50, 'Show menu if leatherworking is 50 or higher'), -- Karolek +(15, 4347, 0, 7, 197, 50, 'Show menu if tailoring is 50 or higher'); -- Magar --- 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'); --- 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'); - --- 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'); - --- 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'); - --- 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'); - --- 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'); - --- 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'); - --- Nazgrel DELETE FROM `creature` WHERE `id1` = 3230 AND `map`= 1; -INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES -(603230, 3230, 1, 1938.55, -4133.22, 41.1424, 4.07636, 300); - --- Orgrimmar Grunt DELETE FROM `creature` WHERE `guid` IN (10299, 203492, 203493, 203494, 203495); +DELETE FROM `creature` WHERE `id1` IN (3890, 12788, 14720, 14942, 15006); INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES -(10299, 3296, 1, 1620.45, -4252.84, 47.5273, 3.7001, 300); +(603230, 3230, 1, 1938.55, -4133.22, 41.1424, 4.07636, 300), -- Nazgrel +(10299, 3296, 1, 1620.45, -4252.84, 47.5273, 3.7001, 300), -- Orgrimmar Grunt +(603890, 3890, 1, 1990.64, -4794.13, 56.0472, 3.22013, 300), -- Brakgul Deathbringer +(612788, 12788, 1, 1650.95, -4212.82, 55.439, 0.182965, 300), -- Legionnaire Teena +(614720, 14720, 1, 1565.79, -4395.27, 6.9866, 3.35103, 600), -- High Overlord Saurfang +(614942, 14942, 1, 1980.9, -4787.78, 55.8796, 5.13127, 600), -- Kartra Bloodsnarl +(615006, 15006, 1, 2002.26, -4796.74, 56.8471, 3.00197, 600); -- Deze Snowbane --- Brakgul Deathbringer -DELETE FROM `creature` WHERE `id1` = 3890; -INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES -(603890, 3890, 1, 1990.64, -4794.13, 56.0472, 3.22013, 300); - --- Legionnaire Teena -DELETE FROM `creature` WHERE `id1` = 12788; -INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES -(612788, 12788, 1, 1650.95, -4212.82, 55.439, 0.182965, 25); - --- High Overlord Saurfang -DELETE FROM `creature` WHERE `id1` = 14720; -INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES -(614720, 14720, 1, 1565.79, -4395.27, 6.9866, 3.35103, 600); - --- Kartra Bloodsnarl -DELETE FROM `creature` WHERE `id1` = 14942; -INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES -(614942, 14942, 1, 1980.9, -4787.78, 55.8796, 5.13127, 600); - --- Deze Snowbane -DELETE FROM `creature` WHERE `id1` = 15006; -INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES -(208240, 15006, 1, 2002.26, -4796.74, 56.8471, 3.00197, 600); -- Master Pyreanor UPDATE `creature` SET `position_x`= 1940.23, `position_y`= -4135.53, `position_z`= 41.1522, `orientation`= 3.12425 WHERE `id1` = 23128; @@ -231,82 +100,41 @@ 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); --- Vol'jin -UPDATE `creature_template` SET `subname`='King of Darkspear Trolls', `minlevel`=60, `maxlevel`=60 WHERE `entry`=10540; + +UPDATE `creature_template` SET `subname` = 'General Goods Merchant' WHERE `entry` = 3313; -- Trak'gen +UPDATE `creature_template` SET `subname` = 'Guns and Ammo Merchant' WHERE `entry` = 3322; -- Kaja +UPDATE `creature_template` SET `subname` = 'Reagents Vendor' WHERE `entry` = 3323; -- Horthus +UPDATE `creature_template` SET `subname` = 'Poison Vendor' WHERE `entry` = 3334; -- Rekkul +UPDATE `creature_template` SET `subname` = 'Reagents Vendor' WHERE `entry` = 3335; -- Hagrus +UPDATE `creature_template` SET `subname` = 'General Goods Vendor' WHERE `entry` = 3350; -- Asoran +UPDATE `creature_template` SET `subname` = 'Reagents Vendor' WHERE `entry` = 3351; -- Magenius +UPDATE `creature_template` SET `subname` = 'Blacksmithing Supplier' WHERE `entry` = 3356; -- Sumi +UPDATE `creature_template` SET `subname` = 'Mining Supplier' WHERE `entry` = 3358; -- Gorina +UPDATE `creature_template` SET `subname` = 'General Trade Goods Merchant' WHERE `entry` = 3367; -- Felika +UPDATE `creature_template` SET `subname` = 'Cooking Supplier' WHERE `entry` = 3400; -- Xen'to +UPDATE `creature_template` SET `subname` = 'General Trade Goods Merchant' WHERE `entry` = 5817; -- Shimra +UPDATE `creature_template` SET `subname` = 'King of Darkspear Trolls' WHERE `entry` = 10540; -- Vol'jin +UPDATE `creature_template` SET `subname` = 'Zeppelin Master' WHERE `entry` = 12136; -- Snurk Bucksquick + +UPDATE `creature_template` SET `minlevel` = 55, `maxlevel` = 55 WHERE `entry` = 3296; -- Orgrimmar Grunt +UPDATE `creature_template` SET `minlevel` = 55, `maxlevel` = 55 WHERE `entry` = 3310; -- Doras +UPDATE `creature_template` SET `minlevel` = 63, `maxlevel` = 63 WHERE `entry` = 4949; -- Thrall +UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60 WHERE `entry` = 10540; -- Vol'jin +UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60 WHERE `entry` = 14375; -- Scout Stronghand +UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60 WHERE `entry` = 14376; -- Scout Manslayer +UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60 WHERE `entry` = 14377; -- Scout Tharr +UPDATE `creature_template` SET `minlevel` = 62, `maxlevel` = 62 WHERE `entry` = 14720; -- High Overlord Saurfang +UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60, `rank` = 0 WHERE `entry` = 14304; -- Kor'kron Elite +UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60, `rank` = 0 WHERE `entry` = 15350; -- Horde Warbringer + +-- Legionnaire Teena +UPDATE `creature_template` SET `subname`= NULL, `npcflag` = 0, `faction` = 85 WHERE `entry` = 12788; +UPDATE `creature_template_locale` SET `Title` = NULL WHERE `entry` = 12788; -- Nazgrel UPDATE `creature_template` SET `scale`=0.7, `npcflag`=2, `faction`=29, `gossip_menu_id`=0 WHERE `entry`=3230; --- Orgrimmar Grunt -UPDATE `creature_template` SET `minlevel`=55, `maxlevel`=55 WHERE `entry`=3296; - --- Doras -UPDATE `creature_template` SET `minlevel`=55, `maxlevel`=55 WHERE `entry`=3310; - --- Trak'gen -UPDATE `creature_template` SET `subname`='General Goods Merchant' WHERE `entry`=3313; - --- Kaja -UPDATE `creature_template` SET `subname`='Guns and Ammo Merchant' WHERE `entry`=3322; - --- Horthus -UPDATE `creature_template` SET `subname`='Reagents Vendor' WHERE `entry`=3323; - --- Rekkul -UPDATE `creature_template` SET `subname`='Poison Vendor' WHERE `entry`=3334; - --- Hagrus -UPDATE `creature_template` SET `subname`='Reagents Vendor' WHERE `entry`=3335; - --- Asoran -UPDATE `creature_template` SET `subname`='General Goods Vendor' WHERE `entry`=3350; - --- Magenius -UPDATE `creature_template` SET `subname`='Reagents Vendor' WHERE `entry`=3351; - --- Sumi -UPDATE `creature_template` SET `subname`='Blacksmithing Supplier' WHERE `entry`=3356; - --- Gorina -UPDATE `creature_template` SET `subname`='Mining Supplier' WHERE `entry`=3358; - --- 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; - --- Thrall -UPDATE `creature_template` SET `minlevel`=63, `maxlevel`=63 WHERE `entry`=4949; - --- Shimra -UPDATE `creature_template` SET `subname`='General Trade Goods Merchant' WHERE `entry`=5817; - --- Snurk Bucksquick -UPDATE `creature_template` SET `subname`='Zeppelin Master' WHERE `entry`=12136; - --- Legionnaire Teena -UPDATE `creature_template` SET `subname`=NULL, `npcflag`=0, `faction`=85 WHERE `entry`=12788; -UPDATE `creature_template_locale` SET `Title` = NULL WHERE `entry` = 12788; - --- Kor'kron Elite -UPDATE `creature_template` SET `minlevel`=60, `maxlevel`=60, `rank`=0 WHERE `entry`=14304; - --- Scout Stronghand -UPDATE `creature_template` SET `minlevel`=60, `maxlevel`=60 WHERE `entry`=14375; - --- Scout Manslayer -UPDATE `creature_template` SET `minlevel`=60, `maxlevel`=60 WHERE `entry`=14376; - --- Scout Tharr -UPDATE `creature_template` SET `minlevel`=60, `maxlevel`=60 WHERE `entry`=14377; - --- High Overlord Saurfang -UPDATE `creature_template` SET `minlevel`=62, `maxlevel`=62 WHERE `entry`=14720; - --- Horde Warbringer -UPDATE `creature_template` SET `minlevel`=60, `maxlevel`=60, `rank`=0 WHERE `entry`=15350; - +-- this should probably be moved to vanilla_vendors -- Olvia DELETE FROM `npc_vendor` WHERE `entry`=3312 AND `item` IN (27854, 33454, 35953); @@ -448,11 +276,10 @@ UPDATE `creature_template` SET `subname` = 'Armor Quartermaster' WHERE `entry` UPDATE `creature_template` SET `subname` = 'Mount Quartermaster' WHERE `entry` = 12796; UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_pre_tbc' WHERE `entry` IN (12799, @TH_Classic, @LP_Classic); -UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_tbc' WHERE `entry` IN (12793, 12794, 12795, 20278, 23396, 23447, @TH_TBC, @LP_TBC); +UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_tbc' WHERE `entry` IN (12788, 12793, 12794, 12795, 19850, 20278, 23396, 23447, @TH_TBC, @LP_TBC); UPDATE `creature_template_addon` SET `mount` = 0 WHERE `entry` = 12796; - DELETE FROM `creature` WHERE `guid` IN (125688, 125690, 125695, 612792, 612793, 612794, 612795, 612796, 612799, 614581, 620278, 623396, 623447, 626396, 626397); INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES @@ -652,7 +479,6 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`, `ExtendedCost (@LP_TBC, 31649, 0, 0, 2265), (@LP_TBC, 31650, 0, 0, 2267); - /* Hide certain vendor items until the player has reached the progression tier for them */ DELETE FROM `conditions` WHERE `SourceGroup` IN (12796, @LP_Classic, @LP_TBC, @TH_Classic, @TH_TBC); INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, @@ -743,8 +569,16 @@ DELETE FROM `creature` WHERE `id1` IN -- Nogg Quest Flags fix UPDATE `creature_template` SET `npcflag` = `npcflag` | 2 WHERE `entry` = 3412; --- Fix quest A Strange Request to use Vanilla NPCs -UPDATE `quest_template` SET `LogDescription` = "Take the Shrunken Head to Neeru Fireblade in Orgrimmar.", `QuestDescription` = "Neeru Fireblade in Orgrimmar has what I need to get started here! He has mixed up a concoction that I need for my... well, you'll see.$B$BOff with you now -- to Orgrimmar. Here, take this with you. It's a shrunken head that I promised Neeru in exchange for the herbs. It's the head of some poor dwarf I ventured across in the forest. I'm sure Neeru will be pleased.$B$BYou'll find Neeru in the Cleft of Shadow." WHERE `ID` = 3121; -UPDATE `creature_questender` SET `id` = 3216 WHERE `quest` = 3121; +-- Quest: Return to Witch Doctor Uzer'i +UPDATE `quest_template` SET `LogDescription` = "Deliver Neeru's Herb Pouch to Witch Doctor Uzer'i in Feralas." WHERE `ID` = 3122; UPDATE `creature_queststarter` SET `id` = 3216 WHERE `quest` = 3122; -UPDATE `quest_template` SET `LogDescription` = "Deliver Neeru's Herb Pouch to Witch Doctor Uzer'i in Feralas." WHERE `ID` = 3122; + +-- Quest: A Strange Request to use Vanilla NPCs +UPDATE `quest_template` SET +`LogDescription` = "Take the Shrunken Head to Neeru Fireblade in Orgrimmar.", +`QuestDescription` = "Neeru Fireblade in Orgrimmar has what I need to get started here! He has mixed up a concoction that I need for my... well, you'll see.$B$B + Off with you now -- to Orgrimmar. Here, take this with you. It's a shrunken head that I promised Neeru in exchange for the herbs. + It's the head of some poor dwarf I ventured across in the forest. I'm sure Neeru will be pleased.$B$B + You'll find Neeru in the Cleft of Shadow." WHERE `ID` = 3121; + +UPDATE `creature_questender` SET `id` = 3216 WHERE `quest` = 3121; diff --git a/sql/world/base/zone_stormwind.sql b/sql/world/base/zone_stormwind.sql index 6189714..1e465fe 100644 --- a/sql/world/base/zone_stormwind.sql +++ b/sql/world/base/zone_stormwind.sql @@ -475,6 +475,8 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry UPDATE `gameobject` SET `ScriptName` = 'gobject_ipp_pre_tbc' WHERE `guid` IN (61936, 61940, 61942, 61944, 61945, 61946, 61947, 61949, 61951); +UPDATE `creature` SET `ScriptName` = 'npc_ipp_tbc' WHERE `id1` = 19848; -- Harbinger Ennarth + -- WotLK pvp vendors DELETE FROM `creature` WHERE `id1` IN diff --git a/sql/world/base/zone_thunder_bluff.sql b/sql/world/base/zone_thunder_bluff.sql index d826288..add6e8e 100644 --- a/sql/world/base/zone_thunder_bluff.sql +++ b/sql/world/base/zone_thunder_bluff.sql @@ -1,214 +1,87 @@ --- Karn Stonehoof -UPDATE `creature_template` SET `subname`='Expert Blacksmith' WHERE `entry`=2998; +UPDATE `creature_template` SET `subname` = 'Expert Blacksmith' WHERE `entry` = 2998; -- Karn Stonehoof +UPDATE `creature_template` SET `subname` = 'Expert Tailor' WHERE `entry` = 3004; -- Tepa +UPDATE `creature_template` SET `subname` = 'Artisan Leatherworker' WHERE `entry` = 3007; -- Una +UPDATE `creature_template` SET `subname` = 'Journeyman Leatherworker' WHERE `entry` = 3008; -- Mak +UPDATE `creature_template` SET `subname` = 'Expert Alchemist' WHERE `entry` = 3009; -- Bena Winterhoof +UPDATE `creature_template` SET `subname` = 'Expert Enchanter' WHERE `entry` = 3011; -- Teg Dawnstrider +UPDATE `creature_template` SET `subname` = 'Journeyman Blacksmith' WHERE `entry` = 10278; -- Thrag Stonehoof +UPDATE `creature_template` SET `subname` = 'Journeyman Alchemist' WHERE `entry` = 11047; -- Kray +UPDATE `creature_template` SET `subname` = 'Journeyman Tailor' WHERE `entry` = 11051; -- Vhan +UPDATE `creature_template` SET `subname` = 'Journeyman Enchanter' WHERE `entry` = 11071; -- Mot Dawnstrider +UPDATE `creature_template` SET `subname` = 'Expert Leatherworker' WHERE `entry` = 11084; -- Tarn --- Tepa -UPDATE `creature_template` SET `subname`='Expert Tailor', `type_flags`=134217728 WHERE `entry`=3004; - --- Una -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', `type_flags`=134217728 WHERE `entry`=3009; - --- Teg Dawnstrider -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; - --- Kray -UPDATE `creature_template` SET `subname`='Journeyman Alchemist', `npcflag`=81, `trainer_type`=2 WHERE `entry`=11047; - --- Vhan -UPDATE `creature_template` SET `subname`='Journeyman Tailor', `npcflag`=81, `trainer_type`=2 WHERE `entry`=11051; - --- Mot Dawnstrider -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, `type_flags`=134217728 WHERE `entry`=11084; +UPDATE `creature_template` SET `npcflag` = 81, `trainer_type` = 2 WHERE `entry` IN (3008, 10278, 11047, 11051, 11071, 11084); +UPDATE `creature_template` SET `type_flags` = 134217728 WHERE `entry` IN (3004, 3007, 3009, 3011, 11084); --- Pand Stonebinder -DELETE FROM `npc_trainer` WHERE `ID`=2798; -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), (2998, -310001); - --- Brek Stonehoof -DELETE FROM `npc_trainer` WHERE `ID`=3001; -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), (3004, -410001); - --- Una -DELETE FROM `npc_trainer` WHERE `ID`=3007; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3007, -380000), (3007, -380001), (3007, -380002); - --- Mak -DELETE FROM `npc_trainer` WHERE `ID`=3008; -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), (3009, -300001); - --- Teg Dawnstrider -DELETE FROM `npc_trainer` WHERE `ID`=3011; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3011, -330000), (3011, -330001); - --- Komin Winterhoof -DELETE FROM `npc_trainer` WHERE `ID`=3013; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3013, -370000); - --- Aska Mistrunner -DELETE FROM `npc_trainer` WHERE `ID`=3026; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3026, -320000); - --- Kah Mistrunner -DELETE FROM `npc_trainer` WHERE `ID`=3028; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (3028, -360000); - --- Mooranta -DELETE FROM `npc_trainer` WHERE `ID`=7089; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (7089, -400000); - --- Thrag Stonehoof -DELETE FROM `npc_trainer` WHERE `ID`=10278; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (10278, -310000); - --- Kray -DELETE FROM `npc_trainer` WHERE `ID`=11047; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11047, -300000); - --- Vhan -DELETE FROM `npc_trainer` WHERE `ID`=11051; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11051, -410000); - --- Mot Dawnstrider -DELETE FROM `npc_trainer` WHERE `ID`=11071; -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), (11084, -380001); +DELETE FROM `npc_trainer` WHERE `ID` IN (2798, 2998, 3001, 3004, 3007, 3008, 3009, 3011, 3013, 3026, 3028, 7089, 10278, 11047, 11051, 11071, 11084); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES +(2798, -350000), -- Pand Stonebinder +(2998, -310000), -- Karn Stonehoof +(2998, -310001), -- Karn Stonehoof +(3001, -390000), -- Brek Stonehoof +(3004, -410000), -- Tepa +(3004, -410001), -- Tepa +(3007, -380000), -- Una +(3007, -380001), -- Una +(3007, -380002), -- Una +(3008, -380000), -- Mak +(3009, -300000), -- Bena Winterhoof +(3009, -300001), -- Bena Winterhoof +(3011, -330000), -- Teg Dawnstrider +(3011, -330001), -- Teg Dawnstrider +(3013, -370000), -- Komin Winterhoof +(3026, -320000), -- Aska Mistrunner +(3028, -360000), -- Kah Mistrunner +(7089, -400000), -- Mooranta +(10278, -310000), -- Thrag Stonehoof +(11047, -300000), -- Kray +(11051, -410000), -- Vhan +(11071, -330000), -- Mot Dawnstrider +(11084, -380000), -- Tarn +(11084, -380001); -- Tarn --- Bena Winterhoof -DELETE FROM `gossip_menu_option` WHERE `MenuID`=4128; +DELETE FROM `gossip_menu_option` WHERE `MenuID` IN (4128, 4165, 4207, 4242, 4351); 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); +(4128, 0, 3, 'Train me.', 3266, 5, 16), -- Bena Winterhoof +(4165, 0, 3, 'Train me.', 3266, 5, 16), -- Teg Dawnstrider +(4207, 0, 3, 'Train me.', 3266, 5, 16), -- Tarn +(4242, 0, 3, 'Train me.', 3266, 5, 16), -- Una +(4351, 0, 3, 'Train me.', 3266, 5, 16); -- Tepa --- Karn Stonehoof -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=1017 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 15 AND `SourceEntry` = 0 AND `ConditionTypeOrReference` = 7 AND `SourceGroup` IN (1017, 4128, 4165, 4207, 4242, 4351); 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'); +(15, 1017, 0, 7, 164, 50, 'Show menu if blacksmithing is 50 or higher'), -- Karn Stonehoof +(15, 4128, 0, 7, 171, 50, 'Show menu if alchemy is 50 or higher'), -- Bena Winterhoof +(15, 4165, 0, 7, 333, 50, 'Show menu if enchanting is 50 or higher'), -- Teg Dawnstrider +(15, 4207, 0, 7, 165, 50, 'Show menu if leatherworking is 50 or higher'), -- Tarn +(15, 4242, 0, 7, 165, 125, 'Show menu if leatherworking is 125 or higher'), -- Una +(15, 4351, 0, 7, 197, 50, 'Show menu if tailoring is 50 or higher'); -- Tepa --- 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); +DELETE FROM `creature` WHERE `id1` IN (7427, 10360, 12198, 34976, 34978); +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), -- Taim Ragetotem +(10360, 1, -1381.29, -75.9809, 160.602, 3.19395, 300), -- Kergul Bloodaxe +(12198, 1, -995.143, 217.173, 104.729, 4.46804, 300); -- Martin Lindsey --- 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); +UPDATE `creature_template` SET `subname` = 'Mining Supplier' WHERE `entry` = 3002;-- Kurm Stonehoof +UPDATE `creature_template` SET `subname` = 'Sword and Dagger Merchant' WHERE `entry` = 3021;-- Kard Ragetotem +UPDATE `creature_template` SET `subname` = 'Cooking Supplier' WHERE `entry` = 3027;-- Naal Mistrunner +UPDATE `creature_template` SET `subname` = 'Fishing Supplier' WHERE `entry` = 3029;-- Sewa Mistrunner +UPDATE `creature_template` SET `subname` = 'Reagent Vendor' WHERE `entry` = 8361;-- Chepi +UPDATE `creature_template` SET `subname` = 'General Goods Vendor' WHERE `entry` = 8362;-- Kuruk +UPDATE `creature_template` SET `subname` = 'Trade Goods Supplier' WHERE `entry` = 8363;-- Shadi Mistrunner --- Remove WotLK Battlemasters -DELETE FROM `creature` WHERE `id1`=34978; -DELETE FROM `creature` WHERE `id1`=34976; +UPDATE `creature_template` SET `minlevel` = 63, `maxlevel` = 63 WHERE `entry` = 3057; -- Cairne Bloodhoof +UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60 WHERE `entry` = 14440; -- Hunter Sagewind +UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60 WHERE `entry` = 14441; -- Hunter Ragetotem +UPDATE `creature_template` SET `minlevel` = 60, `maxlevel` = 60, `rank` = 0 WHERE `entry` = 3083; -- Honor Guard +UPDATE `creature_template` SET `minlevel` = 55, `maxlevel` = 55, `faction` = 105 WHERE `entry` = 3084; -- Bluffwatcher --- 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); @@ -243,4 +116,3 @@ DELETE FROM `npc_vendor` WHERE `entry`=6746 AND `item` IN (27857, 28399, 33443, -- Chepi DELETE FROM `npc_vendor` WHERE `entry`=8361 AND `item` IN (22147, 22148, 37201, 44605, 44614, 44615); - diff --git a/sql/world/base/zone_undercity.sql b/sql/world/base/zone_undercity.sql index 471fb5d..14a2f4f 100644 --- a/sql/world/base/zone_undercity.sql +++ b/sql/world/base/zone_undercity.sql @@ -1,105 +1,44 @@ --- Doctor Martin Felben -UPDATE `creature_template` SET `subname`='Journeyman Alchemist Trainer', `npcflag`=81, `trainer_type`=2 WHERE `entry`=11044; +UPDATE `creature_template` SET `npcflag`=81, `trainer_type`=2, `subname`='Journeyman Leatherworker' WHERE `entry` = 223; -- Dan Golthas +UPDATE `creature_template` SET `npcflag`=81, `trainer_type`=2, `subname`='Journeyman Engineer' WHERE `entry` = 4586; -- Graham Van Talen +UPDATE `creature_template` SET `npcflag`=81, `trainer_type`=2, `subname`='Journeyman Blacksmith' WHERE `entry` = 4605; -- Basil Frye +UPDATE `creature_template` SET `npcflag`=81, `trainer_type`=2, `subname`='Expert Alchemist' WHERE `entry` = 4609; -- Doctor Marsh +UPDATE `creature_template` SET `npcflag`=81, `trainer_type`=2, `subname`='Journeyman Alchemist Trainer' WHERE `entry` = 11044; -- Doctor Martin Felben +UPDATE `creature_template` SET `npcflag`=81, `trainer_type`=2, `subname`='Journeyman Tailor' WHERE `entry` = 11048; -- Victor Ward +UPDATE `creature_template` SET `npcflag`=81, `trainer_type`=2, `subname`='Expert Tailor' WHERE `entry` = 11049; -- Rhiannon Davis +UPDATE `creature_template` SET `npcflag`=81, `trainer_type`=2, `subname`='Journeyman Enchanter' WHERE `entry` = 11067; -- Malcomb Wynn --- 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`=83, `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; +UPDATE `creature_template` SET `type_flags` = 134217728 WHERE `entry` IN (4609, 11049); --- Doctor Martin Felben -DELETE FROM `npc_trainer` WHERE `ID`=11044; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (11044, -300000); +DELETE FROM `npc_trainer` WHERE `ID` IN (223, 4586, 4605, 4609, 11044, 11048, 11049, 11067); +INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES +(223, -380000), -- Dan Golthas +(4586, -340000), -- Graham Van Talen +(4605, -310000), -- Basil Frye +(4609, -300000), -- Doctor Marsh +(4609, -300001), -- Doctor Marsh +(11044, -300000), -- Doctor Martin Felben +(11048, -410000), -- Victor Ward +(11049, -410000), -- Rhiannon Davis +(11049, -410001), -- Rhiannon Davis +(11067, -330000); -- Malcomb Wynn --- Doctor Marsh -DELETE FROM `npc_trainer` WHERE `ID`=4609; -INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES (4609, -300000), (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), (11049, -410001); - --- Doctor Marsh -DELETE FROM `gossip_menu_option` WHERE `MenuID`=4130; +DELETE FROM `gossip_menu_option` WHERE `MenuID` IN (4130, 4352); 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); +(4130, 0, 3, 'Train me.', 3266, 5, 16), -- Doctor Marsh +(4352, 0, 3, 'Train me.', 3266, 5, 16); -- Rhiannon Davis --- Doctor Marsh -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4130 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceEntry`=0 AND `ConditionTypeOrReference`=7 AND `SourceGroup` IN (1022, 4130, 4132, 4166, 4210, 4352, 4354); 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 -(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'); +(15, 4130, 0, 7, 171, 50, 'Show menu if alchemy is 50 or higher'), -- Doctor Marsh +(15, 4132, 0, 7, 171, 125, 'Show menu if alchemy is 125 or higher'), -- Doctor Herbert Halsey +(15, 1022, 0, 7, 164, 50, 'Show menu if blacksmithing is 50 or higher'), -- James Van Brunt +(15, 4166, 0, 7, 333, 50, 'Show menu if enchanting is 50 or higher'), -- Lavinia Crowe +(15, 4210, 0, 7, 165, 50, 'Show menu if leatherworking is 50 or higher'), -- Arthur Moore +(15, 4352, 0, 7, 197, 50, 'Show menu if tailoring is 50 or higher'), -- Rhiannon Davis +(15, 4354, 0, 7, 197, 125, 'Show menu if tailoring is 125 or higher'); -- Josef Gregorian -- Summon Felsteed (Warlock) @@ -110,12 +49,13 @@ 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); - /* Replace orc guards with pre-wrathgate abomination guards */ UPDATE `creature` SET `id1`=5624, `equipment_id`=0 WHERE `id1`=36213; + DELETE FROM `gossip_menu_option` WHERE (`MenuID`) IN (2847, 2848, 2849); -INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`, `ActionMenuID`, `ActionPoiID`, `BoxCoded`, `BoxMoney`, `BoxText`, `BoxBroadcastTextID`, `VerifiedBuild`) VALUES +INSERT INTO `gossip_menu_option` (`MenuID`, `OptionID`, `OptionIcon`, `OptionText`, `OptionBroadcastTextID`, `OptionType`, `OptionNpcFlag`, + `ActionMenuID`, `ActionPoiID`, `BoxCoded`, `BoxMoney`, `BoxText`, `BoxBroadcastTextID`, `VerifiedBuild`) VALUES (2847, 0, 0, 'Alchemy', 3460, 1, 1, 2834, 336, 0, 0, NULL, 0, 0), (2847, 1, 0, 'Blacksmithing', 3461, 1, 1, 2835, 337, 0, 0, NULL, 0, 0), (2847, 2, 0, 'Cooking', 3462, 1, 1, 2836, 338, 0, 0, NULL, 0, 0), @@ -154,9 +94,9 @@ DELETE FROM `creature` WHERE `guid` IN (43466, 79263); UPDATE `creature_template` SET `AINAME` = '' WHERE `entry` = 2055; /* Restore quests series The Deathstalkers */ -DELETE FROM `creature_questender` WHERE `id` = 6467 AND `quest` = 14420; -DELETE FROM `creature_questender` WHERE `id` = 6467 AND `quest` = 14421; -DELETE FROM `creature_questender` WHERE `id` = 6522 AND `quest` = 14419; +DELETE FROM `creature_questender` WHERE `id` = 6467 AND `quest` = 14420; +DELETE FROM `creature_questender` WHERE `id` = 6467 AND `quest` = 14421; +DELETE FROM `creature_questender` WHERE `id` = 6522 AND `quest` = 14419; DELETE FROM `creature_questender` WHERE `id` = 36517 AND `quest` = 14418; REPLACE INTO `creature_questender` (`id`, `quest`) VALUES (6467, 1886); REPLACE INTO `creature_questender` (`id`, `quest`) VALUES (6467, 1899); @@ -178,7 +118,7 @@ UPDATE `conditions` SET `ConditionValue1`= 1886, `comment` = 'Astor Hadren - Sh /* Restore Varimathras */ -UPDATE `creature` SET `id1`=2425, `equipment_id`=0 WHERE `id1`=36273; +UPDATE `creature` SET `id1` = 2425, `equipment_id` = 0 WHERE `id1` = 36273; /* Restore correct quests for Varimathras */ DELETE FROM `disables` WHERE `sourceType` = 1 AND `entry` IN (550, 6522, 6521, 1048, 5725); @@ -196,35 +136,31 @@ REPLACE INTO `creature_questender` (`id`, `quest`) VALUES (2425, 14353); REPLACE INTO `creature_questender` (`id`, `quest`) VALUES (2425, 14355); REPLACE INTO `creature_questender` (`id`, `quest`) VALUES (2425, 14356); -DELETE FROM `creature_queststarter` WHERE `id`=2215 AND `quest`=14351; +DELETE FROM `creature_queststarter` WHERE `id` = 2215 AND `quest` = 14351; REPLACE INTO `creature_queststarter` (`id`, `quest`) VALUES (2215, 550); REPLACE INTO `creature_questender` (`id`, `quest`) VALUES (2425, 550); UPDATE `quest_template` SET `RewardNextQuest` = 550 WHERE `ID` = 541; -DELETE FROM `creature_loot_template` WHERE `Entry`=4421 AND `Item`=49205 AND `Reference`=0 AND `GroupId`=0; -REPLACE INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES (4421, 17008, 0, 100, 0, 1, 0, 1, 1, 'Charlga Razorflank - Small Scroll'); -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 1 AND `SourceGroup` = 4421 AND `SourceEntry` = 49205 AND `SourceId` = 0 AND `ElseGroup` = 0 AND `ConditionTypeOrReference` = 6 AND `ConditionTarget` = 0 AND `ConditionValue1` = 67 AND `ConditionValue2` = 0 AND `ConditionValue3` = 0; -REPLACE INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES (1, 4421, 17008, 0, 0, 6, 0, 67, 0, 0, 0, 0, 0, '', NULL); +-- Quest: An Unholy Alliance +DELETE FROM `creature_loot_template` WHERE `Entry` = 4421 AND `Item` = 49205 AND `Reference` = 0 AND `GroupId` = 0; +REPLACE INTO `creature_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES +(4421, 17008, 0, 100, 0, 1, 0, 1, 1, 'Charlga Razorflank - Small Scroll'); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 1 AND `SourceGroup` = 4421 AND `SourceEntry` = 49205; +REPLACE INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, + `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(1, 4421, 17008, 0, 0, 6, 0, 67, 0, 0, 0, 0, 0, '', NULL); UPDATE `item_template` SET `flags` = 2048 WHERE `entry` = 17008; UPDATE `item_template` SET `description` = 'To be opened by Lord Varimathras.' WHERE `entry` = 3701; -UPDATE `quest_template` -SET `QuestCompletionLog` = "Return to Varimathras at the Royal Quarter in the Undercity." -WHERE `ID` = 5725; - +-- Quest: An Unholy Alliance UPDATE `quest_template` SET `LogDescription` = "Bring Ambassador Malcin's Head to Varimathras in the Undercity.", `QuestCompletionLog` = "Return to Varimathras at the Royal Quarter in the Undercity." WHERE `ID` = 6521; -UPDATE `quest_template` -SET `LogDescription` = "Take Darthalia's Sealed Commendation to Varimathras in the Undercity.", - `QuestDescription` = "Because you fought with such valor and perseverance in the Battle of Hillsbrad, I have written this commendation, extolling your heroics in combat for the high command to recognize.$b$bTake this sealed commendation to Varimathras in the Undercity. Go with pride, $c.", - `QuestCompletionLog` = "Return to Varimathras at the Royal Quarter in the Undercity." -WHERE `ID` = 14351; - UPDATE `quest_template` SET `LogDescription` = "Take the Small Scroll to Varimathras in the Undercity.", `QuestDescription` = "My Lady,$B$BYou know very well what it is we are offering. The opportunity for you to take the Barrens and the lands beyond is a great one. We simply want your aid in return. By aid we mean nothing more than your giving us the freedom to take action in the area.$B$BPlease, allow us to discuss this further. We have great power and are willing to share with those wise enough to join us. I will remain outside Razorfen Downs for the time being.$B$BBest Regards,$BAmbassador Malcin", @@ -237,14 +173,27 @@ SET `LogDescription` = "Bring Ambassador Malcin's Head to Varimathras in the Un `QuestCompletionLog` = "Return to Varimathras at the Royal Quarter in the Undercity." WHERE `ID` = 14353; +-- Quest: The Power to Destroy... UPDATE `quest_template` -SET `LogDescription` = "Kill High Inquisitor Whitemane, Scarlet Commander Mograine, Herod, the Scarlet Champion and Houndmaster Loksey and then report back to Varimathras in the Undercity.", - `QuestDescription` = "One of my duties while I'm stationed here is to help the Forsaken take care of their borders, and that, $c, is exactly what you're going to do for me.$b$bI might live and breathe, but the Scarlet Crusade will cut down my people as quickly as they will one of the undead. They're a problem here, a big one, and you're going to do something about it.$b$bGo to the Monastery and slay High Inquisitor Whitemane and her lieutenants.", - `QuestCompletionLog` = "Return to Varimathras at the Royal Quarter in the Undercity." -WHERE `ID` = 14355; +SET `QuestCompletionLog` = "Return to Varimathras at the Royal Quarter in the Undercity." +WHERE `ID` = 5725; UPDATE `quest_template` SET `LogDescription` = "Bring the books Spells of Shadow and Incantations from the Nether to Varimathras in Undercity.", `QuestDescription` = "Listen up, $c.$b$bYou may not know this, but Orgrimmar's got a problem. Deep in Ragefire Chasm, a sect of the Shadow Council called the Searing Blade performs their sinister work. They're mainly orcs, and I can't trust sensitive information in the hands of the grunts there. That's where you come in.$b$bThey should have two books in their possession. I want them kept out of the hands of the Searing Blade and the Forsaken alike. Bring them to me directly.", `QuestCompletionLog` = "Return to Varimathras at the Royal Quarter in the Undercity." WHERE `ID` = 14356; + +-- Quest: Battle of Hillsbrad +UPDATE `quest_template` +SET `LogDescription` = "Take Darthalia's Sealed Commendation to Varimathras in the Undercity.", + `QuestDescription` = "Because you fought with such valor and perseverance in the Battle of Hillsbrad, I have written this commendation, extolling your heroics in combat for the high command to recognize.$b$bTake this sealed commendation to Varimathras in the Undercity. Go with pride, $c.", + `QuestCompletionLog` = "Return to Varimathras at the Royal Quarter in the Undercity." +WHERE `ID` = 14351; + +-- Quest: Into The Scarlet Monastery +UPDATE `quest_template` +SET `LogDescription` = "Kill High Inquisitor Whitemane, Scarlet Commander Mograine, Herod, the Scarlet Champion and Houndmaster Loksey and then report back to Varimathras in the Undercity.", + `QuestDescription` = "One of my duties while I'm stationed here is to help the Forsaken take care of their borders, and that, $c, is exactly what you're going to do for me.$b$bI might live and breathe, but the Scarlet Crusade will cut down my people as quickly as they will one of the undead. They're a problem here, a big one, and you're going to do something about it.$b$bGo to the Monastery and slay High Inquisitor Whitemane and her lieutenants.", + `QuestCompletionLog` = "Return to Varimathras at the Royal Quarter in the Undercity." +WHERE `ID` = 14355; diff --git a/sql/world/base/zz_optional_vanilla_phasing.sql b/sql/world/base/zz_optional_vanilla_phasing.sql index 9da3263..8dd07fe 100644 --- a/sql/world/base/zz_optional_vanilla_phasing.sql +++ b/sql/world/base/zz_optional_vanilla_phasing.sql @@ -3,19 +3,12 @@ This includes quest givers and flight paths. */ -/* 1.7 - Zul Gurub */ -/* Zul Gurub meeting stone phased until appropriate phase */ -UPDATE `gameobject` SET `ScriptName` = 'gobject_ipp_preaq' WHERE `map` = 0 AND `zoneId` = 33 AND `id` IN (185433); - -/* 1.9 - AQ */ -/* AQ meeting stone phased until pre-aq phase (at least) */ -UPDATE `gameobject` SET `ScriptName` = 'gobject_ipp_preaq' WHERE `map` = 1 AND `id` IN (185322); -/* Landro for TCG promotion in Booty Bay */ -UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_aq' WHERE `entry` = 17249; - -/* 1.11 - Naxxramas */ -/* Naxx Vanilla meeting stone phased until appropriate phase */ -UPDATE `gameobject` SET `ScriptName` = 'gobject_ipp_naxx40' WHERE `map` = 0 AND `id` IN (193166); +/* Meeting Stones */ +UPDATE `gameobject` SET `ScriptName` = 'gobject_ipp_preaq' WHERE `map` = 0 AND `zoneId` = 33 AND `id` = 185433; -- ZG +UPDATE `gameobject` SET `ScriptName` = 'gobject_ipp_preaq' WHERE `map` = 1 AND `id` = 185322; -- AQ +UPDATE `gameobject` SET `ScriptName` = 'gobject_ipp_tbc' WHERE `map` = 0 AND `id` = 184463; -- Karazhan +UPDATE `gameobject` SET `ScriptName` = 'gobject_ipp_tbc' WHERE `map` = 1 AND `id` = 182560; -- Time cavern +UPDATE `gameobject` SET `ScriptName` = 'gobject_ipp_naxx40' WHERE `map` = 0 AND `id` = 193166; -- Naxx40 /* Flight masters at Ratchet and Marshal's Refuge were originally added in patch 1.11 - disabled by default, because most players will expect these npcs to be there */ /* UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_naxx40' WHERE `entry` IN ( @@ -23,6 +16,7 @@ UPDATE `gameobject` SET `ScriptName` = 'gobject_ipp_naxx40' WHERE `map` = 0 AND 16227 -- Bragok, Ratchet, Flight Master ); */ + /* 2.0+ - NPCs/Gobjects added in Eastern/Kalimdor during TBC pre-patch or more */ UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_tbc' WHERE `entry` IN ( 11701, -- Mor'Vek, Un'Goro @@ -74,45 +68,13 @@ UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_tbc' WHERE `entry` IN ( 37915 -- Timothy Cunningham, The Bulwark, Flight Master ); -UPDATE `creature` SET `ScriptName` = 'npc_ipp_tbc' WHERE `id1` IN ( -12788, -- Legionnaire Teena -19850 -- Councilor Arial D'Anastasis -) AND `map` = 1; -- Orgrimmar only - -UPDATE `creature` SET `ScriptName` = 'npc_ipp_tbc' WHERE `id1` IN ( -19848 -- Harbinger Ennarth -) AND `map` = 0; -- Stormwind only - -/* Fix bad phasing for Wrathscale Myrmidon, Azuremyst Isle */ -UPDATE `creature_template` SET `ScriptName` = '' WHERE `entry` = 17194; - -UPDATE `gameobject` SET `ScriptName` = 'gobject_ipp_tbc' -WHERE `map` = 0 AND `id` = 184463; -- Karazhan meeting stone - -UPDATE `gameobject` SET `ScriptName` = 'gobject_ipp_tbc' -WHERE `map` = 1 AND `id` = 182560; -- Time cavern meeting stone - /* Remove interactions between Cersei, Lorrin and the orcs in Stonard */ UPDATE `creature_template` SET `AIName` = '' WHERE `entry` IN (12807, 17109, 27705); -/* Hide mailboxes, see: https://www.wowhead.com/classic/object=32349/mailbox */ -UPDATE `gameobject` SET `ScriptName` = 'gobject_ipp_tbc' WHERE `guid` = 49832; -- Darnassus /* Hide guild vaults until TBC (was introduced during 2.3) - disabled by default, because most players will expect these gobject to be there */ -/* UPDATE `gameobject` SET `ScriptName` = 'gobject_ipp_tbc' WHERE `guid` IN ( -12496, 12497, -20621, -45029, 45030, 45069, 45132, -44709, 44710, 44711, -44715, 44716, -41911, 41912, 41913, 41914, -49821, 49822, -44713, 44714, -14641, -17352, 17353, -49095, -50356, 50357 -); */ +/* UPDATE `gameobject` SET `ScriptName` = 'gobject_ipp_tbc' WHERE `guid` IN +(12496, 12497, 14641, 17352, 17353, 20621, 41911, 41912, 41913, 41914, 44709, 44710, 44711, 44713, 44714, 44715, 44716, 45029, 45030, 45069, 45132, 49095, 49821, 49822, 50356, 50357); */ /* 3.0+ - NPCs/Gobjects added in Eastern/Kalimdor during WotLK pre-patch or more */ UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_wotlk' WHERE `entry` IN ( @@ -130,17 +92,21 @@ UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_wotlk' WHERE `entry` IN ( ); /* Hide mailboxes, see: https://www.wowhead.com/classic/object=32349/mailbox */ +UPDATE `gameobject` SET `ScriptName` = 'gobject_ipp_tbc' WHERE `guid` = 49832; -- Darnassus UPDATE `gameobject` SET `ScriptName` = 'gobject_ipp_wotlk' WHERE `guid` IN ( 150747, 150748, 150749, 150750, 150751, 150752, 150753, 150755, -- Orgrimmar 100500, 100501, 100502, 100503, 268683, -- Undercity 932, 933, 100156, 100157, 100158, 100159, 100505, 100506, 150736, 150737, 150738, 150740, 150742, 150743, 150744, 150746, 151239, -- Stormwind -121574 -- Darnassus +121573, 121574, 121575 -- Darnassus ); /* Hide Rogg and his anvil + forge at the entrance of Orgrimmar until WotLK */ UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_wotlk' WHERE `entry` = 37072; UPDATE `gameobject` SET `ScriptName` = 'gobject_ipp_wotlk' WHERE `guid` IN (347, 387); +/* Landro for TCG promotion in Booty Bay */ +UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_aq' WHERE `entry` = 17249; + /* Hide barber in Kalimdor/Eastern Kingdom/Outland until WotLK - disabled by default, because most players will expect barbers to be there */ /* UPDATE `creature` SET `ScriptName` = 'npc_ipp_wotlk' WHERE `map` IN (0, 1, 530) AND `id1` IN (29139, 29141, 29142, 29143, 29145); UPDATE `gameobject` SET `ScriptName` = 'gobject_ipp_wotlk' WHERE `map` IN (0, 1, 530) AND `id` IN (190683, 190684, 190697, 190698, 190699, 190704, 190710, 190711, 190712, 191028, 191029, 191030); */