Skip to content

Fix the 6p from the latest ptr update, add a property on the rogue proto to be able to update the dynamic value of t4 2p tank #1432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kayla-glick merged 6 commits into from
Apr 3, 2025
Merged

Fix the 6p from the latest ptr update, add a property on the rogue proto to be able to update the dynamic value of t4 2p tank #1432

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9f7ce51
Fix the 6p from the latest ptr update, add a property on the rogue pr…
fynnen Apr 2, 2025
f778de9
Update sim/rogue/item_sets_phase_8.go
fynnen Apr 3, 2025
58bfd27
newest PTR balances
fynnen Apr 3, 2025
286958e
Merge branch 'feat/p8-rogue-tank-6p-ptr-update' of https://github.com…
fynnen Apr 3, 2025
3bf4eda
activate rwtp proc aura before adding a stack
fynnen Apr 3, 2025
7419015
Merge branch 'master' into feat/p8-rogue-tank-6p-ptr-update
fynnen Apr 3, 2025
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
View file
Open in desktop
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 oldStacks == 5 {
energyAura.Deactivate(sim)
}
})
Expand Down
9 changes: 7 additions & 2 deletions sim/rogue/main_gauche.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func (rogue *Rogue) registerMainGaucheSpell() {
mainGaucheAura := rogue.RegisterAura(core.Aura{
Label: "Main Gauche Buff",
ActionID: core.ActionID{SpellID: int32(proto.RogueRune_RuneMainGauche)},
Duration: time.Second * 10,
Duration: time.Second * 5,
OnSpellHitTaken: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
if spell.ProcMask.Matches(core.ProcMaskMelee|core.ProcMaskRanged) && result.DidParry() {
aura.Deactivate(sim)
Expand All @@ -29,7 +29,7 @@ func (rogue *Rogue) registerMainGaucheSpell() {
mainGaucheSSAura := rogue.RegisterAura(core.Aura{
Label: "Main Gauche Sinister Strike Discount",
ActionID: core.ActionID{SpellID: 462752},
Duration: time.Second * 30,
Duration: time.Second * 20,
OnGain: func(aura *core.Aura, sim *core.Simulation) {
rogue.SinisterStrike.Cost.FlatModifier -= 20
rogue.SinisterStrike.ThreatMultiplier *= 1.5
Expand Down Expand Up @@ -66,6 +66,11 @@ func (rogue *Rogue) registerMainGaucheSpell() {
rogue.QuickDraw.ApplyMultiplicativeDamageBonus(1 / 1.5)
}
},
OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, spellResult *core.SpellResult) {
if spell.ProcMask.Matches(rogue.SinisterStrike.ProcMask) && spellResult.Landed() {
rogue.RollingWithThePunchesProcAura.AddStack(sim)
}
},
})

rogue.MainGauche = rogue.RegisterSpell(core.SpellConfig{
Expand Down
1 change: 1 addition & 0 deletions sim/rogue/rogue.go
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion sim/rogue/runes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ func (rogue *Rogue) applyRollingWithThePunches() {
return
}

rogue.rollingWithThePunchesBonusHealthStackMultiplier += 0.06
rogue.rollingWithThePunchesBonusHealthStackMultiplier += 0.05
rogue.rollingWithThePunchesMaxStacks += 5
statDeps := make([]*stats.StatDependency, rogue.rollingWithThePunchesMaxStacks+1) // amount of possible stacks + zero condition
for i := 1; i < rogue.rollingWithThePunchesMaxStacks+1; i++ {
Expand Down
Loading