Skip to content

Commit

Permalink
fixes for warrior HS, Blood Surge, stance dancing
Browse files Browse the repository at this point in the history
  • Loading branch information
@kayla-glick
kayla-glick committed Sep 16, 2024
1 parent 7374dde commit a335ed7
Show file tree
Hide file tree
Showing 12 changed files with 127 additions and 140 deletions.
22 changes: 11 additions & 11 deletions sim/warrior/dps_warrior/TestArms.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ character_stats_results: {
stat_weights_results: {
key: "TestArms-Lvl50-StatWeights-Default"
value: {
weights: 1.16152
weights: 0.71412
weights: 1.28336
weights: 0.80641
weights: 0
weights: 0
weights: 0
Expand All @@ -67,9 +67,9 @@ stat_weights_results: {
weights: 0
weights: 0
weights: 0
weights: 0.48311
weights: 17.65005
weights: 11.04028
weights: 0.57244
weights: 16.67654
weights: 10.5069
weights: 0
weights: 0
weights: 0
Expand Down Expand Up @@ -99,15 +99,15 @@ stat_weights_results: {
dps_results: {
key: "TestArms-Lvl50-AllItems-BattlegearofHeroism"
value: {
dps: 825.95914
tps: 715.68449
dps: 815.15405
tps: 705.68016
}
}
dps_results: {
key: "TestArms-Lvl50-Average-Default"
value: {
dps: 1193.71442
tps: 1020.35534
dps: 1189.32287
tps: 1014.87036
}
}
dps_results: {
Expand Down Expand Up @@ -197,7 +197,7 @@ dps_results: {
dps_results: {
key: "TestArms-Lvl50-SwitchInFrontOfTarget-Default"
value: {
dps: 1101.63619
tps: 942.14306
dps: 1110.05407
tps: 947.54801
}
}
112 changes: 56 additions & 56 deletions sim/warrior/dps_warrior/TestFury.results
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ character_stats_results: {
stat_weights_results: {
key: "TestFury-Lvl40-StatWeights-Default"
value: {
weights: 1.14306
weights: 0.80328
weights: 1.11186
weights: 0.46909
weights: 0
weights: 0
weights: 0
Expand All @@ -116,9 +116,9 @@ stat_weights_results: {
weights: 0
weights: 0
weights: 0
weights: 0.721
weights: 6.65428
weights: 8.47037
weights: 0.49852
weights: 8.03267
weights: 7.42202
weights: 0
weights: 0
weights: 0
Expand Down Expand Up @@ -148,8 +148,8 @@ stat_weights_results: {
stat_weights_results: {
key: "TestFury-Lvl60-StatWeights-Default"
value: {
weights: 1.81805
weights: 2.25629
weights: 2.36901
weights: 1.97882
weights: 0
weights: 0
weights: 0
Expand All @@ -165,9 +165,9 @@ stat_weights_results: {
weights: 0
weights: 0
weights: 0
weights: 0.78043
weights: 14.03212
weights: 27.40603
weights: 1.07316
weights: 7.04635
weights: 29.57867
weights: 0
weights: 0
weights: 0
Expand Down Expand Up @@ -197,15 +197,15 @@ stat_weights_results: {
dps_results: {
key: "TestFury-Lvl40-AllItems-BattlegearofHeroism"
value: {
dps: 538.4304
tps: 479.67884
dps: 548.33219
tps: 487.14109
}
}
dps_results: {
key: "TestFury-Lvl40-Average-Default"
value: {
dps: 598.53114
tps: 529.54172
dps: 602.3906
tps: 532.56978
}
}
dps_results: {
Expand Down Expand Up @@ -295,147 +295,147 @@ dps_results: {
dps_results: {
key: "TestFury-Lvl40-SwitchInFrontOfTarget-Default"
value: {
dps: 559.87735
tps: 496.64252
dps: 564.51331
tps: 500.30612
}
}
dps_results: {
key: "TestFury-Lvl60-AllItems-BanishedMartyr'sFullPlate"
value: {
dps: 2558.50099
tps: 2261.74001
dps: 2418.63136
tps: 2099.75618
}
}
dps_results: {
key: "TestFury-Lvl60-AllItems-BattlegearofHeroism"
value: {
dps: 1875.13256
tps: 1680.6678
dps: 1870.00407
tps: 1655.56943
}
}
dps_results: {
key: "TestFury-Lvl60-AllItems-BloodGuard'sPlate"
value: {
dps: 2183.42916
tps: 1922.96912
dps: 2226.51669
tps: 1931.10456
}
}
dps_results: {
key: "TestFury-Lvl60-AllItems-EmeraldDreamPlate"
value: {
dps: 2174.33168
tps: 1918.65749
dps: 2202.31654
tps: 1911.29467
}
}
dps_results: {
key: "TestFury-Lvl60-AllItems-Knight-Lieutenant'sPlate"
value: {
dps: 2183.42916
tps: 1922.96912
dps: 2226.51669
tps: 1931.10456
}
}
dps_results: {
key: "TestFury-Lvl60-AllItems-WailingBerserker'sPlateArmor"
value: {
dps: 2725.88696
tps: 2406.69801
dps: 2579.94628
tps: 2233.54775
}
}
dps_results: {
key: "TestFury-Lvl60-Average-Default"
value: {
dps: 3190.47383
tps: 2781.38168
dps: 3135.72914
tps: 2466.04654
}
}
dps_results: {
key: "TestFury-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-FullBuffs-Phase 1 Consumes-LongMultiTarget"
value: {
dps: 1367.65613
tps: 1377.85847
dps: 1236.36312
tps: 1142.30358
}
}
dps_results: {
key: "TestFury-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-FullBuffs-Phase 1 Consumes-LongSingleTarget"
value: {
dps: 418.08433
tps: 412.2446
dps: 409.29763
tps: 374.41306
}
}
dps_results: {
key: "TestFury-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-FullBuffs-Phase 1 Consumes-ShortSingleTarget"
value: {
dps: 495.37116
tps: 478.49288
dps: 511.06631
tps: 458.38038
}
}
dps_results: {
key: "TestFury-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-NoBuffs-Phase 1 Consumes-LongMultiTarget"
value: {
dps: 592.63164
tps: 655.2906
dps: 541.36466
tps: 547.83913
}
}
dps_results: {
key: "TestFury-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-NoBuffs-Phase 1 Consumes-LongSingleTarget"
value: {
dps: 203.58677
tps: 231.08628
dps: 200.62423
tps: 211.50208
}
}
dps_results: {
key: "TestFury-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-NoBuffs-Phase 1 Consumes-ShortSingleTarget"
value: {
dps: 249.72368
tps: 268.27756
dps: 255.15235
tps: 255.07692
}
}
dps_results: {
key: "TestFury-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-FullBuffs-Phase 1 Consumes-LongMultiTarget"
value: {
dps: 1490.04486
tps: 1493.99997
dps: 1386.01066
tps: 1290.532
}
}
dps_results: {
key: "TestFury-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-FullBuffs-Phase 1 Consumes-LongSingleTarget"
value: {
dps: 434.46656
tps: 424.74058
dps: 430.10556
tps: 393.36082
}
}
dps_results: {
key: "TestFury-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-FullBuffs-Phase 1 Consumes-ShortSingleTarget"
value: {
dps: 512.16727
tps: 492.78813
dps: 530.24687
tps: 472.40925
}
}
dps_results: {
key: "TestFury-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-NoBuffs-Phase 1 Consumes-LongMultiTarget"
value: {
dps: 622.9695
tps: 685.28449
dps: 583.28391
tps: 591.44605
}
}
dps_results: {
key: "TestFury-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-NoBuffs-Phase 1 Consumes-LongSingleTarget"
value: {
dps: 201.99509
tps: 228.32634
dps: 198.58116
tps: 209.9713
}
}
dps_results: {
key: "TestFury-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-NoBuffs-Phase 1 Consumes-ShortSingleTarget"
value: {
dps: 249.29055
tps: 266.85652
dps: 255.8088
tps: 253.4769
}
}
dps_results: {
key: "TestFury-Lvl60-SwitchInFrontOfTarget-Default"
value: {
dps: 2459.51359
tps: 2152.33537
dps: 2488.571
tps: 1957.743
}
}
15 changes: 9 additions & 6 deletions sim/warrior/heroic_strike_cleave.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@ func (warrior *Warrior) registerHeroicStrikeSpell(realismICD *core.Cooldown) {
if warrior.curQueueAura != nil {
warrior.curQueueAura.Deactivate(sim)
}

realismICD.Use(sim)
},
})
warrior.HeroicStrikeQueue = warrior.makeQueueSpellsAndAura(warrior.HeroicStrike, realismICD)
Expand Down Expand Up @@ -125,8 +123,6 @@ func (warrior *Warrior) registerCleaveSpell(realismICD *core.Cooldown) {
if warrior.curQueueAura != nil {
warrior.curQueueAura.Deactivate(sim)
}

realismICD.Use(sim)
},
})
warrior.CleaveQueue = warrior.makeQueueSpellsAndAura(warrior.Cleave, realismICD)
Expand Down Expand Up @@ -164,8 +160,15 @@ func (warrior *Warrior) makeQueueSpellsAndAura(srcSpell *WarriorSpell, realismIC
},

ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
queueAura.Activate(sim)
realismICD.Use(sim)
if realismICD.IsReady(sim) {
realismICD.Use(sim)
sim.AddPendingAction(&core.PendingAction{
NextActionAt: sim.CurrentTime + realismICD.Duration,
OnAction: func(sim *core.Simulation) {
queueAura.Activate(sim)
},
})
}
},
})

Expand Down
25 changes: 11 additions & 14 deletions sim/warrior/runes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,16 +225,12 @@ func (warrior *Warrior) applyBloodSurge() {
ActionID: core.ActionID{SpellID: 413399},
Duration: time.Second * 15,
OnGain: func(aura *core.Aura, sim *core.Simulation) {
if warrior.Slam != nil {
warrior.Slam.DefaultCast.CastTime = 0
warrior.Slam.Cost.Multiplier -= 100
}
warrior.Slam.CastTimeMultiplier -= 1
warrior.Slam.Cost.Multiplier -= 100
},
OnExpire: func(aura *core.Aura, sim *core.Simulation) {
if warrior.Slam != nil {
warrior.Slam.DefaultCast.CastTime = 1500 * time.Millisecond
warrior.Slam.Cost.Multiplier += 100
}
warrior.Slam.CastTimeMultiplier += 1
warrior.Slam.Cost.Multiplier += 100
},
OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
// removed even if slam doesn't land
Expand All @@ -247,8 +243,13 @@ func (warrior *Warrior) applyBloodSurge() {
affectedSpells := make(map[*core.Spell]bool)

core.MakePermanent(warrior.RegisterAura(core.Aura{
Label: "Blood Surge",
Label: "Blood Surge Trigger",
OnInit: func(aura *core.Aura, sim *core.Simulation) {
if warrior.Slam == nil {
aura.Deactivate(sim)
return
}

affectedSpells[warrior.HeroicStrike.Spell] = true
affectedSpells[warrior.Whirlwind.Spell] = true

Expand All @@ -261,11 +262,7 @@ func (warrior *Warrior) applyBloodSurge() {
}
},
OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
if !result.Landed() || !affectedSpells[spell] {
return
}

if sim.Proc(0.3, "Blood Surge") {
if result.Landed() && affectedSpells[spell] && sim.Proc(0.3, "Blood Surge") {
warrior.BloodSurgeAura.Activate(sim)
}
},
Expand Down
Loading

0 comments on commit a335ed7

Please sign in to comment.