Compare commits

...

3 Commits

  1. 2
      src/AuraTable/AuraTable.lua
  2. 59
      src/Spell/Spell.lua
  3. 6
      src/SpellBook/SpellBook.lua

@ -53,7 +53,7 @@ function AuraTable:OnUpdate(auras)
if updatedAuras and #updatedAuras > 0 then
for i = 1, #updatedAuras do
local id = updatedAuras[i]
local newAura = C_UnitAuras_GetAuraDataByAuraInstanceID(self.unit:GetOMToken(), id);
local newAura = C_UnitAuras.GetAuraDataByAuraInstanceID(self.unit:GetOMToken(), id);
if newAura then
local aura = Bastion.Aura:CreateFromUnitAuraInfo(newAura)
self:AddOrUpdateAuraInstanceID(aura:GetAuraInstanceID(), aura)

@ -12,7 +12,15 @@ local Spell = {
lastCastAt = false,
conditions = {},
target = false,
release_at = false
release_at = false,
traits = {
ignoreChanneling = false,
ignoreFacing = false,
ignoreLoS = false,
ignoreGCD = false,
ignoreMoving = false,
targeted = false
}
}
local usableExcludes = {
@ -48,12 +56,20 @@ end
-- Constructor
---@param id number
---@param traits? table
---@return Spell
function Spell:New(id)
function Spell:New(id, traits)
local self = setmetatable({}, Spell)
self.spellID = id
if traits == nil then traits = {} end
for k in pairs(traits) do
if self.traits[k] ~= nil and traits[k] ~= nil then
self.traits[k] = traits[k]
end
end
return self
end
@ -283,7 +299,44 @@ function Spell:Castable()
return self:GetCastableFunction()(self)
end
return self:IsKnownAndUsable()
if not self:IsKnownAndUsable() then return false end
local player = Bastion.UnitManager:Get("player")
if self.traits.targeted then
local target = self:GetTarget()
if not target or
not target:Exists() then return false end
if not self:IsInRange(target) then return false end
if not self.traits.ignoreFacing then
if not player:IsFacing(target) then return false end
end
if not self.traits.ignoreLoS then
if not player:CanSee(target) then return false end
end
end
if not self.traits.ignoreCasting then
if player:IsCasting() then return false end
end
if not self.traits.ignoreChanneling then
if player:IsChanneling() then return false end
end
if not self.traits.ignoreGCD then
if player:GetGCD() > C_Spell.GetSpellQueueWindow() then return false end
end
if not self.traits.ignoreMoving then
if self:GetCastLength() > 0 and player:IsMoving() then return false end
end
return true
end
-- Set a script to check if the spell is castable

@ -14,10 +14,12 @@ function SpellBook:New()
end
-- Get a spell from the spellbook
---@param id number
---@param traits? table
---@return Spell
function SpellBook:GetSpell(id)
function SpellBook:GetSpell(id, traits)
if self.spells[id] == nil then
self.spells[id] = Bastion.Spell:New(id)
self.spells[id] = Bastion.Spell:New(id, traits)
end
return self.spells[id]

Loading…
Cancel
Save