Merge pull request LandSandBoat#5902 from benrandallswg/benrandallswg…

…/job_utils_refactoring [LUA] Refactor of bard abilities
cocosolos · Jun 28, 2024 · a707bed · a707bed
2 parents b8df04b + 8d9fd9e
commit a707bed
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 14 deletions.
diff --git a/scripts/actions/abilities/clarion_call.lua b/scripts/actions/abilities/clarion_call.lua
@@ -8,13 +8,11 @@
 local abilityObject = {}
 
 abilityObject.onAbilityCheck = function(player, target, ability)
-    ability:setRecast(math.max(0, ability:getRecast() - player:getMod(xi.mod.ONE_HOUR_RECAST) * 60))
-
-    return 0, 0
+    return xi.job_utils.bard.checkClarionCall(player, target, ability)
 end
 
 abilityObject.onUseAbility = function(player, target, ability)
-    player:addStatusEffect(xi.effect.CLARION_CALL, 10, 0, 180)
+    xi.job_utils.bard.useClarionCall(player, target, ability)
 end
 
 return abilityObject
diff --git a/scripts/actions/abilities/marcato.lua b/scripts/actions/abilities/marcato.lua
@@ -12,7 +12,7 @@ abilityObject.onAbilityCheck = function(player, target, ability)
 end
 
 abilityObject.onUseAbility = function(player, target, ability)
-    player:addStatusEffect(xi.effect.MARCATO, 0, 0, 60)
+    xi.job_utils.bard.useMarcato(player, target, ability)
 end
 
 return abilityObject
diff --git a/scripts/actions/abilities/nightingale.lua b/scripts/actions/abilities/nightingale.lua
@@ -12,7 +12,7 @@ abilityObject.onAbilityCheck = function(player, target, ability)
 end
 
 abilityObject.onUseAbility = function(player, target, ability)
-    player:addStatusEffect(xi.effect.NIGHTINGALE, 0, 0, 60)
+    xi.job_utils.bard.useNightingale(player, target, ability)
 end
 
 return abilityObject
diff --git a/scripts/actions/abilities/pianissimo.lua b/scripts/actions/abilities/pianissimo.lua
@@ -12,7 +12,7 @@ abilityObject.onAbilityCheck = function(player, target, ability)
 end
 
 abilityObject.onUseAbility = function(player, target, ability)
-    player:addStatusEffect(xi.effect.PIANISSIMO, 0, 0, 60)
+    xi.job_utils.bard.usePianissimo(player, target, ability)
 end
 
 return abilityObject
diff --git a/scripts/actions/abilities/soul_voice.lua b/scripts/actions/abilities/soul_voice.lua
@@ -8,13 +8,11 @@
 local abilityObject = {}
 
 abilityObject.onAbilityCheck = function(player, target, ability)
-    ability:setRecast(math.max(0, ability:getRecast() - player:getMod(xi.mod.ONE_HOUR_RECAST) * 60))
-
-    return 0, 0
+    return xi.job_utils.bard.checkSoulVoice(player, target, ability)
 end
 
 abilityObject.onUseAbility = function(player, target, ability)
-    player:addStatusEffect(xi.effect.SOUL_VOICE, 1, 0, 180)
+    xi.job_utils.bard.useSoulVoice(player, target, ability)
 end
 
 return abilityObject
diff --git a/scripts/actions/abilities/tenuto.lua b/scripts/actions/abilities/tenuto.lua
@@ -12,8 +12,7 @@ abilityObject.onAbilityCheck = function(player, target, ability)
 end
 
 abilityObject.onUseAbility = function(player, target, ability)
-    -- TODO: Implement this ability
-    player:addStatusEffect(xi.effect.TENUTO, 0, 0, 60)
+    xi.job_utils.bard.useTenuto(player, target, ability)
 end
 
 return abilityObject
diff --git a/scripts/actions/abilities/troubadour.lua b/scripts/actions/abilities/troubadour.lua
@@ -12,7 +12,7 @@ abilityObject.onAbilityCheck = function(player, target, ability)
 end
 
 abilityObject.onUseAbility = function(player, target, ability)
-    player:addStatusEffect(xi.effect.TROUBADOUR, 0, 0, 60)
+    xi.job_utils.bard.useTroubadour(player, target, ability)
 end
 
 return abilityObject
diff --git a/scripts/globals/job_utils/bard.lua b/scripts/globals/job_utils/bard.lua
@@ -0,0 +1,53 @@
+-----------------------------------
+-- Bard Job Utilities
+-----------------------------------
+xi = xi or {}
+xi.job_utils = xi.job_utils or {}
+xi.job_utils.bard = xi.job_utils.bard or {}
+
+-----------------------------------
+-- Ability Check Functions
+-----------------------------------
+xi.job_utils.bard.checkSoulVoice = function(player, target, ability)
+    ability:setRecast(math.max(0, ability:getRecast() - player:getMod(xi.mod.ONE_HOUR_RECAST) * 60))
+
+    return 0, 0
+end
+
+xi.job_utils.bard.checkClarionCall = function(player, target, ability)
+    ability:setRecast(math.max(0, ability:getRecast() - player:getMod(xi.mod.ONE_HOUR_RECAST) * 60))
+
+    return 0, 0
+end
+
+-----------------------------------
+-- Ability Use Functions
+-----------------------------------
+xi.job_utils.bard.useSoulVoice = function(player, target, ability)
+    player:addStatusEffect(xi.effect.SOUL_VOICE, 1, 0, 180)
+end
+
+xi.job_utils.bard.usePianissimo = function(player, target, ability)
+    player:addStatusEffect(xi.effect.PIANISSIMO, 0, 0, 60)
+end
+
+xi.job_utils.bard.useNightingale = function(player, target, ability)
+    player:addStatusEffect(xi.effect.NIGHTINGALE, 0, 0, 60)
+end
+
+xi.job_utils.bard.useTroubadour = function(player, target, ability)
+    player:addStatusEffect(xi.effect.TROUBADOUR, 0, 0, 60)
+end
+
+xi.job_utils.bard.useTenuto = function(player, target, ability)
+    -- TODO: Implement this ability
+    player:addStatusEffect(xi.effect.TENUTO, 0, 0, 60)
+end
+
+xi.job_utils.bard.useMarcato = function(player, target, ability)
+    player:addStatusEffect(xi.effect.MARCATO, 0, 0, 60)
+end
+
+xi.job_utils.bard.useClarionCall = function(player, target, ability)
+    player:addStatusEffect(xi.effect.CLARION_CALL, 10, 0, 180)
+end