From b760f655bb5a56f645fa64e61e0f51c8f0add372 Mon Sep 17 00:00:00 2001 From: catszeid Date: Thu, 17 Aug 2023 13:57:39 -0600 Subject: [PATCH] Fix APL usage of Hemorrhage, Mutilate, and Hunger for Blood --- sim/rogue/hemorrhage.go | 4 ++++ sim/rogue/mutilate.go | 8 ++++++-- sim/rogue/talents.go | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/sim/rogue/hemorrhage.go b/sim/rogue/hemorrhage.go index 3b3ac9e0f8..1c7649d04c 100644 --- a/sim/rogue/hemorrhage.go +++ b/sim/rogue/hemorrhage.go @@ -8,6 +8,10 @@ import ( ) func (rogue *Rogue) registerHemorrhageSpell() { + if !rogue.Talents.Hemorrhage { + return + } + actionID := core.ActionID{SpellID: 48660} var numPlayers int diff --git a/sim/rogue/mutilate.go b/sim/rogue/mutilate.go index 7f5db40e7a..d062cd79d0 100644 --- a/sim/rogue/mutilate.go +++ b/sim/rogue/mutilate.go @@ -21,7 +21,7 @@ func (rogue *Rogue) newMutilateHitSpell(isMH bool) *core.Spell { ActionID: actionID, SpellSchool: core.SpellSchoolPhysical, ProcMask: procMask, - Flags: core.SpellFlagMeleeMetrics | SpellFlagBuilder | SpellFlagColdBlooded | core.SpellFlagAPL, + Flags: core.SpellFlagMeleeMetrics | SpellFlagBuilder | SpellFlagColdBlooded, BonusCritRating: core.TernaryFloat64(rogue.HasSetBonus(Tier9, 4), 5*core.CritRatingPerCritChance, 0) + []float64{0, 2, 4, 6}[rogue.Talents.TurnTheTables]*core.CritRatingPerCritChance + @@ -54,6 +54,10 @@ func (rogue *Rogue) newMutilateHitSpell(isMH bool) *core.Spell { } func (rogue *Rogue) registerMutilateSpell() { + if !rogue.Talents.Mutilate { + return + } + rogue.MutilateMH = rogue.newMutilateHitSpell(true) rogue.MutilateOH = rogue.newMutilateHitSpell(false) @@ -61,7 +65,7 @@ func (rogue *Rogue) registerMutilateSpell() { ActionID: core.ActionID{SpellID: MutilateSpellID}, SpellSchool: core.SpellSchoolPhysical, ProcMask: core.ProcMaskMeleeMHSpecial, - Flags: core.SpellFlagMeleeMetrics, + Flags: core.SpellFlagMeleeMetrics | core.SpellFlagAPL, EnergyCost: core.EnergyCostOptions{ Cost: rogue.costModifier(60 - core.TernaryFloat64(rogue.HasMajorGlyph(proto.RogueMajorGlyph_GlyphOfMutilate), 5, 0)), diff --git a/sim/rogue/talents.go b/sim/rogue/talents.go index 659ab3ed5f..072d2d4d94 100644 --- a/sim/rogue/talents.go +++ b/sim/rogue/talents.go @@ -145,6 +145,7 @@ func (rogue *Rogue) registerHungerForBlood() { rogue.HungerForBlood = rogue.RegisterSpell(core.SpellConfig{ ActionID: actionID, + Flags: core.SpellFlagAPL, EnergyCost: core.EnergyCostOptions{ Cost: 15,