From d8296d68672543e2225eaa01cb21ac07fec375e8 Mon Sep 17 00:00:00 2001 From: Skold177 <113406182+Skold177@users.noreply.github.com> Date: Wed, 21 Jan 2026 11:28:43 -0500 Subject: [PATCH] [lua] Enwater conversion, ae.enwater retirement Converts the additional effect enwater over to the new system --- scripts/globals/mobs.lua | 10 ---------- scripts/zones/Bibiki_Bay/mobs/Dalham.lua | 11 ++++++++++- scripts/zones/Bibiki_Bay/mobs/Splacknuck.lua | 11 ++++++++++- scripts/zones/Cape_Teriggan/mobs/Tegmine.lua | 11 ++++++++++- .../Carpenters_Landing/mobs/Tempest_Tigon.lua | 15 ++++++++++----- .../mobs/Leviathan_Prime_TBW.lua | 11 ++++++++++- .../mobs/Leviathan_Prime_TSTBW.lua | 11 ++++++++++- .../mobs/Leviathan_Prime_WTB.lua | 11 ++++++++++- scripts/zones/Dangruf_Wadi/mobs/Chocoboleech.lua | 11 ++++++++++- .../zones/Gusgen_Mines/mobs/Juggler_Hecatomb.lua | 11 ++++++++++- scripts/zones/Kuftal_Tunnel/mobs/Cancer.lua | 11 ++++++++++- scripts/zones/Misareaux_Coast/mobs/Ziphius.lua | 11 ++++++++++- .../zones/Mount_Zhayolm/mobs/Chary_Apkallu.lua | 11 ++++++++++- scripts/zones/Qufim_Island/mobs/Qoofim.lua | 11 ++++++++++- scripts/zones/RuAun_Gardens/mobs/Genbu.lua | 11 ++++++++++- scripts/zones/The_Boyahda_Tree/mobs/Aquarius.lua | 11 ++++++++++- .../zones/The_Shrine_of_RuAvitau/mobs/Genbu.lua | 11 ++++++++++- .../Yuhtunga_Jungle/mobs/Pyuu_the_Spatemaker.lua | 11 ++++++++++- 18 files changed, 170 insertions(+), 31 deletions(-) diff --git a/scripts/globals/mobs.lua b/scripts/globals/mobs.lua index d405ab12192..78ffba2164c 100644 --- a/scripts/globals/mobs.lua +++ b/scripts/globals/mobs.lua @@ -319,16 +319,6 @@ local additionalEffects = bonusAbilityParams = { bonusmab = 0, includemab = false }, }, - [xi.mob.ae.ENWATER] = - { - ele = xi.element.WATER, - sub = xi.subEffect.WATER_DAMAGE, - msg = xi.msg.basic.ADD_EFFECT_DMG, - negMsg = xi.msg.basic.ADD_EFFECT_HEAL, - mod = xi.mod.INT, - bonusAbilityParams = { bonusmab = 0, includemab = false }, - }, - [xi.mob.ae.EVASION_DOWN] = { chance = 25, diff --git a/scripts/zones/Bibiki_Bay/mobs/Dalham.lua b/scripts/zones/Bibiki_Bay/mobs/Dalham.lua index 81a8f286d9d..35707217049 100644 --- a/scripts/zones/Bibiki_Bay/mobs/Dalham.lua +++ b/scripts/zones/Bibiki_Bay/mobs/Dalham.lua @@ -19,7 +19,16 @@ entity.onMobSpawn = function(mob) end entity.onAdditionalEffect = function(mob, target, damage) - return xi.mob.onAddEffect(mob, target, damage, xi.mob.ae.ENWATER, { chance = 100 }) + local pTable = + { + chance = 100, + attackType = xi.attackType.MAGICAL, + magicalElement = xi.element.WATER, + basePower = math.floor(damage / 2), + actorStat = xi.mod.INT, + } + + return xi.combat.action.executeAdditionalDamage(mob, target, pTable) end entity.onMobFight = function(mob, target) diff --git a/scripts/zones/Bibiki_Bay/mobs/Splacknuck.lua b/scripts/zones/Bibiki_Bay/mobs/Splacknuck.lua index 3b6d1f688b5..1f01abe10cc 100644 --- a/scripts/zones/Bibiki_Bay/mobs/Splacknuck.lua +++ b/scripts/zones/Bibiki_Bay/mobs/Splacknuck.lua @@ -34,7 +34,16 @@ entity.onMobSpawn = function(mob) end entity.onAdditionalEffect = function(mob, target, damage) - return xi.mob.onAddEffect(mob, target, damage, xi.mob.ae.ENWATER) + local pTable = + { + chance = 100, + attackType = xi.attackType.MAGICAL, + magicalElement = xi.element.WATER, + basePower = math.floor(damage / 2), + actorStat = xi.mod.INT, + } + + return xi.combat.action.executeAdditionalDamage(mob, target, pTable) end entity.onMobDeath = function(mob, player, optParams) diff --git a/scripts/zones/Cape_Teriggan/mobs/Tegmine.lua b/scripts/zones/Cape_Teriggan/mobs/Tegmine.lua index 844584ed27e..9b0982ae2bb 100644 --- a/scripts/zones/Cape_Teriggan/mobs/Tegmine.lua +++ b/scripts/zones/Cape_Teriggan/mobs/Tegmine.lua @@ -35,7 +35,16 @@ entity.onMobSpawn = function(mob) end entity.onAdditionalEffect = function(mob, target, damage) - return xi.mob.onAddEffect(mob, target, damage, xi.mob.ae.ENWATER) + local pTable = + { + chance = 100, + attackType = xi.attackType.MAGICAL, + magicalElement = xi.element.WATER, + basePower = math.floor(damage / 2), + actorStat = xi.mod.INT, + } + + return xi.combat.action.executeAdditionalDamage(mob, target, pTable) end entity.onMobDeath = function(mob, player, optParams) diff --git a/scripts/zones/Carpenters_Landing/mobs/Tempest_Tigon.lua b/scripts/zones/Carpenters_Landing/mobs/Tempest_Tigon.lua index 55476875f49..624e10bf8af 100644 --- a/scripts/zones/Carpenters_Landing/mobs/Tempest_Tigon.lua +++ b/scripts/zones/Carpenters_Landing/mobs/Tempest_Tigon.lua @@ -67,11 +67,16 @@ entity.onMobInitialize = function(mob) end entity.onAdditionalEffect = function(mob, target, damage) - if math.random(1, 100) <= 50 then - return xi.mob.onAddEffect(mob, target, damage, xi.mob.ae.ENAERO, { chance = 50 }) - else - return xi.mob.onAddEffect(mob, target, damage, xi.mob.ae.ENWATER, { chance = 50 }) - end + local pTable = + { + chance = 50, + attackType = xi.attackType.MAGICAL, + magicalElement = math.random(1, 100) <= 50 and xi.element.WIND or xi.element.WATER, + basePower = math.floor(damage / 2), + actorStat = xi.mod.INT, + } + + return xi.combat.action.executeAdditionalDamage(mob, target, pTable) end entity.onMobDeath = function(mob, player, optParams) diff --git a/scripts/zones/Cloister_of_Tides/mobs/Leviathan_Prime_TBW.lua b/scripts/zones/Cloister_of_Tides/mobs/Leviathan_Prime_TBW.lua index 635d337f998..9a876772caa 100644 --- a/scripts/zones/Cloister_of_Tides/mobs/Leviathan_Prime_TBW.lua +++ b/scripts/zones/Cloister_of_Tides/mobs/Leviathan_Prime_TBW.lua @@ -38,7 +38,16 @@ entity.onMobSpawn = function(mob) end entity.onAdditionalEffect = function(mob, target, damage) - return xi.mob.onAddEffect(mob, target, damage, xi.mob.ae.ENWATER, { chance = 100, power = math.random(20, 40) }) + local pTable = + { + chance = 100, + attackType = xi.attackType.MAGICAL, + magicalElement = xi.element.WATER, + basePower = math.floor(damage / 2), + actorStat = xi.mod.INT, + } + + return xi.combat.action.executeAdditionalDamage(mob, target, pTable) end entity.onMobFight = function(mob, target) diff --git a/scripts/zones/Cloister_of_Tides/mobs/Leviathan_Prime_TSTBW.lua b/scripts/zones/Cloister_of_Tides/mobs/Leviathan_Prime_TSTBW.lua index a4f661c92e3..f82e16bc6a7 100644 --- a/scripts/zones/Cloister_of_Tides/mobs/Leviathan_Prime_TSTBW.lua +++ b/scripts/zones/Cloister_of_Tides/mobs/Leviathan_Prime_TSTBW.lua @@ -41,7 +41,16 @@ entity.onMobSpawn = function(mob) end entity.onAdditionalEffect = function(mob, target, damage) - return xi.mob.onAddEffect(mob, target, damage, xi.mob.ae.ENWATER, { chance = 100, power = math.random(15, 25) }) + local pTable = + { + chance = 100, + attackType = xi.attackType.MAGICAL, + magicalElement = xi.element.WATER, + basePower = math.floor(damage / 2), + actorStat = xi.mod.INT, + } + + return xi.combat.action.executeAdditionalDamage(mob, target, pTable) end entity.onMobEngage = function(mob, target) diff --git a/scripts/zones/Cloister_of_Tides/mobs/Leviathan_Prime_WTB.lua b/scripts/zones/Cloister_of_Tides/mobs/Leviathan_Prime_WTB.lua index 1635df6ed92..f7cecff648f 100644 --- a/scripts/zones/Cloister_of_Tides/mobs/Leviathan_Prime_WTB.lua +++ b/scripts/zones/Cloister_of_Tides/mobs/Leviathan_Prime_WTB.lua @@ -41,7 +41,16 @@ entity.onMobSpawn = function(mob) end entity.onAdditionalEffect = function(mob, target, damage) - return xi.mob.onAddEffect(mob, target, damage, xi.mob.ae.ENWATER, { chance = 100, power = math.random(75, 125) }) + local pTable = + { + chance = 100, + attackType = xi.attackType.MAGICAL, + magicalElement = xi.element.WATER, + basePower = math.floor(damage / 2), + actorStat = xi.mod.INT, + } + + return xi.combat.action.executeAdditionalDamage(mob, target, pTable) end entity.onMobWeaponSkill = function(target, mob, skill) diff --git a/scripts/zones/Dangruf_Wadi/mobs/Chocoboleech.lua b/scripts/zones/Dangruf_Wadi/mobs/Chocoboleech.lua index e23047ede05..92f9d23a3b4 100644 --- a/scripts/zones/Dangruf_Wadi/mobs/Chocoboleech.lua +++ b/scripts/zones/Dangruf_Wadi/mobs/Chocoboleech.lua @@ -10,7 +10,16 @@ entity.onMobInitialize = function(mob) end entity.onAdditionalEffect = function(mob, target, damage) - return xi.mob.onAddEffect(mob, target, damage, xi.mob.ae.ENWATER) + local pTable = + { + chance = 100, + attackType = xi.attackType.MAGICAL, + magicalElement = xi.element.WATER, + basePower = math.floor(damage / 2), + actorStat = xi.mod.INT, + } + + return xi.combat.action.executeAdditionalDamage(mob, target, pTable) end entity.onMobDeath = function(mob, player, optParams) diff --git a/scripts/zones/Gusgen_Mines/mobs/Juggler_Hecatomb.lua b/scripts/zones/Gusgen_Mines/mobs/Juggler_Hecatomb.lua index 845327c7f20..e98c7500449 100644 --- a/scripts/zones/Gusgen_Mines/mobs/Juggler_Hecatomb.lua +++ b/scripts/zones/Gusgen_Mines/mobs/Juggler_Hecatomb.lua @@ -18,7 +18,16 @@ entity.onMobInitialize = function(mob) end entity.onAdditionalEffect = function(mob, target, damage) - return xi.mob.onAddEffect(mob, target, damage, xi.mob.ae.ENWATER) + local pTable = + { + chance = 100, + attackType = xi.attackType.MAGICAL, + magicalElement = xi.element.WATER, + basePower = math.floor(damage / 2), + actorStat = xi.mod.INT, + } + + return xi.combat.action.executeAdditionalDamage(mob, target, pTable) end return entity diff --git a/scripts/zones/Kuftal_Tunnel/mobs/Cancer.lua b/scripts/zones/Kuftal_Tunnel/mobs/Cancer.lua index fbe9a1b5649..ccbe1fd6641 100644 --- a/scripts/zones/Kuftal_Tunnel/mobs/Cancer.lua +++ b/scripts/zones/Kuftal_Tunnel/mobs/Cancer.lua @@ -13,7 +13,16 @@ entity.onMobInitialize = function(mob) end entity.onAdditionalEffect = function(mob, target, damage) - return xi.mob.onAddEffect(mob, target, damage, xi.mob.ae.ENWATER) + local pTable = + { + chance = 25, + attackType = xi.attackType.MAGICAL, + magicalElement = xi.element.WATER, + basePower = math.floor(damage / 2), + actorStat = xi.mod.INT, + } + + return xi.combat.action.executeAdditionalDamage(mob, target, pTable) end entity.onMobDeath = function(mob, player, optParams) diff --git a/scripts/zones/Misareaux_Coast/mobs/Ziphius.lua b/scripts/zones/Misareaux_Coast/mobs/Ziphius.lua index e3d6e2b034f..27bdf970589 100644 --- a/scripts/zones/Misareaux_Coast/mobs/Ziphius.lua +++ b/scripts/zones/Misareaux_Coast/mobs/Ziphius.lua @@ -10,7 +10,16 @@ entity.onMobInitialize = function(mob) end entity.onAdditionalEffect = function(mob, target, damage) - return xi.mob.onAddEffect(mob, target, damage, xi.mob.ae.ENWATER) + local pTable = + { + chance = 100, + attackType = xi.attackType.MAGICAL, + magicalElement = xi.element.WATER, + basePower = math.floor(damage / 2), + actorStat = xi.mod.INT, + } + + return xi.combat.action.executeAdditionalDamage(mob, target, pTable) end entity.onMobDeath = function(mob, player, optParams) diff --git a/scripts/zones/Mount_Zhayolm/mobs/Chary_Apkallu.lua b/scripts/zones/Mount_Zhayolm/mobs/Chary_Apkallu.lua index 40fb3f06be0..48dfd11a07a 100644 --- a/scripts/zones/Mount_Zhayolm/mobs/Chary_Apkallu.lua +++ b/scripts/zones/Mount_Zhayolm/mobs/Chary_Apkallu.lua @@ -13,7 +13,16 @@ entity.onMobInitialize = function(mob) end entity.onAdditionalEffect = function(mob, target, damage) - return xi.mob.onAddEffect(mob, target, damage, xi.mob.ae.ENWATER) + local pTable = + { + chance = 100, + attackType = xi.attackType.MAGICAL, + magicalElement = xi.element.WATER, + basePower = math.floor(damage / 2), + actorStat = xi.mod.INT, + } + + return xi.combat.action.executeAdditionalDamage(mob, target, pTable) end entity.onMobDeath = function(mob, player, optParams) diff --git a/scripts/zones/Qufim_Island/mobs/Qoofim.lua b/scripts/zones/Qufim_Island/mobs/Qoofim.lua index ed66fb7f7b5..a152482b746 100644 --- a/scripts/zones/Qufim_Island/mobs/Qoofim.lua +++ b/scripts/zones/Qufim_Island/mobs/Qoofim.lua @@ -10,7 +10,16 @@ entity.onMobInitialize = function(mob) end entity.onAdditionalEffect = function(mob, target, damage) - return xi.mob.onAddEffect(mob, target, damage, xi.mob.ae.ENWATER) + local pTable = + { + chance = 100, + attackType = xi.attackType.MAGICAL, + magicalElement = xi.element.WATER, + basePower = math.floor(damage / 2), + actorStat = xi.mod.INT, + } + + return xi.combat.action.executeAdditionalDamage(mob, target, pTable) end entity.onMobDeath = function(mob, player, optParams) diff --git a/scripts/zones/RuAun_Gardens/mobs/Genbu.lua b/scripts/zones/RuAun_Gardens/mobs/Genbu.lua index 9232e1753ac..2227d5a1cab 100644 --- a/scripts/zones/RuAun_Gardens/mobs/Genbu.lua +++ b/scripts/zones/RuAun_Gardens/mobs/Genbu.lua @@ -47,7 +47,16 @@ entity.onMobFight = function(mob, target) end entity.onAdditionalEffect = function(mob, target, damage) - return xi.mob.onAddEffect(mob, target, damage, xi.mob.ae.ENWATER) + local pTable = + { + chance = 100, + attackType = xi.attackType.MAGICAL, + magicalElement = xi.element.WATER, + basePower = math.floor(damage / 2), + actorStat = xi.mod.INT, + } + + return xi.combat.action.executeAdditionalDamage(mob, target, pTable) end entity.onMobDeath = function(mob, player, optParams) diff --git a/scripts/zones/The_Boyahda_Tree/mobs/Aquarius.lua b/scripts/zones/The_Boyahda_Tree/mobs/Aquarius.lua index 4440595e342..91e2844d554 100644 --- a/scripts/zones/The_Boyahda_Tree/mobs/Aquarius.lua +++ b/scripts/zones/The_Boyahda_Tree/mobs/Aquarius.lua @@ -53,7 +53,16 @@ entity.onMobSpawn = function(mob) end entity.onAdditionalEffect = function(mob, target, damage) - return xi.mob.onAddEffect(mob, target, damage, xi.mob.ae.ENWATER) + local pTable = + { + chance = 25, + attackType = xi.attackType.MAGICAL, + magicalElement = xi.element.WATER, + basePower = math.floor(damage / 2), + actorStat = xi.mod.INT, + } + + return xi.combat.action.executeAdditionalDamage(mob, target, pTable) end entity.onMobDeath = function(mob, player, optParams) diff --git a/scripts/zones/The_Shrine_of_RuAvitau/mobs/Genbu.lua b/scripts/zones/The_Shrine_of_RuAvitau/mobs/Genbu.lua index c187893e365..a47fed15576 100644 --- a/scripts/zones/The_Shrine_of_RuAvitau/mobs/Genbu.lua +++ b/scripts/zones/The_Shrine_of_RuAvitau/mobs/Genbu.lua @@ -30,7 +30,16 @@ entity.onMobFight = function(mob, target) end entity.onAdditionalEffect = function(mob, target, damage) - return xi.mob.onAddEffect(mob, target, damage, xi.mob.ae.ENWATER) + local pTable = + { + chance = 100, + attackType = xi.attackType.MAGICAL, + magicalElement = xi.element.WATER, + basePower = math.floor(damage / 2), + actorStat = xi.mod.INT, + } + + return xi.combat.action.executeAdditionalDamage(mob, target, pTable) end return entity diff --git a/scripts/zones/Yuhtunga_Jungle/mobs/Pyuu_the_Spatemaker.lua b/scripts/zones/Yuhtunga_Jungle/mobs/Pyuu_the_Spatemaker.lua index f9457faf1d1..d4c4539225d 100644 --- a/scripts/zones/Yuhtunga_Jungle/mobs/Pyuu_the_Spatemaker.lua +++ b/scripts/zones/Yuhtunga_Jungle/mobs/Pyuu_the_Spatemaker.lua @@ -31,7 +31,16 @@ entity.onMobSpawn = function(mob) end entity.onAdditionalEffect = function(mob, target, damage) - return xi.mob.onAddEffect(mob, target, damage, xi.mob.ae.ENWATER) + local pTable = + { + chance = 100, + attackType = xi.attackType.MAGICAL, + magicalElement = xi.element.WATER, + basePower = math.floor(damage / 2), + actorStat = xi.mod.INT, + } + + return xi.combat.action.executeAdditionalDamage(mob, target, pTable) end entity.onMobDeath = function(mob, player, optParams)