yolinlin/mod-individual-progression
1
0
Fork 0
mirror of https://github.com/ZhengPeiRu21/mod-individual-progression synced 2025-11-29 23:44:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Vanilla Vendors Overhaul (#814)

Browse Source 
- massive clean up of vanilla_vendors
- now hiding TBC and WotLK vendor items instead of deleting them
- added jewelcrafting recipes on vanilla vendors to zz_optional_vanilla_phasing
This commit is contained in:
Grimfeather
2025-10-18 04:46:13 +02:00
committed by GitHub
parent 1b6893705f
commit 84894c2088
6 changed files with 1681 additions and 5027 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
data/sql/world/base/mounts_and_riding.sql
View File

@@ -46,7 +46,7 @@ UPDATE npc_trainer SET ReqLevel = 68 WHERE SpellID = 33950; -- Flight Form
-- Hide pre 1.6 epic mounts ater BWL is unlocked
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 23 AND `SourceGroup` IN (384, 1261, 3362, 3685, 4730, 7952, 7955);
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 23 AND `SourceGroup` IN (384, 1261, 3362, 3685, 4730, 4731, 7952, 7955);
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`,
`ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
(23, 384, 12353, 0, 0, 8, 0, 66002, 0, 0, 1, 0, 0, '', 'Katie Hunter will not sell White Stallion Bridle after the player has completed PROGRESSION_ONYXIA'),
@@ -55,16 +55,58 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry
(23, 1261, 13329, 0, 0, 8, 0, 66002, 0, 0, 1, 0, 0, '', 'Veron Emberstill will not sell Frost Ram after the player has completed PROGRESSION_ONYXIA'),
(23, 3362, 12330, 0, 0, 8, 0, 66002, 0, 0, 1, 0, 0, '', 'Ogunaro Wolfrunner will not sell Horn of the Red Wolf after the player has completed PROGRESSION_ONYXIA'),
(23, 3362, 12351, 0, 0, 8, 0, 66002, 0, 0, 1, 0, 0, '', 'Ogunaro Wolfrunner will not sell Horn of the Arctic Wolf after the player has completed PROGRESSION_ONYXIA'),
(23, 3362, 46099, 0, 0, 8, 0, 66013, 0, 0, 0, 0, 0, '', 'Ogunaro Wolfrunner will not sell Horn of the Black Wolf until the player has reached WotLK'),
(23, 3685, 15292, 0, 0, 8, 0, 66002, 0, 0, 1, 0, 0, '', 'Harb Clawfoot will not sell Green Kodo after the player has completed PROGRESSION_ONYXIA'),
(23, 3685, 15293, 0, 0, 8, 0, 66002, 0, 0, 1, 0, 0, '', 'Harb Clawfoot will not sell Teal Kodo after the player has completed PROGRESSION_ONYXIA'),
(23, 3685, 46100, 0, 0, 8, 0, 66013, 0, 0, 0, 0, 0, '', 'Harb Clawhoof will not sell White Kodo until the player has reached WotLK'),
(23, 4730, 12302, 0, 0, 8, 0, 66002, 0, 0, 1, 0, 0, '', 'Lelanai will not sell Reins of the Ancient Frostsaber after the player has completed PROGRESSION_ONYXIA'),
(23, 4730, 12303, 0, 0, 8, 0, 66002, 0, 0, 1, 0, 0, '', 'Lelanai will not sell Reins of the Nightsaber after the player has completed PROGRESSION_ONYXIA'),
(23, 4731, 46308, 0, 0, 8, 0, 66013, 0, 0, 0, 0, 0, '', 'Zachariah Post will not sell Black Skeletal Horse until the player has reached WotLK'),
(23, 4731, 47101, 0, 0, 8, 0, 66013, 0, 0, 0, 0, 0, '', 'Zachariah Post will not sell Ochre Skeletal Warhorse until the player has reached WotLK'),
(23, 7952, 8586, 0, 0, 8, 0, 66002, 0, 0, 1, 0, 0, '', 'Zjolnir will not sell Whistle of the Mottled Red Raptor after the player has completed PROGRESSION_ONYXIA'),
(23, 7952, 13317, 0, 0, 8, 0, 66002, 0, 0, 1, 0, 0, '', 'Zjolnir will not sell Whistle of the Ivory Raptor after the player has completed PROGRESSION_ONYXIA'),
(23, 7955, 13326, 0, 0, 8, 0, 66002, 0, 0, 1, 0, 0, '', 'Milli Featherwhistle will not sell White Mechanostrider Mod A after the player has completed PROGRESSION_ONYXIA'),
(23, 7955, 13327, 0, 0, 8, 0, 66002, 0, 0, 1, 0, 0, '', 'Milli Featherwhistle will not sell Icy Blue Mechanostrider Mod A after the player has completed PROGRESSION_ONYXIA');
DELETE FROM `npc_vendor` WHERE `entry` = 384 AND `item` IN (12353, 12354);
DELETE FROM `npc_vendor` WHERE `entry` = 1261 AND `item` IN (13328, 13329);
DELETE FROM `npc_vendor` WHERE `entry` = 1460 AND `item` IN (12353, 12354, 18776, 18777, 18778);
DELETE FROM `npc_vendor` WHERE `entry` = 2357 AND `item` IN (12353, 12354);
DELETE FROM `npc_vendor` WHERE `entry` = 3362 AND `item` IN (12330, 12351);
DELETE FROM `npc_vendor` WHERE `entry` = 3685 AND `item` IN (15292, 15293);
DELETE FROM `npc_vendor` WHERE `entry` = 4730 AND `item` IN (12302, 12303);
DELETE FROM `npc_vendor` WHERE `entry` = 4885 AND `item` IN (12353, 12354);
DELETE FROM `npc_vendor` WHERE `entry` = 7952 AND `item` IN (8586, 13317);
DELETE FROM `npc_vendor` WHERE `entry` = 7955 AND `item` IN (13326, 13327);
INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES
--
(384, 12353, 0, 0), -- Katie Hunter, White Stallion Bridle
(384, 12354, 0, 0), -- Katie Hunter, Palomino Bridle
(1261, 13328, 0, 0), -- Veron Amberstill, Black Ram
(1261, 13329, 0, 0), -- Veron Amberstill, Frost Ram
(1460, 18776, 0, 0), -- Unger Statforth, Swift Palomino
(1460, 18777, 0, 0), -- Unger Statforth, Swift Brown Steed
(1460, 18778, 0, 0), -- Unger Statforth, Swift White Steed
(1460, 12353, 0, 0), -- Unger Statforth, White Stallion Bridle
(1460, 12354, 0, 0), -- Unger Statforth, Palomino Bridle
(2357, 12353, 0, 0), -- Merideth Carlson, White Stallion Bridle
(2357, 12354, 0, 0), -- Merideth Carlson, Palomino Bridle
(3362, 12330, 0, 0), -- Ogunaro Wolfrunner, Horn of the Red Wolf
(3362, 12351, 0, 0), -- Ogunaro Wolfrunner, Horn of the Arctic Wolf
(3685, 15293, 0, 0), -- Harb Clawhoof, Teal Kodo
(3685, 15292, 0, 0), -- Harb Clawhoof, Green Kodo
(4730, 12302, 0, 0), -- Lelanai, Ancient Frostsaber
(4730, 12303, 0, 0), -- Lelanai, Reins of the Nightsaber
(4885, 12353, 0, 0), -- Gregor MacVince, White Stallion Bridle
(4885, 12354, 0, 0), -- Gregor MacVince, Palomino Bridle
(7952, 8586, 0, 0), -- Zjolnir, Whistle of the Mottled Red Raptor
(7952, 13317, 0, 0), -- Zjolnir, Whistle of the Ivory Raptor
(7955, 13326, 0, 0), -- Milli Featherwhistle, White Mechanostrider Mod B
(7955, 13327, 0, 0); -- Milli Featherwhistle, Icy Blue Mechanostrider Mod A
-- Alliance 60% speed mounts
UPDATE `item_template` SET `Quality` = 3, `BuyPrice` = 100000, `RequiredLevel` = 40, `Name` = 'Black Stallion' WHERE `entry` = 2411;
UPDATE `item_template` SET `Quality` = 3, `BuyPrice` = 100000, `RequiredLevel` = 40, `Name` = 'Pinto' WHERE `entry` = 2414;

4
data/sql/world/base/vanilla_creatures.sql
View File

@@ -18398,8 +18398,8 @@ UPDATE `creature_template` SET `DamageModifier` = 1.6, `ArmorModifier` = 1.15, `
UPDATE `creature_template` SET `DamageModifier` = 1.6, `ArmorModifier` = 1.15, `ManaModifier` = 1.0, `RangeAttackTime` = 1529, `unit_class` = 1 WHERE `entry` = 12791;
/* Lady Palanseer */
UPDATE `creature_template` SET `minlevel` = 65, `maxlevel` = 65, `speed_walk` = 1.0, `DamageModifier` = 2.2, `ArmorModifier` = 1.65 WHERE `entry` = 12792;
UPDATE `creature_template` SET `minlevel` = 55, `maxlevel` = 55, `speed_walk` = 1.0, `DamageModifier` = 2.2, `ArmorModifier` = 1.65 WHERE `entry` = 26397;
UPDATE `creature_template` SET `minlevel` = 55, `maxlevel` = 55, `speed_walk` = 1.0, `DamageModifier` = 2.2, `ArmorModifier` = 1.65 WHERE `entry` = 12792;
UPDATE `creature_template` SET `minlevel` = 65, `maxlevel` = 65, `speed_walk` = 1.0, `DamageModifier` = 2.2, `ArmorModifier` = 1.65 WHERE `entry` = 26397;
/* Brave Stonehide */
UPDATE `creature_template` SET `DamageModifier` = 2.9 WHERE `entry` = 12793;

6584
data/sql/world/base/vanilla_vendors.sql
View File

File diff suppressed because it is too large Load Diff

18
data/sql/world/base/zone_orgrimmar.sql
View File

@@ -126,8 +126,8 @@ SET @Zarg := 112794; -- Stone Guard Zarg <Food and Drink>, Vanilla
SET @Hola := 112795; -- First Sergeant Hola'mahi, Vanilla
SET @TH_Classic := 26396; -- Sergeant Thunderhorn, Vanilla
SET @TH_TBC := 14581; -- Sergeant Thunderhorn, TBC
SET @LP_Classic := 26397; -- Lady Palanseer <Armor Quartermaster>, Vanilla
SET @LP_TBC := 12792; -- Lady Palanseer <Armor Quartermaster>, TBC
SET @LP_Classic := 12792; -- Lady Palanseer <Armor Quartermaster>, Vanilla
SET @LP_TBC := 26397; -- Lady Palanseer <Armor Quartermaster>, TBC
DELETE FROM `creature_template` WHERE `entry` IN (@Stonehide, @Zarg, @Hola);
@@ -191,8 +191,8 @@ DELETE FROM `creature` WHERE `guid` IN (125688, 125690, 125694, 125695, 612792,
INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES
--
(612799, 12799, 1, 1632.21, -4262.19, 49.027, 3.63029, 430), -- Sergeant Ba'sha <Accessories Quartermaster>, Vanilla
(626397, @LP_Classic, 1, 1669.78, -4200.1, 56.3815, 3.61023, 180), -- Lady Palanseer <Armor Quartermaster>, Vanilla
(612792, @LP_TBC, 1, 1669.78, -4200.1, 56.3815, 3.61023, 180), -- Lady Palanseer <Armor Quartermaster>, TBC
(612792, @LP_Classic, 1, 1669.78, -4200.1, 56.3815, 3.61023, 180), -- Lady Palanseer <Armor Quartermaster>, Vanilla
(626397, @LP_TBC, 1, 1669.78, -4200.1, 56.3815, 3.61023, 180), -- Lady Palanseer <Armor Quartermaster>, TBC
(612793, @Stonehide, 1, 1657.6, -4191.97, 56.383, 4.52365, 180), -- Brave Stonehide <Officer Accessories Quartermaster>, Vanilla
(125690, 12793, 1, 1672.24, -4206.81, 56.3827, 3.30568, 180), -- Brave Stonehide <Officer Accessories Quartermaster>, TBC
(612794, @Zarg, 1, 1641.65, -4197.52, 56.3823, 5.41219, 180), -- Stone Guard Zarg <Food and Drink>, Vanilla
@@ -365,7 +365,9 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES
(@LP_Classic, 22878, 653), (@LP_Classic, 22879, 652), (@LP_Classic, 22880, 653), (@LP_Classic, 22881, 653), (@LP_Classic, 22882, 653), (@LP_Classic, 22883, 653), (@LP_Classic, 22884, 652),
(@LP_Classic, 22885, 652), (@LP_Classic, 22886, 652), (@LP_Classic, 22887, 653), (@LP_Classic, 23243, 427), (@LP_Classic, 23244, 444), (@LP_Classic, 23251, 444), (@LP_Classic, 23252, 427),
(@LP_Classic, 23253, 444), (@LP_Classic, 23254, 427), (@LP_Classic, 23255, 444), (@LP_Classic, 23256, 427), (@LP_Classic, 23257, 444), (@LP_Classic, 23258, 427), (@LP_Classic, 23259, 444),
(@LP_Classic, 23260, 427), (@LP_Classic, 23261, 444), (@LP_Classic, 23262, 427), (@LP_Classic, 23263, 444), (@LP_Classic, 23264, 427);
(@LP_Classic, 23260, 427), (@LP_Classic, 23261, 444), (@LP_Classic, 23262, 427), (@LP_Classic, 23263, 444), (@LP_Classic, 23264, 427), (@LP_Classic, 29600, 428), (@LP_Classic, 29601, 427),
(@LP_Classic, 29602, 652), (@LP_Classic, 29603, 653), (@LP_Classic, 29604, 444), (@LP_Classic, 29605, 427), (@LP_Classic, 29612, 465), (@LP_Classic, 29613, 541), (@LP_Classic, 29614, 542),
(@LP_Classic, 29615, 463), (@LP_Classic, 29616, 464), (@LP_Classic, 29617, 465);
-- Lady Palanseer <Armor Quartermaster> - TBC
DELETE FROM `npc_vendor` WHERE `entry`= @LP_TBC;
@@ -439,6 +441,12 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry
(23, @LP_Classic, 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, @LP_Classic, 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, @LP_Classic, 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, @LP_Classic, 29612, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Generals Lamellar Boots until the player has completed PROGRESSION_ONYXIA'),
(23, @LP_Classic, 29613, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Generals Lamellar Gloves until the player has completed PROGRESSION_ONYXIA'),
(23, @LP_Classic, 29614, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Warlords Lamellar Legplates until the player has completed PROGRESSION_ONYXIA'),
(23, @LP_Classic, 29615, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Warlords Lamellar Chestplate until the player has completed PROGRESSION_ONYXIA'),
(23, @LP_Classic, 29616, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Warlords Lamellar Faceguard until the player has completed PROGRESSION_ONYXIA'),
(23, @LP_Classic, 29617, 0, 0, 8, 0, 66002, 0, 0, 0, 0, 0, '', 'Lady Palanseer will not sell Generals Lamellar Pauldrons until the player has completed PROGRESSION_ONYXIA'),
--
(23, @TH_Classic, 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, @TH_Classic, 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'),

32
data/sql/world/base/zone_stormwind.sql
View File

@@ -156,7 +156,7 @@ UPDATE `creature_template` SET `ScriptName` = 'npc_ipp_tbc' WHERE `entry` IN (12
UPDATE `creature_template_addon` SET `mount` = 0 WHERE `entry` = 12783;
DELETE FROM `creature` WHERE `guid` IN (133928, 133926, 133929, 612781, 612783, 612785, 623446, 624671, 624672, 626393, 626394, 720278, 723396);
DELETE FROM `creature` WHERE `guid` IN (133928, 133926, 133929, 612781, 612783, 612785, 623446, 624671, 624672, 612777, 626394, 720278, 723396);
INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`) VALUES
--
(612781, @Biggins, 0, -8777.4, 417.124, 103.921, 6.23553, 180), -- Master Sergeant Biggins <Officer Accessories Quartermaster>, Vanilla
@@ -165,7 +165,7 @@ INSERT INTO `creature` (`guid`, `id1`, `map`, `position_x`, `position_y`, `posit
(133929, 12785, 0, -8771.31, 401.973, 109.665, 0.659191, 180), -- Sergeant Major Clate <Armor Quartermaster>, TBC
(626394, 26394, 0, -8778.3, 432.142, 105.309, 4.17386, 180), -- Captain O'Neal <Weapons Quartermaster>, Vanilla
(624671, 24671, 0, -8778.3, 432.142, 105.309, 4.17386, 180), -- Captain O'Neal <Weapons Quartermaster>, TBC
(626393, 26393, 0, -8768.77, 401.647, 109.665, 2.22999, 180), -- Captain Dirgehammer <Armor Quartermaster>, Vanilla
(612777, 12777, 0, -8768.77, 401.647, 109.665, 2.22999, 180), -- Captain Dirgehammer <Armor Quartermaster>, Vanilla
(624672, 24672, 0, -8773.33, 427.279, 105.233, 3.84677, 180), -- Captain Dirgehammer <Armor Quartermaster>, TBC
(133928, 12784, 0, -8764.6, 413.632, 103.922, 0.693375, 180), -- Lieutenant Jackspring <Weapons Quartermaster>, TBC
(720278, 20278, 0, -8789.08, 425.681, 105.233, 5.68294, 180), -- Vixton Pinchwhistle <Arena Vendor>, TBC
@@ -268,18 +268,18 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`, `ExtendedCost
-- Captain Dirgehammer <Armor Quartermaster> - Vanilla
DELETE FROM `npc_vendor` WHERE `entry` IN (12777, 26393);
INSERT INTO `npc_vendor` (`entry`, `item`, `ExtendedCost`) VALUES
(26393, 16437, 465), (26393, 16440, 541), (26393, 16441, 464), (26393, 16442, 542), (26393, 16443, 463), (26393, 16444, 465), (26393, 16446, 465), (26393, 16448, 541), (26393, 16449, 465),
(26393, 16450, 542), (26393, 16451, 464), (26393, 16452, 463), (26393, 16453, 463), (26393, 16454, 541), (26393, 16455, 464), (26393, 16456, 542), (26393, 16457, 465), (26393, 16459, 465),
(26393, 16462, 465), (26393, 16463, 541), (26393, 16465, 464), (26393, 16466, 463), (26393, 16467, 542), (26393, 16468, 465), (26393, 16471, 541), (26393, 16472, 465), (26393, 16473, 463),
(26393, 16474, 464), (26393, 16475, 542), (26393, 16476, 465), (26393, 16477, 463), (26393, 16478, 464), (26393, 16479, 542), (26393, 16480, 465), (26393, 16483, 465), (26393, 16484, 541),
(26393, 17578, 464), (26393, 17579, 542), (26393, 17580, 465), (26393, 17581, 463), (26393, 17583, 465), (26393, 17584, 541), (26393, 17602, 464), (26393, 17603, 542), (26393, 17604, 465),
(26393, 17605, 463), (26393, 17607, 465), (26393, 17608, 541), (26393, 23272, 652), (26393, 23273, 653), (26393, 23274, 428), (26393, 23275, 427), (26393, 23276, 444), (26393, 23277, 427),
(26393, 23278, 427), (26393, 23279, 428), (26393, 23280, 428), (26393, 23281, 427), (26393, 23282, 428), (26393, 23283, 427), (26393, 23284, 428), (26393, 23285, 427), (26393, 23286, 428),
(26393, 23287, 427), (26393, 23288, 428), (26393, 23289, 427), (26393, 23290, 428), (26393, 23291, 427), (26393, 23292, 652), (26393, 23293, 653), (26393, 23294, 652), (26393, 23295, 653),
(26393, 23296, 653), (26393, 23297, 652), (26393, 23298, 652), (26393, 23299, 653), (26393, 23300, 652), (26393, 23301, 653), (26393, 23302, 653), (26393, 23303, 652), (26393, 23304, 653),
(26393, 23305, 652), (26393, 23306, 444), (26393, 23307, 427), (26393, 23308, 444), (26393, 23309, 427), (26393, 23310, 444), (26393, 23311, 427), (26393, 23312, 444), (26393, 23313, 427),
(26393, 23314, 444), (26393, 23315, 427), (26393, 23316, 444), (26393, 23317, 427), (26393, 23318, 444), (26393, 23319, 427), (26393, 29594, 427), (26393, 29595, 428), (26393, 29596, 652),
(26393, 29597, 653), (26393, 29598, 444), (26393, 29599, 427), (26393, 29606, 465), (26393, 29607, 541), (26393, 29608, 542), (26393, 29609, 463), (26393, 29610, 464), (26393, 29611, 465);
(12777, 16437, 465), (12777, 16440, 541), (12777, 16441, 464), (12777, 16442, 542), (12777, 16443, 463), (12777, 16444, 465), (12777, 16446, 465), (12777, 16448, 541), (12777, 16449, 465),
(12777, 16450, 542), (12777, 16451, 464), (12777, 16452, 463), (12777, 16453, 463), (12777, 16454, 541), (12777, 16455, 464), (12777, 16456, 542), (12777, 16457, 465), (12777, 16459, 465),
(12777, 16462, 465), (12777, 16463, 541), (12777, 16465, 464), (12777, 16466, 463), (12777, 16467, 542), (12777, 16468, 465), (12777, 16471, 541), (12777, 16472, 465), (12777, 16473, 463),
(12777, 16474, 464), (12777, 16475, 542), (12777, 16476, 465), (12777, 16477, 463), (12777, 16478, 464), (12777, 16479, 542), (12777, 16480, 465), (12777, 16483, 465), (12777, 16484, 541),
(12777, 17578, 464), (12777, 17579, 542), (12777, 17580, 465), (12777, 17581, 463), (12777, 17583, 465), (12777, 17584, 541), (12777, 17602, 464), (12777, 17603, 542), (12777, 17604, 465),
(12777, 17605, 463), (12777, 17607, 465), (12777, 17608, 541), (12777, 23272, 652), (12777, 23273, 653), (12777, 23274, 428), (12777, 23275, 427), (12777, 23276, 444), (12777, 23277, 427),
(12777, 23278, 427), (12777, 23279, 428), (12777, 23280, 428), (12777, 23281, 427), (12777, 23282, 428), (12777, 23283, 427), (12777, 23284, 428), (12777, 23285, 427), (12777, 23286, 428),
(12777, 23287, 427), (12777, 23288, 428), (12777, 23289, 427), (12777, 23290, 428), (12777, 23291, 427), (12777, 23292, 652), (12777, 23293, 653), (12777, 23294, 652), (12777, 23295, 653),
(12777, 23296, 653), (12777, 23297, 652), (12777, 23298, 652), (12777, 23299, 653), (12777, 23300, 652), (12777, 23301, 653), (12777, 23302, 653), (12777, 23303, 652), (12777, 23304, 653),
(12777, 23305, 652), (12777, 23306, 444), (12777, 23307, 427), (12777, 23308, 444), (12777, 23309, 427), (12777, 23310, 444), (12777, 23311, 427), (12777, 23312, 444), (12777, 23313, 427),
(12777, 23314, 444), (12777, 23315, 427), (12777, 23316, 444), (12777, 23317, 427), (12777, 23318, 444), (12777, 23319, 427), (12777, 29594, 427), (12777, 29595, 428), (12777, 29596, 652),
(12777, 29597, 653), (12777, 29598, 444), (12777, 29599, 427), (12777, 29606, 465), (12777, 29607, 541), (12777, 29608, 542), (12777, 29609, 463), (12777, 29610, 464), (12777, 29611, 465);
-- Captain Dirgehammer <Armor Quartermaster> - TBC
DELETE FROM `npc_vendor` WHERE `entry` = 24672;
@@ -385,8 +385,8 @@ UPDATE `creature` SET `ScriptName` = 'npc_ipp_tbc' WHERE `id1` = 19848; -- Har
-- WotLK pvp vendors
DELETE FROM `creature` WHERE `id1` IN
(12777, -- Captain Dirgehammer <Armor Quartermaster>
12782, -- Captain O'Neal <Weapons Quartermaster>
(12782, -- Captain O'Neal <Weapons Quartermaster>
26393, -- Captain Dirgehammer <Armor Quartermaster>
34075, -- Captain Dirgehammer <Armor Quartermaster>
34081); -- Captain O'Neal <Jewelcrafting Quartermaster>