From 08d3ba5afe9eb627f80a6443eecbc45195d6f488 Mon Sep 17 00:00:00 2001 From: Nathan Berman Date: Fri, 15 Nov 2024 20:28:26 +0000 Subject: [PATCH 1/2] Added null check to killshot aq2.5 set --- sim/hunter/item_sets_pve.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sim/hunter/item_sets_pve.go b/sim/hunter/item_sets_pve.go index 6c6cd71363..3abf99c67f 100644 --- a/sim/hunter/item_sets_pve.go +++ b/sim/hunter/item_sets_pve.go @@ -462,7 +462,9 @@ var StrikersPursuit = core.NewItemSet(core.ItemSet{ hunter.RegisterAura(core.Aura{ Label: "Striker's Pursuit 4P", OnInit: func(aura *core.Aura, sim *core.Simulation) { - hunter.KillShot.DamageMultiplier *= 1.50 + if hunter.KillShot != nil { + hunter.KillShot.DamageMultiplier *= 1.50 + } }, }) }, From 61592bc0cee9f0557606061484b03e8501ffc0d7 Mon Sep 17 00:00:00 2001 From: Nathan Berman Date: Fri, 15 Nov 2024 20:37:29 +0000 Subject: [PATCH 2/2] Added null checks to not added any of the auras that are entirely based on rune spells - hunter aq --- sim/hunter/item_sets_pve.go | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/sim/hunter/item_sets_pve.go b/sim/hunter/item_sets_pve.go index 3abf99c67f..9238123447 100644 --- a/sim/hunter/item_sets_pve.go +++ b/sim/hunter/item_sets_pve.go @@ -408,12 +408,14 @@ var StrikersProwess = core.NewItemSet(core.ItemSet{ // Increases Wyvern Strike DoT by 50% 2: func(agent core.Agent) { hunter := agent.(HunterAgent).GetHunter() + if hunter.WyvernStrike == nil { + return + } + hunter.RegisterAura(core.Aura{ Label: "Striker's Prowess 2P", OnInit: func(aura *core.Aura, sim *core.Simulation) { - if hunter.WyvernStrike != nil { - hunter.WyvernStrike.DoTDamageMultiplier *= 1.50 - } + hunter.WyvernStrike.DoTDamageMultiplier *= 1.50 }, }) }, @@ -441,6 +443,10 @@ var StrikersPursuit = core.NewItemSet(core.ItemSet{ // Kill Shot's remaining cooldown is reduced by 50% when used on targets between 20% and 50% health, and has no cooldown while your Rapid Fire is active 2: func(agent core.Agent) { hunter := agent.(HunterAgent).GetHunter() + if hunter.KillShot == nil { + return + } + core.MakePermanent(hunter.RegisterAura(core.Aura{ Label: "Striker's Pursuit 2P", OnCastComplete: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell) { @@ -459,12 +465,14 @@ var StrikersPursuit = core.NewItemSet(core.ItemSet{ // Increases Kill Shot damage by 50% 4: func(agent core.Agent) { hunter := agent.(HunterAgent).GetHunter() + if hunter.KillShot == nil { + return + } + hunter.RegisterAura(core.Aura{ Label: "Striker's Pursuit 4P", OnInit: func(aura *core.Aura, sim *core.Simulation) { - if hunter.KillShot != nil { - hunter.KillShot.DamageMultiplier *= 1.50 - } + hunter.KillShot.DamageMultiplier *= 1.50 }, }) },