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

Cleanup Vanilla Vendors (#806)

Browse Source 
moving edits done to vanilla vendors in other sql files to vanilla_vendors

---------

Co-authored-by: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
This commit is contained in:
Simon Hensel
2025-10-16 01:33:22 +02:00
committed by GitHub
parent e1c501f221
commit c333d1674e
10 changed files with 106 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/sql/world/base/professions.sql
View File

@@ -1,9 +1,3 @@
-- Lhara in Darkmmon Faire - TBC Items
DELETE FROM `npc_vendor` WHERE (`entry` = 14846) AND (`item` IN (21887, 22572, 22573, 22574, 22575, 22576, 22577, 22578, 22787, 22789, 22790, 22791, 22792, 22793, 22794, 23436, 23437, 23438, 23439, 23440, 23441, 23793, 25707, 25708));
-- Lhara WotLK Items
DELETE FROM `npc_vendor` WHERE (`entry` = 14846) AND (`item` IN (33568, 36901, 36903, 36904, 36905, 36906, 36907, 36908, 37700, 37701, 37702, 37703, 37704, 37705, 37921, 38425, 44128, 46812));
-- Enchant formulas dropped as items -- Enchant formulas dropped as items
DELETE FROM npc_trainer WHERE SpellID IN (20008, 20012, 20013, 20014, 20016, 20023, 20028, 32667); DELETE FROM npc_trainer WHERE SpellID IN (20008, 20012, 20013, 20014, 20016, 20023, 20028, 32667);

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

@@ -94,6 +94,8 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (791,
/* Add Missing Vanilla item Hot Spices */ /* Add Missing Vanilla item Hot Spices */
DELETE FROM `npc_vendor` WHERE `entry` = 843 AND `item` = 2692; DELETE FROM `npc_vendor` WHERE `entry` = 843 AND `item` = 2692;
INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (843, 2692, 0, 0); INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (843, 2692, 0, 0);
/* Remove non-Vanilla item Light Parchment */
DELETE FROM `npc_vendor` WHERE `entry` = 843 AND `item` = 39354;
/* NPC Antonio Perelli - 844 */ /* NPC Antonio Perelli - 844 */
@@ -106,6 +108,8 @@ DELETE FROM `npc_vendor` WHERE `entry` = 844 AND `item` = 40411;
DELETE FROM `npc_vendor` WHERE `entry` = 958 AND `item` = 22147; DELETE FROM `npc_vendor` WHERE `entry` = 958 AND `item` = 22147;
/* Remove non-Vanilla item Wild Quillvine */ /* Remove non-Vanilla item Wild Quillvine */
DELETE FROM `npc_vendor` WHERE `entry` = 958 AND `item` = 22148; DELETE FROM `npc_vendor` WHERE `entry` = 958 AND `item` = 22148;
/* Remove non-Vanilla item Corpse Dust */
DELETE FROM `npc_vendor` WHERE `entry` = 958 AND `item` = 37201;
/* Remove non-Vanilla item Enchanted Vial */ /* Remove non-Vanilla item Enchanted Vial */
DELETE FROM `npc_vendor` WHERE `entry` = 958 AND `item` = 40411; DELETE FROM `npc_vendor` WHERE `entry` = 958 AND `item` = 40411;
/* Add Missing Vanilla item Arcane Dust */ /* Add Missing Vanilla item Arcane Dust */
@@ -200,6 +204,8 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (1250,
DELETE FROM `npc_vendor` WHERE `entry` = 1286 AND `item` = 14341; DELETE FROM `npc_vendor` WHERE `entry` = 1286 AND `item` = 14341;
/* Remove non-Vanilla item Imbued Vial */ /* Remove non-Vanilla item Imbued Vial */
DELETE FROM `npc_vendor` WHERE `entry` = 1286 AND `item` = 18256; DELETE FROM `npc_vendor` WHERE `entry` = 1286 AND `item` = 18256;
/* Remove non-Vanilla item Design: Heavy Golden Necklace of Battle */
DELETE FROM `npc_vendor` WHERE `entry` = 1286 AND `item` = 20856;
/* Add Missing Vanilla item Green Dye */ /* Add Missing Vanilla item Green Dye */
DELETE FROM `npc_vendor` WHERE `entry` = 1286 AND `item` = 2605; DELETE FROM `npc_vendor` WHERE `entry` = 1286 AND `item` = 2605;
INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (1286, 2605, 0, 0); INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (1286, 2605, 0, 0);
@@ -231,6 +237,8 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (1286,
DELETE FROM `npc_vendor` WHERE `entry` = 1257 AND `item` = 22147; DELETE FROM `npc_vendor` WHERE `entry` = 1257 AND `item` = 22147;
/* Remove non-Vanilla item Wild Quillvine */ /* Remove non-Vanilla item Wild Quillvine */
DELETE FROM `npc_vendor` WHERE `entry` = 1257 AND `item` = 22148; DELETE FROM `npc_vendor` WHERE `entry` = 1257 AND `item` = 22148;
/* Remove non-Vanilla item Corpse Durst */
DELETE FROM `npc_vendor` WHERE `entry` = 1257 AND `item` = 37201;
/* Remove non-Vanilla item Enchanted Vial */ /* Remove non-Vanilla item Enchanted Vial */
DELETE FROM `npc_vendor` WHERE `entry` = 1257 AND `item` = 40411; DELETE FROM `npc_vendor` WHERE `entry` = 1257 AND `item` = 40411;
/* Add Missing Vanilla item Arcane Dust */ /* Add Missing Vanilla item Arcane Dust */
@@ -252,6 +260,8 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (1261,
DELETE FROM `npc_vendor` WHERE `entry` = 1275 AND `item` = 22147; DELETE FROM `npc_vendor` WHERE `entry` = 1275 AND `item` = 22147;
/* Remove non-Vanilla item Wild Quillvine */ /* Remove non-Vanilla item Wild Quillvine */
DELETE FROM `npc_vendor` WHERE `entry` = 1275 AND `item` = 22148; DELETE FROM `npc_vendor` WHERE `entry` = 1275 AND `item` = 22148;
/* Remove non-Vanilla item Corpse Durst */
DELETE FROM `npc_vendor` WHERE `entry` = 1275 AND `item` = 37201;
/* Add Missing Vanilla item Arcane Dust */ /* Add Missing Vanilla item Arcane Dust */
DELETE FROM `npc_vendor` WHERE `entry` = 1275 AND `item` = 17019; DELETE FROM `npc_vendor` WHERE `entry` = 1275 AND `item` = 17019;
INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (1275, 17019, 0, 0); INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (1275, 17019, 0, 0);
@@ -277,6 +287,8 @@ DELETE FROM `npc_vendor` WHERE `entry` = 1298 AND `item` = 28053;
DELETE FROM `npc_vendor` WHERE `entry` = 1307 AND `item` = 22147; DELETE FROM `npc_vendor` WHERE `entry` = 1307 AND `item` = 22147;
/* Remove non-Vanilla item Wild Quillvine */ /* Remove non-Vanilla item Wild Quillvine */
DELETE FROM `npc_vendor` WHERE `entry` = 1307 AND `item` = 22148; DELETE FROM `npc_vendor` WHERE `entry` = 1307 AND `item` = 22148;
/* Remove non-Vanilla item Corpse Dust */
DELETE FROM `npc_vendor` WHERE `entry` = 1307 AND `item` = 37201;
/* Add Missing Vanilla item Arcane Dust */ /* Add Missing Vanilla item Arcane Dust */
DELETE FROM `npc_vendor` WHERE `entry` = 1307 AND `item` = 17019; DELETE FROM `npc_vendor` WHERE `entry` = 1307 AND `item` = 17019;
INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (1307, 17019, 0, 0); INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (1307, 17019, 0, 0);
@@ -287,6 +299,8 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (1307,
DELETE FROM `npc_vendor` WHERE `entry` = 1308 AND `item` = 22147; DELETE FROM `npc_vendor` WHERE `entry` = 1308 AND `item` = 22147;
/* Remove non-Vanilla item Wild Quillvine */ /* Remove non-Vanilla item Wild Quillvine */
DELETE FROM `npc_vendor` WHERE `entry` = 1308 AND `item` = 22148; DELETE FROM `npc_vendor` WHERE `entry` = 1308 AND `item` = 22148;
/* Remove non-Vanilla item Corpse Dust */
DELETE FROM `npc_vendor` WHERE `entry` = 1308 AND `item` = 37201;
/* Add Missing Vanilla item Arcane Dust */ /* Add Missing Vanilla item Arcane Dust */
DELETE FROM `npc_vendor` WHERE `entry` = 1308 AND `item` = 17019; DELETE FROM `npc_vendor` WHERE `entry` = 1308 AND `item` = 17019;
INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (1308, 17019, 0, 0); INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (1308, 17019, 0, 0);
@@ -337,6 +351,8 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (1325,
/* Add Missing Vanilla item Crystal Vial */ /* Add Missing Vanilla item Crystal Vial */
DELETE FROM `npc_vendor` WHERE `entry` = 1325 AND `item` = 8925; DELETE FROM `npc_vendor` WHERE `entry` = 1325 AND `item` = 8925;
INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (1325, 8925, 0, 0); INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (1325, 8925, 0, 0);
/* Remove non-Vanilla Poisons */
DELETE FROM `npc_vendor` WHERE `entry` = 1325 AND `item` IN (21835, 21927, 22053, 22054, 22055, 43230, 43231, 43232, 43233, 43234, 43235, 43237);
/* NPC Sloan McCoy - 1326 */ /* NPC Sloan McCoy - 1326 */
@@ -373,6 +389,8 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (1326,
/* Add Missing Vanilla item Crystal Vial */ /* Add Missing Vanilla item Crystal Vial */
DELETE FROM `npc_vendor` WHERE `entry` = 1326 AND `item` = 8925; DELETE FROM `npc_vendor` WHERE `entry` = 1326 AND `item` = 8925;
INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (1326, 8925, 0, 0); INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (1326, 8925, 0, 0);
/* Remove non-Vanilla Poisons */
DELETE FROM `npc_vendor` WHERE `entry` = 1326 AND `item` IN (21835, 21927, 22053, 22054, 22055, 43230, 43231, 43232, 43233, 43234, 43235, 43237);
/* NPC Alexandra Bolero - 1347 */ /* NPC Alexandra Bolero - 1347 */
@@ -385,6 +403,8 @@ DELETE FROM `npc_vendor` WHERE `entry` = 1347 AND `item` = 38426;
DELETE FROM `npc_vendor` WHERE `entry` = 1351 AND `item` = 22147; DELETE FROM `npc_vendor` WHERE `entry` = 1351 AND `item` = 22147;
/* Remove non-Vanilla item Wild Quillvine */ /* Remove non-Vanilla item Wild Quillvine */
DELETE FROM `npc_vendor` WHERE `entry` = 1351 AND `item` = 22148; DELETE FROM `npc_vendor` WHERE `entry` = 1351 AND `item` = 22148;
/* Remove non-Vanilla item Corpse Dust */
DELETE FROM `npc_vendor` WHERE `entry` = 1351 AND `item` = 37201;
/* Add Missing Vanilla item Arcane Dust */ /* Add Missing Vanilla item Arcane Dust */
DELETE FROM `npc_vendor` WHERE `entry` = 1351 AND `item` = 17019; DELETE FROM `npc_vendor` WHERE `entry` = 1351 AND `item` = 17019;
INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (1351, 17019, 0, 0); INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (1351, 17019, 0, 0);
@@ -582,8 +602,12 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (2084,
/* NPC Abigail Shiel - 2118 */ /* NPC Abigail Shiel - 2118 */
/* Remove non-Vanilla item Common Parchment */
DELETE FROM `npc_vendor` WHERE `entry` = 2118 AND `item` = 10648;
/* Remove non-Vanilla item Simple Flour */ /* Remove non-Vanilla item Simple Flour */
DELETE FROM `npc_vendor` WHERE `entry` = 2118 AND `item` = 30817; DELETE FROM `npc_vendor` WHERE `entry` = 2118 AND `item` = 30817;
/* Remove non-Vanilla item Light Parchment */
DELETE FROM `npc_vendor` WHERE `entry` = 2118 AND `item` = 39354;
/* NPC Mrs. Winters - 2134 */ /* NPC Mrs. Winters - 2134 */
@@ -1117,6 +1141,10 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3012,
DELETE FROM `npc_vendor` WHERE `entry` = 13429 AND `item` = 17195; DELETE FROM `npc_vendor` WHERE `entry` = 13429 AND `item` = 17195;
INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (13429, 17195, 0, 0); INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (13429, 17195, 0, 0);
/* NPC Winterhoof */
/* Remove non-Vanilla item Enchanted Vial */
DELETE FROM `npc_vendor` WHERE `entry`=3014 AND `item`= 40411;
/* NPC Kuna Thunderhorn - 3015 */ /* NPC Kuna Thunderhorn - 3015 */
/* Remove non-Vanilla item Wicked Arrow */ /* Remove non-Vanilla item Wicked Arrow */
@@ -1306,10 +1334,36 @@ DELETE FROM `npc_vendor` WHERE `entry` = 3312 AND `item` = 35953;
/* NPC Trak'gen - 3313 */ /* NPC Trak'gen - 3313 */
/* Remove non-Vanilla item Crude Throwing Axe */
DELETE FROM `npc_vendor` WHERE `entry` = 3313 AND `item` = 25861;
/* Remove non-Vanilla item Balanced Throwing Dagger */
DELETE FROM `npc_vendor` WHERE `entry` = 3313 AND `item` = 25872;
/* Remove non-Vanilla item Keen Throwing Knife */
DELETE FROM `npc_vendor` WHERE `entry` = 3313 AND `item` = 25873;
/* Remove non-Vanilla item Deadly Throwing Axe */
DELETE FROM `npc_vendor` WHERE `entry` = 3313 AND `item` = 25875;
/* Remove non-Vanilla item Gleaming Throwing Axe */
DELETE FROM `npc_vendor` WHERE `entry` = 3313 AND `item` = 25876;
/* Remove non-Vanilla item Wicked Arrow */ /* Remove non-Vanilla item Wicked Arrow */
DELETE FROM `npc_vendor` WHERE `entry` = 3313 AND `item` = 28053; DELETE FROM `npc_vendor` WHERE `entry` = 3313 AND `item` = 28053;
/* Remove non-Vanilla item Impact Shot */ /* Remove non-Vanilla item Impact Shot */
DELETE FROM `npc_vendor` WHERE `entry` = 3313 AND `item` = 28060; DELETE FROM `npc_vendor` WHERE `entry` = 3313 AND `item` = 28060;
/* Remove non-Vanilla item Light Throwing Knife */
DELETE FROM `npc_vendor` WHERE `entry` = 3313 AND `item` = 28979;
/* Remove non-Vanilla item Weighted Throwing Axe */
DELETE FROM `npc_vendor` WHERE `entry` = 3313 AND `item` = 29007;
/* Remove non-Vanilla item Sharp Throwing Axe */
DELETE FROM `npc_vendor` WHERE `entry` = 3313 AND `item` = 29008;
/* Remove non-Vanilla item Heavy Throwing Dagger */
DELETE FROM `npc_vendor` WHERE `entry` = 3313 AND `item` = 29009;
/* Remove non-Vanilla item Wicked Throwing Dagger */
DELETE FROM `npc_vendor` WHERE `entry` = 3313 AND `item` = 29010;
/* Remove non-Vanilla item Jagged Throwing Axe */
DELETE FROM `npc_vendor` WHERE `entry` = 3313 AND `item` = 29013;
/* Remove non-Vanilla item Blacksteel Throwing Dagger */
DELETE FROM `npc_vendor` WHERE `entry` = 3313 AND `item` = 29014;
/* Add Missing Vanilla item Flint and Tinder */ /* Add Missing Vanilla item Flint and Tinder */
DELETE FROM `npc_vendor` WHERE `entry` = 3313 AND `item` = 4471; DELETE FROM `npc_vendor` WHERE `entry` = 3313 AND `item` = 4471;
INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3313, 4471, 0, 0); INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3313, 4471, 0, 0);
@@ -1325,6 +1379,8 @@ DELETE FROM `npc_vendor` WHERE `entry` = 3322 AND `item` = 28060;
DELETE FROM `npc_vendor` WHERE `entry` = 3323 AND `item` = 22147; DELETE FROM `npc_vendor` WHERE `entry` = 3323 AND `item` = 22147;
/* Remove non-Vanilla item Wild Quillvine */ /* Remove non-Vanilla item Wild Quillvine */
DELETE FROM `npc_vendor` WHERE `entry` = 3323 AND `item` = 22148; DELETE FROM `npc_vendor` WHERE `entry` = 3323 AND `item` = 22148;
/* Remove non-Vanilla item Corpse Dust */
DELETE FROM `npc_vendor` WHERE `entry` = 3323 AND `item` = 37201;
/* Remove non-Vanilla item Wild Spineleaf */ /* Remove non-Vanilla item Wild Spineleaf */
DELETE FROM `npc_vendor` WHERE `entry` = 3323 AND `item` = 44605; DELETE FROM `npc_vendor` WHERE `entry` = 3323 AND `item` = 44605;
/* Remove non-Vanilla item Starleaf Seed */ /* Remove non-Vanilla item Starleaf Seed */
@@ -1379,6 +1435,8 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3334,
/* Add Missing Vanilla item Crystal Vial */ /* Add Missing Vanilla item Crystal Vial */
DELETE FROM `npc_vendor` WHERE `entry` = 3334 AND `item` = 8925; DELETE FROM `npc_vendor` WHERE `entry` = 3334 AND `item` = 8925;
INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3334, 8925, 0, 0); INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3334, 8925, 0, 0);
/* Remove non-Vanilla Poisons */
DELETE FROM `npc_vendor` WHERE `entry`= 3334 AND `item` IN (21835, 21927, 22053, 22054, 22055, 43230, 43231, 43232, 43233, 43234, 43235, 43237);
/* NPC Hagrus - 3335 */ /* NPC Hagrus - 3335 */
@@ -1386,6 +1444,8 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3334,
DELETE FROM `npc_vendor` WHERE `entry` = 3335 AND `item` = 22147; DELETE FROM `npc_vendor` WHERE `entry` = 3335 AND `item` = 22147;
/* Remove non-Vanilla item Wild Quillvine */ /* Remove non-Vanilla item Wild Quillvine */
DELETE FROM `npc_vendor` WHERE `entry` = 3335 AND `item` = 22148; DELETE FROM `npc_vendor` WHERE `entry` = 3335 AND `item` = 22148;
/* Remove non-Vanilla item Corpse Dust */
DELETE FROM `npc_vendor` WHERE `entry` = 3335 AND `item` = 37201;
/* Add Missing Vanilla item Arcane Dust */ /* Add Missing Vanilla item Arcane Dust */
DELETE FROM `npc_vendor` WHERE `entry` = 3335 AND `item` = 17019; DELETE FROM `npc_vendor` WHERE `entry` = 3335 AND `item` = 17019;
INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3335, 17019, 0, 0); INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3335, 17019, 0, 0);
@@ -1426,6 +1486,8 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3350,
DELETE FROM `npc_vendor` WHERE `entry` = 3351 AND `item` = 22147; DELETE FROM `npc_vendor` WHERE `entry` = 3351 AND `item` = 22147;
/* Remove non-Vanilla item Wild Quillvine */ /* Remove non-Vanilla item Wild Quillvine */
DELETE FROM `npc_vendor` WHERE `entry` = 3351 AND `item` = 22148; DELETE FROM `npc_vendor` WHERE `entry` = 3351 AND `item` = 22148;
/* Remove non-Vanilla item Corpse Dust */
DELETE FROM `npc_vendor` WHERE `entry` = 3351 AND `item` = 37201;
/* Add Missing Vanilla item Arcane Dust */ /* Add Missing Vanilla item Arcane Dust */
DELETE FROM `npc_vendor` WHERE `entry` = 3351 AND `item` = 17019; DELETE FROM `npc_vendor` WHERE `entry` = 3351 AND `item` = 17019;
INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3351, 17019, 0, 0); INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3351, 17019, 0, 0);
@@ -1464,6 +1526,8 @@ DELETE FROM `npc_vendor` WHERE `entry` = 3366 AND `item` = 38426;
DELETE FROM `npc_vendor` WHERE `entry` = 3367 AND `item` = 14341; DELETE FROM `npc_vendor` WHERE `entry` = 3367 AND `item` = 14341;
/* Remove non-Vanilla item Imbued Vial */ /* Remove non-Vanilla item Imbued Vial */
DELETE FROM `npc_vendor` WHERE `entry` = 3367 AND `item` = 18256; DELETE FROM `npc_vendor` WHERE `entry` = 3367 AND `item` = 18256;
/* Remove non-Vanilla item Design: Heavy Golden Necklace of Battle */
DELETE FROM `npc_vendor` WHERE `entry` = 3367 AND `item` = 20856;
/* Add Missing Vanilla item Hot Spices */ /* Add Missing Vanilla item Hot Spices */
DELETE FROM `npc_vendor` WHERE `entry` = 3367 AND `item` = 2692; DELETE FROM `npc_vendor` WHERE `entry` = 3367 AND `item` = 2692;
INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3367, 2692, 0, 0); INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3367, 2692, 0, 0);
@@ -1551,6 +1615,8 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3481,
/* Add Missing Vanilla item Hot Spices */ /* Add Missing Vanilla item Hot Spices */
DELETE FROM `npc_vendor` WHERE `entry` = 3482 AND `item` = 2692; DELETE FROM `npc_vendor` WHERE `entry` = 3482 AND `item` = 2692;
INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3482, 2692, 0, 0); INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3482, 2692, 0, 0);
/* Remove non-Vanilla item Light Parchment */
DELETE FROM `npc_vendor` WHERE `entry` = 3482 AND `item` = 39354;
/* NPC Wrahk - 3485 */ /* NPC Wrahk - 3485 */
@@ -1599,6 +1665,8 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3490,
/* Add Missing Vanilla item Arcane Dust */ /* Add Missing Vanilla item Arcane Dust */
DELETE FROM `npc_vendor` WHERE `entry` = 3490 AND `item` = 17019; DELETE FROM `npc_vendor` WHERE `entry` = 3490 AND `item` = 17019;
INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3490, 17019, 0, 0); INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3490, 17019, 0, 0);
/* Remove non-Vanilla Poisons */
DELETE FROM `npc_vendor` WHERE `entry`=3490 AND `item` IN (21835, 21927, 22053, 22054, 22055, 22147, 22148, 37201, 43230, 43231, 43232, 43233, 43234, 43235, 43237);
/* NPC Gagsprocket - 3495 */ /* NPC Gagsprocket - 3495 */
@@ -1623,6 +1691,10 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3499,
/* Add Missing Vanilla item Dust of Decay */ /* Add Missing Vanilla item Dust of Decay */
DELETE FROM `npc_vendor` WHERE `entry` = 3499 AND `item` = 2928; DELETE FROM `npc_vendor` WHERE `entry` = 3499 AND `item` = 2928;
INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3499, 2928, 0, 0); INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3499, 2928, 0, 0);
/* Remove non-Vanilla item Design: Wicked Moonstone Ring */
DELETE FROM `npc_vendor` WHERE `entry` = 3499 AND `item` = 20855;
/* Remove non-Vanilla item Light Parchment */
DELETE FROM `npc_vendor` WHERE `entry` = 3499 AND `item` = 39354;
/* NPC Tarhus - 3500 */ /* NPC Tarhus - 3500 */
@@ -2918,12 +2990,16 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (5814,
/* NPC Shimra - 5817 */ /* NPC Shimra - 5817 */
/* Remove non-Vanilla item Common Parchment */
DELETE FROM `npc_vendor` WHERE `entry` = 5817 AND `item` = 10648;
/* Remove non-Vanilla item Rune Thread */ /* Remove non-Vanilla item Rune Thread */
DELETE FROM `npc_vendor` WHERE `entry` = 5817 AND `item` = 14341; DELETE FROM `npc_vendor` WHERE `entry` = 5817 AND `item` = 14341;
/* Remove non-Vanilla item Imbued Vial */ /* Remove non-Vanilla item Imbued Vial */
DELETE FROM `npc_vendor` WHERE `entry` = 5817 AND `item` = 18256; DELETE FROM `npc_vendor` WHERE `entry` = 5817 AND `item` = 18256;
/* Remove non-Vanilla item Simple Flour */ /* Remove non-Vanilla item Simple Flour */
DELETE FROM `npc_vendor` WHERE `entry` = 5817 AND `item` = 30817; DELETE FROM `npc_vendor` WHERE `entry` = 5817 AND `item` = 30817;
/* Remove non-Vanilla item Light Parchment */
DELETE FROM `npc_vendor` WHERE `entry` = 5817 AND `item` = 30817;
/* Add Missing Vanilla item Hot Spices */ /* Add Missing Vanilla item Hot Spices */
DELETE FROM `npc_vendor` WHERE `entry` = 5817 AND `item` = 2692; DELETE FROM `npc_vendor` WHERE `entry` = 5817 AND `item` = 2692;
INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (5817, 2692, 0, 0); INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (5817, 2692, 0, 0);
@@ -2937,6 +3013,11 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (5817,
DELETE FROM `npc_vendor` WHERE `entry` = 5817 AND `item` = 3777; DELETE FROM `npc_vendor` WHERE `entry` = 5817 AND `item` = 3777;
INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (5817, 3777, 0, 0); INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (5817, 3777, 0, 0);
/* NPC Zansoa */
/* Remove non-Vanilla item Aquadynamic Fish Attractor */
DELETE FROM `npc_vendor` WHERE `entry` = 5942 AND `item` = 6365;
/* Remove non-Vanilla item Strong Fishing Pole */
DELETE FROM `npc_vendor` WHERE `entry` = 5942 AND `item` = 6533;
/* NPC Yonada - 5944 */ /* NPC Yonada - 5944 */
/* Remove non-Vanilla item Eternium Thread */ /* Remove non-Vanilla item Eternium Thread */
@@ -3371,6 +3452,8 @@ INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (8307,
DELETE FROM `npc_vendor` WHERE `entry` = 8361 AND `item` = 22147; DELETE FROM `npc_vendor` WHERE `entry` = 8361 AND `item` = 22147;
/* Remove non-Vanilla item Wild Quillvine */ /* Remove non-Vanilla item Wild Quillvine */
DELETE FROM `npc_vendor` WHERE `entry` = 8361 AND `item` = 22148; DELETE FROM `npc_vendor` WHERE `entry` = 8361 AND `item` = 22148;
/* Remove non-Vanilla item Corpse Dust */
DELETE FROM `npc_vendor` WHERE `entry` = 8361 AND `item` = 37201;
/* Remove non-Vanilla item Wild Spineleaf */ /* Remove non-Vanilla item Wild Spineleaf */
DELETE FROM `npc_vendor` WHERE `entry` = 8361 AND `item` = 44605; DELETE FROM `npc_vendor` WHERE `entry` = 8361 AND `item` = 44605;
/* Remove non-Vanilla item Starleaf Seed */ /* Remove non-Vanilla item Starleaf Seed */
@@ -3405,12 +3488,16 @@ DELETE FROM `npc_vendor` WHERE `entry` = 8681 AND `item` = 38426;
/* NPC Christopher Hewen - 8934 */ /* NPC Christopher Hewen - 8934 */
/* Remove non-Vanilla item Common Parchment */
DELETE FROM `npc_vendor` WHERE `entry` = 8934 AND `item` = 10648;
/* Remove non-Vanilla item Rune Thread */ /* Remove non-Vanilla item Rune Thread */
DELETE FROM `npc_vendor` WHERE `entry` = 8934 AND `item` = 14341; DELETE FROM `npc_vendor` WHERE `entry` = 8934 AND `item` = 14341;
/* Remove non-Vanilla item Imbued Vial */ /* Remove non-Vanilla item Imbued Vial */
DELETE FROM `npc_vendor` WHERE `entry` = 8934 AND `item` = 18256; DELETE FROM `npc_vendor` WHERE `entry` = 8934 AND `item` = 18256;
/* Remove non-Vanilla item Simple Flour */ /* Remove non-Vanilla item Simple Flour */
DELETE FROM `npc_vendor` WHERE `entry` = 8934 AND `item` = 30817; DELETE FROM `npc_vendor` WHERE `entry` = 8934 AND `item` = 30817;
/* Remove non-Vanilla item Light Parchment */
DELETE FROM `npc_vendor` WHERE `entry` = 8934 AND `item` = 39354;
/* Add Missing Vanilla item Hot Spices */ /* Add Missing Vanilla item Hot Spices */
DELETE FROM `npc_vendor` WHERE `entry` = 8934 AND `item` = 2692; DELETE FROM `npc_vendor` WHERE `entry` = 8934 AND `item` = 2692;
INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (8934, 2692, 0, 0); INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (8934, 2692, 0, 0);
@@ -4596,12 +4683,16 @@ DELETE FROM `npc_vendor` WHERE `entry` = 10367 AND `item` = 27858;
DELETE FROM `npc_vendor` WHERE `entry` = 10367 AND `item` = 27859; DELETE FROM `npc_vendor` WHERE `entry` = 10367 AND `item` = 27859;
/* Remove non-Vanilla item Purified Draenic Water */ /* Remove non-Vanilla item Purified Draenic Water */
DELETE FROM `npc_vendor` WHERE `entry` = 10367 AND `item` = 27860; DELETE FROM `npc_vendor` WHERE `entry` = 10367 AND `item` = 27860;
/* Remove non-Vanilla item Purified Zangar Caps */
DELETE FROM `npc_vendor` WHERE `entry` = 10367 AND `item` = 27859;
/* Remove non-Vanilla item Filtered Draenic Water */ /* Remove non-Vanilla item Filtered Draenic Water */
DELETE FROM `npc_vendor` WHERE `entry` = 10367 AND `item` = 28399; DELETE FROM `npc_vendor` WHERE `entry` = 10367 AND `item` = 28399;
/* Remove non-Vanilla item Mag'har Mild Cheese */ /* Remove non-Vanilla item Mag'har Mild Cheese */
DELETE FROM `npc_vendor` WHERE `entry` = 10367 AND `item` = 29448; DELETE FROM `npc_vendor` WHERE `entry` = 10367 AND `item` = 29448;
/* Remove non-Vanilla item Bladespire Bagel */ /* Remove non-Vanilla item Bladespire Bagel */
DELETE FROM `npc_vendor` WHERE `entry` = 10367 AND `item` = 29449; DELETE FROM `npc_vendor` WHERE `entry` = 10367 AND `item` = 29449;
/* Remove non-Vanilla item Telaari Grapes */
DELETE FROM `npc_vendor` WHERE `entry` = 10367 AND `item` = 29450;
/* Remove non-Vanilla item Clefthoof Ribs */ /* Remove non-Vanilla item Clefthoof Ribs */
DELETE FROM `npc_vendor` WHERE `entry` = 10367 AND `item` = 29451; DELETE FROM `npc_vendor` WHERE `entry` = 10367 AND `item` = 29451;
/* Remove non-Vanilla item Zangar Trout */ /* Remove non-Vanilla item Zangar Trout */
@@ -4624,6 +4715,10 @@ DELETE FROM `npc_vendor` WHERE `entry` = 10367 AND `item` = 33452;
DELETE FROM `npc_vendor` WHERE `entry` = 10367 AND `item` = 33454; DELETE FROM `npc_vendor` WHERE `entry` = 10367 AND `item` = 33454;
/* Remove non-Vanilla item Sparkling Frostcap */ /* Remove non-Vanilla item Sparkling Frostcap */
DELETE FROM `npc_vendor` WHERE `entry` = 10367 AND `item` = 35947; DELETE FROM `npc_vendor` WHERE `entry` = 10367 AND `item` = 35947;
/* Remove non-Vanilla item Savory Snowplum */
DELETE FROM `npc_vendor` WHERE `entry` = 10367 AND `item` = 35948;
/* Remove non-Vanilla item Tundra Berries */
DELETE FROM `npc_vendor` WHERE `entry` = 10367 AND `item` = 35949;
/* Remove non-Vanilla item Sweet Potato Bread */ /* Remove non-Vanilla item Sweet Potato Bread */
DELETE FROM `npc_vendor` WHERE `entry` = 10367 AND `item` = 35950; DELETE FROM `npc_vendor` WHERE `entry` = 10367 AND `item` = 35950;
/* Remove non-Vanilla item Poached Emperor Salmon */ /* Remove non-Vanilla item Poached Emperor Salmon */

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

@@ -361,22 +361,8 @@ INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES
(6387, -400000), -- Dranh <Skinner> (6387, -400000), -- Dranh <Skinner>
(8306, -320000); -- Duhng <Cook> (8306, -320000); -- Duhng <Cook>
/* NPC Grub - not a Vendor in Vanilla */
-- this should go to vanilla_vendors DELETE FROM `npc_vendor` WHERE `entry` = 3443;
DELETE FROM `npc_vendor` WHERE `entry` = 3443; -- Grub
DELETE FROM `npc_vendor` WHERE `entry` = 3482 AND `item` = 39354; -- Tari'qa <Trade Supplies>
DELETE FROM `npc_vendor` WHERE `entry` = 3485 AND `item` = 38426; -- Wrahk <Tailoring Supplies>
DELETE FROM `npc_vendor` WHERE `entry` = 3495 AND `item` IN (14639, 39684, 40533); -- Gagsprocket <Engineering Goods>
DELETE FROM `npc_vendor` WHERE `entry` = 3499 AND `item` IN (20855, 39354); -- Ranik <Trade Supplies>
DELETE FROM `npc_vendor` WHERE `entry` = 5783 AND `item` = 38426; -- Kalldan Felmoon <Specialist Leatherworking Supplies>
DELETE FROM `npc_vendor` WHERE `entry` = 5944 AND `item` = 38426; -- Yonada <Tailoring & Leatherworking Supplies>
DELETE FROM `npc_vendor` WHERE `entry` = 8307 AND `item` = 30817; -- Tarban Hearthgrain <Baker>
DELETE FROM `npc_vendor` WHERE `entry` = 14754 AND `item` = 30498; -- Kelm Hargunth <Warsong Supply Officer>
-- Hula'mahi <Reagents and Herbs>
DELETE FROM `npc_vendor` WHERE `entry`=3490 AND `item` IN (21835, 21927, 22053, 22054, 22055, 22147, 22148, 37201, 43230, 43231, 43232, 43233, 43234, 43235, 43237);
DELETE FROM `npc_vendor` WHERE `entry`=3490 AND `item`=8925;
INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (3490, 8925);
-- The Angry Scytheclaws -- The Angry Scytheclaws
DELETE FROM `quest_offer_reward` WHERE `ID` = 905; DELETE FROM `quest_offer_reward` WHERE `ID` = 905;

5
data/sql/world/base/zone_durotar.sql
View File

@@ -271,11 +271,6 @@ INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES
(7953, -450000), -- Xar'Ti <Riding Trainer> (7953, -450000), -- Xar'Ti <Riding Trainer>
(11025, -340000); -- Mukdrak <Journeyman Engineer> (11025, -340000); -- Mukdrak <Journeyman Engineer>
DELETE FROM `npc_vendor` WHERE `entry` = 3167 AND `item` IN (20815, 20824); -- Wuark <Armorer & Shieldcrafter>
DELETE FROM `npc_vendor` WHERE `entry` = 3168 AND `item` IN (30817); -- Flakk <Trade Supplies>
DELETE FROM `npc_vendor` WHERE `entry` = 3187 AND `item` IN (30817); -- Tai'tasi <Trade Supplies>
DELETE FROM `npc_vendor` WHERE `entry` = 5942 AND `item` IN (6365, 6533); -- Zansoa <Fishing Supplies>
/* Quests */ /* Quests */

5
data/sql/world/base/zone_elwynn_forest.sql
View File

@@ -163,11 +163,6 @@ INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES
(11072, -330001), (11072, -330001),
(11072, -330002); (11072, -330002);
-- Antonio Perelli <Traveling Salesman>
DELETE FROM `npc_vendor` WHERE `entry` = 844 AND `item` = 40411;
-- Dawn Brightstar <Arcane Goods>
DELETE FROM `npc_vendor` WHERE `entry` = 958 AND `item` IN (22147, 22148, 37201, 40411);
-- Wolves Across the Border -- Wolves Across the Border
DELETE FROM `quest_offer_reward` WHERE `ID` = 33; DELETE FROM `quest_offer_reward` WHERE `ID` = 33;

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

@@ -115,89 +115,11 @@ UPDATE `creature_template` SET `subname` = 'Zeppelin Master' WHERE
-- Legionnaire Teena -- Legionnaire Teena
UPDATE `creature_template` SET `subname`= NULL, `npcflag` = 0, `faction` = 85 WHERE `entry` = 12788; UPDATE `creature_template` SET `subname`= NULL, `npcflag` = 0, `faction` = 85 WHERE `entry` = 12788;
UPDATE `creature_template_locale` SET `Title` = NULL WHERE `entry` = 12788; UPDATE `creature_template_locale` SET `Title` = NULL WHERE `entry` = 12788;
DELETE FROM `npc_vendor` WHERE `entry`= 12788; -- was placed in battlegrounds during Vanilla and TBC. needs to be hidden until wotlk
-- Nazgrel <Advisor to Thrall> -- Nazgrel <Advisor to Thrall>
UPDATE `creature_template` SET `scale`=0.7, `npcflag`=2, `faction`=29, `gossip_menu_id`=0 WHERE `entry`=3230; UPDATE `creature_template` SET `scale`=0.7, `npcflag`=2, `faction`=29, `gossip_menu_id`=0 WHERE `entry`=3230;
-- this should probably be moved to vanilla_vendors
-- Olvia <Meat Vendor>
DELETE FROM `npc_vendor` WHERE `entry`=3312 AND `item` IN (27854, 33454, 35953);
-- Trak'gen <General Goods Merchant>
DELETE FROM `npc_vendor` WHERE `entry`=3313 AND `item` IN (25861, 25872, 25873, 25875, 25876, 28053, 28060, 28979, 29007, 29008, 29009, 29010, 29013, 29014);
-- Kaja <Guns and Ammo Merchant>
DELETE FROM `npc_vendor` WHERE `entry`=3322 AND `item`=28060;
-- Horthus <Reagents Vendor>
DELETE FROM `npc_vendor` WHERE `entry`=3323 AND `item` IN (22147, 22148, 37201, 44605, 44614, 44615);
-- Kor'jus <Mushroom Vendor>
DELETE FROM `npc_vendor` WHERE `entry`=3329 AND `item` IN (27859, 33452, 35947);
-- Rekkul <Poison Vendor>
DELETE FROM `npc_vendor` WHERE `entry`=3334 AND `item` IN (21835, 21927, 22053, 22054, 22055, 43230, 43231, 43232, 43233, 43234, 43235, 43237);
-- Hagrus <Reagents Vendor>
DELETE FROM `npc_vendor` WHERE `entry`=3335 AND `item` IN (22147, 22148, 37201);
-- Shan'ti <Fruit Vendor>
DELETE FROM `npc_vendor` WHERE `entry`=3342 AND `item` IN (27856, 35948, 35949);
-- Kithas <Enchanting Supplies>
DELETE FROM `npc_vendor` WHERE `entry`=3346 AND `item`=6342;
INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3346, 6342, 1, 7200);
-- Kor'geld <Alchemy Supplies>
DELETE FROM `npc_vendor` WHERE `entry`=3348 AND `item`=40411;
-- Asoran <General Goods Vendor>
DELETE FROM `npc_vendor` WHERE `entry`=3350 AND `item` IN (28053, 28060);
-- Magenius <Reagents Vendor>
DELETE FROM `npc_vendor` WHERE `entry`=3351 AND `item` IN (22147, 22148, 37201);
-- Gorina <Mining Supplier>
DELETE FROM `npc_vendor` WHERE `entry`=3358 AND `item` IN (20815, 20824);
-- Ogunaro Wolfrunner <Kennel Master>
DELETE FROM `npc_vendor` WHERE `entry`=3362 AND `item`=46099;
-- Borya <Tailoring Supplies>
DELETE FROM `npc_vendor` WHERE `entry`=3364 AND `item`=38426;
-- Tamar <Leatherworking Supplies>
DELETE FROM `npc_vendor` WHERE `entry`=3366 AND `item`=38426;
-- Felika <General Trade Goods Merchant>
DELETE FROM `npc_vendor` WHERE `entry`=3367 AND `item` IN (14341, 18256, 20856);
DELETE FROM `npc_vendor` WHERE `entry`=3367 AND `item` IN (2324, 2605, 6260, 6529);
INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (3367, 2324), (3367, 2605), (3367, 6260), (3367, 6529);
-- Borstan <Meat Vendor>
DELETE FROM `npc_vendor` WHERE `entry`=3368 AND `item` IN (27854, 33454, 35953);
-- Xen'to <Cooking Supplier>
DELETE FROM `npc_vendor` WHERE `entry`=3400 AND `item`=30817;
-- Jin'sora <Bow Merchant>
DELETE FROM `npc_vendor` WHERE `entry`=3410 AND `item` IN (11303, 11306, 11307, 28053);
-- Sovik <Engineering Supplies>
DELETE FROM `npc_vendor` WHERE `entry`=3413 AND `item` IN (22729, 39684, 40533);
-- Garyl <Tabard Vendor>
DELETE FROM `npc_vendor` WHERE `entry`=5188 AND `item` IN (15197, 15199, 19031, 19505, 24004, 31773, 31775, 31776, 31777, 31778, 31779, 31780, 31781, 31804, 32445, 32828, 35221);
-- Shimra <General Trade Goods Merchant>
DELETE FROM `npc_vendor` WHERE `entry`=5817 AND `item` IN (10648, 14341, 18256, 30817, 39354);
-- Innkeeper Gryshka <Innkeeper>
DELETE FROM `npc_vendor` WHERE `entry`=6929 AND `item` IN (27854, 28399, 33444, 33445, 33454, 35953, 35954);
-- Legionnaire Teena
DELETE FROM `npc_vendor` WHERE `entry`= 12788;
SET @Stonehide := 112793; -- Brave Stonehide <Officer Accessories Quartermaster>, Vanilla SET @Stonehide := 112793; -- Brave Stonehide <Officer Accessories Quartermaster>, Vanilla
SET @Zarg := 112794; -- Stone Guard Zarg <Food and Drink>, Vanilla SET @Zarg := 112794; -- Stone Guard Zarg <Food and Drink>, Vanilla
@@ -551,6 +473,9 @@ DELETE FROM `creature` WHERE `id1` IN
34063); -- Blood Guard Zar'shi <Northrend Armor Quartermaster> 34063); -- Blood Guard Zar'shi <Northrend Armor Quartermaster>
/* NPC Garyl - Remove non-Vanilla Tabards */
DELETE FROM `npc_vendor` WHERE `entry`= 5188 AND `item` IN (15197, 15199, 19031, 19505, 24004, 31773, 31775, 31776, 31777, 31778, 31779, 31780, 31781, 31804, 32445, 32828, 35221);
-- Nogg Quest Flags fix -- Nogg Quest Flags fix
UPDATE `creature_template` SET `npcflag` = `npcflag` | 2 WHERE `entry` = 3412; UPDATE `creature_template` SET `npcflag` = `npcflag` | 2 WHERE `entry` = 3412;

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

@@ -78,7 +78,7 @@ UPDATE `creature_template` SET `subname` = 'Weapon Crafter' WHERE `entry` = 723
-- Lieutenant Rachel Vaccar <Outland Armor Quartermaster> -- Lieutenant Rachel Vaccar <Outland Armor Quartermaster>
UPDATE `creature_template` SET `subname` = NULL, `npcflag` = 0 WHERE `entry` = 12778; UPDATE `creature_template` SET `subname` = NULL, `npcflag` = 0 WHERE `entry` = 12778;
UPDATE `creature_template_locale` SET `Title` = NULL WHERE `entry` = 12778; UPDATE `creature_template_locale` SET `Title` = NULL WHERE `entry` = 12778;
DELETE FROM `npc_vendor` WHERE `entry`= 12778; -- was placed in battlegrounds during Vanilla and TBC. needs to be hidden until wotlk
DELETE FROM `npc_trainer` WHERE `ID` IN (1430, 2327, 5482, 5493, 5513); DELETE FROM `npc_trainer` WHERE `ID` IN (1430, 2327, 5482, 5493, 5513);
INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES
@@ -89,76 +89,6 @@ INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES
(5513, -390000); -- Gelman Stonehand <Mining Trainer> (5513, -390000); -- Gelman Stonehand <Mining Trainer>
-- the following should perhaps go to vanilla_vendors
-- Elaine Trias <Mistress of Cheese>
DELETE FROM `npc_vendor` WHERE `entry` = 483 AND `item` IN (27857, 33443, 35952);
-- Keldric Boucher <Alchemy Supplies & Reagents>
DELETE FROM `npc_vendor` WHERE `entry` = 1257 AND `item` IN (22147, 22148, 37201, 40411);
-- Kyra Boucher <Reagents>
DELETE FROM `npc_vendor` WHERE `entry` = 1275 AND `item` IN (22147, 22148, 37201);
-- Edna Mullby <Trade Supplies>
DELETE FROM `npc_vendor` WHERE `entry` = 1286 AND `item` IN (14341, 18256, 20856);
DELETE FROM `npc_vendor` WHERE `entry` = 1286 AND `item` IN (2324, 2605, 2928, 6260, 6529);
INSERT INTO `npc_vendor` (`entry`, `item`) VALUES (1286, 2324), (1286, 2605), (1286, 2928), (1286, 6260), (1286, 6529);
-- Frederick Stover <Bow & Arrow Merchant>
DELETE FROM `npc_vendor` WHERE `entry` = 1298 AND `item` IN (11303, 11306, 11307, 28053);
-- Bernard Gump <Florist>
DELETE FROM `npc_vendor` WHERE `entry` = 1302 AND `item` IN (785, 2449, 2453, 3355, 3356, 3357);
-- Charys Yserian <Arcane Trinkets Vendor>
DELETE FROM `npc_vendor` WHERE `entry` = 1307 AND `item` IN (22147, 22148, 37201);
-- Owen Vaughn <Reagent Vendor>
DELETE FROM `npc_vendor` WHERE `entry` = 1308 AND `item` IN (22147, 22148, 37201);
-- Maria Lumere <Alchemy Supplies>
DELETE FROM `npc_vendor` WHERE `entry` = 1313 AND `item`=40411;
-- Jasper Fel <Shady Dealer>
DELETE FROM `npc_vendor` WHERE `entry` = 1325 AND `item` IN (21835, 21927, 22053, 22054, 22055, 43230, 43231, 43232, 43233, 43234, 43235, 43237);
-- Sloan McCoy <Poison Supplier>
DELETE FROM `npc_vendor` WHERE `entry` = 1326 AND `item` IN (21835, 21927, 22053, 22054, 22055, 43230, 43231, 43232, 43233, 43234, 43235, 43237);
-- Alexandra Bolero <Tailoring Supplies>
DELETE FROM `npc_vendor` WHERE `entry` = 1347 AND `item`=38426;
-- Brother Cassius <Reagent Vendor>
DELETE FROM `npc_vendor` WHERE `entry` = 1351 AND `item` IN (22147, 22148, 37201);
-- Thomas Miller <Baker>
DELETE FROM `npc_vendor` WHERE `entry` = 3518 AND `item` IN (27855, 33449, 35950);
-- Bren Trias <Apprentice of Cheese>
DELETE FROM `npc_vendor` WHERE `entry` = 4981 AND `item` IN (27857, 28399, 33443, 33444, 33445, 35952, 35954);
-- Rebecca Laughlin <Tabard Designer>
DELETE FROM `npc_vendor` WHERE `entry` = 5193 AND `item` IN (15196, 15198, 19032, 19506, 23999, 31774, 31775, 31776, 31777, 31778, 31779, 31780, 31781, 31804, 32445, 32828, 35221);
-- Eldraeith <Herbalism Supplier>
DELETE FROM `npc_vendor` WHERE `entry` = 5503 AND `item` IN (18256, 40411);
-- Brooke Stonebraid <Mining Supplies>
DELETE FROM `npc_vendor` WHERE `entry` = 5514 AND `item` IN (20815, 20824);
-- Billibub Cogspinner <Engineering Supplies>
DELETE FROM `npc_vendor` WHERE `entry` = 5519 AND `item` IN (39684, 40533);
-- Jillian Tanner <Leatherworking Supplies>
DELETE FROM `npc_vendor` WHERE `entry` = 5565 AND `item`=38426;
-- Innkeeper Allison <Innkeeper>
DELETE FROM `npc_vendor` WHERE `entry` = 6740 AND `item` IN (4536, 4537, 4538, 4539, 4602, 8953, 27855, 27856, 28399, 33444, 33445, 33449, 35948, 35949, 35950, 35954);
-- Lieutenant Rachel Vaccar <Outland Armor Quartermaster>
DELETE FROM `npc_vendor` WHERE `entry` = 12778;
SET @Biggins := 112781; -- Master Sergeant Biggins <Officer Accessories Quartermaster>, Vanilla SET @Biggins := 112781; -- Master Sergeant Biggins <Officer Accessories Quartermaster>, Vanilla
SET @Clate := 112785; -- Stone Guard Zarg <Food and Drink>, Vanilla SET @Clate := 112785; -- Stone Guard Zarg <Food and Drink>, Vanilla
SET @Wrynn := 629611; -- creating copy with 'npc_king_varian_wrynn' script, to prevent AC worldserver error for not using the script SET @Wrynn := 629611; -- creating copy with 'npc_king_varian_wrynn' script, to prevent AC worldserver error for not using the script
@@ -460,6 +390,8 @@ DELETE FROM `creature` WHERE `id1` IN
34075, -- Captain Dirgehammer <Armor Quartermaster> 34075, -- Captain Dirgehammer <Armor Quartermaster>
34081); -- Captain O'Neal <Jewelcrafting Quartermaster> 34081); -- Captain O'Neal <Jewelcrafting Quartermaster>
/* NPC Rebecca Laughlin - Remove non-Vanilla Tabards */
DELETE FROM `npc_vendor` WHERE `entry`= 5193 AND `item` IN (15197, 15199, 19031, 19505, 24004, 31773, 31775, 31776, 31777, 31778, 31779, 31780, 31781, 31804, 32445, 32828, 35221);
-- Summon Felsteed (Warlock) -- Summon Felsteed (Warlock)
DELETE FROM `quest_offer_reward` WHERE `ID` = 4488; DELETE FROM `quest_offer_reward` WHERE `ID` = 4488;
@@ -497,14 +429,3 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_
-- --
(12739, 0, 0, 1, 2, 0, 100, 0, 0, 30, 0, 0, 0, 0, 11, 8599, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Onyxias Elite Guard - Between 0-30% Health - Cast Enrage'), (12739, 0, 0, 1, 2, 0, 100, 0, 0, 30, 0, 0, 0, 0, 11, 8599, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Onyxias Elite Guard - Between 0-30% Health - Cast Enrage'),
(12739, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Onyxias Elite Guard - On Enrage - Say Line 0'); (12739, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Onyxias Elite Guard - On Enrage - Say Line 0');
-- this should probably go to vanilla_vendors
-- Remove non-Vanilla food items from Stormwind vendors
DELETE FROM npc_vendor WHERE entry = 483 and item IN (27857, 33443, 35952);
DELETE FROM npc_vendor WHERE entry = 3518 and item IN (27855, 33449, 35950);
DELETE FROM npc_vendor WHERE entry = 3003 and item IN (27855, 33449, 35950);
DELETE FROM npc_vendor WHERE entry = 4255 and item IN (27854, 27855, 27856, 27857, 27858, 27860, 28399, 29448, 29449, 29450, 29451, 29452, 33443, 33444, 33445, 33449, 33451, 33454, 35948, 35949, 35950, 35951, 35952, 35953, 35954);
DELETE FROM npc_vendor WHERE entry = 4981 and item IN (27857, 28399, 33443, 33444, 33445, 35952, 35954);
DELETE FROM npc_vendor WHERE entry = 5109 and item IN (27855, 33449, 35950);
DELETE FROM npc_vendor WHERE entry = 6740 and item IN (27855, 27856, 28399, 33444, 33445, 33449, 35948, 35949, 35950, 35954);
DELETE FROM npc_vendor WHERE entry = 10367 and item IN (27854, 27855, 27856, 27857, 27858, 27860, 28399, 29448, 29449, 29450, 29451, 29452, 33443, 33444, 33445, 33449, 33451, 33454, 35948, 35949, 35950, 35951, 35952, 35953, 35954, 27859, 29453, 33452, 35947);

36
data/sql/world/base/zone_thunder_bluff.sql
View File

@@ -13,6 +13,8 @@ UPDATE `creature_template` SET `subname` = 'Expert Leatherworker' WHERE `ent
UPDATE `creature_template` SET `npcflag` = 81, `trainer_type` = 2 WHERE `entry` IN (3008, 10278, 11047, 11051, 11071, 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); UPDATE `creature_template` SET `type_flags` = 134217728 WHERE `entry` IN (3004, 3007, 3009, 3011, 11084);
/* NPC Thrumn - Remove non-Vanilla Tabards */
DELETE FROM `npc_vendor` WHERE `entry`= 5189 AND `item` IN (15197, 15199, 19031, 19505, 24004, 31773, 31775, 31776, 31777, 31778, 31779, 31780, 31781, 31804, 32445, 32828, 35221);
DELETE FROM `npc_trainer` WHERE `ID` IN (2798, 2998, 3001, 3004, 3007, 3008, 3009, 3011, 3013, 3026, 3028, 7089, 10278, 11047, 11051, 11071, 11084); 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 INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES
@@ -77,40 +79,6 @@ UPDATE `creature_template` SET `subname` = 'General Goods Vendor' WHERE `en
UPDATE `creature_template` SET `subname` = 'Trade Goods Supplier' WHERE `entry` = 8363;-- Shadi Mistrunner <Trade Goods Supplier> UPDATE `creature_template` SET `subname` = 'Trade Goods Supplier' WHERE `entry` = 8363;-- Shadi Mistrunner <Trade Goods Supplier>
-- Kurm Stonehoof <Mining Supplier>
DELETE FROM `npc_vendor` WHERE `entry`=3002 AND `item` IN (20815, 20824);
-- Fyr Mistrunner <Bread Vendor>
DELETE FROM `npc_vendor` WHERE `entry`=3003 AND `item` IN (27855, 33449, 35950);
-- Mahu <Leatherworking & Tailoring Supplies>
DELETE FROM `npc_vendor` WHERE `entry`=3005 AND `item`=38426;
-- Nida Winterhoof <Herbalism Supplier>
DELETE FROM `npc_vendor` WHERE `entry`=3014 AND `item`=40411;
-- Kuna Thunderhorn <Bowyer & Fletching Goods>
DELETE FROM `npc_vendor` WHERE `entry`=3015 AND `item`=28053;
-- Nata Dawnstrider <Enchanting Supplies>
DELETE FROM `npc_vendor` WHERE `entry`=3012 AND `item`=6342;
INSERT INTO `npc_vendor` (`entry`, `item`, `maxcount`, `incrtime`) VALUES (3012, 6342, 1, 7200);
-- Kaga Mistrunner <Meat Vendor>
DELETE FROM `npc_vendor` WHERE `entry`=3025 AND `item` IN (27854, 33454, 35953);
-- Naal Mistrunner <Cooking Supplier>
DELETE FROM `npc_vendor` WHERE `entry`=3027 AND `item`=30817;
-- Thrumn <Tabard Vendor>
DELETE FROM `npc_vendor` WHERE `entry`=5189 AND `item` IN (15197, 15199, 19031, 19505, 24004, 31773, 31775, 31776, 31777, 31778, 31779, 31780, 31781, 31804, 32445, 32828, 35221);
-- Innkeeper Pala <Innkeeper>
DELETE FROM `npc_vendor` WHERE `entry`=6746 AND `item` IN (27857, 28399, 33443, 33444, 33445, 35952, 35954);
-- Chepi <Reagent Vendor>
DELETE FROM `npc_vendor` WHERE `entry`=8361 AND `item` IN (22147, 22148, 37201, 44605, 44614, 44615);
-- Evergreen Herb Casing should drop random herbs - was changed to WotLK to drop only Morrowgrain and Mutated Morrowgrain -- Evergreen Herb Casing should drop random herbs - was changed to WotLK to drop only Morrowgrain and Mutated Morrowgrain
DELETE FROM `item_loot_template` WHERE `Entry` = 11024; DELETE FROM `item_loot_template` WHERE `Entry` = 11024;
INSERT INTO `item_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES INSERT INTO `item_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES

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

@@ -143,10 +143,6 @@ INSERT INTO `npc_trainer` (`ID`, `SpellID`) VALUES
(5759, -350000), -- Nurse Neela <First Aid Trainer> (5759, -350000), -- Nurse Neela <First Aid Trainer>
(6289, -400000); -- Rand Rhobart <Skinner> (6289, -400000); -- Rand Rhobart <Skinner>
DELETE FROM `npc_vendor` WHERE `entry` = 2118 AND `item` IN (10648, 30817, 39354); -- Abigail Shiel <Trade Supplies>
DELETE FROM `npc_vendor` WHERE `entry` = 3548 AND `item` = 40411; -- Selina Weston <Alchemy & Herbalism Supplies>
DELETE FROM `npc_vendor` WHERE `entry` = 4731 AND `item` IN (46308, 47101); -- Zachariah Post <Undead Horse Merchant>
/* Quests */ /* Quests */

6
data/sql/world/base/zone_westfall.sql
View File

@@ -122,12 +122,6 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_
(1424, 0, 2, 0, 2, 0, 100, 1, 0, 15, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Master Digger - Between 0-15% Health - Flee For Assist (No Repeat)'); (1424, 0, 2, 0, 2, 0, 100, 1, 0, 15, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Master Digger - Between 0-15% Health - Flee For Assist (No Repeat)');
-- Gina MacGregor <Trade Supplies>
DELETE FROM `npc_vendor` WHERE `entry` = 843 AND `item` = 39354;
-- Christopher Hewen <General Trade Goods Vendor>
DELETE FROM `npc_vendor` WHERE `entry` = 8934 AND `item` IN (10648, 14341, 18256, 30817, 39354);
-- Restore Defias Pillager to original Fireball spell (was nerfed in 2.3) -- Restore Defias Pillager to original Fireball spell (was nerfed in 2.3)
DELETE FROM `creature_template_spell` WHERE `CreatureID` = 589 AND `Index` = 0; DELETE FROM `creature_template_spell` WHERE `CreatureID` = 589 AND `Index` = 0;
INSERT INTO `creature_template_spell` (`CreatureID`, `Index`, `Spell`, `VerifiedBuild`) VALUES (589, 0, 19816, 12340); INSERT INTO `creature_template_spell` (`CreatureID`, `Index`, `Spell`, `VerifiedBuild`) VALUES (589, 0, 19816, 12340);