Skip to content

Commit

Permalink
allow MSW to proc from melee procs, fix HoTR hand restrictions
Browse files Browse the repository at this point in the history
kayla-glick committed Sep 23, 2024
1 parent 5101c9f commit b0f3040
Showing 4 changed files with 54 additions and 52 deletions.
6 changes: 4 additions & 2 deletions sim/paladin/hammer_of_the_righteous.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package paladin

import (
"slices"
"time"

"github.com/wowsims/sod/sim/core"
"github.com/wowsims/sod/sim/core/proto"
"time"
)

func (paladin *Paladin) registerHammerOfTheRighteous() {
@@ -36,7 +38,7 @@ func (paladin *Paladin) registerHammerOfTheRighteous() {
},
},
ExtraCastCondition: func(sim *core.Simulation, target *core.Unit) bool {
return paladin.MainHand().HandType == proto.HandType_HandTypeOneHand
return slices.Contains([]proto.HandType{proto.HandType_HandTypeMainHand, proto.HandType_HandTypeOneHand}, paladin.MainHand().HandType)
},
DamageMultiplier: 3,
ThreatMultiplier: 2, // verified with TinyThreat in game
96 changes: 48 additions & 48 deletions sim/shaman/enhancement/TestEnhancement.results
Original file line number Diff line number Diff line change
@@ -1520,85 +1520,85 @@ dps_results: {
dps_results: {
key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
value: {
dps: 2117.39563
tps: 2031.59923
dps: 2183.39859
tps: 2079.26572
}
}
dps_results: {
key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
value: {
dps: 1348.77372
tps: 962.04254
dps: 1357.89541
tps: 970.27076
}
}
dps_results: {
key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
value: {
dps: 1460.34954
tps: 978.05626
dps: 1455.20475
tps: 972.84771
}
}
dps_results: {
key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
value: {
dps: 845.64911
tps: 1057.05145
dps: 854.0451
tps: 1061.18898
}
}
dps_results: {
key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
value: {
dps: 564.63341
tps: 413.64148
dps: 567.82282
tps: 416.16667
}
}
dps_results: {
key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
value: {
dps: 685.32178
tps: 473.31696
dps: 680.68891
tps: 468.68905
}
}
dps_results: {
key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
value: {
dps: 2117.39563
tps: 2031.59923
dps: 2183.39859
tps: 2079.26572
}
}
dps_results: {
key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
value: {
dps: 1348.77372
tps: 962.04254
dps: 1357.89541
tps: 970.27076
}
}
dps_results: {
key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
value: {
dps: 1460.34954
tps: 978.05626
dps: 1455.20475
tps: 972.84771
}
}
dps_results: {
key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
value: {
dps: 845.64911
tps: 1057.05145
dps: 854.0451
tps: 1061.18898
}
}
dps_results: {
key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
value: {
dps: 564.63341
tps: 413.64148
dps: 567.82282
tps: 416.16667
}
}
dps_results: {
key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
value: {
dps: 685.32178
tps: 473.31696
dps: 680.68891
tps: 468.68905
}
}
dps_results: {
@@ -1688,85 +1688,85 @@ dps_results: {
dps_results: {
key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
value: {
dps: 2092.18636
tps: 2013.92186
dps: 2103.21916
tps: 2019.65753
}
}
dps_results: {
key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
value: {
dps: 1341.84745
tps: 959.9333
dps: 1312.60432
tps: 943.01075
}
}
dps_results: {
key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
value: {
dps: 1458.57012
tps: 975.5921
dps: 1410.66898
tps: 940.47685
}
}
dps_results: {
key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
value: {
dps: 839.29295
tps: 1054.16857
dps: 831.13593
tps: 1047.53871
}
}
dps_results: {
key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
value: {
dps: 560.88186
tps: 411.37785
dps: 542.4737
tps: 397.6378
}
}
dps_results: {
key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
value: {
dps: 685.74512
tps: 474.00783
dps: 662.69317
tps: 455.44253
}
}
dps_results: {
key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
value: {
dps: 2092.18636
tps: 2013.92186
dps: 2103.21916
tps: 2019.65753
}
}
dps_results: {
key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
value: {
dps: 1341.84745
tps: 959.9333
dps: 1312.60432
tps: 943.01075
}
}
dps_results: {
key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
value: {
dps: 1458.57012
tps: 975.5921
dps: 1410.66898
tps: 940.47685
}
}
dps_results: {
key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
value: {
dps: 839.29295
tps: 1054.16857
dps: 831.13593
tps: 1047.53871
}
}
dps_results: {
key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
value: {
dps: 560.88186
tps: 411.37785
dps: 542.4737
tps: 397.6378
}
}
dps_results: {
key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
value: {
dps: 685.74512
tps: 474.00783
dps: 662.69317
tps: 455.44253
}
}
dps_results: {
2 changes: 1 addition & 1 deletion sim/shaman/runes.go
Original file line number Diff line number Diff line change
@@ -339,7 +339,7 @@ func (shaman *Shaman) applyMaelstromWeapon() {
core.MakePermanent(shaman.RegisterAura(core.Aura{
Label: "Maelstrom Weapon Trigger",
OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
if result.Landed() && spell.ProcMask.Matches(core.ProcMaskMelee) && shaman.maelstromWeaponPPMM.Proc(sim, spell.ProcMask, "Maelstrom Weapon") {
if result.Landed() && spell.ProcMask.Matches(core.ProcMaskMelee|core.ProcMaskMeleeDamageProc) && shaman.maelstromWeaponPPMM.Proc(sim, spell.ProcMask, "Maelstrom Weapon") {
shaman.MaelstromWeaponAura.Activate(sim)
shaman.MaelstromWeaponAura.AddStack(sim)
}
2 changes: 1 addition & 1 deletion ui/enhancement_shaman/gear_sets/phase_5_2h.gear.json
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
{"id":230839,"rune":442881},
{"id":230273},
{"id":231779},
{"id":227683,"enchant":1900},
{"id":230271,"enchant":1900},
{},
{"id":228177}
]

0 comments on commit b0f3040

Please sign in to comment.