Skip to content

Commit

Permalink
db: update db for new hallows end items
Browse files Browse the repository at this point in the history 
 - also override for dwarven hand cannon

Signed-off-by: jarves <jarveson@gmail.com>
  • Loading branch information
@jarveson
jarveson committed Oct 20, 2023
1 parent b332a54 commit 83ef62b
Show file tree
Hide file tree
Showing 7 changed files with 1,918 additions and 1,890 deletions.
Binary file modified assets/database/db.bin
View file
Binary file not shown.
589 changes: 297 additions & 292 deletions assets/database/db.json
View file

Large diffs are not rendered by default.

3,193 changes: 1,599 additions & 1,594 deletions assets/db_inputs/wowhead_gearplannerdb.txt
View file

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions assets/db_inputs/wowhead_item_tooltips.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44599,3 +44599,8 @@
54857,{"name":"Murkimus' Little Spear","quality":3,"icon":"inv_spear_05","tooltip":"<table><tr><td><!--nstart--><b class=\"q3\">Murkimus' Little Spear</b><!--nend--><!--ndstart--><!--ndend--><span class=\"q whtt-extra whtt-ilvl\"><br>Item Level <!--ilvl-->20</span><!--bo--><br>Binds when picked up<br>Unique<!--ebstats--><!--egstats--><!--eistats--><!--nameDescStats--></td></tr></table><table><tr><td><span class=\"q2\">Use: <a href=\"/wotlk/spell=75936/murkimus-the-gladiator\">Teaches you how to summon this companion.</a></span><br><span class=\"q2\"><a href=\"/wotlk/spell=75936/murkimus-the-gladiator\" class=\"q2\">Right Click to summon and dismiss Murkimus the Gladiator.</a></span></td></tr></table>","spells":[],"completion_category":"15-2"}
54860,{"name":"X-53 Touring Rocket","quality":4,"icon":"ability_mount_rocketmount2","tooltip":"<table><tr><td><!--nstart--><b class=\"q4\">X-53 Touring Rocket</b><!--nend--><!--ndstart--><!--ndend--><span class=\"q whtt-extra whtt-ilvl\"><br>Item Level <!--ilvl-->60</span><!--bo--><br>Binds when picked up<br>Unique<br />Mount<!--ebstats--><!--egstats--><!--eistats--><!--nameDescStats--></td></tr></table><table><tr><td>Requires Level <!--rlvl-->60<br>Requires <a href=\"/wotlk/skill=762/riding\" class=\"q1\">Riding</a> (225)<br><span class=\"q2\">Use: <a href=\"/wotlk/spell=75973/x-53-touring-rocket\">Teaches you how to summon this mount.</a></span><br><span class=\"q2\"><a href=\"/wotlk/spell=75973/x-53-touring-rocket\" class=\"q2\">Summons an X-53 Touring Rocket. &nbsp;This two-passenger mount's speed depends upon your riding skill.</a></span></td></tr></table>","spells":[],"completion_category":"15-5"}
56806,{"name":"Mini Thor","quality":3,"icon":"t_roboticon","tooltip":"<table><tr><td><!--nstart--><b class=\"q3\">Mini Thor</b><!--nend--><!--ndstart--><!--ndend--><span class=\"q whtt-extra whtt-ilvl\"><br>Item Level <!--ilvl-->20</span><br>Binds to account<!--ue--><!--ebstats--><!--egstats--><!--eistats--><!--nameDescStats--></td></tr></table><table><tr><td><span class=\"q2\">Use: <a href=\"/wotlk/spell=78381/mini-thor\">Teaches you how to summon Mini Thor.</a></span><br><span class=\"q2\"><a href=\"/wotlk/spell=78381/mini-thor\" class=\"q2\">Right Click to summon and dismiss Mini Thor.</a></span></td></tr></table>","spells":[],"completion_category":"15-2"}
211817,{"name":"Ring of Ghoulish Glee","quality":4,"icon":"inv_misc_bag_28_halloween","tooltip":"<table><tr><td><!--nstart--><b class=\"q4\">Ring of Ghoulish Glee</b><!--nend--><!--ndstart--><!--ndend--><span class=\"q\"><br>Item Level <!--ilvl-->232</span><!--bo--><br>Binds when picked up<br>Unique<table width=\"100%\"><tr><td>Finger</td><th><!--scstart4:-2--><span class=\"q1\"></span><!--scend--></th></tr></table><span><!--stat3-->+45 Agility</span><br><span><!--stat7-->+68 Stamina</span><!--ebstats--><!--egstats--><!--eistats--><!--nameDescStats--><!--e--><!--ps--></td></tr></table><table><tr><td>Requires Level <!--rlvl-->80<br><span class=\"q2\">Equip: Improves critical strike rating by <!--rtg32-->48.</span><br><span class=\"q2\">Equip: Improves hit rating by <!--rtg31-->39.</span><br><span class=\"q2\">Equip: Increases attack power by <!--rtg38-->134.</span><!--itemEffects:1--><div class=\"whtt-extra whtt-droppedby\">Dropped by: Headless Horseman</div><div class=\"whtt-extra whtt-dropchance\">Drop Chance: 0.80%</div></td></tr></table><!--i?211817:1:80:80-->","spells":[]}
211844,{"name":"The Horseman's Seal","quality":4,"icon":"inv_misc_bag_28_halloween","tooltip":"<table><tr><td><!--nstart--><b class=\"q4\">The Horseman's Seal</b><!--nend--><!--ndstart--><!--ndend--><span class=\"q\"><br>Item Level <!--ilvl-->232</span><!--bo--><br>Binds when picked up<br>Unique<table width=\"100%\"><tr><td>Finger</td><th><!--scstart4:-2--><span class=\"q1\"></span><!--scend--></th></tr></table><span><!--stat7-->+50 Stamina</span><br><span><!--stat5-->+51 Intellect</span><!--ebstats--><!--egstats--><!--eistats--><!--nameDescStats--><!--e--><!--ps--></td></tr></table><table><tr><td>Requires Level <!--rlvl-->80<br><span class=\"q2\">Equip: Improves hit rating by <!--rtg31-->39.</span><br><span class=\"q2\">Equip: Improves haste rating by <!--rtg36-->48.</span><br><span class=\"q2\">Equip: Increases spell power by <!--rtg45-->78.</span><!--itemEffects:1--><div class=\"whtt-extra whtt-droppedby\">Dropped by: Headless Horseman</div><div class=\"whtt-extra whtt-dropchance\">Drop Chance: 0.77%</div></td></tr></table><!--i?211844:1:80:80-->","spells":[]}
211847,{"name":"Wicked Witch's Band","quality":4,"icon":"inv_misc_bag_28_halloween","tooltip":"<table><tr><td><!--nstart--><b class=\"q4\">Wicked Witch's Band</b><!--nend--><!--ndstart--><!--ndend--><span class=\"q\"><br>Item Level <!--ilvl-->232</span><!--bo--><br>Binds when picked up<br>Unique<table width=\"100%\"><tr><td>Finger</td><th><!--scstart4:-2--><span class=\"q1\"></span><!--scend--></th></tr></table><span><!--stat7-->+50 Stamina</span><br><span><!--stat5-->+51 Intellect</span><!--ebstats--><!--egstats--><!--eistats--><!--nameDescStats--><!--e--><!--ps--></td></tr></table><table><tr><td>Requires Level <!--rlvl-->80<br><span class=\"q2\">Equip: Improves critical strike rating by <!--rtg32-->45.</span><br><span class=\"q2\">Equip: Restores <!--rtg43-->23 mana per 5 sec.</span><br><span class=\"q2\">Equip: Increases spell power by <!--rtg45-->78.</span><!--itemEffects:1--><div class=\"whtt-extra whtt-droppedby\">Dropped by: Headless Horseman</div><div class=\"whtt-extra whtt-dropchance\">Drop Chance: 0.78%</div></td></tr></table><!--i?211847:1:80:80-->","spells":[]}
211850,{"name":"The Horseman's Horrific Helm","quality":4,"icon":"inv_helmet_21","tooltip":"<table><tr><td><!--nstart--><b class=\"q4\">The Horseman's Horrific Helm</b><!--nend--><!--ndstart--><!--ndend--><span class=\"q\"><br>Item Level <!--ilvl-->232</span><!--bo--><br>Binds when picked up<!--ue--><table width=\"100%\"><tr><td>Head</td><th><!--scstart4:4--><span class=\"q1\">Plate</span><!--scend--></th></tr></table><span><!--amr-->1925 Armor</span><br><span><!--stat4-->+120 Strength</span><br><span><!--stat7-->+137 Stamina</span><!--ebstats--><!--egstats--><!--eistats--><!--nameDescStats--><!--e--><br /><br><a href=\"/wotlk/items/gems?filter=81;1;0\" class=\"socket-meta q0\">Meta Socket</a><br><a href=\"/wotlk/items/gems?filter=81;3;0\" class=\"socket-yellow q0\">Yellow Socket</a><!--ps--><br><!--sb--><span class=\"q0\">Socket Bonus: +8 Strength</span><br /><br />Durability 100 / 100</td></tr></table><table><tr><td>Requires Level <!--rlvl-->80<br><span class=\"q2\">Equip: Improves critical strike rating by <!--rtg32-->63.</span><br><span class=\"q2\">Equip: Improves hit rating by <!--rtg31-->50.</span><br><span class=\"q2\">Use: <a href=\"/wotlk/spell=43873/headless-horseman-laugh\" class=\"q2\">Let the Horseman laugh through you.</a> (30 Sec Cooldown)</span><!--itemEffects:1--></td></tr></table><!--i?211850:1:80:80-->","spells":[]}
211851,{"name":"The Horseman's Baleful Blade","quality":4,"icon":"inv_sword_07","tooltip":"<table><tr><td><!--nstart--><b class=\"q4\">The Horseman's Baleful Blade</b><!--nend--><!--ndstart--><!--ndend--><span class=\"q\"><br>Item Level <!--ilvl-->232</span><!--bo--><br>Binds when picked up<br>Unique<table width=\"100%\"><tr><td>Main Hand</td><th><!--scstart2:7--><span class=\"q1\">Sword</span><!--scend--></th></tr></table><table width=\"100%\"><tr>\n <td><span><!--dmg-->338 - 628 Damage</span></td>\n <th>Speed <!--spd-->2.70</th>\n</tr></table><!--dps-->(178.89 damage per second)<br><span><!--stat3-->+35 Agility</span><br><span><!--stat7-->+52 Stamina</span><!--ebstats--><!--egstats--><!--eistats--><!--nameDescStats--><!--e--><!--ps--><br>Durability 105 / 105</td></tr></table><table><tr><td>Requires Level <!--rlvl-->80<br><span class=\"q2\">Equip: Improves hit rating by <!--rtg31-->34.</span><br><span class=\"q2\">Equip: Increases attack power by <!--rtg38-->102.</span><br><span class=\"q2\">Equip: Increases your expertise rating by <!--rtg37-->34.</span><br><span class=\"q2\">Use: <a href=\"/wotlk/spell=50070/summon-pumpkin-soldiers\" class=\"q2\">Summon Pumpkin Soldiers to burn your foes.</a> (10 Min Cooldown)</span><!--itemEffects:1--><br><span class=\"q\">&quot;Soldiers arise, stand and fight!&quot;</span></td></tr></table><!--i?211851:1:80:80-->","spells":[]}
6 changes: 3 additions & 3 deletions tools/database/gen_db/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,16 @@ func main() {
db.WriteJson(fmt.Sprintf("%s/atlasloot_db.json", inputsDir))
return
} else if *genAsset == "wowhead-items" {
database.NewWowheadItemTooltipManager(fmt.Sprintf("%s/wowhead_item_tooltips.csv", inputsDir)).Fetch(int32(*minId), int32(*maxId))
database.NewWowheadItemTooltipManager(fmt.Sprintf("%s/wowhead_item_tooltips.csv", inputsDir)).Fetch(int32(*minId), int32(*maxId), database.OtherItemIdsToFetch)
return
} else if *genAsset == "wowhead-spells" {
database.NewWowheadSpellTooltipManager(fmt.Sprintf("%s/wowhead_spell_tooltips.csv", inputsDir)).Fetch(int32(*minId), int32(*maxId))
database.NewWowheadSpellTooltipManager(fmt.Sprintf("%s/wowhead_spell_tooltips.csv", inputsDir)).Fetch(int32(*minId), int32(*maxId), []string{})
return
} else if *genAsset == "wowhead-gearplannerdb" {
tools.WriteFile(fmt.Sprintf("%s/wowhead_gearplannerdb.txt", inputsDir), tools.ReadWebRequired("https://nether.wowhead.com/wotlk/data/gear-planner?dv=100"))
return
} else if *genAsset == "wotlk-items" {
database.NewWotlkItemTooltipManager(fmt.Sprintf("%s/wotlk_items_tooltips.csv", inputsDir)).Fetch(int32(*minId), int32(*maxId))
database.NewWotlkItemTooltipManager(fmt.Sprintf("%s/wotlk_items_tooltips.csv", inputsDir)).Fetch(int32(*minId), int32(*maxId), []string{})
return
} else if *genAsset == "wago-db2-items" {
tools.WriteFile(fmt.Sprintf("%s/wago_db2_items.csv", inputsDir), tools.ReadWebRequired("https://wago.tools/db2/ItemSparse/csv?build=3.4.2.49311"))
Expand Down
12 changes: 12 additions & 0 deletions tools/database/overrides.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@ import (
"github.com/wowsims/wotlk/sim/core/stats"
)

var OtherItemIdsToFetch = []string{
// Hallow's End Ilvl bumped rings
"211817",
"211844",
"211847",
"211850",
"211851",
}

var ItemOverrides = []*proto.UIItem{
{ /** Destruction Holo-gogs */ Id: 32494, ClassAllowlist: []proto.Class{proto.Class_ClassMage, proto.Class_ClassPriest, proto.Class_ClassWarlock}},
{ /** Gadgetstorm Goggles */ Id: 32476, ClassAllowlist: []proto.Class{proto.Class_ClassShaman}},
Expand Down Expand Up @@ -155,6 +164,9 @@ var ItemOverrides = []*proto.UIItem{

// Cata pre-patch event items
{Id: 53492, Phase: 5},

// Heirloom Dwarven Handcannon, Wowhead partially glitchs out and shows us some other lvl calc for this
{Id: 44093, Stats: stats.Stats{stats.MeleeCrit: 30, stats.SpellCrit: 30, stats.Resilience: 13, stats.AttackPower: 34}.ToFloatArray()},
}

// Keep these sorted by item ID.
Expand Down
3 changes: 2 additions & 1 deletion tools/database/tooltip_manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func (tm *TooltipManager) FetchFromWeb(idsToFetch []string) map[string]string {
return newTooltips
}

func (tm *TooltipManager) Fetch(minId, maxId int32) {
func (tm *TooltipManager) Fetch(minId, maxId int32, otherIds []string) {
strDB := tools.ReadMapOrNil(tm.FilePath)

var idsToFetch []string
Expand All @@ -63,6 +63,7 @@ func (tm *TooltipManager) Fetch(minId, maxId int32) {
idsToFetch = append(idsToFetch, id)
}
}
idsToFetch = append(idsToFetch, otherIds...)

newTooltips := tm.FetchFromWeb(idsToFetch)

Expand Down

0 comments on commit 83ef62b

Please sign in to comment.