From 754945bf0c0f96775a9f77d4c72cf245c2010bf8 Mon Sep 17 00:00:00 2001 From: claywar Date: Fri, 2 Jan 2026 15:35:55 -0500 Subject: [PATCH] Align mobPool enum with other enum naming Removes plural from filename and enum definition from xi.mobPools to xi.mobPool --- scripts/actions/mobskills/absorbing_kiss.lua | 2 +- scripts/actions/mobskills/blood_drain.lua | 2 +- scripts/actions/mobskills/charm.lua | 2 +- scripts/actions/mobskills/deep_kiss.lua | 2 +- scripts/actions/mobskills/dread_shriek.lua | 2 +- scripts/actions/mobskills/drop_hammer.lua | 2 +- scripts/actions/mobskills/flat_blade.lua | 4 ++-- scripts/actions/mobskills/flying_hip_press.lua | 4 ++-- scripts/actions/mobskills/heavy_armature.lua | 2 +- scripts/actions/mobskills/hurricane_wing.lua | 2 +- scripts/actions/mobskills/qn_aern_rdm.lua | 2 +- scripts/actions/mobskills/qn_aern_whm.lua | 2 +- scripts/actions/mobskills/red_lotus_blade.lua | 8 ++++---- scripts/actions/mobskills/restoral.lua | 2 +- scripts/actions/mobskills/sand_blast.lua | 2 +- scripts/actions/mobskills/savage_blade.lua | 4 ++-- scripts/actions/mobskills/shadow_spread.lua | 4 ++-- scripts/actions/mobskills/soothing_aroma.lua | 2 +- scripts/actions/mobskills/spirits_within.lua | 4 ++-- scripts/actions/mobskills/vorpal_blade.lua | 4 ++-- scripts/actions/mobskills/wild_rage.lua | 4 ++-- scripts/actions/spells/black/sleepga.lua | 2 +- scripts/enum/{mob_pools.lua => mob_pool.lua} | 4 ++-- scripts/items/blackened_muddy_siredon.lua | 14 +++++++------- scripts/mixins/families/chigoe_pet.lua | 2 +- scripts/mixins/families/gorger_nm.lua | 10 +++++----- scripts/mixins/families/hpemde.lua | 4 ++-- scripts/mixins/families/zdei.lua | 12 ++++++------ 28 files changed, 55 insertions(+), 55 deletions(-) rename scripts/enum/{mob_pools.lua => mob_pool.lua} (98%) diff --git a/scripts/actions/mobskills/absorbing_kiss.lua b/scripts/actions/mobskills/absorbing_kiss.lua index 268d68b1475..219a953287f 100644 --- a/scripts/actions/mobskills/absorbing_kiss.lua +++ b/scripts/actions/mobskills/absorbing_kiss.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) -- https://docs.google.com/spreadsheets/d/1TnrBzUAQ0hyuFVIjf5OLviIfhGw4vxN1x_4zv9gG4N4/edit?gid=368168805#gid=368168805&range=H31 -- pic of -7/-8 stat to the right of that - if mob:getPool() == xi.mobPools.PEPPER then + if mob:getPool() == xi.mobPool.PEPPER then numAttributesDrained = 0 -- Reset in case of resists for i = xi.effect.STR_DOWN, xi.effect.CHR_DOWN do diff --git a/scripts/actions/mobskills/blood_drain.lua b/scripts/actions/mobskills/blood_drain.lua index d4aec42661a..67f144db444 100644 --- a/scripts/actions/mobskills/blood_drain.lua +++ b/scripts/actions/mobskills/blood_drain.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local shadow = xi.mobskills.shadowBehavior.NUMSHADOWS_1 -- Asanbosam uses a modified blood drain that ignores shadows - if mob:getPool() == xi.mobPools.ASANBOSAM then + if mob:getPool() == xi.mobPool.ASANBOSAM then shadow = xi.mobskills.shadowBehavior.IGNORE_SHADOWS end diff --git a/scripts/actions/mobskills/charm.lua b/scripts/actions/mobskills/charm.lua index b11fca746ad..cd1e04050dd 100644 --- a/scripts/actions/mobskills/charm.lua +++ b/scripts/actions/mobskills/charm.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) return xi.effect.CHARM_I end - if mob:getPool() == xi.mobPools.OSSCHAART then + if mob:getPool() == xi.mobPool.OSSCHAART then duration = 30 end diff --git a/scripts/actions/mobskills/deep_kiss.lua b/scripts/actions/mobskills/deep_kiss.lua index a9277af00c1..ccb4519ec72 100644 --- a/scripts/actions/mobskills/deep_kiss.lua +++ b/scripts/actions/mobskills/deep_kiss.lua @@ -11,7 +11,7 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) -- https://docs.google.com/spreadsheets/d/1TnrBzUAQ0hyuFVIjf5OLviIfhGw4vxN1x_4zv9gG4N4/edit?gid=368168805#gid=368168805&range=H32 - if mob:getPool() == xi.mobPools.PHOEDME then + if mob:getPool() == xi.mobPool.PHOEDME then local numEffectsStolen = 0 -- Steal all statuses until none are left diff --git a/scripts/actions/mobskills/dread_shriek.lua b/scripts/actions/mobskills/dread_shriek.lua index 558b0c61457..5c68807725f 100644 --- a/scripts/actions/mobskills/dread_shriek.lua +++ b/scripts/actions/mobskills/dread_shriek.lua @@ -23,7 +23,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) end -- Cyranuce M Cutauleon - if mob:getPool() == xi.mobPools.CYRANUCE_M_CUTAULEON then + if mob:getPool() == xi.mobPool.CYRANUCE_M_CUTAULEON then power = 100 -- yes, really end diff --git a/scripts/actions/mobskills/drop_hammer.lua b/scripts/actions/mobskills/drop_hammer.lua index f020cbbb6a6..154fa46017a 100644 --- a/scripts/actions/mobskills/drop_hammer.lua +++ b/scripts/actions/mobskills/drop_hammer.lua @@ -25,7 +25,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) - if mob:getPool() == xi.mobPools.FAHRAFAHR_THE_BLOODIED then -- Fahrafahr the Bloodied + if mob:getPool() == xi.mobPool.FAHRAFAHR_THE_BLOODIED then -- Fahrafahr the Bloodied mob:resetEnmity(target) end diff --git a/scripts/actions/mobskills/flat_blade.lua b/scripts/actions/mobskills/flat_blade.lua index b16bbb2d818..039248ed446 100644 --- a/scripts/actions/mobskills/flat_blade.lua +++ b/scripts/actions/mobskills/flat_blade.lua @@ -10,7 +10,7 @@ local mobskillObject = {} mobskillObject.onMobSkillCheck = function(target, mob, skill) - if mob:getPool() ~= xi.mobPools.QUBIA_ARENA_TRION then + if mob:getPool() ~= xi.mobPool.QUBIA_ARENA_TRION then mob:messageBasic(xi.msg.basic.READIES_WS, 0, 35) end @@ -18,7 +18,7 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - if mob:getPool() == xi.mobPools.QUBIA_ARENA_TRION then + if mob:getPool() == xi.mobPool.QUBIA_ARENA_TRION then target:showText(mob, zones[xi.zone.QUBIA_ARENA].text.FLAT_LAND) end diff --git a/scripts/actions/mobskills/flying_hip_press.lua b/scripts/actions/mobskills/flying_hip_press.lua index 7d7585e642a..c3d23c0c2d2 100644 --- a/scripts/actions/mobskills/flying_hip_press.lua +++ b/scripts/actions/mobskills/flying_hip_press.lua @@ -15,11 +15,11 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local fTP = 2.0 - if mob:getPool() == xi.mobPools.BUGBOY then + if mob:getPool() == xi.mobPool.BUGBOY then fTP = 7.0 end - if mob:getPool() == xi.mobPools.BUGBEAR_MATMAN then + if mob:getPool() == xi.mobPool.BUGBEAR_MATMAN then fTP = 10.0 end diff --git a/scripts/actions/mobskills/heavy_armature.lua b/scripts/actions/mobskills/heavy_armature.lua index f4efa61f886..37b80e3ad38 100644 --- a/scripts/actions/mobskills/heavy_armature.lua +++ b/scripts/actions/mobskills/heavy_armature.lua @@ -6,7 +6,7 @@ local mobskillObject = {} mobskillObject.onMobSkillCheck = function(target, mob, skill) - if mob:getPool() == xi.mobPools.ARMED_GEARS then + if mob:getPool() == xi.mobPool.ARMED_GEARS then return 0 else return 1 diff --git a/scripts/actions/mobskills/hurricane_wing.lua b/scripts/actions/mobskills/hurricane_wing.lua index 59b394c77c4..a48db77e88e 100644 --- a/scripts/actions/mobskills/hurricane_wing.lua +++ b/scripts/actions/mobskills/hurricane_wing.lua @@ -27,7 +27,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) - if mob:getPool() == xi.mobPools.NIDHOGG then + if mob:getPool() == xi.mobPool.NIDHOGG then xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BLINDNESS, 160, 0, 30) else xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BLINDNESS, 100, 0, 30) diff --git a/scripts/actions/mobskills/qn_aern_rdm.lua b/scripts/actions/mobskills/qn_aern_rdm.lua index 853098e4c6c..a3bea392943 100644 --- a/scripts/actions/mobskills/qn_aern_rdm.lua +++ b/scripts/actions/mobskills/qn_aern_rdm.lua @@ -6,7 +6,7 @@ local mobskillObject = {} mobskillObject.onMobSkillCheck = function(target, mob, skill) - if mob:getPool() == xi.mobPools.QNAERN_RDM and mob:getHPP() <= 70 then + if mob:getPool() == xi.mobPool.QNAERN_RDM and mob:getHPP() <= 70 then return 0 else return 1 diff --git a/scripts/actions/mobskills/qn_aern_whm.lua b/scripts/actions/mobskills/qn_aern_whm.lua index bbcb98ce7b0..bc9287ca84e 100644 --- a/scripts/actions/mobskills/qn_aern_whm.lua +++ b/scripts/actions/mobskills/qn_aern_whm.lua @@ -6,7 +6,7 @@ local mobskillObject = {} mobskillObject.onMobSkillCheck = function(target, mob, skill) - if mob:getPool() == xi.mobPools.QNAERN_WHM and mob:getHPP() <= 50 then + if mob:getPool() == xi.mobPool.QNAERN_WHM and mob:getHPP() <= 50 then return 0 else return 1 diff --git a/scripts/actions/mobskills/red_lotus_blade.lua b/scripts/actions/mobskills/red_lotus_blade.lua index 2de54cf7948..ca4be32fcf3 100644 --- a/scripts/actions/mobskills/red_lotus_blade.lua +++ b/scripts/actions/mobskills/red_lotus_blade.lua @@ -11,8 +11,8 @@ local mobskillObject = {} mobskillObject.onMobSkillCheck = function(target, mob, skill) if - mob:getPool() ~= xi.mobPools.QUBIA_ARENA_TRION and - mob:getPool() ~= xi.mobPools.THRONE_ROOM_VOLKER + mob:getPool() ~= xi.mobPool.QUBIA_ARENA_TRION and + mob:getPool() ~= xi.mobPool.THRONE_ROOM_VOLKER then mob:messageBasic(xi.msg.basic.READIES_WS, 0, 34) end @@ -21,9 +21,9 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - if mob:getPool() == xi.mobPools.QUBIA_ARENA_TRION then -- Trion: uBia_Arena only + if mob:getPool() == xi.mobPool.QUBIA_ARENA_TRION then -- Trion: uBia_Arena only target:showText(mob, zones[xi.zone.QUBIA_ARENA].text.RLB_LAND) - elseif mob:getPool() == xi.mobPools.THRONE_ROOM_VOLKER then -- Volker: Throne_Room only + elseif mob:getPool() == xi.mobPool.THRONE_ROOM_VOLKER then -- Volker: Throne_Room only target:showText(mob, zones[xi.zone.THRONE_ROOM].text.FEEL_MY_PAIN) end diff --git a/scripts/actions/mobskills/restoral.lua b/scripts/actions/mobskills/restoral.lua index 774cd142869..5fc49223117 100644 --- a/scripts/actions/mobskills/restoral.lua +++ b/scripts/actions/mobskills/restoral.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) So math.random() for now! ]] local heal = math.random(900, 1400) - if mob:getPool() == xi.mobPools.ARMED_GEARS then + if mob:getPool() == xi.mobPool.ARMED_GEARS then heal = heal * 2.5 end diff --git a/scripts/actions/mobskills/sand_blast.lua b/scripts/actions/mobskills/sand_blast.lua index 9680bd91860..adc925f1f30 100644 --- a/scripts/actions/mobskills/sand_blast.lua +++ b/scripts/actions/mobskills/sand_blast.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) skill:setMsg(xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BLINDNESS, 40, 0, 180)) if - mob:getPool() == xi.mobPools.FEELER_ANTLION and + mob:getPool() == xi.mobPool.FEELER_ANTLION and mob:getLocalVar('SAND_BLAST') == 1 then local alastorId = mob:getID() + 6 diff --git a/scripts/actions/mobskills/savage_blade.lua b/scripts/actions/mobskills/savage_blade.lua index bd805de46e6..a1b8ec7b8ab 100644 --- a/scripts/actions/mobskills/savage_blade.lua +++ b/scripts/actions/mobskills/savage_blade.lua @@ -10,7 +10,7 @@ local mobskillObject = {} mobskillObject.onMobSkillCheck = function(target, mob, skill) - if mob:getPool() ~= xi.mobPools.QUBIA_ARENA_TRION then + if mob:getPool() ~= xi.mobPool.QUBIA_ARENA_TRION then mob:messageBasic(xi.msg.basic.READIES_WS, 0, 42) end @@ -18,7 +18,7 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - if mob:getPool() == xi.mobPools.QUBIA_ARENA_TRION then -- Trion@QuBia_Arena only + if mob:getPool() == xi.mobPool.QUBIA_ARENA_TRION then -- Trion@QuBia_Arena only target:showText(mob, zones[xi.zone.QUBIA_ARENA].text.SAVAGE_LAND) end diff --git a/scripts/actions/mobskills/shadow_spread.lua b/scripts/actions/mobskills/shadow_spread.lua index 7920359839a..e6c11417c26 100644 --- a/scripts/actions/mobskills/shadow_spread.lua +++ b/scripts/actions/mobskills/shadow_spread.lua @@ -15,8 +15,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local sleepDuration = 60 if - mob:getPool() == xi.mobPools.WREAKER or - mob:getPool() == xi.mobPools.AGONIZER + mob:getPool() == xi.mobPool.WREAKER or + mob:getPool() == xi.mobPool.AGONIZER then sleepDuration = 120 end diff --git a/scripts/actions/mobskills/soothing_aroma.lua b/scripts/actions/mobskills/soothing_aroma.lua index a9f506708af..ef950acb483 100644 --- a/scripts/actions/mobskills/soothing_aroma.lua +++ b/scripts/actions/mobskills/soothing_aroma.lua @@ -8,7 +8,7 @@ local mobskillObject = {} mobskillObject.onMobSkillCheck = function(target, mob, skill) - if mob:getHPP() >= 50 and mob:getPool() == xi.mobPools.RASKOVNIK then + if mob:getHPP() >= 50 and mob:getPool() == xi.mobPool.RASKOVNIK then -- Raskovnik doesn't use this for the 1st half of its HP. return 1 end diff --git a/scripts/actions/mobskills/spirits_within.lua b/scripts/actions/mobskills/spirits_within.lua index 8aa36881640..44f1bf95758 100644 --- a/scripts/actions/mobskills/spirits_within.lua +++ b/scripts/actions/mobskills/spirits_within.lua @@ -10,7 +10,7 @@ local mobskillObject = {} mobskillObject.onMobSkillCheck = function(target, mob, skill) - if mob:getPool() ~= xi.mobPools.THRONE_ROOM_VOLKER then + if mob:getPool() ~= xi.mobPool.THRONE_ROOM_VOLKER then mob:messageBasic(xi.msg.basic.READIES_WS, 0, 39) end @@ -18,7 +18,7 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - if mob:getPool() == xi.mobPools.THRONE_ROOM_VOLKER then -- Volker@Throne_Room only + if mob:getPool() == xi.mobPool.THRONE_ROOM_VOLKER then -- Volker@Throne_Room only target:showText(mob, zones[xi.zone.THRONE_ROOM].text.RETURN_TO_THE_DARKNESS) end diff --git a/scripts/actions/mobskills/vorpal_blade.lua b/scripts/actions/mobskills/vorpal_blade.lua index 1e374eb1e9d..fe0fc42a9f3 100644 --- a/scripts/actions/mobskills/vorpal_blade.lua +++ b/scripts/actions/mobskills/vorpal_blade.lua @@ -27,7 +27,7 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) else return 1 end - elseif mob:getPool() ~= xi.mobPools.THRONE_ROOM_VOLKER then + elseif mob:getPool() ~= xi.mobPool.THRONE_ROOM_VOLKER then mob:messageBasic(xi.msg.basic.READIES_WS, 0, 40) end @@ -35,7 +35,7 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - if mob:getPool() == xi.mobPools.THRONE_ROOM_VOLKER then -- Volker@Throne_Room only + if mob:getPool() == xi.mobPool.THRONE_ROOM_VOLKER then -- Volker@Throne_Room only target:showText(mob, zones[xi.zone.THRONE_ROOM].text.BLADE_ANSWER) end diff --git a/scripts/actions/mobskills/wild_rage.lua b/scripts/actions/mobskills/wild_rage.lua index 5972bfdf1ab..4c0ccd096df 100644 --- a/scripts/actions/mobskills/wild_rage.lua +++ b/scripts/actions/mobskills/wild_rage.lua @@ -22,7 +22,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2.1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - if mob:getPool() == xi.mobPools.PLATOON_SCORPION then + if mob:getPool() == xi.mobPool.PLATOON_SCORPION then -- should not have to verify because platoon scorps only in battlefield local numScorpsDead = mob:getBattlefield():getLocalVar('[ODS]NumScorpsDead') @@ -33,7 +33,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) - if mob:getPool() == xi.mobPools.KING_VINEGARROON then + if mob:getPool() == xi.mobPool.KING_VINEGARROON then xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.POISON, 25, 3, 60) end diff --git a/scripts/actions/spells/black/sleepga.lua b/scripts/actions/spells/black/sleepga.lua index 4e2005f562e..301e56ea22d 100644 --- a/scripts/actions/spells/black/sleepga.lua +++ b/scripts/actions/spells/black/sleepga.lua @@ -10,7 +10,7 @@ end spellObject.onSpellCast = function(caster, target, spell) if caster:isMob() then - if caster:getPool() == xi.mobPools.AMNAF_PSYCHEFLAYER then + if caster:getPool() == xi.mobPool.AMNAF_PSYCHEFLAYER then caster:resetEnmity(target) end diff --git a/scripts/enum/mob_pools.lua b/scripts/enum/mob_pool.lua similarity index 98% rename from scripts/enum/mob_pools.lua rename to scripts/enum/mob_pool.lua index 2f9e6747900..e205b241b81 100644 --- a/scripts/enum/mob_pools.lua +++ b/scripts/enum/mob_pool.lua @@ -4,8 +4,8 @@ ----------------------------------- xi = xi or {} ----@enum xi.mobPools -xi.mobPools = +---@enum xi.mobPool +xi.mobPool = { AGONIZER = 63, -- Agonizer (CoP 5-2 Spire Battle) ARMED_GEARS = 243, -- Armed Gears Restoral diff --git a/scripts/items/blackened_muddy_siredon.lua b/scripts/items/blackened_muddy_siredon.lua index 5b19a328d21..86bf18224af 100644 --- a/scripts/items/blackened_muddy_siredon.lua +++ b/scripts/items/blackened_muddy_siredon.lua @@ -11,9 +11,9 @@ itemObject.onItemCheck = function(target, player) local result = xi.msg.basic.ITEM_UNABLE_TO_USE if - target:getPool() == xi.mobPools.SHIKAREE_X or - target:getPool() == xi.mobPools.SHIKAREE_Y or - target:getPool() == xi.mobPools.SHIKAREE_Z + target:getPool() == xi.mobPool.SHIKAREE_X or + target:getPool() == xi.mobPool.SHIKAREE_Y or + target:getPool() == xi.mobPool.SHIKAREE_Z then result = 0 elseif target:checkDistance(player) > 10 then @@ -28,7 +28,7 @@ itemObject.onItemUse = function(target, player) local siredonCount = target:getLocalVar('siredonCount') -- Shikaree Z rejects the second siredon - if pool == xi.mobPools.SHIKAREE_Z and siredonCount >= 1 then + if pool == xi.mobPool.SHIKAREE_Z and siredonCount >= 1 then target:messageText(target, ID.text.SHIKAREE_Z_OFFSET + 6) -- SIREDON_REJECT return end @@ -36,9 +36,9 @@ itemObject.onItemUse = function(target, player) -- Determine which accept message to use based on pool and count local messageOffsets = { - [xi.mobPools.SHIKAREE_X] = { ID.text.SHIKAREE_X_OFFSET + 5, ID.text.SHIKAREE_X_OFFSET + 6 }, - [xi.mobPools.SHIKAREE_Y] = { ID.text.SHIKAREE_Y_OFFSET + 5, ID.text.SHIKAREE_Y_OFFSET + 6 }, - [xi.mobPools.SHIKAREE_Z] = { ID.text.SHIKAREE_Z_OFFSET + 5 }, + [xi.mobPool.SHIKAREE_X] = { ID.text.SHIKAREE_X_OFFSET + 5, ID.text.SHIKAREE_X_OFFSET + 6 }, + [xi.mobPool.SHIKAREE_Y] = { ID.text.SHIKAREE_Y_OFFSET + 5, ID.text.SHIKAREE_Y_OFFSET + 6 }, + [xi.mobPool.SHIKAREE_Z] = { ID.text.SHIKAREE_Z_OFFSET + 5 }, } local messages = messageOffsets[pool] diff --git a/scripts/mixins/families/chigoe_pet.lua b/scripts/mixins/families/chigoe_pet.lua index acad05d8cf1..866cfbea836 100644 --- a/scripts/mixins/families/chigoe_pet.lua +++ b/scripts/mixins/families/chigoe_pet.lua @@ -17,7 +17,7 @@ g_mixins.families.chigoe_pet = function(hostMob) end local numChigoesToSpawn = 1 - if mob:getPool() == xi.mobPools.PEALLAIDH then + if mob:getPool() == xi.mobPool.PEALLAIDH then numChigoesToSpawn = 2 end diff --git a/scripts/mixins/families/gorger_nm.lua b/scripts/mixins/families/gorger_nm.lua index 2f74a9ed670..ac6dd6bb1d1 100644 --- a/scripts/mixins/families/gorger_nm.lua +++ b/scripts/mixins/families/gorger_nm.lua @@ -21,11 +21,11 @@ g_mixins.families = g_mixins.families or {} local fissionAdds = { - [xi.mobPools.HADAL_SATIATOR] = 3, - [xi.mobPools.INGESTER ] = 4, - [xi.mobPools.PROCREATOR ] = 4, - [xi.mobPools.PROGENERATOR ] = 4, - [xi.mobPools.PROPAGATOR ] = 2, + [xi.mobPool.HADAL_SATIATOR] = 3, + [xi.mobPool.INGESTER ] = 4, + [xi.mobPool.PROCREATOR ] = 4, + [xi.mobPool.PROGENERATOR ] = 4, + [xi.mobPool.PROPAGATOR ] = 2, } xi.mix.gorger.canUseFission = function(mob) diff --git a/scripts/mixins/families/hpemde.lua b/scripts/mixins/families/hpemde.lua index 1a36eed4a4f..7c58d1adf10 100644 --- a/scripts/mixins/families/hpemde.lua +++ b/scripts/mixins/families/hpemde.lua @@ -13,7 +13,7 @@ local function dive(mob) mob:setMobAbilityEnabled(false) -- Om'hpedme in north half of Al'Taieu do not dive or become untargetable - if mob:getPool() ~= xi.mobPools.HPEMDE_NO_DIVING then + if mob:getPool() ~= xi.mobPool.HPEMDE_NO_DIVING then mob:hideName(true) mob:setUntargetable(true) mob:setAnimationSub(5) @@ -58,7 +58,7 @@ g_mixins.families.hpemde = function(hpemdeMob) end if - mob:getPool() ~= xi.mobPools.HPEMDE_NO_DIVING and + mob:getPool() ~= xi.mobPool.HPEMDE_NO_DIVING and mob:getAnimationSub() ~= 5 then dive(mob) diff --git a/scripts/mixins/families/zdei.lua b/scripts/mixins/families/zdei.lua index 2a6c3e4e151..dc1ca9c5fbd 100644 --- a/scripts/mixins/families/zdei.lua +++ b/scripts/mixins/families/zdei.lua @@ -20,12 +20,12 @@ g_mixins.families.zdei = function(zdeiMob) -- Assign rotation speed and direction based off of pools local rotationPools = { - [xi.mobPools.EOZDEI_LEFT] = -16, - [xi.mobPools.EOZDEI_RIGHT] = 16, - [xi.mobPools.AWZDEI_LEFT] = -16, - [xi.mobPools.AWZDEI_RIGHT] = 16, - [xi.mobPools.AWZDEI_FAST_L] = -32, - [xi.mobPools.AWZDEI_FAST_R] = 32, + [xi.mobPool.EOZDEI_LEFT] = -16, + [xi.mobPool.EOZDEI_RIGHT] = 16, + [xi.mobPool.AWZDEI_LEFT] = -16, + [xi.mobPool.AWZDEI_RIGHT] = 16, + [xi.mobPool.AWZDEI_FAST_L] = -32, + [xi.mobPool.AWZDEI_FAST_R] = 32, } zdeiMob:addListener('SPAWN', 'ZDEI_SPAWN', function(mob)