From 06b52e940134affefa520c577db3c302c8ad3283 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E4=BD=A9=E8=8C=B9?= Date: Sat, 3 Sep 2022 16:24:29 -0600 Subject: [PATCH] Do not use models or spells removed from game files --- sql/world/base/item_changes.sql | 15 --------------- sql/world/base/vanilla_creature_values.sql | 12 ++++++------ 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/sql/world/base/item_changes.sql b/sql/world/base/item_changes.sql index 1baa003..2949e7a 100644 --- a/sql/world/base/item_changes.sql +++ b/sql/world/base/item_changes.sql @@ -9298,9 +9298,6 @@ UPDATE `item_template` SET `spellid_1` = 18063, `spelltrigger_1` = 1 WHERE entry /* Test Block Chest */ UPDATE `item_template` SET `spellid_1` = 18064, `spelltrigger_1` = 1 WHERE entry=13715; -/* Test Haste Chest */ -UPDATE `item_template` SET `spellid_1` = 18065, `spelltrigger_1` = 1 WHERE entry=13716; - /* Test Hit Chance Chest */ UPDATE `item_template` SET `spellid_1` = 18066, `spelltrigger_1` = 1 WHERE entry=13717; @@ -15082,18 +15079,12 @@ UPDATE `item_template` SET `BuyPrice` = 250218, `SellPrice` = 50043 WHERE entry= /* High Warlord's Left Claw */ UPDATE `item_template` SET `BuyPrice` = 251079, `SellPrice` = 50215 WHERE entry=18848; -/* Insignia of the Horde */ -UPDATE `item_template` SET `BuyPrice` = 15000, `SellPrice` = 3750, `ItemLevel` = 0, `spellid_1` = 23273, `spellcategorycooldown_1` = -1, `spellcategory_1` = 0 WHERE entry=18849; - /* Insignia of the Horde */ UPDATE `item_template` SET `BuyPrice` = 15000, `SellPrice` = 3750, `ItemLevel` = 0, `spellid_1` = 23274, `spellcategorycooldown_1` = -1, `spellcategory_1` = 0 WHERE entry=18850; /* Insignia of the Horde */ UPDATE `item_template` SET `BuyPrice` = 15000, `SellPrice` = 3750, `ItemLevel` = 0, `spellid_1` = 23276, `spellcategorycooldown_1` = -1, `spellcategory_1` = 0 WHERE entry=18851; -/* Insignia of the Horde */ -UPDATE `item_template` SET `BuyPrice` = 15000, `SellPrice` = 3750, `ItemLevel` = 0, `spellid_1` = 23273, `spellcategorycooldown_1` = -1, `spellcategory_1` = 0 WHERE entry=18852; - /* Insignia of the Horde */ UPDATE `item_template` SET `BuyPrice` = 15000, `SellPrice` = 3750, `ItemLevel` = 0, `spellid_1` = 23277, `spellcategorycooldown_1` = -1, `spellcategory_1` = 0 WHERE entry=18853; @@ -15106,12 +15097,6 @@ UPDATE `item_template` SET `BuyPrice` = 179726, `SellPrice` = 35945, `dmg_min1` /* Insignia of the Alliance */ UPDATE `item_template` SET `BuyPrice` = 15000, `SellPrice` = 3750, `ItemLevel` = 0, `spellid_1` = 5579, `spellcategorycooldown_1` = -1, `spellcategory_1` = 0 WHERE entry=18856; -/* Insignia of the Alliance */ -UPDATE `item_template` SET `BuyPrice` = 15000, `SellPrice` = 3750, `ItemLevel` = 0, `spellid_1` = 23273, `spellcategorycooldown_1` = -1, `spellcategory_1` = 0 WHERE entry=18857; - -/* Insignia of the Alliance */ -UPDATE `item_template` SET `BuyPrice` = 15000, `SellPrice` = 3750, `ItemLevel` = 0, `spellid_1` = 23273, `spellcategorycooldown_1` = -1, `spellcategory_1` = 0 WHERE entry=18858; - /* Insignia of the Alliance */ UPDATE `item_template` SET `BuyPrice` = 15000, `SellPrice` = 3750, `ItemLevel` = 0, `spellid_1` = 23274, `spellcategorycooldown_1` = -1, `spellcategory_1` = 0 WHERE entry=18859; diff --git a/sql/world/base/vanilla_creature_values.sql b/sql/world/base/vanilla_creature_values.sql index 840f63e..604cfd6 100644 --- a/sql/world/base/vanilla_creature_values.sql +++ b/sql/world/base/vanilla_creature_values.sql @@ -7932,7 +7932,7 @@ UPDATE `creature_template` SET `DamageModifier` = 0.8 WHERE `entry`=3649; UPDATE `creature_template` SET `DamageModifier` = 0.8 WHERE `entry`=3650; /* [UNUSED] Kolkar Observer */ -UPDATE `creature_template` SET `modelid2` = 1257, `detection_range` = 18.0, `DamageModifier` = 1.0 WHERE `entry`=3651; +UPDATE `creature_template` SET `detection_range` = 18.0, `DamageModifier` = 1.0 WHERE `entry`=3651; /* Trigore the Lasher */ UPDATE `creature_template` SET `minlevel` = 19, `maxlevel` = 19, `rank` = 2, `DamageModifier` = 3.9, `HealthModifier` = 3.0, `ArmorModifier` = 0.95, `mingold` = 25, `maxgold` = 125 WHERE `entry`=3652; @@ -14751,7 +14751,7 @@ UPDATE `creature_template` SET `minlevel` = 55, `maxlevel` = 55, `DamageModifier UPDATE `creature_template` SET `minlevel` = 55, `maxlevel` = 55, `DamageModifier` = 3.25, `ArmorModifier` = 1.4 WHERE `entry`=7824; /* Ambassador Ardalan */ -UPDATE `creature_template` SET `modelid1` = 7010, `DamageModifier` = 1.05, `ArmorModifier` = 1.4 WHERE `entry`=7826; +UPDATE `creature_template` SET `DamageModifier` = 1.05, `ArmorModifier` = 1.4 WHERE `entry`=7826; /* Teremus the Devourer */ UPDATE `creature_template` SET `rank` = 3, `DamageModifier` = 7.2, `ArmorModifier` = 1.5, `mingold` = 8283, `maxgold` = 41416 WHERE `entry`=7846; @@ -18813,7 +18813,7 @@ UPDATE `creature_template` SET `DamageModifier` = 4.8, `maxgold` = 1812 WHERE `e UPDATE `creature_template` SET `DamageModifier` = 8.35, `ArmorModifier` = 1.1, `maxgold` = 2093 WHERE `entry`=11445; /* Gordok Spirit */ -UPDATE `creature_template` SET `modelid3` = 13131, `ArmorModifier` = 1.1 WHERE `entry`=11446; +UPDATE `creature_template` SET `ArmorModifier` = 1.1 WHERE `entry`=11446; /* Mushgog */ UPDATE `creature_template` SET `speed_walk` = 1.0, `DamageModifier` = 5.45, `ArmorModifier` = 1.1, `BaseAttackTime` = 1150, `RangeAttackTime` = 1265, `mingold` = 168, `maxgold` = 838 WHERE `entry`=11447; @@ -20829,7 +20829,7 @@ UPDATE `creature_template` SET `speed_walk` = 1.0, `detection_range` = 18.0 WHER UPDATE `creature_template` SET `DamageModifier` = 3.2 WHERE `entry`=13084; /* Myrokos Silentform */ -UPDATE `creature_template` SET `modelid1` = 13150, `DamageModifier` = 1.0 WHERE `entry`=13085; +UPDATE `creature_template` SET `DamageModifier` = 1.0 WHERE `entry`=13085; /* Aggi Rumblestomp */ UPDATE `creature_template` SET `speed_walk` = 1.0, `DamageModifier` = 3.35, `ArmorModifier` = 0.8, `BaseAttackTime` = 2000, `RangeAttackTime` = 1310, `mingold` = 143, `maxgold` = 713 WHERE `entry`=13086; @@ -21966,7 +21966,7 @@ UPDATE `creature_template` SET `speed_walk` = 1.0, `DamageModifier` = 2.4, `Armo UPDATE `creature_template` SET `speed_walk` = 4.0, `speed_run` = 1.42857, `DamageModifier` = 2.05, `ArmorModifier` = 0.95 WHERE `entry`=14386; /* Lothos Riftwaker */ -UPDATE `creature_template` SET `modelid1` = 7010, `DamageModifier` = 5.4, `ArmorModifier` = 1.35 WHERE `entry`=14387; +UPDATE `creature_template` SET `DamageModifier` = 5.4, `ArmorModifier` = 1.35 WHERE `entry`=14387; /* Rogue Black Drake */ UPDATE `creature_template` SET `rank` = 1, `DamageModifier` = 3.0, `HealthModifier` = 3.0, `ManaModifier` = 2.0 WHERE `entry`=14388; @@ -25920,7 +25920,7 @@ UPDATE `creature_template` SET `speed_walk` = 1.0, `detection_range` = 18.0 WHER UPDATE `creature_template` SET `speed_walk` = 1.0, `detection_range` = 18.0 WHERE `entry`=16895; /* Midsummer Merchant */ -UPDATE `creature_template` SET `modelid2` = 16542, `minlevel` = 1, `maxlevel` = 1, `speed_walk` = 1.0, `DamageModifier` = 1.3 WHERE `entry`=16979; +UPDATE `creature_template` SET `minlevel` = 1, `maxlevel` = 1, `speed_walk` = 1.0, `DamageModifier` = 1.3 WHERE `entry`=16979; /* Midsummer Merchant Horde Costume */ UPDATE `creature_template` SET `minlevel` = 1, `maxlevel` = 1, `speed_walk` = 1.0, `DamageModifier` = 1.3 WHERE `entry`=16985;