main
Ryan Crockett 2 years ago
parent df988ab750
commit e0c2e15a47
  1. 17
      scripts/paladin/paladin_protection.lua
  2. 69
      scripts/paladin/shared/hammer-of-wrath.lua
  3. 17
      scripts/paladin/shared/rebuke.lua
  4. 2
      src/Unit/Unit.lua

@ -20,8 +20,11 @@ local ShieldOfTheRighteous = Bastion.SpellBook:GetSpell(53600)
local BlessedHammer = Bastion.SpellBook:GetSpell(204019) local BlessedHammer = Bastion.SpellBook:GetSpell(204019)
local AutoAttack = Bastion.SpellBook:GetSpell(6603) local AutoAttack = Bastion.SpellBook:GetSpell(6603)
---@type ShouldRebuke ---@type Rebuke
local ShouldRebuke = Tinkr:require("scripts/bastion/scripts/paladin/shared/should-rebuke", Bastion) local Rebuke = Tinkr:require("scripts/bastion/scripts/paladin/shared/rebuke", Bastion)
---@type HammerOfWrath
local HammerOfWrath = Tinkr:require("scripts/bastion/scripts/paladin/shared/hammer-of-wrath", Bastion)
local AvengersShieldTarget = Bastion.UnitManager:CreateCustomUnit('avengers_shield', function() local AvengersShieldTarget = Bastion.UnitManager:CreateCustomUnit('avengers_shield', function()
local target = nil local target = nil
@ -66,7 +69,7 @@ local function CombatRotation()
end end
-- Kick -- Kick
if ShouldRebuke() then return true end if Rebuke() then return true end
-- Cast Consecrate if an enemy is in range, and the player isnt moving. -- Cast Consecrate if an enemy is in range, and the player isnt moving.
if Consecrate:IsKnownAndUsable() and not Player:IsMoving() and not Player:GetAuras():FindMy(ConsecrateAura):IsUp() and Player:GetEnemies(10) >= 1 then if Consecrate:IsKnownAndUsable() and not Player:IsMoving() and not Player:GetAuras():FindMy(ConsecrateAura):IsUp() and Player:GetEnemies(10) >= 1 then
@ -101,6 +104,9 @@ local function CombatRotation()
return Judgement:Cast(Target) return Judgement:Cast(Target)
end end
-- Hammer of Wrath
if HammerOfWrath() then return true end
-- Avengers shield with lower prio than Judgement in ST. Prefer targets that are casting. -- Avengers shield with lower prio than Judgement in ST. Prefer targets that are casting.
if Player:GetEnemies(10) == 1 and AvengersShield:IsKnownAndUsable() and AvengersShieldTarget:Exists() then if Player:GetEnemies(10) == 1 and AvengersShield:IsKnownAndUsable() and AvengersShieldTarget:Exists() then
return AvengersShield:Cast(AvengersShieldTarget) return AvengersShield:Cast(AvengersShieldTarget)
@ -111,6 +117,11 @@ local function CombatRotation()
return BlessedHammer:Cast(Player) return BlessedHammer:Cast(Player)
end end
-- Refresh Consecrate if we've got nothing else to cast.
if Consecrate:IsKnownAndUsable() and Player:GetEnemies(10) >= 1 and not Player:IsMoving() then
return Consecrate:Cast(Player)
end
return false return false
end end

@ -0,0 +1,69 @@
local Tinkr, _Bastion = ...
---@type Bastion
local Bastion = _Bastion
local Player = Bastion.UnitManager:Get('player')
local Target = Bastion.UnitManager:Get('target')
local None = Bastion.UnitManager:Get('none')
local _HammerOfWrath = Bastion.SpellBook:GetSpell(24275)
local AvengingWrath = Bastion.SpellBook:GetSpell(389539)
local HammerOfWrathTarget = Bastion.UnitManager:CreateCustomUnit('hammerofwrath', function()
if not _HammerOfWrath:IsKnownAndUsable() then return None end
if Player:GetAuras():FindMy(AvengingWrath):IsUp() and _HammerOfWrath:IsKnownAndUsable() and Target:Exists() and Target:IsEnemy() and Target:IsAffectingCombat() and _HammerOfWrath:IsInRange(Target) then
return Target
end
local how = nil
Bastion.UnitManager:EnumEnemies(function(unit)
if unit:IsDead() then
return false
end
if not Player:CanSee(unit) then
return false
end
if not Player:IsFacing(unit) then
return false
end
if not _HammerOfWrath:IsInRange(unit) then
return false
end
if Player:GetAuras():FindMy(AvengingWrath):IsUp() then
how = unit
return true
end
if unit:GetHealthPercent() <= 20 then
how = unit
return true
end
return false
end)
if how == nil then
how = None
end
return how
end)
---@alias HammerOfWrath fun():boolean
---@type HammerOfWrath
function HammerOfWrath()
if HammerOfWrathTarget:Exists() and not Player:IsCastingOrChanneling() then
return _HammerOfWrath:Cast(HammerOfWrathTarget)
end
return false
end
return HammerOfWrath

@ -6,7 +6,7 @@ local Bastion = _Bastion
local Player = Bastion.UnitManager:Get('player') local Player = Bastion.UnitManager:Get('player')
local None = Bastion.UnitManager:Get('none') local None = Bastion.UnitManager:Get('none')
local Rebuke = Bastion.SpellBook:GetSpell(96231) local _Rebuke = Bastion.SpellBook:GetSpell(96231)
local RebukeTarget = Bastion.UnitManager:CreateCustomUnit('rebuke', function() local RebukeTarget = Bastion.UnitManager:CreateCustomUnit('rebuke', function()
local kick = nil local kick = nil
@ -24,7 +24,7 @@ local RebukeTarget = Bastion.UnitManager:CreateCustomUnit('rebuke', function()
return false return false
end end
if unit:IsInterruptible() and Rebuke:IsInRange(unit) and Player:IsFacing(unit) then if unit:IsInterruptibleAt(10) and _Rebuke:IsInRange(unit) and Player:IsFacing(unit) then
kick = unit kick = unit
return true return true
end end
@ -45,14 +45,15 @@ local RebukeTarget = Bastion.UnitManager:CreateCustomUnit('rebuke', function()
return kick return kick
end) end)
---@alias ShouldRebuke fun():boolean ---@alias Rebuke fun():boolean
---@return boolean
function ShouldRebuke() ---@type Rebuke
if RebukeTarget:Exists() and not Player:IsCastingOrChanneling() and Rebuke:IsKnownAndUsable() then function Rebuke()
if RebukeTarget:Exists() and not Player:IsCastingOrChanneling() and _Rebuke:IsKnownAndUsable() then
print('HAS KICK TARGET, KICKING') print('HAS KICK TARGET, KICKING')
return Rebuke:Cast(RebukeTarget) return _Rebuke:Cast(RebukeTarget)
end end
return false return false
end end
return ShouldRebuke return Rebuke

@ -452,7 +452,7 @@ end
-- Check if unit is interruptible -- Check if unit is interruptible
---@param percent number ---@param percent number
---@param ignoreInterruptible boolean ---@param ignoreInterruptible? boolean
---@return boolean ---@return boolean
function Unit:IsInterruptibleAt(percent, ignoreInterruptible) function Unit:IsInterruptibleAt(percent, ignoreInterruptible)
if not ignoreInterruptible and not self:IsInterruptible() then if not ignoreInterruptible and not self:IsInterruptible() then

Loading…
Cancel
Save