[Combat] Improve (lua's) mob spell choosing logic

scripts/actions/spells/white/aurorastorm_ii.lua

@@ -0,0 +1,15 @@
+-----------------------------------
+-- Spell: Aurorastorm II
+-----------------------------------
+---@type TSpell
+local spellObject = {}
+
+spellObject.onMagicCastingCheck = function(caster, target, spell)
+    return 0
+end
+
+spellObject.onSpellCast = function(caster, target, spell)
+    return xi.spells.enhancing.useEnhancingSpell(caster, target, spell)
+end
+
+return spellObject

scripts/actions/spells/white/firestorm_ii.lua

@@ -0,0 +1,15 @@
+-----------------------------------
+-- Spell: Firestorm II
+-----------------------------------
+---@type TSpell
+local spellObject = {}
+
+spellObject.onMagicCastingCheck = function(caster, target, spell)
+    return 0
+end
+
+spellObject.onSpellCast = function(caster, target, spell)
+    return xi.spells.enhancing.useEnhancingSpell(caster, target, spell)
+end
+
+return spellObject

scripts/actions/spells/white/hailstorm_ii.lua

@@ -0,0 +1,15 @@
+-----------------------------------
+-- Spell: Hailstorm II
+-----------------------------------
+---@type TSpell
+local spellObject = {}
+
+spellObject.onMagicCastingCheck = function(caster, target, spell)
+    return 0
+end
+
+spellObject.onSpellCast = function(caster, target, spell)
+    return xi.spells.enhancing.useEnhancingSpell(caster, target, spell)
+end
+
+return spellObject

scripts/actions/spells/white/rainstorm_ii.lua

@@ -0,0 +1,15 @@
+-----------------------------------
+-- Spell: Rainstorm II
+-----------------------------------
+---@type TSpell
+local spellObject = {}
+
+spellObject.onMagicCastingCheck = function(caster, target, spell)
+    return 0
+end
+
+spellObject.onSpellCast = function(caster, target, spell)
+    return xi.spells.enhancing.useEnhancingSpell(caster, target, spell)
+end
+
+return spellObject

scripts/actions/spells/white/reraise.lua

@@ -9,8 +9,7 @@ spellObject.onMagicCastingCheck = function(caster, target, spell)
 end
 
 spellObject.onSpellCast = function(caster, target, spell)
-    --duration = 1800
-    target:addStatusEffect(xi.effect.RERAISE, { power = 1, duration = 3600, origin = caster }) --reraise 1, 30min duration
+    target:addStatusEffect(xi.effect.RERAISE, { power = 1, duration = 3600, tier = 1, origin = caster })
 
     return xi.effect.RERAISE
 end

scripts/actions/spells/white/reraise_ii.lua

@@ -9,9 +9,7 @@ spellObject.onMagicCastingCheck = function(caster, target, spell)
 end
 
 spellObject.onSpellCast = function(caster, target, spell)
-    --duration = 1800
-    target:delStatusEffect(xi.effect.RERAISE)
-    target:addStatusEffect(xi.effect.RERAISE, { power = 2, duration = 3600, origin = caster }) --reraise 2, 30min duration
+    target:addStatusEffect(xi.effect.RERAISE, { power = 2, duration = 3600, tier = 2, origin = caster })
 
     return xi.effect.RERAISE
 end

scripts/actions/spells/white/reraise_iii.lua

@@ -9,9 +9,7 @@ spellObject.onMagicCastingCheck = function(caster, target, spell)
 end
 
 spellObject.onSpellCast = function(caster, target, spell)
-    --duration = 1800
-    target:delStatusEffect(xi.effect.RERAISE)
-    target:addStatusEffect(xi.effect.RERAISE, { power = 3, duration = 3600, origin = caster }) --reraise 3, 30min duration
+    target:addStatusEffect(xi.effect.RERAISE, { power = 3, duration = 3600, tier = 3, origin = caster })
 
     return xi.effect.RERAISE
 end

scripts/actions/spells/white/reraise_iv.lua

@@ -9,9 +9,7 @@ spellObject.onMagicCastingCheck = function(caster, target, spell)
 end
 
 spellObject.onSpellCast = function(caster, target, spell)
-    --duration = 1800
-    target:delStatusEffect(xi.effect.RERAISE)
-    target:addStatusEffect(xi.effect.RERAISE, { power = 4, duration = 3600, origin = caster }) --reraise 3, 30min duration
+    target:addStatusEffect(xi.effect.RERAISE, { power = 4, duration = 3600, tier = 4, origin = caster })
 
     return xi.effect.RERAISE
 end

scripts/actions/spells/white/sandstorm_ii.lua

@@ -0,0 +1,15 @@
+-----------------------------------
+-- Spell: Sandstorm II
+-----------------------------------
+---@type TSpell
+local spellObject = {}
+
+spellObject.onMagicCastingCheck = function(caster, target, spell)
+    return 0
+end
+
+spellObject.onSpellCast = function(caster, target, spell)
+    return xi.spells.enhancing.useEnhancingSpell(caster, target, spell)
+end
+
+return spellObject

scripts/actions/spells/white/thunderstorm_ii.lua

@@ -0,0 +1,15 @@
+-----------------------------------
+-- Spell: Thunderstorm II
+-----------------------------------
+---@type TSpell
+local spellObject = {}
+
+spellObject.onMagicCastingCheck = function(caster, target, spell)
+    return 0
+end
+
+spellObject.onSpellCast = function(caster, target, spell)
+    return xi.spells.enhancing.useEnhancingSpell(caster, target, spell)
+end
+
+return spellObject

scripts/actions/spells/white/voidstorm_ii.lua

@@ -0,0 +1,15 @@
+-----------------------------------
+-- Spell: Voidstorm II
+-----------------------------------
+---@type TSpell
+local spellObject = {}
+
+spellObject.onMagicCastingCheck = function(caster, target, spell)
+    return 0
+end
+
+spellObject.onSpellCast = function(caster, target, spell)
+    return xi.spells.enhancing.useEnhancingSpell(caster, target, spell)
+end
+
+return spellObject

scripts/actions/spells/white/windstorm_ii.lua

@@ -0,0 +1,15 @@
+-----------------------------------
+-- Spell: Windstorm II
+-----------------------------------
+---@type TSpell
+local spellObject = {}
+
+spellObject.onMagicCastingCheck = function(caster, target, spell)
+    return 0
+end
+
+spellObject.onSpellCast = function(caster, target, spell)
+    return xi.spells.enhancing.useEnhancingSpell(caster, target, spell)
+end
+
+return spellObject

scripts/effects/addle.lua

@@ -5,8 +5,10 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    effect:addMod(xi.mod.FASTCAST, -effect:getPower()) -- Yes we are subtracting in addMod()
-    effect:addMod(xi.mod.MACC, -effect:getSubPower()) -- This is intentional
+    local power    = effect:getPower()
+    local subpower = math.floor(power / 2)
+    effect:addMod(xi.mod.MACC, -power)
+    effect:addMod(xi.mod.FASTCAST, -subpower)
 
     -- Immunobreak reset.
     target:setMod(xi.mod.ADDLE_IMMUNOBREAK, 0)

scripts/effects/aurorastorm_ii.lua

@@ -0,0 +1,17 @@
+-----------------------------------
+-- xi.effect.AURORASTORM_II
+-----------------------------------
+---@type TEffect
+local effectObject = {}
+
+effectObject.onEffectGain = function(target, effect)
+    effect:addMod(xi.mod.CHR, effect:getPower())
+end
+
+effectObject.onEffectTick = function(target, effect)
+end
+
+effectObject.onEffectLose = function(target, effect)
+end
+
+return effectObject

scripts/effects/firestorm.lua

@@ -5,14 +5,13 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    target:addMod(xi.mod.STR, effect:getPower())
+    effect:addMod(xi.mod.STR, effect:getPower())
 end
 
 effectObject.onEffectTick = function(target, effect)
 end
 
 effectObject.onEffectLose = function(target, effect)
-    target:delMod(xi.mod.STR, effect:getPower())
 end
 
 return effectObject

scripts/effects/firestorm_ii.lua

@@ -0,0 +1,17 @@
+-----------------------------------
+-- xi.effect.FIRESTORM_II
+-----------------------------------
+---@type TEffect
+local effectObject = {}
+
+effectObject.onEffectGain = function(target, effect)
+    effect:addMod(xi.mod.STR, effect:getPower())
+end
+
+effectObject.onEffectTick = function(target, effect)
+end
+
+effectObject.onEffectLose = function(target, effect)
+end
+
+return effectObject

scripts/effects/hailstorm.lua

@@ -5,14 +5,13 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    target:addMod(xi.mod.INT, effect:getPower())
+    effect:addMod(xi.mod.INT, effect:getPower())
 end
 
 effectObject.onEffectTick = function(target, effect)
 end
 
 effectObject.onEffectLose = function(target, effect)
-    target:delMod(xi.mod.INT, effect:getPower())
 end
 
 return effectObject

scripts/effects/hailstorm_ii.lua

@@ -0,0 +1,17 @@
+-----------------------------------
+-- xi.effect.HAILSTORM_II
+-----------------------------------
+---@type TEffect
+local effectObject = {}
+
+effectObject.onEffectGain = function(target, effect)
+    effect:addMod(xi.mod.INT, effect:getPower())
+end
+
+effectObject.onEffectTick = function(target, effect)
+end
+
+effectObject.onEffectLose = function(target, effect)
+end
+
+return effectObject

scripts/effects/rainstorm.lua

@@ -5,14 +5,13 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    target:addMod(xi.mod.MND, effect:getPower())
+    effect:addMod(xi.mod.MND, effect:getPower())
 end
 
 effectObject.onEffectTick = function(target, effect)
 end
 
 effectObject.onEffectLose = function(target, effect)
-    target:delMod(xi.mod.MND, effect:getPower())
 end
 
 return effectObject

scripts/effects/rainstorm_ii.lua

@@ -0,0 +1,17 @@
+-----------------------------------
+-- xi.effect.RAINSTORM_II
+-----------------------------------
+---@type TEffect
+local effectObject = {}
+
+effectObject.onEffectGain = function(target, effect)
+    effect:addMod(xi.mod.MND, effect:getPower())
+end
+
+effectObject.onEffectTick = function(target, effect)
+end
+
+effectObject.onEffectLose = function(target, effect)
+end
+
+return effectObject

scripts/effects/sandstorm.lua

@@ -5,14 +5,13 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    target:addMod(xi.mod.VIT, effect:getPower())
+    effect:addMod(xi.mod.VIT, effect:getPower())
 end
 
 effectObject.onEffectTick = function(target, effect)
 end
 
 effectObject.onEffectLose = function(target, effect)
-    target:delMod(xi.mod.VIT, effect:getPower())
 end
 
 return effectObject

scripts/effects/sandstorm_ii.lua

@@ -0,0 +1,17 @@
+-----------------------------------
+-- xi.effect.SANDSTORM_II
+-----------------------------------
+---@type TEffect
+local effectObject = {}
+
+effectObject.onEffectGain = function(target, effect)
+    effect:addMod(xi.mod.VIT, effect:getPower())
+end
+
+effectObject.onEffectTick = function(target, effect)
+end
+
+effectObject.onEffectLose = function(target, effect)
+end
+
+return effectObject

scripts/effects/thunderstorm.lua

@@ -5,14 +5,13 @@
 local effectObject = {}
 
 effectObject.onEffectGain = function(target, effect)
-    target:addMod(xi.mod.DEX, effect:getPower())
+    effect:addMod(xi.mod.DEX, effect:getPower())
 end
 
 effectObject.onEffectTick = function(target, effect)
 end
 
 effectObject.onEffectLose = function(target, effect)
-    target:delMod(xi.mod.DEX, effect:getPower())
 end
 
 return effectObject

scripts/effects/thunderstorm_ii.lua

@@ -0,0 +1,17 @@
+-----------------------------------
+-- xi.effect.THUNDERSTORM_II
+-----------------------------------
+---@type TEffect
+local effectObject = {}
+
+effectObject.onEffectGain = function(target, effect)
+    effect:addMod(xi.mod.DEX, effect:getPower())
+end
+
+effectObject.onEffectTick = function(target, effect)
+end
+
+effectObject.onEffectLose = function(target, effect)
+end
+
+return effectObject