Skip to content

Commit

Permalink
Merge pull request #648 from wowsims/decay-mojo-fixes
Browse files Browse the repository at this point in the history 
Fix Decay ICD and ST Might enchant rAP
  • Loading branch information
@rosenrusinov
rosenrusinov authored Apr 10, 2024
2 parents ebca2c4 + cf0c3d5 commit d2117cb
Show file tree
Hide file tree
Showing 10 changed files with 95 additions and 84 deletions.
Binary file modified assets/database/db.bin
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion assets/database/db.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9778,7 +9778,7 @@
{"effectId":7223,"spellId":435903,"name":"Enchant Chest - Retricutioner","type":5,"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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":4},
{"effectId":7325,"itemId":221322,"spellId":446459,"name":"Atal'ai Signet of Mojo","type":3,"stats":[0,0,0,0,0,9,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,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
{"effectId":7326,"itemId":221323,"spellId":446472,"name":"Atal'ai Signet of Serenity","type":3,"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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,0,0],"quality":3},
{"effectId":7328,"itemId":221321,"spellId":446451,"name":"Atal'ai Signet of Might","type":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,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":3}
{"effectId":7328,"itemId":221321,"spellId":446451,"name":"Atal'ai Signet of Might","type":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3}
],
"runes":[
{"id":29787,"name":"Engrave Belt - Focused Rage","icon":"ability_warrior_focusedrage","class":9,"type":8,"requiresLevel":1},
Expand Down
Binary file modified assets/database/leftover_db.bin
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions assets/database/leftover_db.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1483,8 +1483,8 @@
{"effectId":63,"spellId":13538,"name":"Enchant Chest - Lesser Absorption","type":5,"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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":66,"spellId":7457,"name":"Enchant Bracer - Minor Stamina","type":6,"stats":[0,0,1,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":66,"spellId":7863,"name":"Enchant Boots - Minor Stamina","type":10,"stats":[0,0,1,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":241,"spellId":7745,"name":"Enchant 2H Weapon - Minor Impact","type":13,"enchantType":1,"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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":241,"spellId":13503,"name":"Enchant Weapon - Lesser Striking","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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":241,"spellId":7745,"name":"Enchant 2H Weapon - Minor Impact","type":13,"enchantType":1,"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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":242,"spellId":7748,"name":"Enchant Chest - Lesser Health","type":5,"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,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0],"quality":1},
{"effectId":243,"spellId":7766,"name":"Enchant Bracer - Minor Spirit","type":6,"stats":[0,0,0,0,1,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,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
{"effectId":246,"spellId":7776,"name":"Enchant Chest - Lesser Mana","type":5,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
Expand Down Expand Up @@ -1596,7 +1596,7 @@
{"effectId":7223,"spellId":435903,"name":"Enchant Chest - Retricutioner","type":5,"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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":4},
{"effectId":7325,"itemId":221322,"spellId":446459,"name":"Atal'ai Signet of Mojo","type":3,"stats":[0,0,0,0,0,9,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,0,0,0,0,0,0,0,0,0,0,0],"quality":3},
{"effectId":7326,"itemId":221323,"spellId":446472,"name":"Atal'ai Signet of Serenity","type":3,"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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,0,0],"quality":3},
{"effectId":7328,"itemId":221321,"spellId":446451,"name":"Atal'ai Signet of Might","type":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,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":3}
{"effectId":7328,"itemId":221321,"spellId":446451,"name":"Atal'ai Signet of Might","type":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":3}
],
"runes":[
{"id":29787,"name":"Engrave Belt - Focused Rage","icon":"ability_warrior_focusedrage","class":9,"type":8,"requiresLevel":1},
Expand Down
19 changes: 15 additions & 4 deletions sim/common/sod/item_effects/phase_3.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,29 +182,40 @@ func init() {
},
})

// Custom ICD so it can be shared by both proc triggers
icd := core.Cooldown{
Timer: character.NewTimer(),
Duration: time.Millisecond * 200,
}

handler := func(sim *core.Simulation, spell *core.Spell, _ *core.SpellResult) {
if !icd.IsReady(sim) {
return
}

icd.Use(sim)
decayProcSpell.Cast(sim, character.CurrentTarget)
}

core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{
hitAura := core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{
ActionID: core.ActionID{SpellID: 446392},
Name: "DMC Decay Spell Hit",
Callback: core.CallbackOnSpellHitDealt,
ProcMask: core.ProcMaskMelee | core.ProcMaskRanged,
PPM: 5.0, // Placeholder proc value
ICD: time.Millisecond * 200,
Handler: handler,
})
hitAura.Icd = &icd

core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{
castAura := core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{
ActionID: core.ActionID{SpellID: 450110},
Name: "DMC Decay Spell Cast",
Callback: core.CallbackOnCastComplete,
ProcMask: core.ProcMaskSpellDamage,
ProcChance: 0.35,
ICD: time.Millisecond * 200,
Handler: handler,
})
castAura.Icd = &icd
})

core.NewItemEffect(DarkmoonCardSandstorm, func(agent core.Agent) {
Expand Down
2 changes: 1 addition & 1 deletion sim/druid/feral/TestFeral.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ character_stats_results: {
final_stats: 0
final_stats: 0
final_stats: 2992.118
final_stats: 300
final_stats: 315
final_stats: 0
final_stats: 0
final_stats: 0
Expand Down
94 changes: 47 additions & 47 deletions sim/priest/shadow/TestShadow.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,18 +249,18 @@ stat_weights_results: {
weights: 0
weights: 0
weights: 0
weights: 0.44304
weights: -0.03231
weights: 0
weights: 0.70032
weights: 0.70039
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0.70032
weights: 0.70039
weights: 0
weights: 4.54977
weights: 4.28364
weights: 5.20663
weights: 4.4777
weights: 0
weights: 0
weights: 0
Expand Down Expand Up @@ -491,112 +491,112 @@ dps_results: {
dps_results: {
key: "TestShadow-Lvl50-Average-Default"
value: {
dps: 862.17816
tps: 749.16242
hps: 11.85753
dps: 862.26569
tps: 749.18761
hps: 11.84531
}
}
dps_results: {
key: "TestShadow-Lvl50-Settings-NightElf-phase_3-Basic-phase_3-FullBuffs-Phase 3 Consumes-LongMultiTarget"
value: {
dps: 866.3069
tps: 1202.42922
hps: 12.52733
dps: 866.03283
tps: 1201.25304
hps: 12.24243
}
}
dps_results: {
key: "TestShadow-Lvl50-Settings-NightElf-phase_3-Basic-phase_3-FullBuffs-Phase 3 Consumes-LongSingleTarget"
value: {
dps: 866.3069
tps: 752.94947
hps: 12.52733
dps: 866.03283
tps: 752.56495
hps: 12.24243
}
}
dps_results: {
key: "TestShadow-Lvl50-Settings-NightElf-phase_3-Basic-phase_3-FullBuffs-Phase 3 Consumes-ShortSingleTarget"
value: {
dps: 973.09267
tps: 834.45483
hps: 14.78001
dps: 972.43492
tps: 833.83971
hps: 14.41341
}
}
dps_results: {
key: "TestShadow-Lvl50-Settings-NightElf-phase_3-Basic-phase_3-NoBuffs-Phase 3 Consumes-LongMultiTarget"
value: {
dps: 359.44934
tps: 560.69542
hps: 6.17489
dps: 360.91719
tps: 562.25519
hps: 5.99595
}
}
dps_results: {
key: "TestShadow-Lvl50-Settings-NightElf-phase_3-Basic-phase_3-NoBuffs-Phase 3 Consumes-LongSingleTarget"
value: {
dps: 359.44934
tps: 315.25352
hps: 6.17489
dps: 360.91719
tps: 316.49663
hps: 5.99595
}
}
dps_results: {
key: "TestShadow-Lvl50-Settings-NightElf-phase_3-Basic-phase_3-NoBuffs-Phase 3 Consumes-ShortSingleTarget"
value: {
dps: 678.6894
tps: 582.29844
hps: 11.60043
dps: 679.19049
tps: 582.66115
hps: 11.38002
}
}
dps_results: {
key: "TestShadow-Lvl50-Settings-Troll-phase_3-Basic-phase_3-FullBuffs-Phase 3 Consumes-LongMultiTarget"
value: {
dps: 858.4773
tps: 1189.70003
hps: 12.4582
dps: 857.08342
tps: 1188.67931
hps: 12.37859
}
}
dps_results: {
key: "TestShadow-Lvl50-Settings-Troll-phase_3-Basic-phase_3-FullBuffs-Phase 3 Consumes-LongSingleTarget"
value: {
dps: 858.4773
tps: 746.11425
hps: 12.4582
dps: 857.08342
tps: 744.88454
hps: 12.37859
}
}
dps_results: {
key: "TestShadow-Lvl50-Settings-Troll-phase_3-Basic-phase_3-FullBuffs-Phase 3 Consumes-ShortSingleTarget"
value: {
dps: 974.47646
tps: 836.23106
hps: 14.79048
dps: 973.72119
tps: 835.52128
hps: 14.41341
}
}
dps_results: {
key: "TestShadow-Lvl50-Settings-Troll-phase_3-Basic-phase_3-NoBuffs-Phase 3 Consumes-LongMultiTarget"
value: {
dps: 353.33734
tps: 552.45318
hps: 6.13126
dps: 353.17445
tps: 552.2685
hps: 6.00898
}
}
dps_results: {
key: "TestShadow-Lvl50-Settings-Troll-phase_3-Basic-phase_3-NoBuffs-Phase 3 Consumes-LongSingleTarget"
value: {
dps: 353.33734
tps: 309.89928
hps: 6.13126
dps: 353.17445
tps: 309.7146
hps: 6.00898
}
}
dps_results: {
key: "TestShadow-Lvl50-Settings-Troll-phase_3-Basic-phase_3-NoBuffs-Phase 3 Consumes-ShortSingleTarget"
value: {
dps: 680.73235
tps: 583.71071
hps: 11.46818
dps: 682.08631
tps: 584.8795
hps: 11.4241
}
}
dps_results: {
key: "TestShadow-Lvl50-SwitchInFrontOfTarget-Default"
value: {
dps: 858.4773
tps: 746.11425
hps: 12.4582
dps: 857.08342
tps: 744.88454
hps: 12.37859
}
}
2 changes: 1 addition & 1 deletion sim/shaman/enhancement/TestEnhancement.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ character_stats_results: {
final_stats: 0
final_stats: 0
final_stats: 3690.262
final_stats: 544
final_stats: 559
final_stats: 0
final_stats: 0
final_stats: 0
Expand Down
54 changes: 27 additions & 27 deletions sim/warlock/tank/TestDestruction.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,18 +249,18 @@ stat_weights_results: {
weights: 0
weights: 0
weights: 0
weights: -5.87785
weights: -0.18665
weights: 0
weights: -1.8752
weights: 1.08965
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0
weights: 0
weights: 10.31637
weights: 5.19042
weights: 5.33965
weights: 5.2049
weights: 0
weights: 0
weights: 0
Expand Down Expand Up @@ -407,64 +407,64 @@ dps_results: {
dps_results: {
key: "TestDestruction-Lvl50-Average-Default"
value: {
dps: 1115.39155
tps: 1999.01866
hps: 18.50804
dps: 1112.66938
tps: 1995.49929
hps: 17.11231
}
}
dps_results: {
key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-FullBuffs-Phase 3 Consumes-LongMultiTarget"
value: {
dps: 1622.6295
tps: 3704.86879
hps: 14.40397
dps: 1622.41843
tps: 3706.02407
hps: 14.3812
}
}
dps_results: {
key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-FullBuffs-Phase 3 Consumes-LongSingleTarget"
value: {
dps: 1048.26316
tps: 1881.95197
hps: 14.5217
dps: 1046.77327
tps: 1880.46016
hps: 14.47206
}
}
dps_results: {
key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-FullBuffs-Phase 3 Consumes-ShortSingleTarget"
value: {
dps: 1147.72093
tps: 1927.71076
hps: 15.41481
dps: 1147.47967
tps: 1920.63206
hps: 14.91843
}
}
dps_results: {
key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-NoBuffs-Phase 3 Consumes-LongMultiTarget"
value: {
dps: 960.0278
tps: 2701.97711
hps: 9.61833
dps: 962.27005
tps: 2706.70691
hps: 9.65167
}
}
dps_results: {
key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-NoBuffs-Phase 3 Consumes-LongSingleTarget"
value: {
dps: 539.28623
tps: 1033.29869
hps: 9.61667
dps: 537.08905
tps: 1029.45698
hps: 9.545
}
}
dps_results: {
key: "TestDestruction-Lvl50-Settings-Orc-p3.destro.tank-Destruction Warlock-p3.destro.tank-NoBuffs-Phase 3 Consumes-ShortSingleTarget"
value: {
dps: 592.38908
tps: 1048.21553
dps: 592.17307
tps: 1048.83522
hps: 10.325
}
}
dps_results: {
key: "TestDestruction-Lvl50-SwitchInFrontOfTarget-Default"
value: {
dps: 1096.9318
tps: 1966.73227
hps: 19.11673
dps: 1084.15732
tps: 1940.07841
hps: 17.41171
}
}
2 changes: 1 addition & 1 deletion tools/database/enchant_overrides.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ var EnchantOverrides = []*proto.UIEnchant{

// Shoulder
// SoD Phase 3 Enchants
{EffectId: 7328, ItemId: 221321, SpellId: 446451, Name: "Atal'ai Signet of Might", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{stats.AttackPower: 15}.ToFloatArray(), Type: proto.ItemType_ItemTypeShoulder},
{EffectId: 7328, ItemId: 221321, SpellId: 446451, Name: "Atal'ai Signet of Might", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{stats.AttackPower: 15, stats.RangedAttackPower: 15}.ToFloatArray(), Type: proto.ItemType_ItemTypeShoulder},
{EffectId: 7325, ItemId: 221322, SpellId: 446459, Name: "Atal'ai Signet of Mojo", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{stats.SpellPower: 9}.ToFloatArray(), Type: proto.ItemType_ItemTypeShoulder},
{EffectId: 7326, ItemId: 221323, SpellId: 446472, Name: "Atal'ai Signet of Serenity", Quality: proto.ItemQuality_ItemQualityRare, Stats: stats.Stats{stats.HealingPower: 18}.ToFloatArray(), Type: proto.ItemType_ItemTypeShoulder},
// Drop in ZG
Expand Down

0 comments on commit d2117cb

Please sign in to comment.