From 9a54a437a7d2b00500ccda98ef10ea08504953af Mon Sep 17 00:00:00 2001 From: MrSent Date: Sun, 22 Mar 2026 00:16:56 +0000 Subject: [PATCH] [trust] tuned AAEV/AAHM/Amchuchu and cleaned up scripts --- scripts/actions/spells/trust/aaev.lua | 7 ++++--- scripts/actions/spells/trust/aahm.lua | 12 ++++++++---- scripts/actions/spells/trust/amchuchu.lua | 6 ++++-- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/scripts/actions/spells/trust/aaev.lua b/scripts/actions/spells/trust/aaev.lua index 325b8953f0f..5035f508a0d 100644 --- a/scripts/actions/spells/trust/aaev.lua +++ b/scripts/actions/spells/trust/aaev.lua @@ -16,6 +16,7 @@ spellObject.onMobSpawn = function(mob) xi.trust.message(mob, xi.trust.messageOffset.SPAWN) mob:setMobMod(xi.mobMod.CAN_SHIELD_BLOCK, 1) + mob:setMobMod(xi.mobMod.CAN_PARRY, 3) local lvl = mob:getMainLvl() local shieldMasteryPower = 0 @@ -103,10 +104,10 @@ spellObject.onMobSpawn = function(mob) mob:setTrustTPSkillSettings(ai.tp.CLOSER_UNTIL_TP, ai.s.RANDOM, 2000) - mob:addListener('WEAPONSKILL_USE', 'AAEV_WEAPONSKILL_USE', function(mobArg, target, wsid, tp, action) - if wsid == 3710 then + mob:addListener('WEAPONSKILL_USE', 'AAEV_WEAPONSKILL_USE', function(mobArg, target, skill, tp, action) + if skill:getID() == 3710 then -- Arrogance Incarnate xi.trust.message(mobArg, xi.trust.messageOffset.SPECIAL_MOVE_1) - elseif wsid == 3712 then + elseif skill:getID() == 3712 then -- Dominion Slash xi.trust.message(mobArg, xi.trust.messageOffset.SPECIAL_MOVE_2) end end) diff --git a/scripts/actions/spells/trust/aahm.lua b/scripts/actions/spells/trust/aahm.lua index c390afa0d9c..3234adec9e8 100644 --- a/scripts/actions/spells/trust/aahm.lua +++ b/scripts/actions/spells/trust/aahm.lua @@ -15,13 +15,16 @@ end spellObject.onMobSpawn = function(mob) xi.trust.message(mob, xi.trust.messageOffset.SPAWN) + mob:addMobMod(xi.mobMod.CAN_PARRY, 3) + mob:addMod(xi.mod.HPP, 20) mob:addMod(xi.mod.UTSUSEMI_BONUS, 1) - + mob:addMod(xi.mod.FASTCAST, 30) + mob:addMod(xi.mod.DUAL_WIELD, 10) local lastSynergyBonus = 0 -- Dynamic modifier that checks party member list on tick to apply - mob:addListener('COMBAT_TICK', 'AAEV_CTICK', function(mobArg) + mob:addListener('COMBAT_TICK', 'AAHM_CTICK', function(mobArg) local synergyMembers = { xi.magic.spell.AAEV, @@ -78,8 +81,9 @@ spellObject.onMobSpawn = function(mob) mob:setTrustTPSkillSettings(ai.tp.ASAP, ai.s.RANDOM) - mob:addListener('WEAPONSKILL_USE', 'AAEV_WEAPONSKILL_USE', function(mobArg, target, wsid, tp, action) - if wsid == 3706 then + mob:addListener('WEAPONSKILL_USE', 'AAHM_WEAPONSKILL_USE', function(mobArg, target, skill, tp, action) + if skill:getID() == 3706 then -- Cross Reaver + -- Apathy strikes! xi.trust.message(mobArg, xi.trust.messageOffset.SPECIAL_MOVE_1) end end) diff --git a/scripts/actions/spells/trust/amchuchu.lua b/scripts/actions/spells/trust/amchuchu.lua index bece2965ecd..86e10755f75 100644 --- a/scripts/actions/spells/trust/amchuchu.lua +++ b/scripts/actions/spells/trust/amchuchu.lua @@ -15,6 +15,8 @@ end spellObject.onMobSpawn = function(mob) xi.trust.message(mob, xi.trust.messageOffset.SPAWN) + mob:addMobMod(xi.mobMod.CAN_PARRY, 3) + mob:addMod(xi.mod.INSPIRATION_FAST_CAST, 50) ----------------------------------- @@ -53,8 +55,8 @@ spellObject.onMobSpawn = function(mob) mob:setTrustTPSkillSettings(ai.tp.CLOSER_UNTIL_TP, ai.s.HIGHEST, 3000) - mob:addListener('WEAPONSKILL_USE', 'AMCHUCHU_WEAPONSKILL_USE', function(mobArg, target, wsid, tp, action) - if wsid == 61 then -- Dimidation + mob:addListener('WEAPONSKILL_USE', 'AMCHUCHU_WEAPONSKILL_USE', function(mobArg, target, skill, tp, action) + if skill:getID() == 61 then -- Dimidation -- Nothing-wothing wrong with a little mad science now and again! xi.trust.message(mobArg, xi.trust.messageOffset.SPECIAL_MOVE_1) end