From d409d2bfc5e6974582e2ed308e704b195c2fba2f Mon Sep 17 00:00:00 2001 From: Cilraaz Date: Tue, 30 Jul 2024 20:10:20 -0400 Subject: [PATCH] fix(Multiple): Fixes for classes broken by removing "unused" spell objects - Some had usage in Events or Overrides that I hadn't considered --- HeroRotation_DemonHunter/DemonHunter.lua | 9 +++++++-- HeroRotation_Hunter/Overrides.lua | 2 +- HeroRotation_Priest/Overrides.lua | 4 +--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/HeroRotation_DemonHunter/DemonHunter.lua b/HeroRotation_DemonHunter/DemonHunter.lua index fe5569845..1225150ee 100644 --- a/HeroRotation_DemonHunter/DemonHunter.lua +++ b/HeroRotation_DemonHunter/DemonHunter.lua @@ -38,13 +38,16 @@ Spell.DemonHunter.Commons = { FirstoftheIllidari = Spell(235893), FoddertotheFlame = Spell(391429), QuickenedSigils = Spell(209281), - SigilofFlame = MultiSpell(204596, 389810), -- 204596: Base ID, 389810: Precise - SigilofMisery = MultiSpell(207684, 389813), -- 207684: Base ID, 389813: Precise SoulSigils = Spell(395446), StudentofSuffering = Spell(452412), TheHunt = Spell(370965), UnhinderedAssault = Spell(444931), VengefulRetreat = Spell(198793), + -- Sigils + SigilofChains = MultiSpell(202138, 389807), + SigilofFlame = MultiSpell(204596, 389810), -- 204596: Base ID, 389810: Precise + SigilofMisery = MultiSpell(207684, 389813), -- 207684: Base ID, 389813: Precise + SigilofSilence = MultiSpell(202137, 389809), -- Utility Disrupt = Spell(183752), -- Debuffs @@ -162,6 +165,8 @@ Spell.DemonHunter.Vengeance = MergeTableByKey(Spell.DemonHunter.Commons, { IlluminatedSigils = Spell(428557), SoulCarver = Spell(207407), SpiritBomb = Spell(247454), + -- Sigils + -- Utility Metamorphosis = Spell(187827), -- Buffs diff --git a/HeroRotation_Hunter/Overrides.lua b/HeroRotation_Hunter/Overrides.lua index fca7d5338..cdb490bd7 100644 --- a/HeroRotation_Hunter/Overrides.lua +++ b/HeroRotation_Hunter/Overrides.lua @@ -163,7 +163,7 @@ function (self, Range, AoESpell, ThisUnit, BypassRecovery, Offset) return OldSVIsReady(self, "Melee", AoESpell, ThisUnit, BypassRecovery, Offset) else local BaseCheck = OldSVIsReady(self, Range, AoESpell, ThisUnit, BypassRecovery, Offset) - if self == SpellSV.Carve or self == SpellSV.Butchery then + if self == SpellSV.Butchery then return BaseCheck and (Player:BuffDown(SpellSV.AspectoftheEagle) or Player:BuffUp(SpellSV.AspectoftheEagle) and Target:IsInMeleeRange(8)) else return BaseCheck diff --git a/HeroRotation_Priest/Overrides.lua b/HeroRotation_Priest/Overrides.lua index b1742f498..5ad9d593e 100755 --- a/HeroRotation_Priest/Overrides.lua +++ b/HeroRotation_Priest/Overrides.lua @@ -50,8 +50,6 @@ HL.AddCoreOverride ("Player.Insanity", return Insanity + 4 elseif Player:IsCasting(SpellShadow.MindFlay) then return Insanity + (12 / SpellShadow.MindFlay:BaseDuration()) - elseif Player:IsCasting(SpellShadow.DarkVoid) then - return Insanity + 15 elseif Player:IsCasting(SpellShadow.DarkAscension) then return Insanity + 30 elseif Player:IsCasting(SpellShadow.VoidTorrent) then @@ -80,7 +78,7 @@ OldShadowIsCastable = HL.AddCoreOverride("Spell.IsCastable", function (self, BypassRecovery, Range, AoESpell, ThisUnit, Offset) local BaseCheck = OldShadowIsCastable(self, BypassRecovery, Range, AoESpell, ThisUnit, Offset) if self == SpellShadow.VampiricTouch then - return BaseCheck and (not SpellShadow.ShadowCrash:InFlight() or SpellShadow.ShadowCrash:TimeSinceLastCast() > Player:GCD()) and (SpellShadow.UnfurlingDarkness:IsAvailable() or not Player:IsCasting(self)) + return BaseCheck and (not SpellShadow.ShadowCrash:InFlight() or SpellShadow.ShadowCrash:TimeSinceLastCast() > Player:GCD()) and (not SpellShadow.ShadowCrashTarget:InFlight() or SpellShadow.ShadowCrashTarget:TimeSinceLastCast() > Player:GCD()) and (SpellShadow.UnfurlingDarkness:IsAvailable() or not Player:IsCasting(self)) elseif self == SpellShadow.MindBlast then return BaseCheck and not (self:Charges() == 1 and Player:IsCasting(self)) elseif self == SpellShadow.VoidEruption or self == SpellShadow.DarkAscension then