feat(Warlock): Add DisplayStyle setting for Malevolence

herotc · Nov 19, 2024 · a38178a · a38178a
1 parent b24cc8f
commit a38178a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/HeroRotation_Warlock/Affliction.lua b/HeroRotation_Warlock/Affliction.lua
@@ -484,7 +484,7 @@ local function AoE()
   -- malevolence,if=variable.ps_up&variable.vt_up&variable.sr_up|cooldown.invoke_power_infusion_0.duration>0&cooldown.invoke_power_infusion_0.up&!talent.soul_rot
   -- Note: Not handling invoke_power_infusion_0.
   if S.Malevolence:IsReady() and (VarPSUp and VarVTUp and VarSRUp) then
-    if Cast(S.Malevolence, Settings.Affliction.GCDasOffGCD.Malevolence) then return "malevolence aoe 14"; end
+    if Cast(S.Malevolence, nil, Settings.CommonsDS.DisplayStyle.Malevolence, not Target:IsSpellInRange(S.Malevolence)) then return "malevolence aoe 14"; end
   end
   -- seed_of_corruption,if=((!talent.wither&dot.corruption.remains<5)|(talent.wither&dot.wither.remains<5))&!(action.seed_of_corruption.in_flight|dot.seed_of_corruption.remains>0)
   if S.SeedofCorruption:IsReady() and (((not S.Wither:IsAvailable() and Target:DebuffRemains(S.CorruptionDebuff) < 5) or (S.Wither:IsAvailable() and Target:DebuffRemains(S.WitherDebuff) < 5)) and not (S.SeedofCorruption:InFlight() or Target:DebuffUp(S.SeedofCorruptionDebuff))) then
@@ -600,7 +600,7 @@ local function Cleave()
   if VarVTPSUp and CDsON() then
     -- malevolence,if=variable.vt_ps_up
     if S.Malevolence:IsReady() then
-      if Cast(S.Malevolence, Settings.Affliction.GCDasOffGCD.Malevolence) then return "malevolence cleave 16"; end
+      if Cast(S.Malevolence, nil, Settings.CommonsDS.DisplayStyle.Malevolence, not Target:IsSpellInRange(S.Malevolence)) then return "malevolence cleave 16"; end
     end
     -- soul_rot,if=(variable.vt_ps_up)&active_dot.agony=2
     if S.SoulRot:IsReady() and (S.AgonyDebuff:AuraActiveCount() == 2) then
@@ -822,7 +822,7 @@ local function APL()
     if VarVTPSUp and CDsON() then
       -- malevolence,if=variable.vt_ps_up
       if S.Malevolence:IsReady() then
-        if Cast(S.Malevolence, Settings.Affliction.GCDasOffGCD.Malevolence) then return "malevolence main 22"; end
+        if Cast(S.Malevolence, nil, Settings.CommonsDS.DisplayStyle.Malevolence, not Target:IsSpellInRange(S.Malevolence)) then return "malevolence main 22"; end
       end
       -- soul_rot,if=variable.vt_ps_up
       if S.SoulRot:IsReady() then

diff --git a/HeroRotation_Warlock/Destruction.lua b/HeroRotation_Warlock/Destruction.lua
@@ -486,7 +486,7 @@ local function Aoe()
   end
   -- malevolence,if=cooldown.summon_infernal.remains>=55&soul_shard<4.7&(active_enemies<=3+active_dot.wither|time>30)
   if S.Malevolence:IsReady() and (S.SummonInfernal:CooldownRemains() >= 55 and SoulShards < 4.7 and (EnemiesCount8ySplash <= 3 + S.WitherDebuff:AuraActiveCount() or HL.CombatTime() > 30)) then
-    if Cast(S.Malevolence, nil, nil, not Target:IsSpellInRange(S.Malevolence)) then return "malevolence aoe 2"; end
+    if Cast(S.Malevolence, nil, Settings.CommonsDS.DisplayStyle.Malevolence, not Target:IsSpellInRange(S.Malevolence)) then return "malevolence aoe 2"; end
   end
   -- rain_of_fire,if=demonic_art
   if S.RainofFire:IsReady() and (DemonicArt()) then
@@ -642,7 +642,7 @@ local function Cleave()
   VarPoolSoulShards = (S.Havoc:CooldownRemains() <= 5) or S.Mayhem:IsAvailable()
   -- malevolence,if=(!cooldown.summon_infernal.up|!talent.summon_infernal)
   if S.Malevolence:IsReady() and (S.SummonInfernal:CooldownDown() or not S.SummonInfernal:IsAvailable()) then
-    if Cast(S.Malevolence, nil, nil, not Target:IsSpellInRange(S.Malevolence)) then return "malevolence cleave 2"; end
+    if Cast(S.Malevolence, nil, Settings.CommonsDS.DisplayStyle.Malevolence, not Target:IsSpellInRange(S.Malevolence)) then return "malevolence cleave 2"; end
   end
   -- havoc,target_if=min:((-target.time_to_die)<?-15)+dot.immolate.remains+99*(self.target=target),if=(!cooldown.summon_infernal.up|!talent.summon_infernal)&target.time_to_die>8
   if S.Havoc:IsCastable() and (S.SummonInfernal:CooldownDown() or not S.SummonInfernal:IsAvailable()) then
@@ -863,7 +863,7 @@ local function APL()
     end
     -- malevolence,if=cooldown.summon_infernal.remains>=55
     if S.Malevolence:IsReady() and (S.SummonInfernal:CooldownRemains() >= 55) then
-      if Cast(S.Malevolence, nil, nil, not Target:IsSpellInRange(S.Malevolence)) then return "malevolence main 2"; end
+      if Cast(S.Malevolence, nil, Settings.CommonsDS.DisplayStyle.Malevolence, not Target:IsSpellInRange(S.Malevolence)) then return "malevolence main 2"; end
     end
     -- wait,sec=((buff.diabolic_ritual_mother_of_chaos.remains+buff.diabolic_ritual_overlord.remains+buff.diabolic_ritual_pit_lord.remains)),if=(diabolic_ritual&(buff.diabolic_ritual_mother_of_chaos.remains+buff.diabolic_ritual_overlord.remains+buff.diabolic_ritual_pit_lord.remains)<gcd.max*0.25)&soul_shard>2
     -- TODO: Add wait?

diff --git a/HeroRotation_Warlock/Settings.lua b/HeroRotation_Warlock/Settings.lua
@@ -32,6 +32,7 @@ HR.GUISettings.APL.Warlock = {
       Potions = "Suggested",
       Trinkets = "Suggested",
       -- Class Specific
+      Malevolence = "Suggested",
       SoulRot = "Suggested",
     },
   },