From d79ddfe9a515049031c6ec8defdaa2df8ca79b9c Mon Sep 17 00:00:00 2001 From: Zirk Date: Sun, 11 Oct 2026 17:35:42 -0700 Subject: [PATCH] [GearSwap] Move helper function to helper_functions Renamed line to rline to keep find_monster_skill consistent with the above spell_complete function. --- addons/GearSwap/helper_functions.lua | 24 ++++++++++++++++++++++++ addons/GearSwap/triggers.lua | 19 +------------------ 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/addons/GearSwap/helper_functions.lua b/addons/GearSwap/helper_functions.lua index 13bfda9a5..9a9fac868 100644 --- a/addons/GearSwap/helper_functions.lua +++ b/addons/GearSwap/helper_functions.lua @@ -1095,6 +1095,30 @@ function spell_complete(rline) return rline end +----------------------------------------------------------------------------------- +--Name: find_monster_skill(abil) +--Desc: Takes a monster ability name and finds the corresponding monster_skills +-- resource line for the player's current species +--Args: +---- abil - ability name +----------------------------------------------------------------------------------- +--Returns: +---- rline - resource line +----------------------------------------------------------------------------------- +function find_monster_skill(abil) + local rline = false + if player.species and player.species.tp_moves then + -- Iterates over currently available monster TP moves instead of using validabils + for i, v in pairs(player.species.tp_moves) do + if res.monster_skills[i][language]:lower() == abil then + rline = copy_entry(res.monster_skills[i]) + break + end + end + end + return rline +end + ----------------------------------------------------------------------------------- --Name: logit() --Args: diff --git a/addons/GearSwap/triggers.lua b/addons/GearSwap/triggers.lua index e3e54d8f5..32ed962ef 100644 --- a/addons/GearSwap/triggers.lua +++ b/addons/GearSwap/triggers.lua @@ -59,7 +59,7 @@ windower.register_event('outgoing text', function(original, modified) return modified end - local abil + local abil, r_line local r_name = res_prefix_map[unified_prefix] local targ = splitline[3] if unified_prefix == '/ra' then @@ -99,23 +99,6 @@ windower.register_event('outgoing text', function(original, modified) refresh_globals() - local r_line, find_monster_skill - - function find_monster_skill(abil) - local line = false - if player.species and player.species.tp_moves then - -- Iterates over currently available monster TP moves instead of using validabils - for i, v in pairs(player.species.tp_moves) do - if res.monster_skills[i][language]:lower() == abil then - line = copy_entry(res.monster_skills[i]) - break - end - end - end - return line - end - - if unified_prefix == '/ms' then r_line = find_monster_skill(abil) else