Skip to content

Commit

Permalink
Merge pull request #1246 from hillerstorm/remove_unavailable_p4_items
Browse files Browse the repository at this point in the history
[Items] Remove unavailable p4 items and fix phases of dungeon loot
  • Loading branch information
hillerstorm authored Dec 3, 2024
2 parents 6cc8c6d + 190ad56 commit f3f1aff
Show file tree
Hide file tree
Showing 35 changed files with 283 additions and 2,080 deletions.
Binary file modified assets/database/db.bin
Binary file not shown.
218 changes: 26 additions & 192 deletions assets/database/db.json

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions assets/db_inputs/wowhead_spell_tooltips.csv
Original file line number Diff line number Diff line change
Expand Up @@ -74315,3 +74315,7 @@
114539,{"name":"[DNT] Quest Complete: Fun for the Little Ones TRACKER","icon":"trade_engineering","tooltip":"<a class=\"whtt-name\" href=\"/cata/spell=114539/dnt-quest-complete-fun-for-the-little-ones-tracker\"><b class=\"whtt-name\">[DNT] Quest Complete: Fun for the Little Ones TRACKER</b></a><br />Unlimited range<br />Instant","tooltip2":"","buff":"","quality":-1,"spells":{},"buffspells":{},"completion_category":"0"}
121805,{"name":"RAF Mount III","icon":"inv_mount_wingedlion","tooltip":"<table><tr><td><a class=\"whtt-name\" href=\"/cata/spell=121805/raf-mount-iii\"><b class=\"whtt-name\">RAF Mount III</b></a><br />1.5 sec cast</td></tr></table><table><tr><td><div class=\"q\">Summons and dismisses a RAF Mount III. &nbsp;This mount changes depending on your Riding skill and location.</div></td></tr></table>","tooltip2":"","buff":"<table><tr><td><b class=\"q\">RAF Mount III</b></td></tr></table><table><tr><td>Increases ground speed by &lt;ground speed&gt;%. (When flying is available) Increases flight speed by &lt;flying speed&gt;%. (When swimming) Increases swim speed by &lt;swimming speed&gt;%.</td></tr></table>","quality":-1,"spells":{},"buffspells":{},"completion_category":"0"}
121820,{"name":"Obsidian Nightwing","icon":"inv_misc_reforgedarchstone_01","tooltip":"<table><tr><td><a class=\"whtt-name\" href=\"/cata/spell=121820/obsidian-nightwing\"><b class=\"whtt-name\">Obsidian Nightwing</b></a><br />1.5 sec cast<br /><span class=\"wowhead-tooltip-requirements\">Requires level 1</span><br /></td></tr></table><table><tr><td><div class=\"q\">Transforms you into an Obsidian Nightwing, allowing you to fly very fast and carry an ally on your back. &nbsp;This is a flying mount.</div></td></tr></table>","tooltip2":"","buff":"<table><tr><td><b class=\"q\">Obsidian Nightwing</b></td></tr></table><table><tr><td>Increases ground speed by &lt;ground speed&gt;%. (When flying is available) Increases flight speed by &lt;flying speed&gt;%. (When swimming) Increases swim speed by &lt;swimming speed&gt;%.</td></tr></table>","quality":-1,"spells":{},"buffspells":{},"completion_category":"-5"}
1214948,{"name":"Explosive Shot","icon":"ability_hunter_explosiveshot","tooltip":"<a class=\"whtt-name\" href=\"/cata/spell=1214948/explosive-shot\"><b class=\"whtt-name\">Explosive Shot</b></a><br />100 yd range<br />Instant<div class=\"wowhead-tooltip-requirements\">Requires Hunter</div><span class=\"wowhead-tooltip-requirements\">Requires level 10</span><br />","tooltip2":"","buff":"","quality":-1,"spells":{},"buffspells":{},"completion_category":0}
1215484,{"name":"Explosive Shot","icon":"ability_hunter_explosiveshot","tooltip":"<table><tr><td><table width=\"100%\"><tr><td><a class=\"whtt-name\" href=\"/cata/spell=1215484/explosive-shot\"><b class=\"whtt-name\">Explosive Shot</b></a></td><th><b class=\"q0\"><br>Level <!--lvl-->85</b></th></tr></table>100 yd range<br />Instant<div class=\"wowhead-tooltip-requirements\">Requires Hunter</div><span class=\"wowhead-tooltip-requirements\">Requires level 10</span><br /></td></tr></table><table><tr><td><span class=\"wowhead-tooltip-requirements\">Requires Ranged Weapon</span><div class=\"q\">You fire an explosive charge into the enemy target, dealing (Ranged attack power * 0.273 + <!--pts1:2:0:1215484-->449<!---->) Fire damage. The charge will blast the target every second for an additional 2 sec.</div></td></tr></table><!--?1215484:1:85:85:15209:0:0:0-->","tooltip2":"","buff":"<table><tr><td><b class=\"q\">Explosive Shot</b></td></tr></table><table><tr><td>Taking <!--pts1:0:0:1215484-->411<!----> Fire damage every second.<br><span class=\"q\">2 seconds remaining</span></td></tr></table><!--?1215484:1:85:85:15209:0:0:0-->","quality":-1,"spells":{},"buffspells":{},"completion_category":0}
1215485,{"name":"Explosive Shot","icon":"ability_hunter_explosiveshot","tooltip":"<table><tr><td><table width=\"100%\"><tr><td><a class=\"whtt-name\" href=\"/cata/spell=1215485/explosive-shot\"><b class=\"whtt-name\">Explosive Shot</b></a></td><th><b class=\"q0\"><br>Level <!--lvl-->85</b></th></tr></table>100 yd range<br />Instant<div class=\"wowhead-tooltip-requirements\">Requires Hunter</div><span class=\"wowhead-tooltip-requirements\">Requires level 10</span><br /></td></tr></table><table><tr><td><span class=\"wowhead-tooltip-requirements\">Requires Ranged Weapon</span><div class=\"q\">You fire an explosive charge into the enemy target, dealing (Ranged attack power * 0.273 + <!--pts1:2:0:1215485-->449<!---->) Fire damage. The charge will blast the target every second for an additional 2 sec.</div></td></tr></table><!--?1215485:1:85:85:15210:0:0:0-->","tooltip2":"","buff":"<table><tr><td><b class=\"q\">Explosive Shot</b></td></tr></table><table><tr><td>Taking <!--pts1:0:0:1215485-->411<!----> Fire damage every second.<br><span class=\"q\">2 seconds remaining</span></td></tr></table><!--?1215485:1:85:85:15210:0:0:0-->","quality":-1,"spells":{},"buffspells":{},"completion_category":0}
1215486,{"name":"Explosive Shot","icon":"ability_hunter_explosiveshot","tooltip":"<table><tr><td><table width=\"100%\"><tr><td><a class=\"whtt-name\" href=\"/cata/spell=1215486/explosive-shot\"><b class=\"whtt-name\">Explosive Shot</b></a></td><th><b class=\"q0\"><br>Level <!--lvl-->85</b></th></tr></table>100 yd range<br />Instant<div class=\"wowhead-tooltip-requirements\">Requires Hunter</div><span class=\"wowhead-tooltip-requirements\">Requires level 10</span><br /></td></tr></table><table><tr><td><span class=\"wowhead-tooltip-requirements\">Requires Ranged Weapon</span><div class=\"q\">You fire an explosive charge into the enemy target, dealing (Ranged attack power * 0.273 + <!--pts1:2:0:1215486-->449<!---->) Fire damage. The charge will blast the target every second for an additional 2 sec.</div></td></tr></table><!--?1215486:1:85:85:15211:0:0:0-->","tooltip2":"","buff":"<table><tr><td><b class=\"q\">Explosive Shot</b></td></tr></table><table><tr><td>Taking <!--pts1:0:0:1215486-->411<!----> Fire damage every second.<br><span class=\"q\">2 seconds remaining</span></td></tr></table><!--?1215486:1:85:85:15211:0:0:0-->","quality":-1,"spells":{},"buffspells":{},"completion_category":0}
10 changes: 0 additions & 10 deletions sim/common/cata/stat_bonus_cds.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ func init() {
shared.NewStrengthActive(72450, 2144, time.Second*20, time.Minute*2) // Ruthless Gladiator's Badge of Victory - 390
shared.NewStrengthActive(73496, 2419, time.Second*20, time.Minute*2) // Cataclysmic Gladiator's Badge of Victory
shared.NewStrengthActive(69002, 1277, time.Second*15, time.Minute) // Essence of the Eternal Flame
shared.NewStrengthActive(77987, 2029, time.Second*15, time.Second*90) // Rotting Skull 384 - Not available to players
shared.NewStrengthActive(77116, 2290, time.Second*15, time.Second*90) // Rotting Skull 397 - Valor Points
shared.NewStrengthActive(78007, 2585, time.Second*15, time.Second*90) // Rotting Skull 410 - Not available to players

// AGILITY
shared.NewAgilityActive(63840, 1095, time.Second*15, time.Second*90) // Juju of Nimbleness
Expand All @@ -53,9 +51,7 @@ func init() {
shared.NewAgilityActive(72304, 2144, time.Second*20, time.Minute*2) // Ruthless Gladiator's Badge of Conquest - 390
shared.NewAgilityActive(73648, 2419, time.Second*20, time.Minute*2) // Cataclysmic Gladiator's Badge of Conquest
shared.NewAgilityActive(69001, 1277, time.Second*15, time.Minute) // Ancient Petrified Seed
shared.NewAgilityActive(77984, 2029, time.Second*15, time.Second*90) // Kiroptyric Sigil 384 - Not available to players
shared.NewAgilityActive(77113, 2290, time.Second*15, time.Second*90) // Kiroptyric Sigil 397 - Valor Points
shared.NewAgilityActive(78004, 2585, time.Second*15, time.Second*90) // Kiroptyric Sigil 410 - Not available to players

// SPIRIT
shared.NewSpiritActive(67101, 555, time.Second*20, time.Minute*2) // Unquenchable Flame
Expand All @@ -69,9 +65,7 @@ func init() {
shared.NewDodgeActive(65109, 1812, time.Second*20, time.Minute*2) // Vial of Stolen Memories (Heroic)
shared.NewDodgeActive(70143, 1700, time.Second*20, time.Minute*2) // Moonwell Phial
shared.NewDodgeActive(232015, 1520, time.Second*20, time.Minute*2) // Brawler's Trophy
shared.NewDodgeActive(77988, 2029, time.Second*15, time.Second*90) // Fire of the Deep 384 - Not available to players
shared.NewDodgeActive(77117, 2290, time.Second*15, time.Second*90) // Fire of the Deep 397 - Valor Points
shared.NewDodgeActive(78008, 2585, time.Second*15, time.Second*90) // Fire of the Deep 410 - Not available to players

// SpellPower
shared.NewSpellPowerActive(61429, 970, time.Second*15, time.Second*90) // Insignia of the Earthen Lord
Expand All @@ -85,12 +79,8 @@ func init() {
shared.NewSpellPowerActive(70401, 2029, time.Second*20, time.Minute*2) // Ruthless Gladiator's Badge of Dominance - 384
shared.NewSpellPowerActive(72448, 2144, time.Second*20, time.Minute*2) // Ruthless Gladiator's Badge of Dominance - 390
shared.NewSpellPowerActive(73498, 2419, time.Second*20, time.Minute*2) // Cataclysmic Gladiator's Badge of Dominance
shared.NewSpellPowerActive(77985, 2029, time.Second*15, time.Second*90) // Bottled Wishes 384 - Not available to players
shared.NewSpellPowerActive(77114, 2290, time.Second*15, time.Second*90) // Bottled Wishes 397 - Valor Points
shared.NewSpellPowerActive(78005, 2585, time.Second*15, time.Second*90) // Bottled Wishes 410 - Not available to players
shared.NewSpellPowerActive(77986, 2029, time.Second*15, time.Second*90) // Reflection of the Light 384 - Not available to players
shared.NewSpellPowerActive(77115, 2290, time.Second*15, time.Second*90) // Reflection of the Light 397 - Valor Points
shared.NewSpellPowerActive(78006, 2585, time.Second*15, time.Second*90) // Reflection of the Light 410 - Not available to players

// HEALTH
shared.NewHealthActive(61433, 6985, time.Second*15, time.Minute*3) // Insignia of Diplomacy
Expand Down
80 changes: 0 additions & 80 deletions sim/death_knight/blood/TestBlood.results
Original file line number Diff line number Diff line change
Expand Up @@ -283,22 +283,6 @@ dps_results: {
hps: 5505.56168
}
}
dps_results: {
key: "TestBlood-AllItems-BottledWishes-77985"
value: {
dps: 21786.47028
tps: 109347.52633
hps: 5480.77391
}
}
dps_results: {
key: "TestBlood-AllItems-BottledWishes-78005"
value: {
dps: 21863.69877
tps: 109789.05841
hps: 5524.89076
}
}
dps_results: {
key: "TestBlood-AllItems-BracingShadowspiritDiamond"
value: {
Expand Down Expand Up @@ -723,22 +707,6 @@ dps_results: {
hps: 5300.29889
}
}
dps_results: {
key: "TestBlood-AllItems-FireoftheDeep-77988"
value: {
dps: 21971.2473
tps: 110542.97145
hps: 5300.29889
}
}
dps_results: {
key: "TestBlood-AllItems-FireoftheDeep-78008"
value: {
dps: 21971.2473
tps: 110542.97145
hps: 5300.29889
}
}
dps_results: {
key: "TestBlood-AllItems-FleetShadowspiritDiamond"
value: {
Expand Down Expand Up @@ -1099,22 +1067,6 @@ dps_results: {
hps: 5505.56168
}
}
dps_results: {
key: "TestBlood-AllItems-KiroptyricSigil-77984"
value: {
dps: 22111.19632
tps: 110925.12639
hps: 5480.77391
}
}
dps_results: {
key: "TestBlood-AllItems-KiroptyricSigil-78004"
value: {
dps: 22262.21955
tps: 111769.27131
hps: 5524.89076
}
}
dps_results: {
key: "TestBlood-AllItems-KvaldirBattleStandard-59685"
value: {
Expand Down Expand Up @@ -1435,22 +1387,6 @@ dps_results: {
hps: 5302.76001
}
}
dps_results: {
key: "TestBlood-AllItems-ReflectionoftheLight-77986"
value: {
dps: 21873.67515
tps: 110045.99068
hps: 5302.76001
}
}
dps_results: {
key: "TestBlood-AllItems-ReflectionoftheLight-78006"
value: {
dps: 21873.67515
tps: 110045.99068
hps: 5302.76001
}
}
dps_results: {
key: "TestBlood-AllItems-ResolveofUndying-77201"
value: {
Expand Down Expand Up @@ -1531,22 +1467,6 @@ dps_results: {
hps: 5316.47195
}
}
dps_results: {
key: "TestBlood-AllItems-RottingSkull-77987"
value: {
dps: 23173.13005
tps: 116494.65838
hps: 5316.47195
}
}
dps_results: {
key: "TestBlood-AllItems-RottingSkull-78007"
value: {
dps: 23534.34878
tps: 118233.55006
hps: 5318.58147
}
}
dps_results: {
key: "TestBlood-AllItems-RuneofZeth-68998"
value: {
Expand Down
80 changes: 0 additions & 80 deletions sim/death_knight/frost/TestFrost.results
Original file line number Diff line number Diff line change
Expand Up @@ -275,22 +275,6 @@ dps_results: {
hps: 521.8429
}
}
dps_results: {
key: "TestFrost-AllItems-BottledWishes-77985"
value: {
dps: 38773.53232
tps: 36561.19916
hps: 513.27533
}
}
dps_results: {
key: "TestFrost-AllItems-BottledWishes-78005"
value: {
dps: 39009.23379
tps: 36808.96411
hps: 524.17951
}
}
dps_results: {
key: "TestFrost-AllItems-BracingShadowspiritDiamond"
value: {
Expand Down Expand Up @@ -715,22 +699,6 @@ dps_results: {
hps: 510.93872
}
}
dps_results: {
key: "TestFrost-AllItems-FireoftheDeep-77988"
value: {
dps: 39093.96334
tps: 36948.08677
hps: 510.93872
}
}
dps_results: {
key: "TestFrost-AllItems-FireoftheDeep-78008"
value: {
dps: 39305.7149
tps: 37159.83833
hps: 510.93872
}
}
dps_results: {
key: "TestFrost-AllItems-FleetShadowspiritDiamond"
value: {
Expand Down Expand Up @@ -1091,22 +1059,6 @@ dps_results: {
hps: 521.8429
}
}
dps_results: {
key: "TestFrost-AllItems-KiroptyricSigil-77984"
value: {
dps: 38773.53232
tps: 36561.19916
hps: 513.27533
}
}
dps_results: {
key: "TestFrost-AllItems-KiroptyricSigil-78004"
value: {
dps: 39009.23379
tps: 36808.96411
hps: 524.17951
}
}
dps_results: {
key: "TestFrost-AllItems-KvaldirBattleStandard-59685"
value: {
Expand Down Expand Up @@ -1459,22 +1411,6 @@ dps_results: {
hps: 510.93872
}
}
dps_results: {
key: "TestFrost-AllItems-ReflectionoftheLight-77986"
value: {
dps: 38319.44864
tps: 36173.57207
hps: 510.93872
}
}
dps_results: {
key: "TestFrost-AllItems-ReflectionoftheLight-78006"
value: {
dps: 38319.44864
tps: 36173.57207
hps: 510.93872
}
}
dps_results: {
key: "TestFrost-AllItems-ResolveofUndying-77201"
value: {
Expand Down Expand Up @@ -1555,22 +1491,6 @@ dps_results: {
hps: 521.06403
}
}
dps_results: {
key: "TestFrost-AllItems-RottingSkull-77987"
value: {
dps: 38824.30034
tps: 36631.40793
hps: 519.50629
}
}
dps_results: {
key: "TestFrost-AllItems-RottingSkull-78007"
value: {
dps: 38957.68766
tps: 36748.8068
hps: 522.62177
}
}
dps_results: {
key: "TestFrost-AllItems-RuneofZeth-68998"
value: {
Expand Down
80 changes: 0 additions & 80 deletions sim/death_knight/unholy/TestUnholy.results
Original file line number Diff line number Diff line change
Expand Up @@ -283,22 +283,6 @@ dps_results: {
hps: 662.96579
}
}
dps_results: {
key: "TestUnholy-AllItems-BottledWishes-77985"
value: {
dps: 40146.36334
tps: 29739.83105
hps: 662.96579
}
}
dps_results: {
key: "TestUnholy-AllItems-BottledWishes-78005"
value: {
dps: 40310.34545
tps: 29850.31794
hps: 666.10038
}
}
dps_results: {
key: "TestUnholy-AllItems-BracingShadowspiritDiamond"
value: {
Expand Down Expand Up @@ -723,22 +707,6 @@ dps_results: {
hps: 647.29284
}
}
dps_results: {
key: "TestUnholy-AllItems-FireoftheDeep-77988"
value: {
dps: 40004.99486
tps: 29877.5845
hps: 647.29284
}
}
dps_results: {
key: "TestUnholy-AllItems-FireoftheDeep-78008"
value: {
dps: 40186.15204
tps: 30075.00669
hps: 647.29284
}
}
dps_results: {
key: "TestUnholy-AllItems-FleetShadowspiritDiamond"
value: {
Expand Down Expand Up @@ -1099,22 +1067,6 @@ dps_results: {
hps: 662.96579
}
}
dps_results: {
key: "TestUnholy-AllItems-KiroptyricSigil-77984"
value: {
dps: 40146.36334
tps: 29739.83105
hps: 662.96579
}
}
dps_results: {
key: "TestUnholy-AllItems-KiroptyricSigil-78004"
value: {
dps: 40310.34545
tps: 29850.31794
hps: 666.10038
}
}
dps_results: {
key: "TestUnholy-AllItems-KvaldirBattleStandard-59685"
value: {
Expand Down Expand Up @@ -1435,22 +1387,6 @@ dps_results: {
hps: 647.29284
}
}
dps_results: {
key: "TestUnholy-AllItems-ReflectionoftheLight-77986"
value: {
dps: 39343.88113
tps: 29156.97892
hps: 647.29284
}
}
dps_results: {
key: "TestUnholy-AllItems-ReflectionoftheLight-78006"
value: {
dps: 39343.88113
tps: 29156.97892
hps: 647.29284
}
}
dps_results: {
key: "TestUnholy-AllItems-ResolveofUndying-77201"
value: {
Expand Down Expand Up @@ -1531,22 +1467,6 @@ dps_results: {
hps: 666.10038
}
}
dps_results: {
key: "TestUnholy-AllItems-RottingSkull-77987"
value: {
dps: 40200.90744
tps: 29791.8695
hps: 662.96579
}
}
dps_results: {
key: "TestUnholy-AllItems-RottingSkull-78007"
value: {
dps: 40438.12977
tps: 29967.85402
hps: 666.88402
}
}
dps_results: {
key: "TestUnholy-AllItems-RuneofZeth-68998"
value: {
Expand Down
Loading

0 comments on commit f3f1aff

Please sign in to comment.