Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions sim/rogue/item_sets_phase_8.go
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,14 @@ func (rogue *Rogue) applyScarletEnclaveTank2PBonus() {
if rogue.HasAura(label) {
return
}
rogue.rollingWithThePunchesDamageMultiplier += 0.01

rogue.RegisterAura(core.Aura{
Label: label,
OnInit: func(aura *core.Aura, sim *core.Simulation) {
rogue.RollingWithThePunchesProcAura.ApplyOnStacksChange(func(aura *core.Aura, sim *core.Simulation, oldStacks int32, newStacks int32) {
rogue.PseudoStats.DamageDealtMultiplier /= 1 + 0.01*float64(oldStacks)
rogue.PseudoStats.DamageDealtMultiplier *= 1 + 0.01*float64(newStacks)
rogue.PseudoStats.DamageDealtMultiplier /= 1 + rogue.rollingWithThePunchesDamageMultiplier*float64(oldStacks)
rogue.PseudoStats.DamageDealtMultiplier *= 1 + rogue.rollingWithThePunchesDamageMultiplier*float64(newStacks)
})
},
})
Expand Down Expand Up @@ -177,7 +178,7 @@ func (rogue *Rogue) applyScarletEnclaveTank4PBonus() {
}))
}

// Your Rolling with the Punches can now stack up to 10 times, but grants 2% less health per stack. At 10 stacks, each time you Dodge you will gain 15 Energy.
// Your Rolling with the Punches now grants 2% more health and 1% more damage per stack. At 5 stacks, each time you Dodge or Parry you will gain 10 Energy.
func (rogue *Rogue) applyScarletEnclaveTank6PBonus() {

if !rogue.HasRune(proto.RogueRune_RuneRollingWithThePunches) {
Expand All @@ -190,8 +191,8 @@ func (rogue *Rogue) applyScarletEnclaveTank6PBonus() {
return
}

rogue.rollingWithThePunchesBonusHealthStackMultiplier -= 0.02
rogue.rollingWithThePunchesMaxStacks += 5
rogue.rollingWithThePunchesBonusHealthStackMultiplier += 0.02
rogue.rollingWithThePunchesDamageMultiplier += 0.01

metrics := rogue.NewEnergyMetrics(core.ActionID{SpellID: 1226957})

Expand All @@ -218,9 +219,9 @@ func (rogue *Rogue) applyScarletEnclaveTank6PBonus() {
Label: label,
OnInit: func(aura *core.Aura, sim *core.Simulation) {
rogue.RollingWithThePunchesProcAura.ApplyOnStacksChange(func(aura *core.Aura, sim *core.Simulation, oldStacks int32, newStacks int32) {
if newStacks == 10 {
if newStacks == 5 {
energyAura.Activate(sim)
} else if newStacks < 10 && oldStacks == 10 {
} else if newStacks < 5 && oldStacks == 5 {
energyAura.Deactivate(sim)
}
})
Expand Down
1 change: 1 addition & 0 deletions sim/rogue/rogue.go
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ type Rogue struct {
cutthroatBonusChance float64
rollingWithThePunchesBonusHealthStackMultiplier float64
rollingWithThePunchesMaxStacks int
rollingWithThePunchesDamageMultiplier float64
bladeFlurryAttackSpeedBonus float64
bladeFlurryTargetCount int32

Expand Down
Loading