From 6e6ffef2c5a90448dade15e830ab7677935ad4ce Mon Sep 17 00:00:00 2001 From: Grimfeather <88028633+Grimfeather@users.noreply.github.com> Date: Sun, 8 Jun 2025 03:45:14 +0200 Subject: [PATCH 1/9] Update tbc_vendors.sql using new method to hide TBC vendor items --- sql/world/base/tbc_vendors.sql | 169 ++++----------------------------- 1 file changed, 20 insertions(+), 149 deletions(-) diff --git a/sql/world/base/tbc_vendors.sql b/sql/world/base/tbc_vendors.sql index ce8d6d1..8875498 100644 --- a/sql/world/base/tbc_vendors.sql +++ b/sql/world/base/tbc_vendors.sql @@ -1,153 +1,24 @@ -/* Nakodu shouldn't sell certain recipes until progression tier 10 */ -/* to solve this a copy of him is created that only sells recipes that were available before progression tier 10 */ -/* the original Nakodu will replace his copy at progression tier 10 */ +/* Hide certain vendor items until the player has reached the progression tier for them */ + +DELETE FROM `conditions` WHERE `SourceEntry` IN (); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, +`ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +-- +(23, 21655, 34200, 0, 0, 8, 0, 66011, 0, 0, 0, 0, 0, '', 'Nakodu will not sell Pattern: Quiver of a Thousand Feathers until the player has completed PROGRESSION_TBC_TIER_3'), +(23, 17585, 34201, 0, 0, 8, 0, 66011, 0, 0, 0, 0, 0, '', 'Urgronn will not sell Pattern: Netherscale Ammo Pouch until the player has completed PROGRESSION_TBC_TIER_3'), +(23, 17657, 34201, 0, 0, 8, 0, 66011, 0, 0, 0, 0, 0, '', 'Ulrike will not sell Pattern: Netherscale Ammo Pouch until the player has completed PROGRESSION_TBC_TIER_3'); + + + +-- UNDO previous cloning method + SET @Nakodu := 121655; - -/* Add copy of Nakodu to creature_template with script npc_ipp_tbc_pre_t4 */ -DELETE FROM `creature_template` WHERE `entry` = @Nakodu; -INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) -VALUES (@Nakodu, 0, 0, 0, 0, 0, 'Nakodu', 'Lower City Quartermaster', NULL, 0, 70, 70, 1, 1818, 128, 1, 1, 1, 1, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 1, 33024, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, '', 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 2, 'npc_ipp_tbc_pre_t4', 12340); - -/* Add copy of Nakodu to creature_template_addon */ -DELETE FROM `creature_template_addon` WHERE `entry` = @Nakodu; -INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES (@Nakodu, 0, 0, 0, 1, 0, 0, NULL); - -/* Add copy of Nakodu to creature_template_locale */ -DELETE FROM `creature_template_locale` WHERE `entry` = @Nakodu; -INSERT INTO `creature_template_locale` (`entry`, `locale`, `Name`, `Title`, `VerifiedBuild`) VALUES -(@Nakodu, 'deDE', 'Nakodu', 'Rüstmeister des Unteren Viertels', 18019), -(@Nakodu, 'esES', 'Nakodu', 'Intendente del Bajo Arrabal', 18019), -(@Nakodu, 'esMX', 'Nakodu', 'Intendente del Bajo Arrabal', 18019), -(@Nakodu, 'frFR', 'Nakodu', 'Intendant de la Ville basse', 18019), -(@Nakodu, 'koKR', '나코두', '고난의 거리 병참장교', 18019), -(@Nakodu, 'ruRU', 'Накоду', 'Начальник снабжения Нижнего Города', 18019), -(@Nakodu, 'zhCN', '纳克杜', '贫民窟军需官', 18019), -(@Nakodu, 'zhTW', '納克杜', '陰鬱城軍需官', 18019); - -/* Add copy of Nakodu to creature_template_model */ -DELETE FROM `creature_template_model` WHERE `CreatureID` = @Nakodu; -INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES (@Nakodu, 0, 20388, 1, 1, 12340); - -/* Add copy of Nakodu to creature */ -DELETE FROM `creature` WHERE `id1` = @Nakodu; -INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`, `CreateObject`, `Comment`) -VALUES (621655, @Nakodu, 0, 0, 530, 0, 0, 1, 1, 0, -2073.21, 5325.57, -37.2402, 3.75246, 300, 0, 0, 6986, 0, 0, 0, 0, 0, '', 0, 0, NULL); - -/* Add correct items to copy of Nakodu - removed Pattern: Quiver of a Thousand Feathers (34200) */ -DELETE FROM `npc_vendor` WHERE `entry` = @Nakodu; -INSERT INTO `npc_vendor` (`entry`, `slot`, `item`, `maxcount`, `incrtime`, `ExtendedCost`, `VerifiedBuild`) VALUES -(@Nakodu, 0, 22538, 0, 0, 0, 0), (@Nakodu, 0, 22910, 0, 0, 0, 0), (@Nakodu, 0, 23138, 0, 0, 0, 0), (@Nakodu, 0, 24175, 0, 0, 0, 0), -(@Nakodu, 0, 24179, 0, 0, 0, 0), (@Nakodu, 0, 29199, 0, 0, 0, 0), (@Nakodu, 0, 30633, 0, 0, 0, 0), (@Nakodu, 0, 30830, 0, 0, 0, 0), -(@Nakodu, 0, 30832, 0, 0, 0, 0), (@Nakodu, 0, 30833, 0, 0, 0, 0), (@Nakodu, 0, 30834, 0, 0, 0, 0), (@Nakodu, 0, 30835, 0, 0, 0, 0), -(@Nakodu, 0, 30836, 0, 0, 0, 0), (@Nakodu, 0, 30841, 0, 0, 0, 0), (@Nakodu, 0, 30846, 0, 0, 0, 0), (@Nakodu, 0, 31357, 0, 0, 0, 0), -(@Nakodu, 0, 31778, 0, 0, 0, 0), (@Nakodu, 0, 33148, 0, 0, 0, 0), (@Nakodu, 0, 33157, 0, 0, 0, 0), (@Nakodu, 0, 35331, 0, 0, 0, 0), -(@Nakodu, 0, 35335, 0, 0, 0, 0), (@Nakodu, 0, 35340, 0, 0, 0, 0), (@Nakodu, 0, 35344, 0, 0, 0, 0), (@Nakodu, 0, 35357, 0, 0, 0, 0), -(@Nakodu, 0, 35361, 0, 0, 0, 0), (@Nakodu, 0, 35370, 0, 0, 0, 0), (@Nakodu, 0, 35373, 0, 0, 0, 0), (@Nakodu, 0, 35378, 0, 0, 0, 0), -(@Nakodu, 0, 35382, 0, 0, 0, 0), (@Nakodu, 0, 35389, 0, 0, 0, 0), (@Nakodu, 0, 35391, 0, 0, 0, 0), (@Nakodu, 0, 35405, 0, 0, 0, 0), -(@Nakodu, 0, 35411, 0, 0, 0, 0), (@Nakodu, 0, 35412, 0, 0, 0, 0); - - -/* Quartermaster Urgronn shouldn't sell certain recipes until progression tier 10 */ -/* to solve this a copy of him is created that only sells recipes that were available before progression tier 10 */ -/* the original Urgronn will replace his copy at progression tier 10 */ SET @Urgronn := 117585; - -/* Add copy of Urgronn to creature_template with script npc_ipp_tbc_pre_t4 */ -DELETE FROM `creature_template` WHERE `entry` = @Urgronn; -INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) -VALUES (@Urgronn, 0, 0, 0, 0, 0, 'Quartermaster Urgronn', 'Thrallmar Quartermaster', NULL, 7450, 62, 62, 1, 1669, 129, 1, 1.14286, 1, 1, 20, 1, 1, 0, 1, 2000, 2000, 1, 1, 1, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 134217728, 0, 0, 0, 0, 0, 0, 0, '', 1, 1, 3, 1, 1, 1, 0, 0, 1, 0, 0, 0, 'npc_ipp_tbc_pre_t4', 12340); - -/* Add copy of Urgronn to creature_template_addon */ -DELETE FROM `creature_template_addon` WHERE `entry` = @Urgronn; -INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES (@Urgronn, 0, 0, 0, 1, 0, 0, NULL); - -/* Add copy of Urgronn to creature_template_locale */ -DELETE FROM `creature_template_locale` WHERE `entry` = @Urgronn; -INSERT INTO `creature_template_locale` (`entry`, `locale`, `Name`, `Title`, `VerifiedBuild`) VALUES -(@Urgronn, 'deDE', 'Rüstmeister Urgronn', 'Rüstmeister von Thrallmar', 18019), -(@Urgronn, 'esES', 'Intendente Urgronn', 'Intendente de Thrallmar', 18019), -(@Urgronn, 'esMX', 'Intendente Urgronn', 'Intendente de Thrallmar', 18019), -(@Urgronn, 'frFR', 'Intendant Urgronn', 'Intendant de Thrallmar', 18019), -(@Urgronn, 'koKR', '병참장교 울그론', '스랄마 병참장교', 18019), -(@Urgronn, 'ruRU', 'Интендант Ургронн', 'Начальник снабжения Траллмара', 18019), -(@Urgronn, 'zhCN', '军需官乌尔格隆', '萨尔玛军需官', 18019), -(@Urgronn, 'zhTW', '軍需官優爾古隆', '索爾瑪軍需官', 18019); - -/* Add copy of Urgronn to creature_template_model */ -DELETE FROM `creature_template_model` WHERE `CreatureID` = @Urgronn; -INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES (@Urgronn, 0, 17111, 1, 1, 12340); - -/* Add copy of Urgronn to creature */ -DELETE FROM `creature` WHERE `id1` = @Urgronn; -INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`, `CreateObject`, `Comment`) -VALUES (617585, @Urgronn, 0, 0, 530, 0, 0, 1, 1, 0, 179.435, 2704.33, 89.1009, 3.38594, 300, 0, 0, 16023, 0, 0, 0, 0, 0, '', 0, 0, NULL); - -/* Add correct items to copy of Urgronn - removed Pattern: Netherscale Ammo Pouch (34201) */ -DELETE FROM `npc_vendor` WHERE `entry` = @Urgronn; -INSERT INTO `npc_vendor` (`entry`, `slot`, `item`, `maxcount`, `incrtime`, `ExtendedCost`, `VerifiedBuild`) VALUES -(@Urgronn, 0, 24000, 0, 0, 0, 0), (@Urgronn, 0, 24001, 0, 0, 0, 0), (@Urgronn, 0, 24002, 0, 0, 0, 0), (@Urgronn, 0, 24003, 0, 0, 0, 0), -(@Urgronn, 0, 24004, 0, 0, 0, 0), (@Urgronn, 0, 24006, 0, 0, 0, 0), (@Urgronn, 0, 24009, 0, 0, 0, 0), (@Urgronn, 0, 25738, 0, 0, 0, 0), -(@Urgronn, 0, 25739, 0, 0, 0, 0), (@Urgronn, 0, 25740, 0, 0, 0, 0), (@Urgronn, 0, 25823, 0, 0, 0, 0), (@Urgronn, 0, 25824, 0, 0, 0, 0), -(@Urgronn, 0, 29152, 0, 0, 0, 0), (@Urgronn, 0, 29155, 0, 0, 0, 0), (@Urgronn, 0, 29165, 0, 0, 0, 0), (@Urgronn, 0, 29167, 0, 0, 0, 0), -(@Urgronn, 0, 29168, 0, 0, 0, 0), (@Urgronn, 0, 29190, 0, 0, 0, 0), (@Urgronn, 0, 29197, 0, 0, 0, 0), (@Urgronn, 0, 29232, 0, 0, 0, 0), -(@Urgronn, 0, 30637, 0, 0, 0, 0), (@Urgronn, 0, 31358, 0, 0, 0, 0), (@Urgronn, 0, 31359, 0, 0, 0, 0), (@Urgronn, 0, 31361, 0, 0, 0, 0), -(@Urgronn, 0, 31362, 0, 0, 0, 0), (@Urgronn, 0, 32882, 0, 0, 0, 0), (@Urgronn, 0, 33151, 0, 0, 0, 0), (@Urgronn, 0, 35332, 0, 0, 0, 0), -(@Urgronn, 0, 35337, 0, 0, 0, 0), (@Urgronn, 0, 35339, 0, 0, 0, 0), (@Urgronn, 0, 35343, 0, 0, 0, 0), (@Urgronn, 0, 35360, 0, 0, 0, 0), -(@Urgronn, 0, 35364, 0, 0, 0, 0), (@Urgronn, 0, 35366, 0, 0, 0, 0), (@Urgronn, 0, 35371, 0, 0, 0, 0), (@Urgronn, 0, 35377, 0, 0, 0, 0), -(@Urgronn, 0, 35383, 0, 0, 0, 0), (@Urgronn, 0, 35386, 0, 0, 0, 0), (@Urgronn, 0, 35392, 0, 0, 0, 0), (@Urgronn, 0, 35406, 0, 0, 0, 0), -(@Urgronn, 0, 35409, 0, 0, 0, 0), (@Urgronn, 0, 35413, 0, 0, 0, 0); - - -/* Logistics Officer Ulrike shouldn't sell certain recipes until progression tier 10 */ -/* to solve this a copy of her is created that only sells recipes that were available before progression tier 10 */ -/* the original Ulrike will replace her copy at progression tier 10 */ SET @Ulrike := 117657; -/* Add copy of Ulrike to creature_template with script npc_ipp_tbc_pre_t4 */ -DELETE FROM `creature_template` WHERE `entry` = @Ulrike; -INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) -VALUES (@Ulrike, 0, 0, 0, 0, 0, 'Logistics Officer Ulrike', 'Honor Hold Quartermaster', NULL, 7448, 62, 62, 0, 1667, 129, 1, 1.14286, 1, 1, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 1, 32768, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, '', 1, 1, 3, 1, 1, 1, 0, 0, 1, 0, 0, 0, 'npc_ipp_tbc_pre_t4', 12340); - -/* Add copy of Ulrike to creature_template_addon */ -DELETE FROM `creature_template_addon` WHERE `entry` = @Ulrike; -INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES (@Ulrike, 0, 0, 0, 1, 0, 0, NULL); - -/* Add copy of Ulrike to creature_template_locale */ -DELETE FROM `creature_template_locale` WHERE `entry` = @Ulrike; -INSERT INTO `creature_template_locale` (`entry`, `locale`, `Name`, `Title`, `VerifiedBuild`) VALUES -(@Ulrike, 'deDE', 'Nachschuboffizier Ulrike', 'Rüstmeisterin der Ehrenfeste', 18019), -(@Ulrike, 'esES', 'Oficial de logística Ulrike', 'Intendente del Bastión del Honor', 18019), -(@Ulrike, 'esMX', 'Oficial de logística Ulrike', 'Intendente del Bastión del Honor', 18019), -(@Ulrike, 'frFR', 'Officier de logistique Ulrike', 'Intendante du bastion de l\'Honneur', 18019), -(@Ulrike, 'koKR', '병참장교 울리케', '명예의 요새 병참장교', 18019), -(@Ulrike, 'ruRU', 'Офицер-логистик Ульрика', 'Начальник снабжения Оплота Чести', 18019), -(@Ulrike, 'zhCN', '后勤军需官乌瑞卡', '荣耀堡军需官', 18019), -(@Ulrike, 'zhTW', '物流官烏賴克', '榮譽堡軍需官', 18019); - -/* Add copy of Ulrike to creature_template_model */ -DELETE FROM `creature_template_model` WHERE `CreatureID` = @Ulrike; -INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES (@Ulrike, 0, 17160, 1, 1, 12340); - -/* Add copy of Ulrike to creature */ -DELETE FROM `creature` WHERE `id1` = @Ulrike; -INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`, `CreateObject`, `Comment`) -VALUES (617657, @Ulrike, 0, 0, 530, 0, 0, 1, 1, 1, -676.087, 2611.44, 86.6955, 6.10865, 300, 0, 0, 9711, 0, 0, 0, 0, 0, '', 0, 0, NULL); - -/* Add copy of Ulrike to creature_equip_template */ -DELETE FROM `creature_equip_template` WHERE `CreatureID` = @Ulrike; -INSERT INTO `creature_equip_template` (`CreatureID`, `ID`, `ItemID1`, `ItemID2`, `ItemID3`, `VerifiedBuild`) VALUES (@Ulrike, 1, 5305, 0, 0, 18019); - -/* Add correct items to copy of Ulrike - removed Pattern: Netherscale Ammo Pouch (34218) */ -DELETE FROM `npc_vendor` WHERE `entry` = @Ulrike; -INSERT INTO `npc_vendor` (`entry`, `slot`, `item`, `maxcount`, `incrtime`, `ExtendedCost`, `VerifiedBuild`) VALUES -(@Ulrike, 0, 22531, 0, 0, 0, 0), (@Ulrike, 0, 22547, 0, 0, 0, 0), (@Ulrike, 0, 22905, 0, 0, 0, 0), (@Ulrike, 0, 23142, 0, 0, 0, 0), -(@Ulrike, 0, 23619, 0, 0, 0, 0), (@Ulrike, 0, 23999, 0, 0, 0, 0), (@Ulrike, 0, 24007, 0, 0, 0, 0), (@Ulrike, 0, 24008, 0, 0, 0, 0), -(@Ulrike, 0, 24180, 0, 0, 0, 0), (@Ulrike, 0, 25825, 0, 0, 0, 0), (@Ulrike, 0, 25826, 0, 0, 0, 0), (@Ulrike, 0, 25870, 0, 0, 0, 0), -(@Ulrike, 0, 29151, 0, 0, 0, 0), (@Ulrike, 0, 29153, 0, 0, 0, 0), (@Ulrike, 0, 29156, 0, 0, 0, 0), (@Ulrike, 0, 29166, 0, 0, 0, 0), -(@Ulrike, 0, 29169, 0, 0, 0, 0), (@Ulrike, 0, 29189, 0, 0, 0, 0), (@Ulrike, 0, 29196, 0, 0, 0, 0), (@Ulrike, 0, 29213, 0, 0, 0, 0), -(@Ulrike, 0, 29214, 0, 0, 0, 0), (@Ulrike, 0, 29215, 0, 0, 0, 0), (@Ulrike, 0, 29719, 0, 0, 0, 0), (@Ulrike, 0, 29722, 0, 0, 0, 0), -(@Ulrike, 0, 30622, 0, 0, 0, 0), (@Ulrike, 0, 32883, 0, 0, 0, 0), (@Ulrike, 0, 33150, 0, 0, 0, 0), (@Ulrike, 0, 35464, 0, 0, 0, 0), -(@Ulrike, 0, 35465, 0, 0, 0, 0), (@Ulrike, 0, 35466, 0, 0, 0, 0), (@Ulrike, 0, 35467, 0, 0, 0, 0), (@Ulrike, 0, 35468, 0, 0, 0, 0), -(@Ulrike, 0, 35469, 0, 0, 0, 0), (@Ulrike, 0, 35470, 0, 0, 0, 0), (@Ulrike, 0, 35471, 0, 0, 0, 0), (@Ulrike, 0, 35472, 0, 0, 0, 0), -(@Ulrike, 0, 35473, 0, 0, 0, 0), (@Ulrike, 0, 35474, 0, 0, 0, 0), (@Ulrike, 0, 35475, 0, 0, 0, 0), (@Ulrike, 0, 35476, 0, 0, 0, 0), -(@Ulrike, 0, 35477, 0, 0, 0, 0), (@Ulrike, 0, 35478, 0, 0, 0, 0); +DELETE FROM `creature_template` WHERE `entry` IN (@Nakodu, @Urgronn, @Ulrike); +DELETE FROM `creature_template_addon` WHERE `entry` IN (@Nakodu, @Urgronn, @Ulrike); +DELETE FROM `creature_template_locale` WHERE `entry` IN (@Nakodu, @Urgronn, @Ulrike); +DELETE FROM `creature_template_model` WHERE `CreatureID` IN (@Nakodu, @Urgronn, @Ulrike); +DELETE FROM `creature` WHERE `id1` IN (@Nakodu, @Urgronn, @Ulrike); +DELETE FROM `npc_vendor` WHERE `entry` IN (@Nakodu, @Urgronn, @Ulrike); From 581f8cdd86846efa76a98a919382bcf80f0c9944 Mon Sep 17 00:00:00 2001 From: Grimfeather <88028633+Grimfeather@users.noreply.github.com> Date: Sun, 8 Jun 2025 03:49:27 +0200 Subject: [PATCH 2/9] UNDO code moved to zz_cleanup UNDO code moved to zz_cleanup --- sql/world/base/tbc_vendors.sql | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/sql/world/base/tbc_vendors.sql b/sql/world/base/tbc_vendors.sql index 8875498..375ce9a 100644 --- a/sql/world/base/tbc_vendors.sql +++ b/sql/world/base/tbc_vendors.sql @@ -7,18 +7,3 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry (23, 21655, 34200, 0, 0, 8, 0, 66011, 0, 0, 0, 0, 0, '', 'Nakodu will not sell Pattern: Quiver of a Thousand Feathers until the player has completed PROGRESSION_TBC_TIER_3'), (23, 17585, 34201, 0, 0, 8, 0, 66011, 0, 0, 0, 0, 0, '', 'Urgronn will not sell Pattern: Netherscale Ammo Pouch until the player has completed PROGRESSION_TBC_TIER_3'), (23, 17657, 34201, 0, 0, 8, 0, 66011, 0, 0, 0, 0, 0, '', 'Ulrike will not sell Pattern: Netherscale Ammo Pouch until the player has completed PROGRESSION_TBC_TIER_3'); - - - --- UNDO previous cloning method - -SET @Nakodu := 121655; -SET @Urgronn := 117585; -SET @Ulrike := 117657; - -DELETE FROM `creature_template` WHERE `entry` IN (@Nakodu, @Urgronn, @Ulrike); -DELETE FROM `creature_template_addon` WHERE `entry` IN (@Nakodu, @Urgronn, @Ulrike); -DELETE FROM `creature_template_locale` WHERE `entry` IN (@Nakodu, @Urgronn, @Ulrike); -DELETE FROM `creature_template_model` WHERE `CreatureID` IN (@Nakodu, @Urgronn, @Ulrike); -DELETE FROM `creature` WHERE `id1` IN (@Nakodu, @Urgronn, @Ulrike); -DELETE FROM `npc_vendor` WHERE `entry` IN (@Nakodu, @Urgronn, @Ulrike); From e676f6eb6fd47b13b4dde13cfefc939c4fcdb408 Mon Sep 17 00:00:00 2001 From: Grimfeather <88028633+Grimfeather@users.noreply.github.com> Date: Sun, 8 Jun 2025 03:57:24 +0200 Subject: [PATCH 3/9] Update ipp_aware_npcs.sql removed unnecessary phasing now using new way to hide vendor items --- sql/world/base/ipp_aware_npcs.sql | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/sql/world/base/ipp_aware_npcs.sql b/sql/world/base/ipp_aware_npcs.sql index be11616..273151e 100644 --- a/sql/world/base/ipp_aware_npcs.sql +++ b/sql/world/base/ipp_aware_npcs.sql @@ -22,14 +22,12 @@ UPDATE `creature` SET `phaseMask` = @IPPPHASE_II WHERE `id1` IN (15612, 15613, 1 UPDATE `gameobject_template` SET `ScriptName` = 'gobject_ipp_preaq' WHERE `entry` IN (180448); -- Phasing Lights Hope Chapel npcs -UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_naxx40' WHERE `entry` IN (11102, 16112, 16113, 16114, 16115, 16116, 16131, 16132, 16133, 16134, 16135, - 16212, 16225, 16228, 16229, 16256, 16283, 16284, 16376, 16378, 17069, 17072); --- undo previous method of phasing (this can be removed later on) -UPDATE `creature` SET `phaseMask` = 1 WHERE `id1` IN (11102, 16112, 16113, 16114, 16115, 16116, 16131, 16132, 16133, 16134, 16135, - 16212, 16225, 16228, 16229, 16256, 16283, 16284, 16376, 16378, 17069, 17072); +UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_naxx40' WHERE `entry` IN +(11102, 16112, 16113, 16114, 16115, 16116, 16131, 16132, 16133, 16134, 16135, 16212, 16225, 16228, 16229, 16256, 16283, 16284, 16376, 16378, 17069, 17072); -- Phasing Lights Hope Chapel game objects -UPDATE `gameobject` SET `ScriptName` = 'gobject_ipp_naxx40' WHERE `guid` IN (45603, 45606, 45607, 45764, 45765, 45766, 45767, 45768, 45769, 45770, 45771, 45838, 45839, 45840); +UPDATE `gameobject` SET `ScriptName` = 'gobject_ipp_naxx40' WHERE `guid` IN +(45603, 45606, 45607, 45764, 45765, 45766, 45767, 45768, 45769, 45770, 45771, 45838, 45839, 45840); UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_wotlk' WHERE `entry` IN (28602, 29611, 34084); @@ -54,15 +52,9 @@ UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_wotlk' WHERE `entry` IN ( UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_wotlk' WHERE `entry` IN (34948, 34949, 34950, 34951); UPDATE `gameobject_template` SET `ScriptName` = 'gobject_ipp_wotlk' WHERE `entry` IN (195532, 195533); --- Drop source for 2.3 Jewelcrafting Recipe -UPDATE `creature_template` SET `ScriptName` = '' WHERE `entry` = 19768; -- disabled for now to prevent the creature from attacking while phased - -- Phasing Zul'Aman quest npcs until TBC T4. UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_tbc_t4' WHERE `entry` IN (19227, 23761); --- Phasing TBC vendors and trainers - Copies are added to replace them until TBC T4. -UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_tbc_t4' WHERE `entry` IN (17585, 17657, 18754, 18771, 19187, 21087, 21655); - -- Phasing for General Tiras'alan and Dathris Sunstriker - prevent early access to Isle of Quel'Danas UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_tbc_t5' WHERE `entry` IN (25167, 18594); From 5e6538999658f8adf87d3a567ef83fe0f94a4e0c Mon Sep 17 00:00:00 2001 From: Grimfeather <88028633+Grimfeather@users.noreply.github.com> Date: Sun, 8 Jun 2025 04:06:01 +0200 Subject: [PATCH 4/9] Update zone_shattrath.sql moved code here from tbc_vendors --- sql/world/base/zone_shattrath.sql | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sql/world/base/zone_shattrath.sql b/sql/world/base/zone_shattrath.sql index d5d8365..d469b5b 100644 --- a/sql/world/base/zone_shattrath.sql +++ b/sql/world/base/zone_shattrath.sql @@ -2,3 +2,13 @@ DELETE FROM `npc_vendor` WHERE `entry`=18756 AND `item`=38089 AND `ExtendedCost`=0; INSERT INTO `npc_vendor` (`entry`, `slot`, `item`, `maxcount`, `incrtime`, `ExtendedCost`, `VerifiedBuild`) VALUES (18756, 0, 38089, 1, 1800, 0, 0); + + +/* Hide certain vendor items until the player has reached the progression tier for them */ +DELETE FROM `conditions` WHERE `SourceEntry` IN (34200, 34201); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, +`ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +-- +(23, 21655, 34200, 0, 0, 8, 0, 66011, 0, 0, 0, 0, 0, '', 'Nakodu will not sell Pattern: Quiver of a Thousand Feathers until the player has completed PROGRESSION_TBC_TIER_3'), +(23, 17585, 34201, 0, 0, 8, 0, 66011, 0, 0, 0, 0, 0, '', 'Urgronn will not sell Pattern: Netherscale Ammo Pouch until the player has completed PROGRESSION_TBC_TIER_3'), +(23, 17657, 34201, 0, 0, 8, 0, 66011, 0, 0, 0, 0, 0, '', 'Ulrike will not sell Pattern: Netherscale Ammo Pouch until the player has completed PROGRESSION_TBC_TIER_3'); From 854bf9ec3f5105ff3f018ae4bb2f79cf93b0ce11 Mon Sep 17 00:00:00 2001 From: Grimfeather <88028633+Grimfeather@users.noreply.github.com> Date: Sun, 8 Jun 2025 04:07:20 +0200 Subject: [PATCH 5/9] Delete sql/world/base/tbc_vendors.sql code moved to zone_shattrath --- sql/world/base/tbc_vendors.sql | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 sql/world/base/tbc_vendors.sql diff --git a/sql/world/base/tbc_vendors.sql b/sql/world/base/tbc_vendors.sql deleted file mode 100644 index 375ce9a..0000000 --- a/sql/world/base/tbc_vendors.sql +++ /dev/null @@ -1,9 +0,0 @@ -/* Hide certain vendor items until the player has reached the progression tier for them */ - -DELETE FROM `conditions` WHERE `SourceEntry` IN (); -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, -`ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES --- -(23, 21655, 34200, 0, 0, 8, 0, 66011, 0, 0, 0, 0, 0, '', 'Nakodu will not sell Pattern: Quiver of a Thousand Feathers until the player has completed PROGRESSION_TBC_TIER_3'), -(23, 17585, 34201, 0, 0, 8, 0, 66011, 0, 0, 0, 0, 0, '', 'Urgronn will not sell Pattern: Netherscale Ammo Pouch until the player has completed PROGRESSION_TBC_TIER_3'), -(23, 17657, 34201, 0, 0, 8, 0, 66011, 0, 0, 0, 0, 0, '', 'Ulrike will not sell Pattern: Netherscale Ammo Pouch until the player has completed PROGRESSION_TBC_TIER_3'); From b488294cbdb56aad283e51a0f5a2112444a6283b Mon Sep 17 00:00:00 2001 From: Grimfeather <88028633+Grimfeather@users.noreply.github.com> Date: Sun, 8 Jun 2025 04:28:34 +0200 Subject: [PATCH 6/9] Update ipp_aware_npcs.sql can't use new method for npc trainers --- sql/world/base/ipp_aware_npcs.sql | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sql/world/base/ipp_aware_npcs.sql b/sql/world/base/ipp_aware_npcs.sql index 273151e..bc16d46 100644 --- a/sql/world/base/ipp_aware_npcs.sql +++ b/sql/world/base/ipp_aware_npcs.sql @@ -55,6 +55,9 @@ UPDATE `gameobject_template` SET `ScriptName` = 'gobject_ipp_wotlk' WHERE `entry -- Phasing Zul'Aman quest npcs until TBC T4. UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_tbc_t4' WHERE `entry` IN (19227, 23761); +-- Phasing TBC vendors and trainers - Copies are added to replace them until TBC T4. +UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_tbc_t4' WHERE `entry` IN (18754, 18771, 19187, 21087); + -- Phasing for General Tiras'alan and Dathris Sunstriker - prevent early access to Isle of Quel'Danas UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_tbc_t5' WHERE `entry` IN (25167, 18594); From 8e05c9bd4f5dfebc3ae0b2cf0fc72a69cc963b68 Mon Sep 17 00:00:00 2001 From: Grimfeather <88028633+Grimfeather@users.noreply.github.com> Date: Sun, 8 Jun 2025 04:29:18 +0200 Subject: [PATCH 7/9] Update zz_cleanup.sql undo previous cloning method to hide vendor items --- sql/world/base/zz_cleanup.sql | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/sql/world/base/zz_cleanup.sql b/sql/world/base/zz_cleanup.sql index b542754..442f725 100644 --- a/sql/world/base/zz_cleanup.sql +++ b/sql/world/base/zz_cleanup.sql @@ -13,3 +13,26 @@ DELETE FROM `creature_addon` WHERE `guid` IN (133917, 133918, 133919, 133920, 13 /* Remove script from database to avoid worldserver error. The code for this script has been commented out. Need to figure out why. */ UPDATE `creature_template` SET `Scriptname` = '' WHERE `entry` = 351042; + + +-- undo previous method of Lights Hope Chapel phasing +UPDATE `creature` SET `phaseMask` = 1 WHERE `id1` IN +(11102, 16112, 16113, 16114, 16115, 16116, 16131, 16132, 16133, 16134, 16135, 16212, 16225, 16228, 16229, 16256, 16283, 16284, 16376, 16378, 17069, 17072); + +-- Drop source for 2.3 Jewelcrafting Recipe +UPDATE `creature_template` SET `ScriptName` = '' WHERE `entry` = 19768; -- disabled for now to prevent the creature from attacking while phased + +-- undo TBC vendor phasing +UPDATE `creature_template` SET `ScriptName` = '' WHERE `entry` IN (17585, 17657, 21655); + +-- UNDO previous cloning method to hide vendor item drops +SET @Nakodu := 121655; +SET @Urgronn := 117585; +SET @Ulrike := 117657; + +DELETE FROM `creature_template` WHERE `entry` IN (@Nakodu, @Urgronn, @Ulrike); +DELETE FROM `creature_template_addon` WHERE `entry` IN (@Nakodu, @Urgronn, @Ulrike); +DELETE FROM `creature_template_locale` WHERE `entry` IN (@Nakodu, @Urgronn, @Ulrike); +DELETE FROM `creature_template_model` WHERE `CreatureID` IN (@Nakodu, @Urgronn, @Ulrike); +DELETE FROM `creature` WHERE `id1` IN (@Nakodu, @Urgronn, @Ulrike); +DELETE FROM `npc_vendor` WHERE `entry` IN (@Nakodu, @Urgronn, @Ulrike); From e9f50ca1150a7e5aad99a887283dece1ee354b53 Mon Sep 17 00:00:00 2001 From: Grimfeather <88028633+Grimfeather@users.noreply.github.com> Date: Sun, 8 Jun 2025 05:42:59 +0200 Subject: [PATCH 8/9] Update zone_orgrimmar.sql Hide rank 12+ armor and weapons until BWL --- sql/world/base/zone_orgrimmar.sql | 76 +++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/sql/world/base/zone_orgrimmar.sql b/sql/world/base/zone_orgrimmar.sql index c365537..3cb0c2c 100644 --- a/sql/world/base/zone_orgrimmar.sql +++ b/sql/world/base/zone_orgrimmar.sql @@ -507,6 +507,82 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES (14581, 18877, 2257), (14581, 23464, 2291), (14581, 23465, 2257), (14581, 23466, 2291), (14581, 23467, 2291), (14581, 23468, 2291), (14581, 23469, 2291); +/* Hide certain vendor items until the player has reached the progression tier for them */ +DELETE FROM `conditions` WHERE `SourceGroup` IN (12792, 14581); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, +`ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +-- +(23, 12792, 16533, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Warlords Silk Cowl until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16534, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Generals Silk Trousers until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16535, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Warlords Silk Raiment until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16536, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Warlords Silk Amice until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16539, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Generals Silk Boots until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16540, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Generals Silk Handguards until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16541, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Warlords Plate Armor until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16542, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Warlords Plate Headpiece until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16543, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Generals Plate Leggings until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16544, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Warlords Plate Shoulders until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16545, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Generals Plate Boots until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16548, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Generals Plate Gauntlets until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16549, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Warlords Dragonhide Hauberk until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16550, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Warlords Dragonhide Helmet until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16551, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Warlords Dragonhide Epaulets until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16552, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Generals Dragonhide Leggings until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16554, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Generals Dragonhide Boots until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16555, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Generals Dragonshide Gloves until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16558, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Generals Leather Treads until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16560, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Generals Leather Mitts until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16561, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Warlords Leather Helm until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16562, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Warlords Leather Spaulders until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16563, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Warlords Leather Breastplate until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16564, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Generals Leather Legguards until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16565, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Warlords Chain Chestpiece until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16566, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Warlords Chain Helmet until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16567, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Generals Chain Legguards until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16568, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Warlords Chain Shoulders until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16569, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Generals Chain Sabatons until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16571, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Generals Chain Gloves until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16573, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Generals Mail Boots until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16574, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Generals Mail Gauntlets until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16577, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Warlords Mail Armor until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16578, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Warlords Mail Helm until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16579, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Generals Mail Leggings until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 16580, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Warlords Mail Spaulders until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 17586, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Generals Dreadweave Boots until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 17588, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Generals Dreadweave Gloves until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 17590, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Warlords Dreadweave Mantle until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 17591, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Warlords Dreadweave Hood until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 17592, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Warlords Dreadweave Robe until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 17593, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Generals Dreadweave Pants until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 17618, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Generals Satin Boots until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 17620, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Generals Satin Gloves until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 17622, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Warlords Satin Mantle until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 17623, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Warlords Satin Cowl until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 17624, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Warlords Satin Robes until the player has completed PROGRESSION_ONYXIA'), +(23, 12792, 17625, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Generals Satin Leggings until the player has completed PROGRESSION_ONYXIA'), +-- +(23, 14581, 16345, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Sergeant Thunderhorn will not sell High Warlords Blade until the player has completed PROGRESSION_ONYXIA'), +(23, 14581, 18826, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Sergeant Thunderhorn will not sell High Warlords Shield Wall until the player has completed PROGRESSION_ONYXIA'), +(23, 14581, 18828, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Sergeant Thunderhorn will not sell High Warlords Cleaver until the player has completed PROGRESSION_ONYXIA'), +(23, 14581, 18831, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Sergeant Thunderhorn will not sell High Warlords Battle Axe until the player has completed PROGRESSION_ONYXIA'), +(23, 14581, 18835, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Sergeant Thunderhorn will not sell High Warlords Recurve until the player has completed PROGRESSION_ONYXIA'), +(23, 14581, 18837, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Sergeant Thunderhorn will not sell High Warlords Crossbow until the player has completed PROGRESSION_ONYXIA'), +(23, 14581, 18840, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Sergeant Thunderhorn will not sell High Warlords Razor until the player has completed PROGRESSION_ONYXIA'), +(23, 14581, 18844, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Sergeant Thunderhorn will not sell High Warlords Right Claw until the player has completed PROGRESSION_ONYXIA'), +(23, 14581, 18848, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Sergeant Thunderhorn will not sell High Warlords Left Claw until the player has completed PROGRESSION_ONYXIA'), +(23, 14581, 18860, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Sergeant Thunderhorn will not sell High Warlords Street Sweeper until the player has completed PROGRESSION_ONYXIA'), +(23, 14581, 18866, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Sergeant Thunderhorn will not sell High Warlords Bludgeon until the player has completed PROGRESSION_ONYXIA'), +(23, 14581, 18868, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Sergeant Thunderhorn will not sell High Warlords Pulverizer until the player has completed PROGRESSION_ONYXIA'), +(23, 14581, 18871, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Sergeant Thunderhorn will not sell High Warlords Pig Sticker until the player has completed PROGRESSION_ONYXIA'), +(23, 14581, 18874, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Sergeant Thunderhorn will not sell High Warlords War Staff until the player has completed PROGRESSION_ONYXIA'), +(23, 14581, 18877, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Sergeant Thunderhorn will not sell High Warlords Greatsword until the player has completed PROGRESSION_ONYXIA'), +(23, 14581, 23464, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Sergeant Thunderhorn will not sell High Warlords Battle Mace until the player has completed PROGRESSION_ONYXIA'), +(23, 14581, 23465, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Sergeant Thunderhorn will not sell High Warlords Destroyer until the player has completed PROGRESSION_ONYXIA'), +(23, 14581, 23466, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Sergeant Thunderhorn will not sell High Warlords Spellblade until the player has completed PROGRESSION_ONYXIA'), +(23, 14581, 23467, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Sergeant Thunderhorn will not sell High Warlords Quickblade until the player has completed PROGRESSION_ONYXIA'), +(23, 14581, 23468, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Sergeant Thunderhorn will not sell High Warlords Tome of Destruction until the player has completed PROGRESSION_ONYXIA'), +(23, 14581, 23469, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Sergeant Thunderhorn will not sell High Warlords Tome of Mending until the player has completed PROGRESSION_ONYXIA'); + DELETE FROM `creature` WHERE `id1` IN (34038, -- Sergeant Thunderhorn 34060, -- Doris Volanthius From 00a158912c990bd94d0a5403fd7c05d4e1a7329b Mon Sep 17 00:00:00 2001 From: Grimfeather <88028633+Grimfeather@users.noreply.github.com> Date: Sun, 8 Jun 2025 09:16:23 +0200 Subject: [PATCH 9/9] Update zone_stormwind.sql Hide rank 12+ armor and weapons until BWL added several missing pvp weapons --- sql/world/base/zone_stormwind.sql | 158 +++++++++++++++++++++++------- 1 file changed, 125 insertions(+), 33 deletions(-) diff --git a/sql/world/base/zone_stormwind.sql b/sql/world/base/zone_stormwind.sql index 0d989ff..197e9f0 100644 --- a/sql/world/base/zone_stormwind.sql +++ b/sql/world/base/zone_stormwind.sql @@ -124,67 +124,80 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry -- Thelman Slatefist -DELETE FROM `creature` WHERE `id1`=7410; -INSERT INTO `creature` (`id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES (7410, 0, -8424.43, 342.967, 120.886, 3.82018, 300); +DELETE FROM `creature` WHERE `id1`= 7410; +INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES +(607410, 7410, 0, -8424.43, 342.967, 120.886, 3.82018, 300); -- Hank the Hammer -DELETE FROM `creature` WHERE `id1`=7798; -INSERT INTO `creature` (`id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES (7798, 0, -8422.17, 630.877, 95.8402, 5.044, 430); +DELETE FROM `creature` WHERE `id1`= 7798; +INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES +(607798, 7798, 0, -8422.17, 630.877, 95.8402, 5.044, 430); -- Lieutenant Karter -DELETE FROM `creature` WHERE `id1`=12783; -INSERT INTO `creature` (`id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES (12783, 0, -8779.7, 432.158, 105.233, 5.36374, 300); +DELETE FROM `creature` WHERE `id1`= 12783; +INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES +(612783, 12783, 0, -8779.7, 432.158, 105.233, 5.36374, 300); -- Captain Dirgehammer -DELETE FROM `creature` WHERE `id1`=12777; -DELETE FROM `creature` WHERE `id1`=34075; -INSERT INTO `creature` (`id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES (12777, 0, -8768.77, 401.647, 109.665, 2.22999, 300); +DELETE FROM `creature` WHERE `id1`= 12777; +DELETE FROM `creature` WHERE `id1`= 34075; +INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES +(612777, 12777, 0, -8768.77, 401.647, 109.665, 2.22999, 300); -- Lieutenant Rachel Vaccar -DELETE FROM `creature` WHERE `id1`=12778; -INSERT INTO `creature` (`id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES (12778, 0, -8783.7, 423.749, 105.276, 0.651345, 300); +DELETE FROM `creature` WHERE `id1`= 12778; +INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES +(612778, 12778, 0, -8783.7, 423.749, 105.276, 0.651345, 300); -- Archmage Gaiman -DELETE FROM `creature` WHERE `id1`=12779; -INSERT INTO `creature` (`id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES (12779, 0, -8783.33, 426.686, 105.276, 5.37159, 300); +DELETE FROM `creature` WHERE `id1`= 12779; +INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES +(612779, 12779, 0, -8783.33, 426.686, 105.276, 5.37159, 300); -- Sergeant Major Skyshadow -DELETE FROM `creature` WHERE `id1`=12780; -INSERT INTO `creature` (`id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES (12780, 0, -8779.46, 427.206, 105.275, 3.80473, 300); +DELETE FROM `creature` WHERE `id1`= 12780; +INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES +(612780, 12780, 0, -8779.46, 427.206, 105.275, 3.80473, 300); -- Master Sergeant Biggins -DELETE FROM `creature` WHERE `id1`=12781; -INSERT INTO `creature` (`id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES (12781, 0, -8777.4, 417.124, 103.921, 6.23553, 300); +DELETE FROM `creature` WHERE `id1`= 12781; +INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES +(612781, 12781, 0, -8777.4, 417.124, 103.921, 6.23553, 300); -- Captain O'Neal -DELETE FROM `creature` WHERE `id1`=12782; -DELETE FROM `creature` WHERE `id1`=34081; -INSERT INTO `creature` (`id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES (12782, 0, -8778.3, 432.142, 105.309, 4.17386, 300); +DELETE FROM `creature` WHERE `id1`= 12782; +DELETE FROM `creature` WHERE `id1`= 34081; +INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES +(612782, 12782, 0, -8778.3, 432.142, 105.309, 4.17386, 300); -- Lieutenant Jackspring -DELETE FROM `creature` WHERE `id1`=12784; +DELETE FROM `creature` WHERE `id1`= 12784; -- Knight-Lieutenant T'Maire Sydes -DELETE FROM `creature` WHERE `id1`=40607; +DELETE FROM `creature` WHERE `id1`= 40607; -- Lieutenant Tristia -DELETE FROM `creature` WHERE `id1`=34078; +DELETE FROM `creature` WHERE `id1`= 34078; -- Sergeant Major Clate -DELETE FROM `creature` WHERE `id1`=12785; -INSERT INTO `creature` (`id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES (12785, 0, -8771.31, 401.973, 109.665, 0.659191, 300); +DELETE FROM `creature` WHERE `id1`= 12785; +INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES +(612785, 12785, 0, -8771.31, 401.973, 109.665, 0.659191, 300); -- Officer Areyn -DELETE FROM `creature` WHERE `id1`=12805; -INSERT INTO `creature` (`id1`, `map`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES (12805, 0, 1, -8759.18, 389.112, 101.056, 0.648394, 430); +DELETE FROM `creature` WHERE `id1`= 12805; +INSERT INTO `creature` (`guid`, `id1`, `map`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES +(612805, 12805, 0, 1, -8759.18, 389.112, 101.056, 0.648394, 430); -- Elfarran -DELETE FROM `creature` WHERE `id1`=14981; -INSERT INTO `creature` (`id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES (14981, 0, -8454.62, 318.853, 120.969, 0.698132, 180); +DELETE FROM `creature` WHERE `id1`= 14981; +INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES +(614981, 14981, 0, -8454.62, 318.853, 120.969, 0.698132, 180); -- Lady Hoteshem -DELETE FROM `creature` WHERE `id1`=15008; -INSERT INTO `creature` (`id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES (15008, 0, -8420.48, 328.711, 120.886, 3.06638, 180); +DELETE FROM `creature` WHERE `id1`= 15008; +INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES +(615008, 15008, 0, -8420.48, 328.711, 120.886, 3.06638, 180); -- Tome of Nobility (Paladin) DELETE FROM `creature_questender` WHERE `id`=6171 AND `quest`=1661; @@ -382,10 +395,11 @@ DELETE FROM `npc_vendor` WHERE `entry`=12781 AND `item` IN 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); +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, 23451, 23452, 23453, 23454, 23455, 23456); 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); + (12782, 18843, 2291), (12782, 18847, 2291), (12782, 18855, 2291), (12782, 18865, 2291), (12782, 18867, 2257), (12782, 18869, 2257), (12782, 18873, 2257), + (12782, 18876, 2257), (12782, 23451, 2291), (12782, 23452, 2257), (12782, 23453, 2291), (12782, 23454, 2291), (12782, 23455, 2291), (12782, 23456, 2291); -- Lieutenant Karter DELETE FROM `npc_vendor` WHERE `entry`=12783 AND `item` IN (29465, 29467, 29468, 29471, 35906); @@ -413,6 +427,84 @@ 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); + +/* Hide certain vendor items until the player has reached the progression tier for them */ +DELETE FROM `conditions` WHERE `SourceGroup` IN (12777, 12782); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, +`ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +-- +(23, 12777, 16437, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Marshals Silk Footwraps until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16440, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Marshals Silk Gloves until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16441, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Field Marshals Coronet until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16442, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Marshals Silk Leggings until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16443, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Field Marshals Silk Vestments until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16444, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Field Marshals Silk Spaulders until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16446, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Marshals Leather Footguards until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16448, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Marshals Dragonhide Gauntlets until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16449, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Field Marshals Dragonhide Spaulders until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16450, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Marshals Dragonhide Legguards until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16451, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Field Marshals Dragonhide Helmet until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16452, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Field Marshals Dragonhide Breastplate until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16453, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Field Marshals Leather Chestpiece until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16454, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Marshals Leather Handgrips until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16455, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Field Marshals Leather Mask until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16456, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Marshals Leather Leggings until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16457, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Field Marshals Leather Epaulets until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16459, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Marshals Dragonhide Boots until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16462, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Marshals Chain Boots until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16463, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Marshals Chain Grips until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16465, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Field Marshals Chain Helm until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16466, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Field Marshals Chain Breastplate until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16467, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Marshals Chain Legguards until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16468, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Field Marshals Chain Spaulders until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16471, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Marshals Lamellar Gloves until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16472, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Marshals Lamellar Boots until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16473, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Field Marshals Lamellar Chestplate until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16474, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Field Marshals Lamellar Faceguard until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16475, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Marshals Lamellar Legplates until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16476, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Field Marshals Lamellar Pauldrons until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16477, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Field Marshals Plate Armor until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16478, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Field Marshals Plate Helm until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16479, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Marshals Plate Legguards until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16480, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Field Marshals Plate Shoulderguards until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16483, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Marshals Plate Boots until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 16484, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Marshals Plate Gauntlets until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 17578, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Field Marshals Coronal until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 17579, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Marshals Dreadweave Leggings until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 17580, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Field Marshals Dreadweave Shoulders until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 17581, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Field Marshals Dreadweave Robe until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 17583, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Marshals Dreadweave Boots until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 17584, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Marshals Dreadweave Gloves until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 17602, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Field Marshals Headdress until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 17603, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Marshals Satin Pants until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 17604, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Field Marshals Satin Mantle until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 17605, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Field Marshals Satin Vestments until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 17607, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Marshals Satin Sandals until the player has completed PROGRESSION_ONYXIA'), +(23, 12777, 17608, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain Dirgehammer will not sell Marshals Satin Gloves until the player has completed PROGRESSION_ONYXIA'), +-- +(23, 12782, 12584, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain O\'Neal will not sell Grand Marshal\'s Longsword until the player has completed PROGRESSION_ONYXIA'), +(23, 12782, 18825, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain O\'Neal will not sell Grand Marshal\'s Aegis until the player has completed PROGRESSION_ONYXIA'), +(23, 12782, 18827, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain O\'Neal will not sell Grand Marshal\'s Handaxe until the player has completed PROGRESSION_ONYXIA'), +(23, 12782, 18830, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain O\'Neal will not sell Grand Marshal\'s Sunderer until the player has completed PROGRESSION_ONYXIA'), +(23, 12782, 18833, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain O\'Neal will not sell Grand Marshal\'s Bullseye until the player has completed PROGRESSION_ONYXIA'), +(23, 12782, 18836, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain O\'Neal will not sell Grand Marshal\'s Repeater until the player has completed PROGRESSION_ONYXIA'), +(23, 12782, 18838, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain O\'Neal will not sell Grand Marshal\'s Dirk until the player has completed PROGRESSION_ONYXIA'), +(23, 12782, 18843, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain O\'Neal will not sell Grand Marshal\'s Right Hand Blade until the player has completed PROGRESSION_ONYXIA'), +(23, 12782, 18847, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain O\'Neal will not sell Grand Marshal\'s Left Hand Blade until the player has completed PROGRESSION_ONYXIA'), +(23, 12782, 18855, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain O\'Neal will not sell Grand Marshal\'s Hand Cannon until the player has completed PROGRESSION_ONYXIA'), +(23, 12782, 18865, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain O\'Neal will not sell Grand Marshal\'s Punisher until the player has completed PROGRESSION_ONYXIA'), +(23, 12782, 18867, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain O\'Neal will not sell Grand Marshal\'s Battle Hammer until the player has completed PROGRESSION_ONYXIA'), +(23, 12782, 18869, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain O\'Neal will not sell Grand Marshal\'s Glaive until the player has completed PROGRESSION_ONYXIA'), +(23, 12782, 18873, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain O\'Neal will not sell Grand Marshal\'s Stave until the player has completed PROGRESSION_ONYXIA'), +(23, 12782, 18876, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain O\'Neal will not sell Grand Marshal\'s Claymore until the player has completed PROGRESSION_ONYXIA'), +(23, 12782, 23451, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain O\'Neal will not sell Grand Marshal\'s Mageblade until the player has completed PROGRESSION_ONYXIA'), +(23, 12782, 23452, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain O\'Neal will not sell Grand Marshal\'s Tome of Power until the player has completed PROGRESSION_ONYXIA'), +(23, 12782, 23453, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain O\'Neal will not sell Grand Marshal\'s Tome of Restoration until the player has completed PROGRESSION_ONYXIA'), +(23, 12782, 23454, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain O\'Neal will not sell Grand Marshal\'s Warhammer until the player has completed PROGRESSION_ONYXIA'), +(23, 12782, 23455, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain O\'Neal will not sell Grand Marshal\'s Demolisher until the player has completed PROGRESSION_ONYXIA'), +(23, 12782, 23456, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Captain O\'Neal will not sell Grand Marshal\'s Swiftblade until the player has completed PROGRESSION_ONYXIA'); + + -- Summon Felsteed (Warlock) DELETE FROM `quest_offer_reward` WHERE `ID`=4488; INSERT INTO `quest_offer_reward` (`ID`, `RewardText`) VALUES