Merge pull request #105 from wowsims/update-db

Use correct spell ids for enchants in spellIcons

Author: hillerstorm

assets/database/db.bin

@@ -18204,7 +18204,8 @@
 {"id":232016,"name":"Bubblier Brightbrew Charm","icon":"inv_drink_08","type":12,"socketBonus":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":4,"unique":true,"classAllowlist":[1,2,3,4,5,6,7,8,9,10,11],"scalingOptions":{"0":{"randPropPoints":456,"stats":{"2":456},"ilvl":353}}},
 {"id":232017,"name":"Bitterer Balebrew Charm","icon":"inv_drink_04","type":12,"socketBonus":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":4,"unique":true,"classAllowlist":[1,2,3,4,5,6,7,8,9,10,11],"scalingOptions":{"0":{"randPropPoints":456,"stats":{"2":456},"ilvl":353}}},
 {"id":232030,"name":"Direbrew's Bloodied Shanker","icon":"inv_drink_10","type":13,"weaponType":2,"handType":2,"socketBonus":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSpeed":2,"quality":4,"classAllowlist":[1,2,3,4,5,6,7,8,9,10,11],"scalingOptions":{"0":{"randPropPoints":263,"weaponDamageMin":1224,"weaponDamageMax":2273,"stats":{"1":138,"2":207,"5":80,"6":99},"ilvl":353}}},
-{"id":232031,"name":"Tremendous Tankard O' Terror","icon":"inv_drink_03","type":13,"weaponType":4,"handType":2,"socketBonus":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSpeed":2.6,"quality":4,"classAllowlist":[1,2,3,4,5,6,7,8,9,10,11],"scalingOptions":{"0":{"randPropPoints":263,"weaponDamageMin":1591,"weaponDamageMax":2955,"stats":{"1":138,"2":207,"6":94,"7":89},"ilvl":353}}}
+{"id":232031,"name":"Tremendous Tankard O' Terror","icon":"inv_drink_03","type":13,"weaponType":4,"handType":2,"socketBonus":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSpeed":2.6,"quality":4,"classAllowlist":[1,2,3,4,5,6,7,8,9,10,11],"scalingOptions":{"0":{"randPropPoints":263,"weaponDamageMin":1591,"weaponDamageMax":2955,"stats":{"1":138,"2":207,"6":94,"7":89},"ilvl":353}}},
+{"id":246583,"name":"Leafre's Ring of Incredible Haste","icon":"inv_misc_ring_generic_3","type":11,"socketBonus":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":4,"classAllowlist":[1,2,3,4,5,6,7,8,9,10,11],"scalingOptions":{"0":{"randPropPoints":49,"stats":{"7":20000},"ilvl":130}}}
 ],
 "randomSuffixes":[
 ],
@@ -18769,7 +18770,6 @@
 {"effectId":4805,"itemId":87560,"spellId":121194,"name":"Greater Ox Horn Inscription","icon":"inv_inscription_runescrolloffortitude_yellow","type":3,"stats":[0,0,300,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":4},
 {"effectId":4806,"itemId":87559,"spellId":121195,"name":"Greater Crane Wing Inscription","icon":"inv_inscription_runescrolloffortitude_yellow","type":3,"stats":[0,0,0,200,0,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":4},
 {"effectId":4807,"itemId":84578,"spellId":103465,"name":"Enchant Ring - Greater Strength","icon":"inv_scroll_03","type":11,"stats":[160,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1,"requiredProfession":3},
-{"effectId":4808,"spellId":121988,"name":"Enchant Weapon - Magic Weapon","icon":"trade_engraving","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":4822,"itemId":83764,"spellId":122387,"name":"Shadowleather Leg Armor","icon":"inv_misc_cataclysmarmorkit_02","type":9,"stats":[0,285,0,0,0,0,165,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
 {"effectId":4823,"itemId":83765,"spellId":122388,"name":"Angerhide Leg Armor","icon":"inv_misc_armorkit_mop_04","type":9,"stats":[285,0,0,0,0,0,165,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
 {"effectId":4824,"itemId":83763,"spellId":122386,"name":"Ironscale Leg Armor","icon":"inv_misc_armorkit_mop_01","type":9,"stats":[0,0,430,0,0,0,0,0,0,165,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3},

assets/database/db.json

@@ -509,7 +509,6 @@
   "4805": "+300 Stamina and +100 Dodge",
   "4806": "+200 Intellect and +100 Critical Strike",
   "4807": "+160 Strength",
-  "4808": "Magic Weapon",
   "4822": "+285 Agility and +165 Critical Strike",
   "4823": "+285 Strength and +165 Critical Strike",
   "4824": "+430 Stamina and +165 Dodge",

assets/database/leftover_db.bin

@@ -204,7 +204,7 @@ func main() {
 			db.AddItemIcon(enchant.ItemId, enchant.Icon, enchant.Name)
 		}
 		if enchant.SpellId != 0 {
-			db.AddSpellIcon(enchant.ItemId, enchant.Icon, enchant.Name)
+			db.AddSpellIcon(enchant.SpellId, enchant.Icon, enchant.Name)
 		}
 	}