src/Spell/Spell.lua

@@ -13,7 +13,14 @@ local Spell = {
     conditions = {},
     target = false,
     release_at = false,
-    traits = {},
+    traits = {
+        ignoreChanneling = false,
+        ignoreFacing = false,
+        ignoreLoS = false,
+        ignoreGCD = false,
+        ignoreMoving = false,
+        targeted = false
+    }
 }
 
 local usableExcludes = {
@@ -334,10 +341,6 @@ end
 -- Check if the spell is castable
 ---@return boolean
 function Spell:Castable()
-    if #self.traits > 0 then
-        return self:EvaluateTraits()
-    end
-
     if self:GetCastableFunction() then
         return self:GetCastableFunction()(self)
     end
@@ -698,25 +701,4 @@ function Spell:IsFree()
     return self:GetCost() == 0
 end
 
--- AddTraits
----@param traits table
----@return Spell
-function Spell:AddTraits(traits)
-    for _, trait in ipairs(traits) do
-        table.insert(self.traits, trait)
-    end
-    return self
-end
-
--- EvaluateTraits
----@return boolean
-function Spell:EvaluateTraits()
-    for _, trait in ipairs(self.traits) do
-        if not trait:Evaluate(self) then
-            return false
-        end
-    end
-    return true
-end
-
 return Spell

src/SpellTrait/SpellTrait.lua

@@ -1,23 +0,0 @@
-local Tinkr, Bastion = ...
-
----@class SpellTrait
-local SpellTrait = {}
-SpellTrait.__index = SpellTrait
-
--- Constructor
----@param func function
----@return SpellTrait
-function SpellTrait:New(func)
-    local self = setmetatable({}, SpellTrait)
-    self.func = func
-    return self
-end
-
--- Evaluate the trait
----@param spell Spell
----@return boolean
-function SpellTrait:Evaluate(spell)
-    return self.func(spell)
-end
-
-return SpellTrait

src/_bastion.lua

@@ -96,8 +96,6 @@ function Bastion.Bootstrap()
     ---@type SpellBook
     Bastion.SpellBook = Bastion.require("SpellBook")
     Bastion.Globals.SpellBook = Bastion.SpellBook:New()
-    ---@type SpellTrait
-    Bastion.SpellTrait = Bastion.require("SpellTrait")
     ---@type Item
     Bastion.Item = Bastion.require("Item")
     ---@type ItemBook