From ba5da2df6a0672b6712149e3c700fa68d0f2ec62 Mon Sep 17 00:00:00 2001 From: Ryan Crockett Date: Thu, 2 Mar 2023 16:07:58 -0500 Subject: [PATCH] Some tweaks --- scripts/paladin/paladin_protection.lua | 15 +++++++++------ scripts/paladin/shared/rebuke.lua | 1 - 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/scripts/paladin/paladin_protection.lua b/scripts/paladin/paladin_protection.lua index 071edd3..5a5d0c5 100644 --- a/scripts/paladin/paladin_protection.lua +++ b/scripts/paladin/paladin_protection.lua @@ -42,11 +42,15 @@ local AvengersShieldTarget = Bastion.UnitManager:CreateCustomUnit('avengersshiel return false end + if not Player:IsFacing(unit) then + return false + end + if not AvengersShield:IsInRange(unit) then return false end - if unit:IsCasting() and unit:IsInterruptible() then + if unit:IsCasting() then target = unit return true end @@ -119,6 +123,10 @@ local function CombatRotation() return Consecrate:Cast(Player) end + if WoG:IsKnownAndUsable() and Player:GetAuras():FindMy(ShinningLight):IsUp() and Player:GetHealthPercent() <= 51 and not Player:IsCastingOrChanneling() then + return WoG:Cast(Player) + end + -- Handle SoR specially if DuskAndDawn is known. if OfDuskAndDawn:IsKnown() then local HpToSor = 3 @@ -141,10 +149,6 @@ local function CombatRotation() end end - if WoG:IsKnownAndUsable() and Player:GetAuras():FindMy(ShinningLight):IsUp() and Player:GetHealthPercent() <= 51 and not Player:IsCastingOrChanneling() then - return WoG:Cast(Player) - end - -- Avengers shield with higher prio than Judgement in AOE. Prefer targets that are casting. if Player:GetEnemies(10) > 1 and AvengersShield:IsKnownAndUsable() and AvengersShieldTarget:Exists() then return AvengersShield:Cast(AvengersShieldTarget) @@ -157,7 +161,6 @@ local function CombatRotation() -- Hammer of Wrath if HammerOfWrath() then - print("HOW!") return true end diff --git a/scripts/paladin/shared/rebuke.lua b/scripts/paladin/shared/rebuke.lua index 2e59cc1..e92a574 100644 --- a/scripts/paladin/shared/rebuke.lua +++ b/scripts/paladin/shared/rebuke.lua @@ -50,7 +50,6 @@ end) ---@type Rebuke function Rebuke() if RebukeTarget:Exists() and not Player:IsCastingOrChanneling() and _Rebuke:IsKnownAndUsable() then - print('HAS KICK TARGET, KICKING') return _Rebuke:Cast(RebukeTarget) end return false