From 169832b3320d77cfd03cff873709fc193ded9966 Mon Sep 17 00:00:00 2001 From: sruon Date: Thu, 19 Feb 2026 20:46:49 -0700 Subject: [PATCH 1/3] addStatusEffect binding --- scripts/specs/core/CBaseEntity.lua | 86 +++----------- src/map/lua/lua_baseentity.cpp | 178 ++++++++++++----------------- src/map/lua/lua_baseentity.h | 4 +- 3 files changed, 93 insertions(+), 175 deletions(-) diff --git a/scripts/specs/core/CBaseEntity.lua b/scripts/specs/core/CBaseEntity.lua index ac008c99bf0..7f1ae9e8089 100644 --- a/scripts/specs/core/CBaseEntity.lua +++ b/scripts/specs/core/CBaseEntity.lua @@ -2852,79 +2852,29 @@ end function CBaseEntity:clearEnmityForEntity(PEntity) end ----@param effectID integer|CStatusEffect ----@param power number ----@param tick number ----@param duration number ----@param subType integer? ----@param subPower integer? ----@param tier integer? ----@param sourceType integer? ----@param sourceTypeParam integer? ----@param originID integer? +---@class StatusEffectParams +---@field power integer +---@field duration number +---@field origin CBaseEntity +---@field tick integer? +---@field icon xi.effect? +---@field subType integer? +---@field subPower integer? +---@field tier integer? +---@field flag xi.effectFlag? +---@field sourceType xi.effectSourceType? +---@field sourceTypeParam integer? +---@field silent boolean? + +---@param effectId xi.effect +---@param params StatusEffectParams ---@return boolean -function CBaseEntity:addStatusEffect(effectID, power, tick, duration, subType, subPower, tier, sourceType, sourceTypeParam, originID) +function CBaseEntity:addStatusEffect(effectId, params) end ---@param effect CStatusEffect ---@return boolean -function CBaseEntity:addStatusEffect(effect) -end - --- NOTE: TODO: Currently this function allows for an optional last parameter at any position. This is represented --- in currently-used overloads, but should be standardized in the future and just pass 0-values. - ----@param effectID integer ----@param effectIcon integer ----@param power number ----@param tick number ----@param duration number ----@param subType integer? ----@param subPower integer? ----@param tier integer? ----@param effectFlag integer? ----@param sourceType integer? ----@param sourceTypeParam integer? ----@param originID integer? ----@param silent boolean? ----@return boolean -function CBaseEntity:addStatusEffectEx(effectID, effectIcon, power, tick, duration, subType, subPower, tier, effectFlag, sourceType, sourceTypeParam, originID, silent) -end - ----@param effectID integer ----@param effectIcon integer ----@param power number ----@param tick number ----@param duration number ----@param subType integer? ----@param subPower integer? ----@param tier integer? ----@param effectFlag integer? ----@param silent boolean? ----@return boolean -function CBaseEntity:addStatusEffectEx(effectID, effectIcon, power, tick, duration, subType, subPower, tier, effectFlag, silent) -end - ----@param effectID integer ----@param effectIcon integer ----@param power number ----@param tick number ----@param duration number ----@param silent boolean? ----@return boolean -function CBaseEntity:addStatusEffectEx(effectID, effectIcon, power, tick, duration, silent) -end - ----@param effectID integer ----@param effectIcon integer ----@param power number ----@param tick number ----@param duration number ----@param subType integer ----@param subPower integer ----@param silent boolean? ----@return boolean -function CBaseEntity:addStatusEffectEx(effectID, effectIcon, power, tick, duration, subType, subPower, silent) +function CBaseEntity:copyStatusEffect(effect) end ---@nodiscard diff --git a/src/map/lua/lua_baseentity.cpp b/src/map/lua/lua_baseentity.cpp index 3119a76f973..ab372e02af0 100644 --- a/src/map/lua/lua_baseentity.cpp +++ b/src/map/lua/lua_baseentity.cpp @@ -13631,13 +13631,17 @@ void CLuaBaseEntity::clearEnmityForEntity(CLuaBaseEntity* PEntity) } /************************************************************************ - * Function: addStatusEffect(effect, power, tick, duration, subtype, subpower, tier, sourceType, sourceTypeParam, originID) - * Purpose : Adds a specified Status Effect to the Entity - * Example : target:addStatusEffect(xi.effect.ACCURACY_DOWN, 20, 3, 60) + * Function: addStatusEffect(effectId, params) + * Purpose : Adds a Status Effect + * Example : target:addStatusEffect(xi.effect.ACCURACY_DOWN, { + * power = 20, + * tick = 3, + * duration = 60, + * origin = caster, + * }) * Notes : ************************************************************************/ - -bool CLuaBaseEntity::addStatusEffect(sol::variadic_args va) +auto CLuaBaseEntity::addStatusEffect(const EFFECT effectId, sol::table params) const -> bool { auto* PBattleEntity = dynamic_cast(m_PBaseEntity); if (!PBattleEntity) @@ -13645,127 +13649,91 @@ bool CLuaBaseEntity::addStatusEffect(sol::variadic_args va) return false; } - if (va[0].is()) + // Required parameters + auto originEntity = params["origin"].get(); + const auto power = static_cast(params["power"].get()); // Can come in as a lua_number, capture as double and truncate + const auto duration = params["duration"].get(); + + // Optional parameters + const auto tick = static_cast(params["tick"].get_or(0.0)); + const auto icon = params["icon"].get_or(static_cast(effectId)); + const auto subType = params["subType"].get_or(0u); + const auto subPower = static_cast(params["subPower"].get_or(0.0)); + const auto tier = params["tier"].get_or(0); + const auto flag = params["flag"].get_or(0u); + const auto sourceType = params["sourceType"].get_or(0); + const auto sourceTypeParam = params["sourceTypeParam"].get_or(0u); + const auto silent = params["silent"].get_or(false); + + auto* PEffect = new CStatusEffect( + effectId, + icon, + power, + std::chrono::seconds(tick), + std::chrono::milliseconds(static_cast(duration * 1000)), + subType, + subPower, + tier, + flag); + + if (sourceType != EffectSourceType::SOURCE_NONE && sourceTypeParam > 0) { - auto PStatusEffect = va[0].as(); - return PBattleEntity->StatusEffectContainer->AddStatusEffect(new CStatusEffect(*PStatusEffect.GetStatusEffect())); + PEffect->SetSource(sourceType, sourceTypeParam); } - else - { - if (va.size() < 4) - { - return false; - } - - // Mandatory - auto effectID = va[0].as(); // The same - auto effectIcon = va[0].as(); // The same - auto power = static_cast(va[1].as()); // Can come in as a lua_number, capture as double and truncate - auto tick = static_cast(va[2].as()); - auto duration = va[3].as(); - // Optional - auto subType = va[4].is() ? va[4].as() : 0; - auto subPower = va[5].is() ? static_cast(va[5].as()) : 0; - auto tier = va[6].is() ? va[6].as() : 0; - auto sourceType = va[7].is() ? va[7].as() : 0; - auto sourceTypeParam = va[8].is() ? va[8].as() : 0; - auto originID = va[9].is() ? va[9].as() : 0; + PEffect->SetOriginID(originEntity.getID()); - CStatusEffect* PEffect = new CStatusEffect(effectID, - effectIcon, - power, - std::chrono::seconds(tick), - std::chrono::milliseconds(static_cast(duration * 1000)), - subType, - subPower, - tier); - - if (sourceType != EffectSourceType::SOURCE_NONE && sourceTypeParam > 0) - { - PEffect->SetSource(sourceType, sourceTypeParam); - } - - // Set the originID. This is the original source of the effect(Usually an entity) - PEffect->SetOriginID(originID); - - if (PEffect->GetStatusID() == EFFECT_FOOD) + if (effectId == EFFECT_FOOD) + { + if (const auto durationModifier = PBattleEntity->getMod(Mod::FOOD_DURATION)) { - int16 durationModifier = PBattleEntity->getMod(Mod::FOOD_DURATION); - if (durationModifier) - { - PEffect->SetDuration(PEffect->GetDuration() + std::chrono::floor(PEffect->GetDuration() * (durationModifier / 100.0f))); - } + PEffect->SetDuration(PEffect->GetDuration() + std::chrono::floor(PEffect->GetDuration() * (durationModifier / 100.0f))); } - - return PBattleEntity->StatusEffectContainer->AddStatusEffect(PEffect); } + + return PBattleEntity->StatusEffectContainer->AddStatusEffect(PEffect, silent ? EffectNotice::Silent : EffectNotice::ShowMessage); } /************************************************************************ - * Function: addStatusEffectEx() - * Purpose : Adds an instance (or 'battle') Status Effect to the Entity - * Example : target:addStatusEffectEx(xi.effect.MOUNTED, xi.effect.MOUNTED, 0, 0, 900, true) - * Notes : For instance, Chocobo status, Fireflights, Teleport + * Function: copyStatusEffect(effect) + * Purpose : Copies a Status Effect to this entity + * Example : target:getPet():copyStatusEffect(effect) + * Notes : ************************************************************************/ - -auto CLuaBaseEntity::addStatusEffectEx(sol::variadic_args va) -> bool +auto CLuaBaseEntity::copyStatusEffect(const CLuaStatusEffect* PStatusEffect) const -> bool { auto* PBattleEntity = dynamic_cast(m_PBaseEntity); - if (!PBattleEntity) - { - return false; - } - - if (va.size() < 5) + if (!PBattleEntity || !PStatusEffect) { return false; } - bool silent = false; - if (va[va.size() - 1].is()) // Is last argument a bool? - { - silent = va[va.size() - 1].as(); - } - - // Mandatory - auto effectID = va[0].as(); - auto effectIcon = va[1].as(); - auto power = static_cast(va[2].as()); // Can come in as a lua_number, capture as double and truncate - auto tick = static_cast(va[3].as()); - auto duration = va[4].as(); + auto* POriginal = PStatusEffect->GetStatusEffect(); - // Optional - auto subType = va[5].is() ? va[5].as() : 0; - auto subPower = va[6].is() ? static_cast(va[6].as()) : 0; - auto tier = va[7].is() ? va[7].as() : 0; - auto effectFlag = va[8].is() ? va[8].as() : 0; - auto sourceType = va[9].is() ? va[9].as() : 0; - auto sourceTypeParam = va[10].is() ? va[10].as() : 0; - auto originID = va[11].is() ? va[11].as() : 0; - - CStatusEffect* PEffect = - new CStatusEffect(effectID, - effectIcon, - power, - std::chrono::seconds(tick), - std::chrono::milliseconds(static_cast(duration * 1000)), - subType, - subPower, - tier, - effectFlag); // Effect Flag (i.e in lua xi.effectFlag.AURA will make this an aura effect) - - auto addNotice = silent ? EffectNotice::Silent : EffectNotice::ShowMessage; - - if (sourceType != EffectSourceType::SOURCE_NONE && sourceTypeParam > 0) + // Calculate remaining duration + auto remainingDuration = 0s; + if (POriginal->GetDuration() > 0s) { - PEffect->SetSource(sourceType, sourceTypeParam); + auto duration = POriginal->GetStartTime() - timer::now() + POriginal->GetDuration(); + remainingDuration = std::chrono::duration_cast(duration); + remainingDuration = std::max(remainingDuration, 0s); } - // Set the originID. This is the original source of the effect(Usually an entity) - PEffect->SetOriginID(originID); + auto* PNewEffect = new CStatusEffect( + POriginal->GetStatusID(), + POriginal->GetIcon(), + POriginal->GetPower(), + POriginal->GetTickTime(), + remainingDuration, + POriginal->GetSubID(), + POriginal->GetSubPower(), + POriginal->GetTier(), + POriginal->GetFlag(), + POriginal->GetSourceType(), + POriginal->GetSourceTypeParam(), + POriginal->GetOriginID()); - return ((CBattleEntity*)m_PBaseEntity)->StatusEffectContainer->AddStatusEffect(PEffect, addNotice); + return PBattleEntity->StatusEffectContainer->AddStatusEffect(PNewEffect); } /************************************************************************ @@ -20255,7 +20223,7 @@ void CLuaBaseEntity::Register() // Status Effects SOL_REGISTER("addStatusEffect", CLuaBaseEntity::addStatusEffect); - SOL_REGISTER("addStatusEffectEx", CLuaBaseEntity::addStatusEffectEx); + SOL_REGISTER("copyStatusEffect", CLuaBaseEntity::copyStatusEffect); SOL_REGISTER("getStatusEffect", CLuaBaseEntity::getStatusEffect); SOL_REGISTER("getStatusEffectBySource", CLuaBaseEntity::getStatusEffectBySource); SOL_REGISTER("getStatusEffects", CLuaBaseEntity::getStatusEffects); diff --git a/src/map/lua/lua_baseentity.h b/src/map/lua/lua_baseentity.h index 165f29e0c81..0249f2f4807 100644 --- a/src/map/lua/lua_baseentity.h +++ b/src/map/lua/lua_baseentity.h @@ -677,8 +677,8 @@ class CLuaBaseEntity void clearEnmityForEntity(CLuaBaseEntity* PEntity); // Status Effects - bool addStatusEffect(sol::variadic_args va); - auto addStatusEffectEx(sol::variadic_args va) -> bool; + auto addStatusEffect(EFFECT effectId, sol::table params) const -> bool; + auto copyStatusEffect(const CLuaStatusEffect* PStatusEffect) const -> bool; auto getStatusEffect(uint16 StatusID, const sol::object& SubType, const sol::object& SourceType, const sol::object& SourceTypeParam) -> CStatusEffect*; auto getStatusEffectBySource(uint16 StatusID, EffectSourceType SourceType, uint16 SourceTypeParam) -> CStatusEffect*; auto getStatusEffects() -> sol::table; From b51a58c147fe3a07a1b5195b392b3b7ee684b2be Mon Sep 17 00:00:00 2001 From: sruon Date: Thu, 19 Feb 2026 22:48:02 -0700 Subject: [PATCH 2/3] Migrate addStatusEffect --- scripts/actions/abilities/accession.lua | 2 +- scripts/actions/abilities/addendum_black.lua | 2 +- scripts/actions/abilities/addendum_white.lua | 2 +- scripts/actions/abilities/alacrity.lua | 2 +- scripts/actions/abilities/altruism.lua | 2 +- scripts/actions/abilities/apogee.lua | 2 +- scripts/actions/abilities/aspir_samba.lua | 2 +- scripts/actions/abilities/aspir_samba_ii.lua | 2 +- scripts/actions/abilities/astral_conduit.lua | 2 +- scripts/actions/abilities/astral_flow.lua | 2 +- scripts/actions/abilities/avatars_favor.lua | 2 +- scripts/actions/abilities/celerity.lua | 2 +- scripts/actions/abilities/chocobo_jig.lua | 2 +- scripts/actions/abilities/chocobo_jig_ii.lua | 2 +- .../actions/abilities/climactic_flourish.lua | 2 +- scripts/actions/abilities/crooked_cards.lua | 2 +- scripts/actions/abilities/dark_arts.lua | 2 +- scripts/actions/abilities/dark_shot.lua | 2 +- scripts/actions/abilities/drain_samba.lua | 2 +- scripts/actions/abilities/drain_samba_ii.lua | 2 +- scripts/actions/abilities/drain_samba_iii.lua | 2 +- scripts/actions/abilities/earth_shot.lua | 2 +- scripts/actions/abilities/ebullience.lua | 2 +- .../actions/abilities/elemental_sforzo.lua | 2 +- scripts/actions/abilities/embolden.lua | 2 +- scripts/actions/abilities/enlightenment.lua | 2 +- scripts/actions/abilities/entrust.lua | 2 +- scripts/actions/abilities/equanimity.lua | 2 +- scripts/actions/abilities/fan_dance.lua | 2 +- scripts/actions/abilities/fire_shot.lua | 2 +- scripts/actions/abilities/focalization.lua | 2 +- scripts/actions/abilities/grand_pas.lua | 2 +- scripts/actions/abilities/haste_samba.lua | 2 +- scripts/actions/abilities/ice_shot.lua | 2 +- scripts/actions/abilities/immanence.lua | 2 +- scripts/actions/abilities/libra.lua | 2 +- scripts/actions/abilities/light_arts.lua | 2 +- scripts/actions/abilities/light_shot.lua | 4 +- scripts/actions/abilities/manifestation.lua | 2 +- scripts/actions/abilities/parsimony.lua | 2 +- scripts/actions/abilities/penury.lua | 2 +- scripts/actions/abilities/perpetuance.lua | 2 +- .../actions/abilities/pets/aerial_armor.lua | 2 +- .../actions/abilities/pets/altana_s_favor.lua | 2 +- .../pets/automaton/armor_shatterer.lua | 2 +- .../abilities/pets/automaton/bone_crusher.lua | 2 +- .../actions/abilities/pets/automaton/daze.lua | 2 +- .../abilities/pets/automaton/flashbulb.lua | 2 +- .../pets/automaton/mana_converter.lua | 2 +- .../pets/automaton/reactive_shield.lua | 2 +- .../abilities/pets/automaton/replicator.lua | 2 +- .../abilities/pets/automaton/shield_bash.lua | 4 +- .../pets/automaton/shock_absorber.lua | 2 +- .../actions/abilities/pets/chaotic_strike.lua | 2 +- .../actions/abilities/pets/clarsach_call.lua | 12 +++--- .../actions/abilities/pets/crescent_fang.lua | 2 +- .../actions/abilities/pets/crimson_howl.lua | 2 +- .../actions/abilities/pets/dream_shroud.lua | 4 +- .../actions/abilities/pets/earthen_ward.lua | 2 +- .../actions/abilities/pets/ecliptic_growl.lua | 14 +++---- .../actions/abilities/pets/ecliptic_howl.lua | 4 +- scripts/actions/abilities/pets/eerie_eye.lua | 4 +- .../actions/abilities/pets/frost_armor.lua | 2 +- .../abilities/pets/glittering_ruby.lua | 2 +- scripts/actions/abilities/pets/hastega.lua | 2 +- .../abilities/pets/lightning_armor.lua | 2 +- scripts/actions/abilities/pets/lunar_cry.lua | 4 +- .../actions/abilities/pets/mewing_lullaby.lua | 2 +- .../actions/abilities/pets/moonlit_charge.lua | 2 +- scripts/actions/abilities/pets/nightmare.lua | 4 +- .../actions/abilities/pets/noctoshield.lua | 2 +- .../abilities/pets/perfect_defense.lua | 2 +- .../actions/abilities/pets/poison_nails.lua | 2 +- scripts/actions/abilities/pets/reraise_ii.lua | 2 +- .../actions/abilities/pets/shining_ruby.lua | 2 +- .../actions/abilities/pets/shock_strike.lua | 2 +- scripts/actions/abilities/pets/sleepga.lua | 2 +- scripts/actions/abilities/pets/slowga.lua | 2 +- .../abilities/pets/soothing_current.lua | 2 +- scripts/actions/abilities/pets/tail_whip.lua | 2 +- scripts/actions/abilities/pets/tidal_roar.lua | 2 +- scripts/actions/abilities/rapture.lua | 2 +- scripts/actions/abilities/saber_dance.lua | 2 +- scripts/actions/abilities/snake_eye.lua | 2 +- scripts/actions/abilities/spectral_jig.lua | 4 +- .../actions/abilities/striking_flourish.lua | 14 +++---- scripts/actions/abilities/sublimation.lua | 2 +- scripts/actions/abilities/tabula_rasa.lua | 2 +- .../actions/abilities/ternary_flourish.lua | 10 ++--- scripts/actions/abilities/thunder_shot.lua | 2 +- scripts/actions/abilities/trance.lua | 2 +- scripts/actions/abilities/tranquility.lua | 2 +- scripts/actions/abilities/triple_shot.lua | 2 +- scripts/actions/abilities/water_shot.lua | 2 +- scripts/actions/abilities/wind_shot.lua | 2 +- scripts/actions/mobskills/Immortal_shield.lua | 2 +- .../actions/mobskills/bastion_of_twilight.lua | 2 +- .../actions/mobskills/cimicine_discharge.lua | 2 +- .../actions/mobskills/contagion_transfer.lua | 13 ++---- scripts/actions/mobskills/contamination.lua | 13 ++---- .../actions/mobskills/emetic_discharge.lua | 2 +- scripts/actions/mobskills/frog_cheer.lua | 2 +- scripts/actions/mobskills/frog_chorus.lua | 2 +- scripts/actions/mobskills/frog_song.lua | 2 +- scripts/actions/mobskills/frozen_mist.lua | 2 +- scripts/actions/mobskills/glittering_ruby.lua | 2 +- scripts/actions/mobskills/hydro_wave.lua | 2 +- scripts/actions/mobskills/impulse_drive.lua | 2 +- scripts/actions/mobskills/luminous_lance.lua | 2 +- scripts/actions/mobskills/microspores.lua | 19 +++------ .../actions/mobskills/mix_dragon_shield.lua | 2 +- .../actions/mobskills/mix_elemental_power.lua | 2 +- scripts/actions/mobskills/mix_guard_drink.lua | 4 +- scripts/actions/mobskills/mix_insomniant.lua | 2 +- scripts/actions/mobskills/mix_life_water.lua | 2 +- .../mobskills/mix_samsons_strength.lua | 2 +- scripts/actions/mobskills/nightmare.lua | 2 +- .../actions/mobskills/nocturnal_servitude.lua | 2 +- scripts/actions/mobskills/nuclear_waste.lua | 2 +- scripts/actions/mobskills/polar_bulwark.lua | 2 +- scripts/actions/mobskills/pyric_bulwark.lua | 2 +- scripts/actions/mobskills/salaheem_spirit.lua | 14 +++---- scripts/actions/mobskills/saucepan.lua | 2 +- scripts/actions/mobskills/shiko_no_mitate.lua | 4 +- scripts/actions/mobskills/snatch_morsel.lua | 2 +- scripts/actions/mobskills/strap_cutter.lua | 2 +- scripts/actions/mobskills/substitute.lua | 2 +- scripts/actions/mobskills/super_buff.lua | 2 +- .../mobskills/wheel_of_impregnability.lua | 2 +- scripts/actions/spells/black/anemohelix.lua | 2 +- .../actions/spells/black/anemohelix_ii.lua | 2 +- scripts/actions/spells/black/bio.lua | 2 +- scripts/actions/spells/black/bio_ii.lua | 2 +- scripts/actions/spells/black/bio_iii.lua | 2 +- scripts/actions/spells/black/bio_iv.lua | 2 +- scripts/actions/spells/black/bio_v.lua | 2 +- scripts/actions/spells/black/burst.lua | 2 +- scripts/actions/spells/black/burst_ii.lua | 2 +- scripts/actions/spells/black/cryohelix.lua | 2 +- scripts/actions/spells/black/cryohelix_ii.lua | 2 +- scripts/actions/spells/black/endark.lua | 2 +- scripts/actions/spells/black/flare.lua | 2 +- scripts/actions/spells/black/flare_ii.lua | 2 +- scripts/actions/spells/black/flood.lua | 2 +- scripts/actions/spells/black/flood_ii.lua | 2 +- scripts/actions/spells/black/freeze.lua | 2 +- scripts/actions/spells/black/freeze_ii.lua | 2 +- scripts/actions/spells/black/geohelix.lua | 2 +- scripts/actions/spells/black/geohelix_ii.lua | 2 +- scripts/actions/spells/black/hydrohelix.lua | 2 +- .../actions/spells/black/hydrohelix_ii.lua | 2 +- scripts/actions/spells/black/impact.lua | 2 +- scripts/actions/spells/black/ionohelix.lua | 2 +- scripts/actions/spells/black/ionohelix_ii.lua | 2 +- scripts/actions/spells/black/kaustra.lua | 2 +- scripts/actions/spells/black/klimaform.lua | 2 +- scripts/actions/spells/black/luminohelix.lua | 2 +- .../actions/spells/black/luminohelix_ii.lua | 2 +- scripts/actions/spells/black/noctohelix.lua | 2 +- .../actions/spells/black/noctohelix_ii.lua | 2 +- scripts/actions/spells/black/pyrohelix.lua | 2 +- scripts/actions/spells/black/pyrohelix_ii.lua | 2 +- scripts/actions/spells/black/quake.lua | 2 +- scripts/actions/spells/black/quake_ii.lua | 2 +- scripts/actions/spells/black/tornado.lua | 2 +- scripts/actions/spells/black/tornado_ii.lua | 2 +- scripts/actions/spells/blue/amplification.lua | 4 +- .../actions/spells/blue/animating_wail.lua | 2 +- .../actions/spells/blue/battery_charge.lua | 2 +- scripts/actions/spells/blue/cocoon.lua | 2 +- scripts/actions/spells/blue/cold_wave.lua | 2 +- .../actions/spells/blue/corrosive_ooze.lua | 4 +- scripts/actions/spells/blue/diamondhide.lua | 2 +- scripts/actions/spells/blue/enervation.lua | 4 +- .../actions/spells/blue/feather_barrier.lua | 2 +- .../actions/spells/blue/light_of_penance.lua | 4 +- scripts/actions/spells/blue/memento_mori.lua | 2 +- scripts/actions/spells/blue/metallic_body.lua | 2 +- scripts/actions/spells/blue/occultation.lua | 2 +- scripts/actions/spells/blue/plasma_charge.lua | 2 +- .../actions/spells/blue/plenilune_embrace.lua | 4 +- scripts/actions/spells/blue/reactor_cool.lua | 4 +- scripts/actions/spells/blue/refueling.lua | 2 +- scripts/actions/spells/blue/regeneration.lua | 2 +- scripts/actions/spells/blue/saline_coat.lua | 2 +- scripts/actions/spells/blue/self-destruct.lua | 2 +- .../actions/spells/blue/triumphant_roar.lua | 2 +- scripts/actions/spells/blue/warm-up.lua | 4 +- scripts/actions/spells/blue/zephyr_mantle.lua | 2 +- .../actions/spells/ninjutsu/doton_ichi.lua | 2 +- scripts/actions/spells/ninjutsu/doton_ni.lua | 2 +- scripts/actions/spells/ninjutsu/doton_san.lua | 2 +- .../actions/spells/ninjutsu/huton_ichi.lua | 2 +- scripts/actions/spells/ninjutsu/huton_ni.lua | 2 +- scripts/actions/spells/ninjutsu/huton_san.lua | 2 +- .../actions/spells/ninjutsu/hyoton_ichi.lua | 2 +- scripts/actions/spells/ninjutsu/hyoton_ni.lua | 2 +- .../actions/spells/ninjutsu/hyoton_san.lua | 2 +- .../actions/spells/ninjutsu/katon_ichi.lua | 2 +- scripts/actions/spells/ninjutsu/katon_ni.lua | 2 +- scripts/actions/spells/ninjutsu/katon_san.lua | 2 +- .../actions/spells/ninjutsu/raiton_ichi.lua | 2 +- scripts/actions/spells/ninjutsu/raiton_ni.lua | 2 +- .../actions/spells/ninjutsu/raiton_san.lua | 2 +- .../actions/spells/ninjutsu/suiton_ichi.lua | 2 +- scripts/actions/spells/ninjutsu/suiton_ni.lua | 2 +- .../actions/spells/ninjutsu/suiton_san.lua | 2 +- .../actions/spells/trust/ferreous_coffin.lua | 2 +- scripts/actions/spells/trust/moogle.lua | 2 +- scripts/actions/spells/trust/sakura.lua | 2 +- scripts/actions/spells/white/cure.lua | 2 +- scripts/actions/spells/white/cure_ii.lua | 2 +- scripts/actions/spells/white/cure_iii.lua | 2 +- scripts/actions/spells/white/cure_iv.lua | 2 +- scripts/actions/spells/white/cure_v.lua | 2 +- scripts/actions/spells/white/cure_vi.lua | 2 +- scripts/actions/spells/white/dia.lua | 2 +- scripts/actions/spells/white/dia_ii.lua | 2 +- scripts/actions/spells/white/dia_iii.lua | 2 +- scripts/actions/spells/white/dia_iv.lua | 2 +- scripts/actions/spells/white/dia_v.lua | 2 +- scripts/actions/spells/white/diaga.lua | 2 +- scripts/actions/spells/white/diaga_ii.lua | 2 +- scripts/actions/spells/white/diaga_iii.lua | 2 +- scripts/actions/spells/white/diaga_iv.lua | 2 +- scripts/actions/spells/white/diaga_v.lua | 2 +- scripts/actions/spells/white/enlight.lua | 2 +- scripts/actions/spells/white/holy_ii.lua | 2 +- scripts/actions/spells/white/reraise.lua | 2 +- scripts/actions/spells/white/reraise_ii.lua | 2 +- scripts/actions/spells/white/reraise_iii.lua | 2 +- scripts/actions/spells/white/reraise_iv.lua | 2 +- scripts/actions/spells/white/sacrifice.lua | 2 +- scripts/commands/addeffect.lua | 2 +- scripts/commands/chocobo.lua | 2 +- scripts/commands/godmode.lua | 36 ++++++++-------- scripts/commands/immortal.lua | 2 +- scripts/commands/mount.lua | 2 +- scripts/commands/petgodmode.lua | 24 +++++------ scripts/commands/stun.lua | 2 +- scripts/effects/allied_tags.lua | 2 +- scripts/effects/battlefield.lua | 2 +- scripts/effects/confrontation.lua | 2 +- scripts/effects/leavegame.lua | 2 +- scripts/effects/pennant.lua | 2 +- scripts/effects/reive_mark.lua | 2 +- scripts/effects/sublimation_activated.lua | 2 +- scripts/events/egg_hunt_egg-stravaganza.lua | 2 +- scripts/globals/abyssea.lua | 12 +++--- scripts/globals/abyssea/atma.lua | 2 +- scripts/globals/additional_effects.lua | 6 +-- scripts/globals/aftermath.lua | 10 ++--- scripts/globals/assault.lua | 2 +- scripts/globals/automaton.lua | 4 +- scripts/globals/avatars_favor.lua | 2 +- scripts/globals/battlefield.lua | 2 +- scripts/globals/besieged.lua | 2 +- scripts/globals/bluemagic.lua | 6 +-- scripts/globals/brigands_chart.lua | 2 +- scripts/globals/campaign.lua | 2 +- scripts/globals/chocobo.lua | 2 +- .../action_additional_effect_status.lua | 4 +- .../combat/action_mobskill_status_effect.lua | 2 +- scripts/globals/confrontation.lua | 4 +- scripts/globals/conquest.lua | 10 ++--- scripts/globals/dynamis.lua | 12 +++--- scripts/globals/garrison.lua | 2 +- scripts/globals/harvest_festivals.lua | 2 +- .../hobbies/crafting/image_support.lua | 8 ++-- scripts/globals/item_utils.lua | 18 ++++---- scripts/globals/job_utils/bard.lua | 14 +++---- scripts/globals/job_utils/beastmaster.lua | 14 +++---- scripts/globals/job_utils/black_mage.lua | 12 +++--- scripts/globals/job_utils/blue_mage.lua | 16 +++---- scripts/globals/job_utils/corsair.lua | 2 +- scripts/globals/job_utils/dancer.lua | 16 +++---- scripts/globals/job_utils/dark_knight.lua | 24 +++++------ scripts/globals/job_utils/dragoon.lua | 22 +++++----- scripts/globals/job_utils/geomancer.lua | 16 +++---- scripts/globals/job_utils/monk.lua | 26 ++++++------ scripts/globals/job_utils/ninja.lua | 12 +++--- scripts/globals/job_utils/paladin.lua | 24 +++++------ scripts/globals/job_utils/puppetmaster.lua | 8 ++-- scripts/globals/job_utils/ranger.lua | 22 +++++----- scripts/globals/job_utils/red_mage.lua | 10 ++--- scripts/globals/job_utils/rune_fencer.lua | 28 ++++++------- scripts/globals/job_utils/samurai.lua | 28 ++++++------- scripts/globals/job_utils/thief.lua | 22 +++++----- scripts/globals/job_utils/warrior.lua | 22 +++++----- scripts/globals/job_utils/white_mage.lua | 12 +++--- scripts/globals/mobs.lua | 2 +- scripts/globals/mobskills.lua | 6 +-- scripts/globals/monstrosity.lua | 10 ++--- scripts/globals/nyzul/pathos.lua | 10 ++--- scripts/globals/pirates_chart.lua | 2 +- scripts/globals/player.lua | 24 +++++------ scripts/globals/regimes.lua | 42 +++++++++---------- scripts/globals/salvage.lua | 17 ++++---- scripts/globals/spells/absorb_spell.lua | 6 +-- scripts/globals/spells/damage_spell.lua | 2 +- scripts/globals/spells/enfeebling_song.lua | 4 +- scripts/globals/spells/enfeebling_spell.lua | 2 +- scripts/globals/spells/enhancing_ninjutsu.lua | 6 +-- scripts/globals/spells/enhancing_spell.lua | 4 +- scripts/globals/spells/enhancing_teleport.lua | 2 +- scripts/globals/treasure.lua | 2 +- scripts/globals/voidwalker.lua | 6 +-- scripts/globals/weaponskills.lua | 2 +- scripts/items/absorbing_shield.lua | 13 ++---- scripts/items/acorn_cookie.lua | 2 +- scripts/items/acrobats_belt.lua | 4 +- scripts/items/agaricus_mushroom.lua | 2 +- scripts/items/agility_potion.lua | 6 +-- scripts/items/aileens_delight.lua | 2 +- scripts/items/aiming_gloves.lua | 4 +- scripts/items/alabaligi.lua | 2 +- scripts/items/alchemists_belt.lua | 4 +- scripts/items/altanas_repast.lua | 2 +- scripts/items/altanas_repast_+1.lua | 2 +- scripts/items/altanas_repast_+2.lua | 2 +- scripts/items/anchovy_pizza.lua | 2 +- scripts/items/anchovy_pizza_+1.lua | 2 +- scripts/items/angler_stewpot.lua | 2 +- scripts/items/anglers_cassoulet.lua | 2 +- scripts/items/anubiss_knife.lua | 4 +- scripts/items/apingaut_snow_cone.lua | 2 +- scripts/items/apkallu_egg.lua | 2 +- scripts/items/apple_pie.lua | 2 +- scripts/items/apple_pie_+1.lua | 2 +- scripts/items/aries_mantle.lua | 4 +- scripts/items/armored_ring.lua | 4 +- scripts/items/army_biscuit.lua | 2 +- scripts/items/assailants_axe.lua | 4 +- scripts/items/assassins_ring.lua | 4 +- scripts/items/astral_pot.lua | 4 +- scripts/items/augmenting_belt.lua | 4 +- scripts/items/b.e.w._pitaru.lua | 2 +- scripts/items/bag_of_wyvern_feed.lua | 4 +- scripts/items/baked_apple.lua | 2 +- scripts/items/baked_popoto.lua | 2 +- scripts/items/balik_sandvici.lua | 2 +- scripts/items/balik_sandvici_+1.lua | 2 +- scripts/items/balik_sis.lua | 2 +- scripts/items/balik_sis_+1.lua | 2 +- scripts/items/bannaret_mail.lua | 4 +- scripts/items/bar_of_campfire_chocolate.lua | 2 +- scripts/items/bastok_mines_gate_glyph.lua | 4 +- scripts/items/bastore_bream.lua | 2 +- scripts/items/bastore_sardine.lua | 2 +- scripts/items/bastore_sweeper.lua | 2 +- scripts/items/bataquiche.lua | 2 +- scripts/items/bataquiche_+1.lua | 2 +- scripts/items/bean_daifuku.lua | 2 +- scripts/items/bean_daifuku_+1.lua | 2 +- scripts/items/beef_stewpot.lua | 2 +- scripts/items/behemoth_steak.lua | 2 +- scripts/items/behemoth_steak_+1.lua | 2 +- scripts/items/berry_snow_cone.lua | 2 +- scripts/items/betta.lua | 2 +- scripts/items/bibiki_slug.lua | 2 +- scripts/items/bibikibo.lua | 2 +- scripts/items/bijou_glace.lua | 2 +- scripts/items/bird_egg.lua | 2 +- scripts/items/black_bubble-eye.lua | 2 +- scripts/items/black_chocobo_cap.lua | 4 +- scripts/items/black_curry_bun.lua | 2 +- scripts/items/black_curry_bun_+1.lua | 2 +- scripts/items/black_drop.lua | 4 +- scripts/items/black_eel.lua | 2 +- scripts/items/black_ghost.lua | 2 +- scripts/items/black_prawn.lua | 2 +- scripts/items/black_sole.lua | 2 +- scripts/items/blackened_frog.lua | 2 +- scripts/items/blackened_newt.lua | 2 +- scripts/items/blackened_toad.lua | 2 +- scripts/items/blacksmiths_belt.lua | 4 +- scripts/items/blaze_feather.lua | 4 +- scripts/items/blaze_hose.lua | 4 +- scripts/items/blindfish.lua | 2 +- scripts/items/blink_band.lua | 4 +- scripts/items/block_of_rock_cheese.lua | 2 +- scripts/items/block_of_stone_cheese.lua | 2 +- scripts/items/blowfish.lua | 2 +- scripts/items/blue_drop.lua | 6 +-- scripts/items/bluetail.lua | 2 +- scripts/items/boiled_crab.lua | 2 +- scripts/items/boiled_crayfish.lua | 2 +- scripts/items/boiled_tuna_head.lua | 2 +- scripts/items/bonanza_biscuit.lua | 4 +- scripts/items/boneworkers_belt.lua | 4 +- scripts/items/bottle_of_amrita.lua | 6 +-- scripts/items/bottle_of_apple_juice.lua | 4 +- scripts/items/bottle_of_body_boost.lua | 4 +- scripts/items/bottle_of_bravers_drink.lua | 4 +- .../items/bottle_of_buffalo_bonanza_milk.lua | 4 +- scripts/items/bottle_of_cantarella.lua | 4 +- scripts/items/bottle_of_cursed_beverage.lua | 4 +- scripts/items/bottle_of_ether_drops.lua | 4 +- scripts/items/bottle_of_frontier_soda.lua | 4 +- scripts/items/bottle_of_giants_drink.lua | 4 +- scripts/items/bottle_of_goblin_drink.lua | 4 +- scripts/items/bottle_of_grape_juice.lua | 4 +- scripts/items/bottle_of_hi-ether_drops.lua | 4 +- scripts/items/bottle_of_hi-potion_drops.lua | 4 +- scripts/items/bottle_of_hysteroanima.lua | 2 +- scripts/items/bottle_of_kitron_juice.lua | 4 +- scripts/items/bottle_of_mana_boost.lua | 4 +- scripts/items/bottle_of_melon_juice.lua | 4 +- scripts/items/bottle_of_movalpolos_water.lua | 2 +- scripts/items/bottle_of_orange_juice.lua | 4 +- scripts/items/bottle_of_pineapple_juice.lua | 4 +- scripts/items/bottle_of_potion_drops.lua | 4 +- scripts/items/bottle_of_psychoanima.lua | 2 +- scripts/items/bottle_of_strange_juice.lua | 4 +- scripts/items/bottle_of_tomato_juice.lua | 4 +- scripts/items/bottle_of_vampire_juice.lua | 6 +-- scripts/items/bottle_of_viper_potion.lua | 4 +- scripts/items/bottle_of_wizards_drink.lua | 4 +- scripts/items/bottle_of_yagudo_drink.lua | 4 +- scripts/items/bottle_of_yellow_liquid.lua | 2 +- scripts/items/bowl_of_adamantoise_soup.lua | 2 +- scripts/items/bowl_of_adoulinian_soup.lua | 2 +- scripts/items/bowl_of_adoulinian_soup_+1.lua | 2 +- scripts/items/bowl_of_ambrosia.lua | 2 +- scripts/items/bowl_of_boiled_cockatrice.lua | 2 +- scripts/items/bowl_of_brain_stew.lua | 2 +- scripts/items/bowl_of_cursed_soup.lua | 2 +- scripts/items/bowl_of_delicious_puls.lua | 2 +- scripts/items/bowl_of_dhalmel_stew.lua | 2 +- scripts/items/bowl_of_dragon_soup.lua | 2 +- scripts/items/bowl_of_egg_soup.lua | 2 +- scripts/items/bowl_of_emerald_soup.lua | 2 +- scripts/items/bowl_of_eyeball_soup.lua | 2 +- scripts/items/bowl_of_goblin_stew.lua | 2 +- scripts/items/bowl_of_goulash.lua | 2 +- scripts/items/bowl_of_goulash_+1.lua | 2 +- scripts/items/bowl_of_homemade_stew.lua | 2 +- scripts/items/bowl_of_humpty_soup.lua | 2 +- scripts/items/bowl_of_jack-o-soup.lua | 2 +- scripts/items/bowl_of_loach_gruel.lua | 2 +- scripts/items/bowl_of_loach_slop.lua | 2 +- scripts/items/bowl_of_loach_soup.lua | 2 +- scripts/items/bowl_of_medicinal_gruel.lua | 2 +- scripts/items/bowl_of_miso_ramen.lua | 2 +- scripts/items/bowl_of_miso_ramen_+1.lua | 2 +- scripts/items/bowl_of_miso_soup.lua | 2 +- scripts/items/bowl_of_miso_soup_+1.lua | 2 +- scripts/items/bowl_of_mog_pudding.lua | 2 +- scripts/items/bowl_of_moogurt.lua | 2 +- scripts/items/bowl_of_mushroom_soup.lua | 2 +- scripts/items/bowl_of_mushroom_stew.lua | 2 +- scripts/items/bowl_of_nashmau_stew.lua | 2 +- scripts/items/bowl_of_navarin.lua | 2 +- scripts/items/bowl_of_ocean_soup.lua | 2 +- scripts/items/bowl_of_oceanfin_soup.lua | 2 +- scripts/items/bowl_of_oden.lua | 2 +- scripts/items/bowl_of_oden_+1.lua | 2 +- scripts/items/bowl_of_optical_soup.lua | 2 +- scripts/items/bowl_of_pea_soup.lua | 2 +- scripts/items/bowl_of_pebble_soup.lua | 2 +- scripts/items/bowl_of_pomodoro_sauce.lua | 2 +- scripts/items/bowl_of_puls.lua | 2 +- scripts/items/bowl_of_pumpkin_soup.lua | 2 +- scripts/items/bowl_of_quadav_stew.lua | 2 +- scripts/items/bowl_of_riverfin_soup.lua | 2 +- scripts/items/bowl_of_salt_ramen.lua | 2 +- scripts/items/bowl_of_salt_ramen_+1.lua | 2 +- scripts/items/bowl_of_seafood_stew.lua | 2 +- scripts/items/bowl_of_shark_fin_soup.lua | 2 +- scripts/items/bowl_of_shimmy_soup.lua | 2 +- scripts/items/bowl_of_sopa_de_pez_blanco.lua | 2 +- scripts/items/bowl_of_sophic_stew.lua | 2 +- scripts/items/bowl_of_soy_ramen.lua | 2 +- scripts/items/bowl_of_soy_ramen_+1.lua | 2 +- scripts/items/bowl_of_sprightly_soup.lua | 2 +- scripts/items/bowl_of_stamina_soup.lua | 2 +- scripts/items/bowl_of_sunset_soup.lua | 2 +- scripts/items/bowl_of_sutlac.lua | 2 +- scripts/items/bowl_of_sutlac_+1.lua | 2 +- scripts/items/bowl_of_tender_navarin.lua | 2 +- scripts/items/bowl_of_tomato_soup.lua | 2 +- scripts/items/bowl_of_turtle_soup.lua | 2 +- scripts/items/bowl_of_ulbuconut_milk.lua | 2 +- scripts/items/bowl_of_ulbuconut_milk_+1.lua | 2 +- scripts/items/bowl_of_vegetable_broth.lua | 2 +- scripts/items/bowl_of_vegetable_gruel.lua | 2 +- scripts/items/bowl_of_vegetable_soup.lua | 2 +- scripts/items/bowl_of_whitefish_stew.lua | 2 +- scripts/items/bowl_of_wild_stew.lua | 2 +- scripts/items/bowl_of_wisdom_soup.lua | 2 +- scripts/items/bowl_of_witch_soup.lua | 2 +- scripts/items/bowl_of_witch_stew.lua | 2 +- scripts/items/bowl_of_yayla_corbasi.lua | 2 +- scripts/items/bowl_of_yayla_corbasi_+1.lua | 2 +- scripts/items/bowl_of_yogurt.lua | 4 +- scripts/items/bowl_of_zesty_zoni.lua | 2 +- scripts/items/bowl_of_zoni_broth.lua | 2 +- scripts/items/branch_of_gnatbane.lua | 4 +- scripts/items/brass_loach.lua | 2 +- scripts/items/breath_mantle.lua | 4 +- scripts/items/bretzel.lua | 2 +- scripts/items/broiled_carp.lua | 2 +- scripts/items/broiled_eel.lua | 2 +- scripts/items/broiled_pipira.lua | 2 +- scripts/items/broiled_trout.lua | 2 +- scripts/items/bunch_of_azouph_greens.lua | 2 +- scripts/items/bunch_of_buburimu_grapes.lua | 2 +- scripts/items/bunch_of_fortune_fruits.lua | 2 +- scripts/items/bunch_of_gysahl_greens.lua | 2 +- scripts/items/bunch_of_pamamas.lua | 2 +- scripts/items/bunch_of_royal_grapes.lua | 2 +- scripts/items/bunch_of_san_dorian_grapes.lua | 2 +- scripts/items/bunch_of_sharug_greens.lua | 2 +- scripts/items/bunch_of_wild_pamamas.lua | 2 +- scripts/items/bundle_of_shirataki.lua | 2 +- scripts/items/bunny_ball.lua | 2 +- scripts/items/burdock_root.lua | 2 +- scripts/items/butter_crepe.lua | 2 +- scripts/items/buttered_nebimonite.lua | 2 +- scripts/items/butterpear.lua | 2 +- scripts/items/ca_cuong.lua | 2 +- scripts/items/caedarva_frog.lua | 2 +- .../items/cage_of_a_remnants_fireflies.lua | 4 +- scripts/items/cage_of_azouph_fireflies.lua | 4 +- .../items/cage_of_b_remnants_fireflies.lua | 4 +- scripts/items/cage_of_bhaflau_fireflies.lua | 4 +- scripts/items/cage_of_cutter_fireflies.lua | 4 +- scripts/items/cage_of_dvucca_fireflies.lua | 4 +- scripts/items/cage_of_reef_fireflies.lua | 4 +- .../items/cage_of_s_remnants_fireflies.lua | 4 +- .../cage_of_undersea_ruins_fireflies.lua | 4 +- .../items/cage_of_z_remnants_fireflies.lua | 4 +- scripts/items/cage_of_zhayolm_fireflies.lua | 4 +- scripts/items/calico_comet.lua | 2 +- scripts/items/candy_cane.lua | 2 +- scripts/items/candy_ring.lua | 2 +- scripts/items/carp_sushi.lua | 2 +- scripts/items/carpenters_belt.lua | 4 +- scripts/items/cathedral_salad.lua | 2 +- scripts/items/ccb_polymer_pump.lua | 4 +- scripts/items/cehuetzi_snow_cone.lua | 2 +- scripts/items/charisma_potion.lua | 6 +-- scripts/items/charred_salisbury_steak.lua | 2 +- scripts/items/cheese_sandwich.lua | 2 +- scripts/items/cheese_sandwich_+1.lua | 2 +- scripts/items/cherry_macaron.lua | 2 +- scripts/items/cherry_muffin.lua | 2 +- scripts/items/cherry_muffin_+1.lua | 2 +- scripts/items/cheval_salmon.lua | 2 +- scripts/items/chicken_knife.lua | 2 +- scripts/items/choco-katana.lua | 2 +- scripts/items/choco-ligar.lua | 2 +- scripts/items/choco-scroll.lua | 2 +- scripts/items/chocobiscuit.lua | 2 +- scripts/items/chocobo_pullus_torque.lua | 4 +- scripts/items/chocobo_whistle.lua | 4 +- scripts/items/chocolate_cake.lua | 2 +- scripts/items/chocolate_crepe.lua | 2 +- scripts/items/chocolate_rarab_tail.lua | 2 +- scripts/items/chocolate_rusk.lua | 2 +- scripts/items/chunk_of_goblin_chocolate.lua | 2 +- .../items/chunk_of_hobgoblin_chocolate.lua | 2 +- scripts/items/chunk_of_homemade_cheese.lua | 2 +- scripts/items/chunk_of_hydra_meat.lua | 2 +- scripts/items/chunk_of_orobon_meat.lua | 2 +- scripts/items/chunk_of_smelling_salts.lua | 4 +- scripts/items/chunk_of_sweet_lizard.lua | 2 +- scripts/items/cinna-cookie.lua | 2 +- scripts/items/cirrocumulus_cell.lua | 4 +- scripts/items/clear_drop.lua | 6 +-- scripts/items/clump_of_batagreens.lua | 2 +- scripts/items/clump_of_beaugreens.lua | 2 +- scripts/items/clump_of_shungiku.lua | 2 +- scripts/items/cluster_of_paprika.lua | 2 +- scripts/items/coated_shield.lua | 4 +- scripts/items/cobalt_jellyfish.lua | 2 +- scripts/items/cobra_staff.lua | 4 +- scripts/items/coconut_rusk.lua | 2 +- scripts/items/coeurl_sub.lua | 2 +- scripts/items/coeurl_sub_+1.lua | 2 +- scripts/items/coffee_macaron.lua | 2 +- scripts/items/coffeecake_muffin.lua | 2 +- scripts/items/coffeecake_muffin_+1.lua | 2 +- scripts/items/coin_cookie.lua | 2 +- scripts/items/colored_egg.lua | 2 +- scripts/items/cone_calamary.lua | 2 +- scripts/items/cone_of_homemade_gelato.lua | 2 +- scripts/items/cone_of_seraphs_kiss.lua | 2 +- scripts/items/cone_of_snoll_gelato.lua | 2 +- scripts/items/cone_of_sub-zero_gelato.lua | 2 +- scripts/items/copper_frog.lua | 2 +- scripts/items/coral_butterfly.lua | 2 +- scripts/items/coral_fungus.lua | 2 +- scripts/items/counter_earring.lua | 4 +- scripts/items/crab_stewpot.lua | 2 +- scripts/items/crawler_egg.lua | 2 +- scripts/items/crayfish.lua | 2 +- scripts/items/cream_puff.lua | 2 +- scripts/items/crepe_belle_helene.lua | 2 +- scripts/items/crepe_caprice.lua | 2 +- scripts/items/crepe_delice.lua | 2 +- scripts/items/crepe_des_rois.lua | 2 +- scripts/items/crepe_forestiere.lua | 2 +- scripts/items/crepe_paysanne.lua | 2 +- scripts/items/crescent_fish.lua | 2 +- scripts/items/cube_of_cotton_tofu.lua | 2 +- scripts/items/culinarians_belt.lua | 4 +- scripts/items/cumulus_masque_+1.lua | 4 +- scripts/items/cup_of_caravan_tea.lua | 2 +- scripts/items/cup_of_chai.lua | 2 +- scripts/items/cup_of_chai_+1.lua | 2 +- scripts/items/cup_of_chamomile_tea.lua | 2 +- scripts/items/cup_of_choco-delight.lua | 2 +- scripts/items/cup_of_chocomilk.lua | 2 +- scripts/items/cup_of_date_tea.lua | 2 +- scripts/items/cup_of_healing_tea.lua | 2 +- scripts/items/cup_of_imperial_coffee.lua | 2 +- scripts/items/cup_of_imperial_coffee_+1.lua | 2 +- scripts/items/cup_of_windurstian_tea.lua | 2 +- scripts/items/cupid_chocolate.lua | 2 +- scripts/items/custom_gilet_+1.lua | 4 +- scripts/items/custom_top_+1.lua | 4 +- scripts/items/cutlet_sandwich.lua | 2 +- scripts/items/cutlet_sandwich_+1.lua | 2 +- scripts/items/cyclical_coalescence.lua | 2 +- scripts/items/czars_belt.lua | 4 +- scripts/items/danceshroom.lua | 2 +- scripts/items/dark_bass.lua | 2 +- scripts/items/date.lua | 2 +- scripts/items/deadeye_earring.lua | 4 +- scripts/items/death_chakram.lua | 4 +- scripts/items/deathball.lua | 4 +- scripts/items/deductive_brocade_obi.lua | 4 +- scripts/items/deep-fried_shrimp.lua | 2 +- scripts/items/deep-fried_shrimp_+1.lua | 2 +- scripts/items/denizanasi.lua | 2 +- scripts/items/derfland_pear.lua | 2 +- scripts/items/detonator_belt.lua | 4 +- scripts/items/dexterity_potion.lua | 6 +-- scripts/items/dhalmel_pie.lua | 2 +- scripts/items/dhalmel_pie_+1.lua | 2 +- scripts/items/dhalmel_steak.lua | 2 +- scripts/items/dhalmel_whistle.lua | 4 +- scripts/items/dil.lua | 2 +- scripts/items/dish_of_homemade_carbonara.lua | 2 +- scripts/items/dish_of_hydra_kofte.lua | 2 +- scripts/items/dish_of_hydra_kofte_+1.lua | 2 +- scripts/items/dish_of_salsa.lua | 2 +- .../items/dish_of_spaghetti_arrabbiata.lua | 2 +- .../items/dish_of_spaghetti_arrabbiata_+1.lua | 2 +- scripts/items/dish_of_spaghetti_boscaiola.lua | 2 +- .../items/dish_of_spaghetti_boscaiola_+1.lua | 2 +- scripts/items/dish_of_spaghetti_carbonara.lua | 2 +- .../items/dish_of_spaghetti_carbonara_+1.lua | 2 +- scripts/items/dish_of_spaghetti_marinara.lua | 2 +- .../items/dish_of_spaghetti_marinara_+1.lua | 2 +- scripts/items/dish_of_spaghetti_melanzane.lua | 2 +- .../items/dish_of_spaghetti_melanzane_+1.lua | 2 +- .../dish_of_spaghetti_nero_di_seppia.lua | 2 +- .../dish_of_spaghetti_nero_di_seppia_+1.lua | 2 +- scripts/items/dish_of_spaghetti_ortolana.lua | 2 +- .../items/dish_of_spaghetti_ortolana_+1.lua | 2 +- .../items/dish_of_spaghetti_peperoncino.lua | 2 +- .../dish_of_spaghetti_peperoncino_+1.lua | 2 +- scripts/items/dish_of_spaghetti_pescatora.lua | 2 +- .../items/dish_of_spaghetti_pescatora_+1.lua | 2 +- .../items/dish_of_spaghetti_tonno_rosso.lua | 2 +- .../dish_of_spaghetti_tonno_rosso_+1.lua | 2 +- .../items/dish_of_spaghetti_vongole_rosso.lua | 2 +- .../dish_of_spaghetti_vongole_rosso_+1.lua | 2 +- scripts/items/dragon_fruit.lua | 2 +- scripts/items/dragon_heart.lua | 2 +- scripts/items/dragon_steak.lua | 2 +- scripts/items/dream_boots_+1.lua | 4 +- scripts/items/dream_mittens_+1.lua | 4 +- scripts/items/dried_berry.lua | 2 +- scripts/items/dried_date.lua | 2 +- scripts/items/dried_date_+1.lua | 2 +- scripts/items/drovers_belt.lua | 4 +- scripts/items/ducal_guards_ring.lua | 4 +- scripts/items/duchy_earring.lua | 4 +- scripts/items/ear_of_grilled_corn.lua | 2 +- scripts/items/ear_of_roasted_corn.lua | 2 +- .../items/eastern_san_doria_gate_glyph.lua | 4 +- scripts/items/eel_kabob.lua | 2 +- scripts/items/egg_sandwich.lua | 2 +- scripts/items/egg_sandwich_+1.lua | 2 +- scripts/items/eggplant.lua | 2 +- scripts/items/elder_gilet_+1.lua | 4 +- scripts/items/eldritch_bone_hairpin.lua | 4 +- scripts/items/eldritch_horn_hairpin.lua | 4 +- scripts/items/elshena.lua | 2 +- scripts/items/elshimo_coconut.lua | 2 +- scripts/items/elshimo_frog.lua | 2 +- scripts/items/elshimo_pachira_fruit.lua | 4 +- scripts/items/elvaan_rice_cake.lua | 4 +- scripts/items/emerald_quiche.lua | 2 +- scripts/items/empire_earring.lua | 4 +- scripts/items/enthralling_brocade_obi.lua | 4 +- scripts/items/faerie_apple.lua | 2 +- scripts/items/federation_earring.lua | 4 +- scripts/items/federation_signet_staff.lua | 4 +- scripts/items/federation_stables_scarf.lua | 4 +- scripts/items/felicifruit.lua | 2 +- scripts/items/fire_feather.lua | 4 +- scripts/items/fish_chiefkabob.lua | 2 +- scripts/items/fish_mithkabob.lua | 2 +- scripts/items/fishermans_belt.lua | 4 +- scripts/items/fishermans_feast.lua | 2 +- scripts/items/flask_of_apple_au_lait.lua | 4 +- scripts/items/flask_of_ayran.lua | 4 +- scripts/items/flask_of_blinding_potion.lua | 4 +- scripts/items/flask_of_deodorizer.lua | 4 +- scripts/items/flask_of_distilled_water.lua | 4 +- .../items/flask_of_dragon_fruit_au_lait.lua | 4 +- scripts/items/flask_of_orange_au_lait.lua | 4 +- scripts/items/flask_of_pamama_au_lait.lua | 4 +- scripts/items/flask_of_paralyze_potion.lua | 4 +- scripts/items/flask_of_pear_au_lait.lua | 4 +- scripts/items/flask_of_persikos_au_lait.lua | 4 +- scripts/items/flask_of_petrify_potion.lua | 4 +- scripts/items/flask_of_poison_potion.lua | 4 +- scripts/items/flask_of_primeval_brew.lua | 4 +- scripts/items/flask_of_silencing_potion.lua | 4 +- scripts/items/flask_of_sleeping_potion.lua | 4 +- scripts/items/flask_of_strange_milk.lua | 4 +- scripts/items/flask_of_venom_potion.lua | 4 +- scripts/items/flexible_pole.lua | 4 +- scripts/items/forest_carp.lua | 2 +- scripts/items/four-leaf_mandragora_bud.lua | 2 +- scripts/items/fourth_staff.lua | 4 +- scripts/items/fried_popoto.lua | 2 +- scripts/items/fried_popoto_+1.lua | 2 +- scripts/items/frost_turnip.lua | 2 +- scripts/items/fruit_parfait.lua | 2 +- scripts/items/fudgy-wudge.lua | 2 +- scripts/items/fulm-long_salmon_sub.lua | 2 +- scripts/items/galette_des_rois.lua | 2 +- scripts/items/galkan_sausage.lua | 2 +- scripts/items/galkan_sausage_+1.lua | 2 +- scripts/items/galkan_sausage_+2.lua | 2 +- scripts/items/galkan_sausage_+3.lua | 2 +- scripts/items/galkan_sausage_-1.lua | 2 +- scripts/items/gamushara_earring.lua | 4 +- scripts/items/gargoyle_boots.lua | 2 +- scripts/items/garlic_cracker.lua | 2 +- scripts/items/garlic_cracker_+1.lua | 2 +- scripts/items/garpike.lua | 2 +- scripts/items/gateau_aux_fraises.lua | 2 +- scripts/items/getsul_ring.lua | 4 +- scripts/items/ghost_cape.lua | 4 +- scripts/items/gimlet_spear.lua | 4 +- scripts/items/ginger_cookie.lua | 2 +- scripts/items/goblin_belt.lua | 4 +- scripts/items/goblin_mushpot.lua | 2 +- scripts/items/goblin_pie.lua | 2 +- scripts/items/gold_carp.lua | 2 +- scripts/items/gold_lobster.lua | 2 +- scripts/items/goldsmiths_belt.lua | 4 +- scripts/items/grape_daifuku.lua | 2 +- scripts/items/grape_daifuku_+1.lua | 2 +- scripts/items/greedie.lua | 2 +- scripts/items/green_curry_bun.lua | 2 +- scripts/items/green_curry_bun_+1.lua | 2 +- scripts/items/green_drop.lua | 6 +-- scripts/items/green_quiche.lua | 2 +- scripts/items/grilled_lik.lua | 2 +- scripts/items/gurnard.lua | 2 +- scripts/items/gyokuto_obi.lua | 4 +- scripts/items/gyudon.lua | 2 +- scripts/items/gyudon_+1.lua | 2 +- scripts/items/hallowed_sword.lua | 6 +-- scripts/items/ham_and_cheese_crepe.lua | 2 +- scripts/items/hamsi.lua | 2 +- scripts/items/handful_of_bloody_chocolate.lua | 2 +- scripts/items/handful_of_roasted_almonds.lua | 2 +- scripts/items/handful_of_sunflower_seeds.lua | 2 +- scripts/items/hard-boiled_egg.lua | 2 +- scripts/items/haste_belt.lua | 4 +- scripts/items/head_of_grauberg_lettuce.lua | 2 +- scripts/items/head_of_isleracea.lua | 2 +- scripts/items/head_of_napa.lua | 2 +- scripts/items/healing_feather.lua | 4 +- scripts/items/heart_chocolate.lua | 2 +- scripts/items/hedgehog_pie.lua | 2 +- scripts/items/hellsteak.lua | 2 +- scripts/items/hellsteak_+1.lua | 2 +- scripts/items/hermes_quencher.lua | 6 +-- scripts/items/hi-reraiser.lua | 4 +- scripts/items/high_breath_mantle.lua | 4 +- scripts/items/high_mana_wand.lua | 4 +- scripts/items/himesama_rice_ball.lua | 2 +- scripts/items/hobgoblin_pie.lua | 2 +- scripts/items/homemade_omelette.lua | 2 +- scripts/items/homemade_rice_ball.lua | 2 +- scripts/items/homemade_salisbury_steak.lua | 2 +- scripts/items/homemade_steak.lua | 2 +- scripts/items/homing_ring.lua | 4 +- scripts/items/hume_rice_cake.lua | 4 +- scripts/items/humpty_dumpty_effigy.lua | 2 +- scripts/items/hydra_doublet.lua | 4 +- scripts/items/hydra_harness.lua | 4 +- scripts/items/hydra_haubert.lua | 4 +- scripts/items/hydra_mittens.lua | 4 +- scripts/items/hydra_spats.lua | 4 +- scripts/items/hydra_tiara.lua | 6 +-- scripts/items/hydra_tights.lua | 6 +-- scripts/items/hyper_ether.lua | 4 +- scripts/items/hyper_potion.lua | 4 +- scripts/items/icarus_wing.lua | 4 +- scripts/items/ice_trousers.lua | 4 +- scripts/items/icefish.lua | 2 +- scripts/items/imperial_omelette.lua | 2 +- scripts/items/intelligence_potion.lua | 6 +-- scripts/items/invisible_mantle.lua | 4 +- scripts/items/irmik_helvasi.lua | 2 +- scripts/items/irmik_helvasi_+1.lua | 2 +- scripts/items/istakoz.lua | 2 +- scripts/items/istiridye.lua | 2 +- scripts/items/jack-o-lantern.lua | 2 +- scripts/items/jack-o-pie.lua | 2 +- scripts/items/jacknife.lua | 2 +- scripts/items/janizary_earring.lua | 4 +- scripts/items/jar_of_ground_wasabi.lua | 2 +- scripts/items/jar_of_marinara_sauce.lua | 2 +- scripts/items/jolt_axe.lua | 4 +- scripts/items/jug_of_marys_milk.lua | 4 +- scripts/items/jug_of_miracle_milk.lua | 4 +- scripts/items/jug_of_selbina_milk.lua | 6 +-- scripts/items/jug_of_soy_milk.lua | 4 +- scripts/items/jug_of_uleguerand_milk.lua | 4 +- scripts/items/juglan_jumble.lua | 2 +- scripts/items/kalamar.lua | 2 +- scripts/items/kaplumbaga.lua | 2 +- scripts/items/kawahori_kabuto.lua | 4 +- scripts/items/kayabaligi.lua | 2 +- scripts/items/kazham_earring.lua | 4 +- scripts/items/kazham_pineapple.lua | 2 +- scripts/items/keen_zaghnal.lua | 4 +- scripts/items/king_truffle.lua | 2 +- scripts/items/kingdom_earring.lua | 4 +- scripts/items/kingdom_signet_staff.lua | 4 +- scripts/items/kingdom_stables_collar.lua | 4 +- scripts/items/kinkobo.lua | 4 +- scripts/items/kitron.lua | 2 +- scripts/items/kitron_macaron.lua | 2 +- scripts/items/kitron_snow_cone.lua | 2 +- scripts/items/kitty_rod.lua | 4 +- scripts/items/koccos_earring.lua | 4 +- scripts/items/koen.lua | 6 +-- scripts/items/kohlrouladen.lua | 2 +- scripts/items/kohlrouladen_+1.lua | 2 +- scripts/items/konigskuchen.lua | 2 +- scripts/items/la_theine_cabbage.lua | 2 +- scripts/items/lebkuchen_house.lua | 2 +- scripts/items/lebkuchen_manse.lua | 2 +- scripts/items/leremieu_salad.lua | 2 +- scripts/items/leremieu_taco.lua | 2 +- scripts/items/lik_kabob.lua | 2 +- scripts/items/lionhead.lua | 2 +- scripts/items/lizard_egg.lua | 2 +- scripts/items/loaf_of_black_bread.lua | 2 +- scripts/items/loaf_of_goblin_bread.lua | 2 +- scripts/items/loaf_of_hobgoblin_bread.lua | 2 +- scripts/items/loaf_of_homemade_bread.lua | 2 +- scripts/items/loaf_of_iron_bread.lua | 2 +- scripts/items/loaf_of_pain_de_neige.lua | 2 +- scripts/items/loaf_of_pumpernickel.lua | 2 +- scripts/items/loaf_of_steel_bread.lua | 2 +- scripts/items/loaf_of_white_bread.lua | 2 +- scripts/items/love_chocolate.lua | 2 +- scripts/items/lucky_egg.lua | 2 +- scripts/items/lungfish.lua | 2 +- scripts/items/m&p_cracker.lua | 2 +- scripts/items/m&p_doner_kebab.lua | 2 +- scripts/items/m&p_dumpling.lua | 2 +- scripts/items/maats_cap.lua | 4 +- scripts/items/magma_steak.lua | 2 +- scripts/items/magma_steak_+1.lua | 2 +- scripts/items/magna_gilet_+1.lua | 4 +- scripts/items/magna_top_+1.lua | 4 +- scripts/items/maharajas_belt.lua | 4 +- scripts/items/mamool_ja_earring.lua | 4 +- scripts/items/mana_wand.lua | 4 +- scripts/items/manashell_ring.lua | 6 +-- scripts/items/mandragora_belt.lua | 4 +- scripts/items/mandragora_beret.lua | 4 +- scripts/items/maple_cake.lua | 2 +- scripts/items/margherita_pizza.lua | 2 +- scripts/items/margherita_pizza_+1.lua | 2 +- scripts/items/marinara_pizza.lua | 2 +- scripts/items/marinara_pizza_+1.lua | 2 +- scripts/items/maringna.lua | 2 +- scripts/items/marron_glace.lua | 2 +- scripts/items/max-potion.lua | 4 +- scripts/items/max-potion_+1.lua | 4 +- scripts/items/max-potion_+2.lua | 4 +- scripts/items/max-potion_+3.lua | 4 +- scripts/items/meat_chiefkabob.lua | 2 +- scripts/items/meat_mithkabob.lua | 2 +- scripts/items/meatloaf.lua | 2 +- scripts/items/meatloaf_+1.lua | 2 +- scripts/items/melomane_mallet.lua | 4 +- scripts/items/melon_pie.lua | 2 +- scripts/items/melon_pie_+1.lua | 2 +- scripts/items/melon_snow_cone.lua | 2 +- scripts/items/memento_muffler.lua | 6 +-- scripts/items/mercanbaligi.lua | 2 +- scripts/items/messhikimaru.lua | 4 +- scripts/items/mhaura_earring.lua | 4 +- scripts/items/midwinter_dream.lua | 2 +- scripts/items/mighty_ring.lua | 4 +- scripts/items/mihgo_mithkabob.lua | 2 +- scripts/items/mind_potion.lua | 6 +-- scripts/items/mist_crown.lua | 4 +- scripts/items/mist_mitts.lua | 4 +- scripts/items/mist_pumps.lua | 4 +- scripts/items/mist_slacks.lua | 4 +- scripts/items/mist_tunic.lua | 4 +- scripts/items/mithran_rice_cake.lua | 4 +- scripts/items/mithran_tomato.lua | 2 +- scripts/items/moat_carp.lua | 2 +- scripts/items/montagna.lua | 2 +- scripts/items/moogle_cap.lua | 4 +- scripts/items/moogle_pie.lua | 2 +- scripts/items/moon_ball.lua | 2 +- scripts/items/moon_carrot.lua | 2 +- scripts/items/moorish_idol.lua | 2 +- scripts/items/mug_of_honeyed_egg.lua | 2 +- scripts/items/mushroom_crepe.lua | 2 +- scripts/items/mushroom_salad.lua | 2 +- scripts/items/mutton_enchilada.lua | 2 +- scripts/items/mutton_tortilla.lua | 2 +- scripts/items/naruko_earring.lua | 4 +- scripts/items/nashmau_earring.lua | 4 +- scripts/items/naval_rice_ball.lua | 2 +- scripts/items/nebimonite.lua | 2 +- scripts/items/nebimonite_bake.lua | 2 +- scripts/items/nexus_cape.lua | 4 +- scripts/items/noble_lady.lua | 2 +- scripts/items/nomad_cap.lua | 4 +- scripts/items/nomad_moogle_shield.lua | 4 +- scripts/items/nopales_salad.lua | 2 +- scripts/items/nopales_salad_+1.lua | 2 +- scripts/items/norg_earring.lua | 4 +- scripts/items/nosteau_herring.lua | 2 +- scripts/items/ogre_eel.lua | 2 +- scripts/items/ojo_rice_ball.lua | 2 +- scripts/items/olde_rarab_tail.lua | 4 +- scripts/items/olduum_ring.lua | 4 +- scripts/items/omelette_sandwich.lua | 2 +- scripts/items/omelette_sandwich_+1.lua | 2 +- scripts/items/opo-opo_tart.lua | 2 +- scripts/items/orange_cake.lua | 2 +- scripts/items/orange_kuchen.lua | 2 +- scripts/items/orange_kuchen_+1.lua | 2 +- scripts/items/orange_snow_cone.lua | 2 +- scripts/items/pacifist_ring.lua | 4 +- scripts/items/pair_of_nopales.lua | 2 +- scripts/items/palmers_bangles.lua | 6 +-- scripts/items/pamama_tart.lua | 2 +- scripts/items/party_egg.lua | 2 +- scripts/items/pear_crepe.lua | 2 +- scripts/items/pearlscale.lua | 2 +- scripts/items/pelican_ring.lua | 4 +- scripts/items/pendragons_belt.lua | 4 +- scripts/items/pepperoni_pizza.lua | 2 +- scripts/items/pepperoni_pizza_+1.lua | 2 +- scripts/items/persikos.lua | 2 +- scripts/items/persikos_snow_cone.lua | 2 +- scripts/items/phial_of_amnesia_screen.lua | 4 +- scripts/items/phial_of_doom_screen.lua | 4 +- scripts/items/phial_of_petrify_screen.lua | 4 +- scripts/items/phial_of_poison_screen.lua | 4 +- scripts/items/phial_of_spectral_serum.lua | 4 +- scripts/items/phial_of_terror_screen.lua | 4 +- scripts/items/phial_of_volant_serum.lua | 4 +- scripts/items/pickled_herring.lua | 2 +- scripts/items/piece_of_akamochi.lua | 2 +- scripts/items/piece_of_akamochi_+1.lua | 2 +- scripts/items/piece_of_bubble_chocolate.lua | 2 +- scripts/items/piece_of_cascade_candy.lua | 2 +- scripts/items/piece_of_copse_candy.lua | 4 +- scripts/items/piece_of_elvaan_mochi.lua | 4 +- scripts/items/piece_of_galka_mochi.lua | 4 +- scripts/items/piece_of_hume_mochi.lua | 4 +- scripts/items/piece_of_kusamochi.lua | 2 +- scripts/items/piece_of_kusamochi_+1.lua | 2 +- scripts/items/piece_of_metal_slime_candy.lua | 6 +-- scripts/items/piece_of_raisin_bread.lua | 2 +- scripts/items/piece_of_she-slime_candy.lua | 6 +-- scripts/items/piece_of_shiromochi.lua | 2 +- scripts/items/piece_of_shiromochi_+1.lua | 2 +- scripts/items/piece_of_slimeulation_candy.lua | 6 +-- scripts/items/piece_of_tarutaru_mochi.lua | 4 +- scripts/items/piece_of_witch_nougat.lua | 2 +- scripts/items/piercing_dagger.lua | 4 +- scripts/items/pinch_of_prism_powder.lua | 4 +- scripts/items/pinch_of_rainbow_powder.lua | 4 +- scripts/items/pipin_hot_popoto.lua | 2 +- scripts/items/pipira.lua | 2 +- scripts/items/piscators_skewer.lua | 2 +- .../items/pitcher_of_homemade_herbal_tea.lua | 2 +- scripts/items/plate_of_anchovies.lua | 2 +- scripts/items/plate_of_barnacle_paella.lua | 2 +- scripts/items/plate_of_beef_paella.lua | 2 +- scripts/items/plate_of_beef_paella_+1.lua | 2 +- scripts/items/plate_of_boiled_barnacles.lua | 2 +- .../items/plate_of_boiled_barnacles_+1.lua | 2 +- scripts/items/plate_of_bream_risotto.lua | 2 +- scripts/items/plate_of_bream_sushi.lua | 2 +- scripts/items/plate_of_bream_sushi_+1.lua | 2 +- scripts/items/plate_of_coeurl_saute.lua | 2 +- scripts/items/plate_of_crab_sushi.lua | 2 +- scripts/items/plate_of_crab_sushi_+1.lua | 2 +- scripts/items/plate_of_dorado_sushi.lua | 2 +- scripts/items/plate_of_dorado_sushi_+1.lua | 2 +- scripts/items/plate_of_dulcet_panettones.lua | 2 +- scripts/items/plate_of_fatty_tuna_sushi.lua | 2 +- .../items/plate_of_felicifruit_gelatin.lua | 2 +- scripts/items/plate_of_fin_sushi.lua | 2 +- scripts/items/plate_of_fin_sushi_+1.lua | 2 +- scripts/items/plate_of_fish_and_chips.lua | 2 +- scripts/items/plate_of_flapanos_paella.lua | 2 +- .../plate_of_friture_de_la_misareaux.lua | 2 +- scripts/items/plate_of_homemade_risotto.lua | 2 +- scripts/items/plate_of_homemade_salad.lua | 2 +- scripts/items/plate_of_ic_pilav.lua | 2 +- scripts/items/plate_of_ic_pilav_+1.lua | 2 +- scripts/items/plate_of_ikra_gunkan.lua | 2 +- scripts/items/plate_of_ikra_gunkan_+1.lua | 2 +- scripts/items/plate_of_mushroom_paella.lua | 2 +- scripts/items/plate_of_mushroom_paella_+1.lua | 2 +- scripts/items/plate_of_mushroom_risotto.lua | 2 +- scripts/items/plate_of_octopus_sushi.lua | 2 +- scripts/items/plate_of_octopus_sushi_+1.lua | 2 +- scripts/items/plate_of_patlican_salata.lua | 2 +- scripts/items/plate_of_patlican_salata_+1.lua | 2 +- scripts/items/plate_of_piscators_paella.lua | 2 +- scripts/items/plate_of_ratatouille.lua | 2 +- scripts/items/plate_of_ratatouille_+1.lua | 2 +- scripts/items/plate_of_royal_saute.lua | 2 +- scripts/items/plate_of_salmon_sushi.lua | 2 +- scripts/items/plate_of_salmon_sushi_+1.lua | 2 +- scripts/items/plate_of_sea_spray_risotto.lua | 2 +- scripts/items/plate_of_seafood_paella.lua | 2 +- scripts/items/plate_of_shrimp_sushi.lua | 2 +- scripts/items/plate_of_shrimp_sushi_+1.lua | 2 +- scripts/items/plate_of_sole_sushi.lua | 2 +- scripts/items/plate_of_sole_sushi_+1.lua | 2 +- scripts/items/plate_of_squid_sushi.lua | 2 +- scripts/items/plate_of_squid_sushi_+1.lua | 2 +- scripts/items/plate_of_sublime_sushi.lua | 2 +- scripts/items/plate_of_sublime_sushi_+1.lua | 2 +- scripts/items/plate_of_tentacle_sushi.lua | 2 +- scripts/items/plate_of_tentacle_sushi_+1.lua | 2 +- scripts/items/plate_of_tuna_sushi.lua | 2 +- scripts/items/plate_of_urchin_sushi.lua | 2 +- scripts/items/plate_of_urchin_sushi_+1.lua | 2 +- scripts/items/plate_of_vegan_saute.lua | 2 +- scripts/items/plate_of_witch_risotto.lua | 2 +- .../plate_of_yahata-style_carp_sushi.lua | 2 +- scripts/items/pogaca.lua | 2 +- scripts/items/pogaca_+1.lua | 2 +- scripts/items/porcupine_pie.lua | 2 +- scripts/items/pork_cutlet.lua | 2 +- scripts/items/pork_cutlet_+1.lua | 2 +- scripts/items/pork_cutlet_rice_bowl.lua | 2 +- scripts/items/pork_cutlet_rice_bowl_+1.lua | 2 +- scripts/items/pot-au-feu.lua | 2 +- scripts/items/pot-au-feu_+1.lua | 2 +- scripts/items/pot_of_honey.lua | 2 +- scripts/items/pot_of_royal_tea.lua | 2 +- scripts/items/pot_of_san_dorian_tea.lua | 2 +- scripts/items/pot_of_silent_oil.lua | 4 +- scripts/items/pot_of_white_honey.lua | 2 +- scripts/items/poultry_pitaru.lua | 2 +- scripts/items/powder_boots.lua | 4 +- scripts/items/prime_angler_stewpot.lua | 2 +- scripts/items/prime_beef_stewpot.lua | 2 +- scripts/items/prime_crab_stewpot.lua | 2 +- scripts/items/prime_seafood_stewpot.lua | 2 +- scripts/items/prize_angler_stewpot.lua | 2 +- scripts/items/prized_beef_stewpot.lua | 2 +- scripts/items/prized_crab_stewpot.lua | 2 +- scripts/items/prized_seafood_stewpot.lua | 2 +- scripts/items/pro-ether.lua | 4 +- scripts/items/pro-ether_+1.lua | 4 +- scripts/items/pro-ether_+2.lua | 4 +- scripts/items/pro-ether_+3.lua | 4 +- scripts/items/prominence_axe.lua | 6 +-- scripts/items/prominense_sword.lua | 6 +-- scripts/items/protect_earring.lua | 4 +- scripts/items/protect_ring.lua | 4 +- scripts/items/puffball.lua | 2 +- scripts/items/puk_egg.lua | 2 +- scripts/items/pukatrice_egg.lua | 2 +- scripts/items/pukatrice_egg_+1.lua | 2 +- scripts/items/pumpkin_cake.lua | 2 +- scripts/items/pumpkin_pie.lua | 2 +- scripts/items/pumpkin_pie_+1.lua | 2 +- scripts/items/purgatory_collar.lua | 6 +-- scripts/items/purple_drop.lua | 6 +-- scripts/items/purple_polypore.lua | 2 +- scripts/items/quadav_belt.lua | 4 +- scripts/items/queens_crown.lua | 2 +- scripts/items/quus.lua | 2 +- scripts/items/rabao_earring.lua | 4 +- scripts/items/rabbit_belt.lua | 4 +- scripts/items/rabbit_pie.lua | 2 +- scripts/items/raising_earring.lua | 4 +- scripts/items/ram_staff.lua | 4 +- scripts/items/random_ring.lua | 4 +- scripts/items/raphaels_rod.lua | 4 +- scripts/items/rarab_meatball.lua | 2 +- scripts/items/rarab_tail.lua | 2 +- scripts/items/rebirth_feather.lua | 4 +- scripts/items/recall_ring_jugner.lua | 4 +- scripts/items/recall_ring_meriphataud.lua | 4 +- scripts/items/recall_ring_pashhow.lua | 4 +- scripts/items/red_bubble-eye.lua | 2 +- scripts/items/red_curry_bun.lua | 2 +- scripts/items/red_curry_bun_+1.lua | 2 +- scripts/items/red_drop.lua | 6 +-- scripts/items/red_hot_cracker.lua | 2 +- scripts/items/red_terrapin.lua | 2 +- scripts/items/regain_feather.lua | 4 +- scripts/items/regen_collar.lua | 4 +- scripts/items/regen_cuirass.lua | 4 +- scripts/items/reishi_mushroom.lua | 2 +- scripts/items/republic_earring.lua | 4 +- scripts/items/republic_signet_staff.lua | 4 +- scripts/items/republic_stables_medal.lua | 4 +- scripts/items/reraise_earring.lua | 4 +- scripts/items/reraise_gorget.lua | 4 +- scripts/items/reraise_hairpin.lua | 4 +- scripts/items/reraiser.lua | 4 +- scripts/items/return_ring.lua | 4 +- scripts/items/revive_feather.lua | 4 +- scripts/items/rice_ball.lua | 2 +- scripts/items/rice_dumpling.lua | 2 +- scripts/items/ritterhentzes.lua | 4 +- scripts/items/roast_carp.lua | 2 +- scripts/items/roast_mushroom.lua | 2 +- scripts/items/roast_pipira.lua | 2 +- scripts/items/roast_trout.lua | 2 +- scripts/items/roast_turkey.lua | 2 +- scripts/items/rogue_rice_ball.lua | 2 +- scripts/items/rolanberry.lua | 2 +- scripts/items/rolanberry_864_ce.lua | 2 +- scripts/items/rolanberry_874_ce.lua | 2 +- scripts/items/rolanberry_881_ce.lua | 2 +- scripts/items/rolanberry_daifuku.lua | 2 +- scripts/items/rolanberry_daifuku_+1.lua | 2 +- scripts/items/rolanberry_pie.lua | 2 +- scripts/items/rolanberry_pie_+1.lua | 2 +- scripts/items/roll_of_buche_au_chocolat.lua | 2 +- scripts/items/roll_of_sylvan_excursion.lua | 2 +- scripts/items/rolsin.lua | 2 +- scripts/items/royal_omelette.lua | 2 +- scripts/items/runners_belt.lua | 4 +- scripts/items/sacred_degen.lua | 6 +-- scripts/items/sacred_lance.lua | 4 +- scripts/items/sacred_mace.lua | 6 +-- scripts/items/sacred_maul.lua | 4 +- scripts/items/sacred_sword.lua | 4 +- scripts/items/sacred_wand.lua | 4 +- scripts/items/safehold_earring.lua | 4 +- scripts/items/sakura_biscuit.lua | 2 +- scripts/items/salmon_croute.lua | 2 +- scripts/items/salmon_rice_ball.lua | 2 +- scripts/items/salmon_sub_sandwich.lua | 2 +- scripts/items/saltena.lua | 2 +- scripts/items/salty_bretzel.lua | 2 +- scripts/items/samsonian_belt.lua | 4 +- scripts/items/san_dorian_carrot.lua | 2 +- scripts/items/sanation_ring.lua | 4 +- scripts/items/sandfish.lua | 2 +- scripts/items/saruta_orange.lua | 2 +- scripts/items/sausage.lua | 2 +- scripts/items/sausage_roll.lua | 2 +- scripts/items/savage_top_+1.lua | 4 +- scripts/items/sazanbaligi.lua | 2 +- scripts/items/scapegoat.lua | 6 +-- scripts/items/scream_fungus.lua | 2 +- scripts/items/scroll_of_instant_protect.lua | 4 +- scripts/items/scroll_of_instant_reraise.lua | 6 +-- scripts/items/scroll_of_instant_retrace.lua | 4 +- scripts/items/scroll_of_instant_shell.lua | 4 +- scripts/items/scroll_of_instant_stoneskin.lua | 4 +- scripts/items/scroll_of_instant_warp.lua | 4 +- scripts/items/sea_bass_croute.lua | 2 +- scripts/items/seafood_pitaru.lua | 2 +- scripts/items/seafood_stewpot.lua | 2 +- scripts/items/selbina_earring.lua | 4 +- scripts/items/senroh_skewer.lua | 2 +- scripts/items/serving_of_bass_meuniere.lua | 2 +- scripts/items/serving_of_bass_meuniere_+1.lua | 2 +- scripts/items/serving_of_batagreen_saute.lua | 2 +- scripts/items/serving_of_bavarois.lua | 2 +- scripts/items/serving_of_bavarois_+1.lua | 2 +- scripts/items/serving_of_beaugreen_saute.lua | 2 +- scripts/items/serving_of_bison_steak.lua | 2 +- scripts/items/serving_of_black_curry.lua | 2 +- scripts/items/serving_of_black_pudding.lua | 2 +- scripts/items/serving_of_cherry_bavarois.lua | 2 +- .../items/serving_of_cherry_bavarois_+1.lua | 2 +- scripts/items/serving_of_cibarious_cilbir.lua | 2 +- scripts/items/serving_of_cilbir.lua | 2 +- scripts/items/serving_of_crimson_jelly.lua | 2 +- scripts/items/serving_of_dusky_indulgence.lua | 2 +- scripts/items/serving_of_elysian_eclair.lua | 2 +- scripts/items/serving_of_emperor_roe.lua | 2 +- scripts/items/serving_of_flint_caviar.lua | 2 +- .../items/serving_of_flounder_meuniere.lua | 2 +- .../items/serving_of_flounder_meuniere_+1.lua | 2 +- scripts/items/serving_of_flurry_courante.lua | 2 +- scripts/items/serving_of_frog_flambe.lua | 2 +- scripts/items/serving_of_goblin_stir-fry.lua | 2 +- scripts/items/serving_of_golden_royale.lua | 2 +- scripts/items/serving_of_green_curry.lua | 2 +- .../items/serving_of_herb_crawler_eggs.lua | 2 +- scripts/items/serving_of_herb_quus.lua | 2 +- .../items/serving_of_icecap_rolanberry.lua | 2 +- scripts/items/serving_of_karni_yarik.lua | 2 +- scripts/items/serving_of_karni_yarik_+1.lua | 2 +- scripts/items/serving_of_leadafry.lua | 2 +- scripts/items/serving_of_marbled_steak.lua | 2 +- scripts/items/serving_of_medicinal_quus.lua | 2 +- scripts/items/serving_of_menemen.lua | 2 +- scripts/items/serving_of_menemen_+1.lua | 2 +- scripts/items/serving_of_mille-feuille.lua | 2 +- scripts/items/serving_of_monastic_saute.lua | 2 +- scripts/items/serving_of_mont_blanc.lua | 2 +- scripts/items/serving_of_mushroom_saute.lua | 2 +- scripts/items/serving_of_newt_flambe.lua | 2 +- scripts/items/serving_of_patriarch_saute.lua | 2 +- .../items/serving_of_popotoes_con_queso.lua | 2 +- .../serving_of_popotoes_con_queso_+1.lua | 2 +- scripts/items/serving_of_red_curry.lua | 2 +- scripts/items/serving_of_royal_jelly.lua | 2 +- scripts/items/serving_of_salmon_eggs.lua | 2 +- scripts/items/serving_of_salmon_meuniere.lua | 2 +- .../items/serving_of_salmon_meuniere_+1.lua | 2 +- scripts/items/serving_of_salmon_roe.lua | 2 +- scripts/items/serving_of_seafood_gratin.lua | 2 +- .../items/serving_of_seafood_gratin_+1.lua | 2 +- .../items/serving_of_shallops_tropicale.lua | 2 +- scripts/items/serving_of_snowy_rolanberry.lua | 2 +- .../items/serving_of_squirrels_delight.lua | 2 +- scripts/items/serving_of_vermillion_jelly.lua | 2 +- scripts/items/serving_of_yellow_curry.lua | 2 +- scripts/items/serving_of_zaru_soba.lua | 2 +- scripts/items/serving_of_zaru_soba_+1.lua | 2 +- scripts/items/shadow_lord_shirt.lua | 4 +- scripts/items/shall_shell.lua | 2 +- scripts/items/shining_trout.lua | 2 +- scripts/items/shock_subligar.lua | 4 +- scripts/items/shogun_rice_ball.lua | 2 +- scripts/items/shrimp_cracker.lua | 2 +- scripts/items/shrimp_cracker_+1.lua | 2 +- scripts/items/silken_sash.lua | 2 +- scripts/items/silken_siesta.lua | 2 +- scripts/items/silken_smile.lua | 2 +- scripts/items/silken_spirit.lua | 2 +- scripts/items/silken_squeeze.lua | 2 +- scripts/items/silkworm_egg.lua | 2 +- scripts/items/silver_shark.lua | 2 +- scripts/items/simit.lua | 2 +- scripts/items/simit_+1.lua | 2 +- scripts/items/sis_kebabi.lua | 2 +- scripts/items/sis_kebabi_+1.lua | 2 +- scripts/items/skeleton_robe.lua | 4 +- scripts/items/skewer_of_m&p_chicken.lua | 2 +- scripts/items/slab_of_ruszor_meat.lua | 2 +- scripts/items/sleepshroom.lua | 2 +- scripts/items/slice_of_anchovy_pizza.lua | 2 +- scripts/items/slice_of_anchovy_pizza_+1.lua | 2 +- scripts/items/slice_of_buffalo_meat.lua | 2 +- scripts/items/slice_of_cerberus_meat.lua | 2 +- scripts/items/slice_of_cockatrice_meat.lua | 2 +- scripts/items/slice_of_coeurl_meat.lua | 2 +- scripts/items/slice_of_dhalmel_meat.lua | 2 +- scripts/items/slice_of_diatryma_meat.lua | 2 +- scripts/items/slice_of_dragon_meat.lua | 2 +- scripts/items/slice_of_giant_sheep_meat.lua | 2 +- scripts/items/slice_of_grilled_black_hare.lua | 2 +- scripts/items/slice_of_grilled_hare.lua | 2 +- scripts/items/slice_of_hare_meat.lua | 2 +- scripts/items/slice_of_juicy_mutton.lua | 2 +- scripts/items/slice_of_karakul_meat.lua | 2 +- scripts/items/slice_of_land_crab_meat.lua | 2 +- scripts/items/slice_of_lynx_meat.lua | 2 +- scripts/items/slice_of_margherita_pizza.lua | 2 +- .../items/slice_of_margherita_pizza_+1.lua | 2 +- scripts/items/slice_of_marinara_pizza.lua | 2 +- scripts/items/slice_of_marinara_pizza_+1.lua | 2 +- scripts/items/slice_of_pepperoni_pizza.lua | 2 +- scripts/items/slice_of_pepperoni_pizza_+1.lua | 2 +- scripts/items/slice_of_roast_mutton.lua | 2 +- scripts/items/slice_of_salted_hare.lua | 2 +- scripts/items/slice_of_tavnazian_ram_meat.lua | 2 +- scripts/items/slice_of_ziz_meat.lua | 2 +- scripts/items/smash_cesti.lua | 4 +- scripts/items/smilodon_liver.lua | 2 +- scripts/items/smoked_salmon.lua | 2 +- scripts/items/smoldering_salisbury_steak.lua | 2 +- scripts/items/sneaking_boots.lua | 4 +- scripts/items/snow_bunny_hat_+1.lua | 4 +- scripts/items/snowman_cap.lua | 4 +- scripts/items/sobbing_fungus.lua | 4 +- scripts/items/soft-boiled_egg.lua | 2 +- scripts/items/spartan_hoplon.lua | 4 +- scripts/items/spicy_cracker.lua | 2 +- scripts/items/spirit_lantern.lua | 4 +- scripts/items/sprig_of_cibol.lua | 2 +- scripts/items/sprig_of_hemlock.lua | 4 +- scripts/items/sprinters_shoes.lua | 4 +- scripts/items/steamed_catfish.lua | 2 +- scripts/items/steamed_crab.lua | 2 +- scripts/items/steamed_crayfish.lua | 2 +- scripts/items/stick_of_cotton_candy.lua | 2 +- scripts/items/stick_of_pepperoni.lua | 2 +- scripts/items/stirge_belt.lua | 4 +- scripts/items/stoneskin_torque.lua | 4 +- scripts/items/strength_potion.lua | 6 +-- scripts/items/strip_of_bison_jerky.lua | 2 +- scripts/items/strip_of_buffalo_jerky.lua | 2 +- scripts/items/strip_of_meat_jerky.lua | 2 +- scripts/items/strip_of_sheep_jerky.lua | 2 +- scripts/items/strip_of_smoked_mackerel.lua | 2 +- scripts/items/stuffed_pitaru.lua | 2 +- scripts/items/sturdy_slacks.lua | 4 +- scripts/items/sturdy_trousers.lua | 4 +- scripts/items/sugar_rusk.lua | 2 +- scripts/items/sultans_belt.lua | 4 +- scripts/items/super_reraiser.lua | 4 +- scripts/items/sweet_baked_apple.lua | 2 +- scripts/items/sweet_rice_cake.lua | 2 +- scripts/items/tactical_ring.lua | 4 +- scripts/items/taikyoku_kenpogi.lua | 4 +- scripts/items/talaria.lua | 4 +- scripts/items/talisman_obi.lua | 6 +-- scripts/items/tanners_belt.lua | 4 +- scripts/items/tarutaru_rice_cake.lua | 4 +- scripts/items/tavnazian_goby.lua | 2 +- scripts/items/tavnazian_salad.lua | 2 +- scripts/items/tavnazian_sheep_liver.lua | 2 +- scripts/items/tavnazian_taco.lua | 2 +- scripts/items/teleport_ring_altep.lua | 4 +- scripts/items/teleport_ring_dem.lua | 4 +- scripts/items/teleport_ring_holla.lua | 4 +- scripts/items/teleport_ring_mea.lua | 4 +- scripts/items/teleport_ring_vahzl.lua | 4 +- scripts/items/teleport_ring_yhoat.lua | 4 +- scripts/items/temple_truffle.lua | 2 +- scripts/items/thundermelon.lua | 2 +- scripts/items/tidal_talisman.lua | 4 +- scripts/items/tiger_cod.lua | 2 +- scripts/items/timbre_timbers_salad.lua | 2 +- scripts/items/timbre_timbers_taco.lua | 2 +- scripts/items/tiny_goldfish.lua | 2 +- scripts/items/tonosama_rice_ball.lua | 2 +- scripts/items/tortilla.lua | 2 +- scripts/items/tortilla_buena.lua | 2 +- scripts/items/tough_belt.lua | 4 +- scripts/items/town_moogle_shield.lua | 4 +- scripts/items/trail_cookie.lua | 2 +- scripts/items/tricolored_carp.lua | 2 +- scripts/items/trilobite.lua | 2 +- scripts/items/tropical_clam.lua | 2 +- scripts/items/tropical_crepe.lua | 2 +- scripts/items/truelove_chocolate.lua | 2 +- scripts/items/trumpet_shell.lua | 2 +- .../items/turkey_with_rolanberry_sauce.lua | 2 +- scripts/items/twicer.lua | 4 +- scripts/items/two-leaf_mandragora_bud.lua | 2 +- scripts/items/uberkuchen.lua | 2 +- scripts/items/ulbuconut.lua | 2 +- scripts/items/ulbukan_lobster.lua | 2 +- scripts/items/uskumru.lua | 2 +- scripts/items/verboshroom.lua | 4 +- scripts/items/vial_of_refresh_musk.lua | 4 +- scripts/items/viking_herring.lua | 2 +- scripts/items/vision_ring.lua | 4 +- scripts/items/vitality_potion.lua | 6 +-- scripts/items/vomp_carrot.lua | 2 +- scripts/items/vongola_clam.lua | 2 +- scripts/items/vulcan_blade.lua | 6 +-- scripts/items/vulcan_claymore.lua | 6 +-- scripts/items/vulcan_degen.lua | 6 +-- scripts/items/vulcan_sword.lua | 6 +-- scripts/items/walnut.lua | 2 +- scripts/items/walnut_cookie.lua | 2 +- scripts/items/warm_egg.lua | 2 +- scripts/items/warp_cudgel.lua | 4 +- scripts/items/warp_ring.lua | 4 +- scripts/items/watermelon.lua | 2 +- scripts/items/weavers_belt.lua | 4 +- scripts/items/wedge_of_chalaimbille.lua | 2 +- scripts/items/white_drop.lua | 6 +-- scripts/items/white_rarab_cap_+1.lua | 4 +- scripts/items/wild_cookie.lua | 2 +- scripts/items/wild_melon.lua | 2 +- scripts/items/wild_onion.lua | 2 +- scripts/items/wild_pineapple.lua | 2 +- scripts/items/wild_steak.lua | 2 +- scripts/items/windurst_salad.lua | 2 +- scripts/items/windurst_taco.lua | 2 +- scripts/items/windurst_woods_gate_glyph.lua | 4 +- scripts/items/wing_gorget.lua | 4 +- scripts/items/winterflower.lua | 2 +- scripts/items/witch_kabob.lua | 2 +- scripts/items/withered_rolanberry.lua | 2 +- scripts/items/wizard_cookie.lua | 2 +- scripts/items/wonder_maillot_+1.lua | 4 +- scripts/items/wonder_top_+1.lua | 4 +- scripts/items/woozyshroom.lua | 2 +- scripts/items/worm_belt.lua | 4 +- scripts/items/wyrmking_suit_+1.lua | 4 +- scripts/items/x-potion.lua | 4 +- scripts/items/x-potion_+1.lua | 4 +- scripts/items/x-potion_+2.lua | 4 +- scripts/items/x-potion_+3.lua | 4 +- scripts/items/yagudo_cherry.lua | 2 +- scripts/items/yellow_curry_bun.lua | 2 +- scripts/items/yellow_curry_bun_+1.lua | 2 +- scripts/items/yellow_drop.lua | 6 +-- scripts/items/yellow_globe.lua | 2 +- scripts/items/yilanbaligi.lua | 2 +- scripts/items/yogurt_cake.lua | 2 +- scripts/items/zafmlug_bass.lua | 2 +- scripts/items/zebra_eel.lua | 2 +- scripts/items/zegham_carrot.lua | 2 +- scripts/items/zoolater_hat.lua | 4 +- scripts/items/zucchini.lua | 2 +- .../13_A_Challenge_You_Could_Be_a_Winner.lua | 16 +++---- scripts/quests/full_speed_ahead.lua | 2 +- scripts/quests/hiddenQuests/Crimson_Orb.lua | 2 +- scripts/specs/core/CBaseEntity.lua | 10 ++--- .../packets/s2c/0x028_battle2/dancer.lua | 6 +-- .../packets/s2c/0x028_battle2/runefencer.lua | 10 ++--- scripts/tests/systems/elements.lua | 2 +- scripts/tests/systems/invisible.lua | 2 +- scripts/tests/systems/spells/aoe.lua | 28 ++++++------- .../Abyssea-Altepa/npcs/Cruor_Prospector.lua | 2 +- .../Abyssea-Attohwa/npcs/Cruor_Prospector.lua | 2 +- .../npcs/Cruor_Prospector.lua | 2 +- .../npcs/Cruor_Prospector.lua | 2 +- .../npcs/Cruor_Prospector.lua | 2 +- .../Abyssea-Vunkerl/npcs/Cruor_Prospector.lua | 2 +- scripts/zones/Arrapago_Reef/mobs/Velionis.lua | 2 +- .../instances/arrapago_remnants.lua | 10 ++--- scripts/zones/Attohwa_Chasm/Zone.lua | 2 +- scripts/zones/Attohwa_Chasm/mobs/Sargas.lua | 2 +- scripts/zones/Attohwa_Chasm/mobs/Tiamat.lua | 4 +- .../zones/Balgas_Dais/mobs/Opo-opo_Heir.lua | 2 +- scripts/zones/Balgas_Dais/mobs/Wyrm.lua | 2 +- scripts/zones/Batallia_Downs/Zone.lua | 4 +- scripts/zones/Beadeaux/Zone.lua | 2 +- scripts/zones/Beadeaux/npcs/The_Mute.lua | 2 +- .../zones/Beaucedine_Glacier/mobs/Humbaba.lua | 2 +- .../instances/bhaflau_remnants.lua | 10 ++--- .../mobs/Reactionary_Rampart.lua | 2 +- scripts/zones/Bibiki_Bay/mobs/Peerifool.lua | 2 +- scripts/zones/Bibiki_Bay/mobs/Shen.lua | 2 +- scripts/zones/Caedarva_Mire/Zone.lua | 2 +- .../mobs/Demon_Banneret.lua | 2 +- .../mobs/Demon_Secretary.lua | 2 +- .../Ceizak_Battlegrounds/mobs/Mastop.lua | 2 +- .../zones/Crawlers_Nest/mobs/Aqrabuamelu.lua | 2 +- .../zones/Empyreal_Paradox/mobs/Prishe.lua | 6 +-- scripts/zones/FeiYin/npcs/Seed_Afterglow.lua | 2 +- .../mobs/DE_Quasilumin.lua | 2 +- scripts/zones/Gusgen_Mines/npcs/Degga.lua | 2 +- scripts/zones/Halvung/mobs/Copper_Borer.lua | 2 +- scripts/zones/Horlais_Peak/mobs/Aries.lua | 2 +- .../zones/Ifrits_Cauldron/mobs/Tarasque.lua | 2 +- .../Jade_Sepulcher/mobs/Phantom_Puk_Clone.lua | 2 +- scripts/zones/Lufaise_Meadows/mobs/Kurrea.lua | 2 +- scripts/zones/Mamook/mobs/Mamool_Ja.lua | 8 ++-- scripts/zones/Mamook/npcs/Viscous_Liquid.lua | 2 +- .../mobs/Bozzetto_Breadwinner.lua | 2 +- .../npcs/Ahko_Mhalijikhari.lua | 2 +- scripts/zones/Monarch_Linn/mobs/Ouryu.lua | 2 +- scripts/zones/Mount_Zhayolm/mobs/Claret.lua | 4 +- .../mobs/Karababa.lua | 2 +- .../mobs/Watch_Wamoura.lua | 2 +- .../North_Gustaberg/mobs/Bedrock_Barry.lua | 2 +- scripts/zones/Ordelles_Caves/mobs/Bombast.lua | 2 +- .../zones/Ordelles_Caves/npcs/Rojaireaut.lua | 2 +- .../mobs/Legalox_Heftyhind.lua | 2 +- .../mobs/BeHya_Hundredwall.lua | 2 +- scripts/zones/Phomiuna_Aqueducts/Zone.lua | 2 +- scripts/zones/Promyvion-Dem/Zone.lua | 2 +- scripts/zones/Promyvion-Holla/Zone.lua | 2 +- scripts/zones/Promyvion-Mea/Zone.lua | 2 +- scripts/zones/Promyvion-Vahzl/Zone.lua | 2 +- scripts/zones/PsoXja/Zone.lua | 2 +- scripts/zones/Qulun_Dome/npcs/The_Mute.lua | 2 +- scripts/zones/Riverne-Site_A01/Zone.lua | 2 +- scripts/zones/Riverne-Site_A01/mobs/Ouryu.lua | 2 +- scripts/zones/Riverne-Site_B01/Zone.lua | 2 +- .../zones/Riverne-Site_B01/mobs/Bahamut.lua | 8 ++-- .../mobs/Book_Browser_Bokabraq.lua | 2 +- .../mobs/Chemical_Cook_Chemachiq.lua | 2 +- .../mobs/Spell_Spitter_Spilospok.lua | 2 +- scripts/zones/RoMaeve/mobs/Martinet.lua | 2 +- .../Rolanberry_Fields_[S]/mobs/Dyinyinga.lua | 4 +- scripts/zones/Sacrarium/Zone.lua | 2 +- .../mobs/Old_Sabertooth.lua | 2 +- .../instances/silver_sea_remnants.lua | 10 ++--- .../npcs/Saphiriance_TK.lua | 2 +- .../The_Celestial_Nexus/mobs/Ealdnarche.lua | 6 +-- .../mobs/Mother_Globe.lua | 4 +- .../Throne_Room/mobs/Shadow_Lord_Phase_1.lua | 6 +-- .../Toraimarai_Canal/mobs/Brazen_Bones.lua | 2 +- .../Uleguerand_Range/mobs/Jormungand.lua | 2 +- .../Upper_Delkfutts_Tower/mobs/Autarch.lua | 2 +- .../West_Sarutabaruta_[S]/mobs/Ramponneau.lua | 2 +- scripts/zones/Western_Adoulin/npcs/Ruth.lua | 2 +- .../zones/Xarcabard/mobs/Barbaric_Weapon.lua | 2 +- src/map/lua/lua_baseentity.cpp | 14 +++---- 1523 files changed, 2301 insertions(+), 2330 deletions(-) diff --git a/scripts/actions/abilities/accession.lua b/scripts/actions/abilities/accession.lua index ea7b97337dc..63934817b5d 100644 --- a/scripts/actions/abilities/accession.lua +++ b/scripts/actions/abilities/accession.lua @@ -26,7 +26,7 @@ abilityObject.onAbilityCheck = function(player, target, ability) end abilityObject.onUseAbility = function(player, target, ability) - player:addStatusEffect(xi.effect.ACCESSION, 1, 0, 60) + player:addStatusEffect(xi.effect.ACCESSION, { power = 1, duration = 60, origin = player }) return xi.effect.ACCESSION end diff --git a/scripts/actions/abilities/addendum_black.lua b/scripts/actions/abilities/addendum_black.lua index 803c281af24..e2ed9def961 100644 --- a/scripts/actions/abilities/addendum_black.lua +++ b/scripts/actions/abilities/addendum_black.lua @@ -36,7 +36,7 @@ abilityObject.onUseAbility = function(player, target, ability) helixbonus = math.floor(player:getMainLvl() / 4) end - player:addStatusEffectEx(xi.effect.ADDENDUM_BLACK, xi.effect.ADDENDUM_BLACK, effectbonus, 0, 7200, 0, helixbonus, true) + player:addStatusEffect(xi.effect.ADDENDUM_BLACK, { power = effectbonus, duration = 7200, origin = player, subPower = helixbonus, silent = true }) return xi.effect.ADDENDUM_BLACK end diff --git a/scripts/actions/abilities/addendum_white.lua b/scripts/actions/abilities/addendum_white.lua index e78f605d339..9408b97f985 100644 --- a/scripts/actions/abilities/addendum_white.lua +++ b/scripts/actions/abilities/addendum_white.lua @@ -36,7 +36,7 @@ abilityObject.onUseAbility = function(player, target, ability) regenbonus = 3 * math.floor((player:getMainLvl() - 10) / 10) end - player:addStatusEffectEx(xi.effect.ADDENDUM_WHITE, xi.effect.ADDENDUM_WHITE, effectbonus, 0, 7200, 0, regenbonus, true) + player:addStatusEffect(xi.effect.ADDENDUM_WHITE, { power = effectbonus, duration = 7200, origin = player, subPower = regenbonus, silent = true }) return xi.effect.ADDENDUM_WHITE end diff --git a/scripts/actions/abilities/alacrity.lua b/scripts/actions/abilities/alacrity.lua index b977e81bf19..1e482326b9b 100644 --- a/scripts/actions/abilities/alacrity.lua +++ b/scripts/actions/abilities/alacrity.lua @@ -25,7 +25,7 @@ abilityObject.onAbilityCheck = function(player, target, ability) end abilityObject.onUseAbility = function(player, target, ability) - player:addStatusEffect(xi.effect.ALACRITY, 1, 0, 60) + player:addStatusEffect(xi.effect.ALACRITY, { power = 1, duration = 60, origin = player }) return xi.effect.ALACRITY end diff --git a/scripts/actions/abilities/altruism.lua b/scripts/actions/abilities/altruism.lua index edfee268986..66e6e4fce61 100644 --- a/scripts/actions/abilities/altruism.lua +++ b/scripts/actions/abilities/altruism.lua @@ -25,7 +25,7 @@ abilityObject.onAbilityCheck = function(player, target, ability) end abilityObject.onUseAbility = function(player, target, ability) - player:addStatusEffect(xi.effect.ALTRUISM, player:getMerit(xi.merit.ALTRUISM), 0, 60) + player:addStatusEffect(xi.effect.ALTRUISM, { power = player:getMerit(xi.merit.ALTRUISM), duration = 60, origin = player }) return xi.effect.ALTRUISM end diff --git a/scripts/actions/abilities/apogee.lua b/scripts/actions/abilities/apogee.lua index c38dddf4da8..bc31068b9cd 100644 --- a/scripts/actions/abilities/apogee.lua +++ b/scripts/actions/abilities/apogee.lua @@ -17,7 +17,7 @@ abilityObject.onAbilityCheck = function(player, target, ability) end abilityObject.onUseAbility = function(player, target, ability) - player:addStatusEffect(xi.effect.APOGEE, 1, 0, 60) + player:addStatusEffect(xi.effect.APOGEE, { power = 1, duration = 60, origin = player }) return xi.effect.APOGEE end diff --git a/scripts/actions/abilities/aspir_samba.lua b/scripts/actions/abilities/aspir_samba.lua index 48349a01988..198c2587a2a 100644 --- a/scripts/actions/abilities/aspir_samba.lua +++ b/scripts/actions/abilities/aspir_samba.lua @@ -32,7 +32,7 @@ abilityObject.onUseAbility = function(player, target, ability) player:delStatusEffect(xi.effect.HASTE_SAMBA) player:delStatusEffect(xi.effect.DRAIN_SAMBA) - player:addStatusEffect(xi.effect.ASPIR_SAMBA, 1, 0, duration) + player:addStatusEffect(xi.effect.ASPIR_SAMBA, { power = 1, duration = duration, origin = player }) return xi.effect.ASPIR_SAMBA end diff --git a/scripts/actions/abilities/aspir_samba_ii.lua b/scripts/actions/abilities/aspir_samba_ii.lua index 3e5b2eab156..abc32521ae8 100644 --- a/scripts/actions/abilities/aspir_samba_ii.lua +++ b/scripts/actions/abilities/aspir_samba_ii.lua @@ -32,7 +32,7 @@ abilityObject.onUseAbility = function(player, target, ability) player:delStatusEffect(xi.effect.HASTE_SAMBA) player:delStatusEffect(xi.effect.DRAIN_SAMBA) - player:addStatusEffect(xi.effect.ASPIR_SAMBA, 2, 0, duration) + player:addStatusEffect(xi.effect.ASPIR_SAMBA, { power = 2, duration = duration, origin = player }) return xi.effect.ASPIR_SAMBA end diff --git a/scripts/actions/abilities/astral_conduit.lua b/scripts/actions/abilities/astral_conduit.lua index 8d43a1f4f77..1408c025c23 100644 --- a/scripts/actions/abilities/astral_conduit.lua +++ b/scripts/actions/abilities/astral_conduit.lua @@ -15,7 +15,7 @@ abilityObject.onAbilityCheck = function(player, target, ability) end abilityObject.onUseAbility = function(player, target, ability) - player:addStatusEffect(xi.effect.ASTRAL_CONDUIT, 15, 1, 30) + player:addStatusEffect(xi.effect.ASTRAL_CONDUIT, { power = 15, duration = 30, origin = player, tick = 1 }) end return abilityObject diff --git a/scripts/actions/abilities/astral_flow.lua b/scripts/actions/abilities/astral_flow.lua index 98e5d329349..10bc08487c5 100644 --- a/scripts/actions/abilities/astral_flow.lua +++ b/scripts/actions/abilities/astral_flow.lua @@ -15,7 +15,7 @@ abilityObject.onAbilityCheck = function(player, target, ability) end abilityObject.onUseAbility = function(player, target, ability) - player:addStatusEffect(xi.effect.ASTRAL_FLOW, 1, 0, 180) + player:addStatusEffect(xi.effect.ASTRAL_FLOW, { power = 1, duration = 180, origin = player }) return xi.effect.ASTRAL_FLOW end diff --git a/scripts/actions/abilities/avatars_favor.lua b/scripts/actions/abilities/avatars_favor.lua index ca371cf1a54..983647cc51f 100644 --- a/scripts/actions/abilities/avatars_favor.lua +++ b/scripts/actions/abilities/avatars_favor.lua @@ -9,7 +9,7 @@ abilityObject.onAbilityCheck = function(player, target, ability) end abilityObject.onUseAbility = function(player, target, ability) - player:addStatusEffect(xi.effect.AVATARS_FAVOR, 1, 10, 7200) + player:addStatusEffect(xi.effect.AVATARS_FAVOR, { power = 1, duration = 7200, origin = player, tick = 10 }) end return abilityObject diff --git a/scripts/actions/abilities/celerity.lua b/scripts/actions/abilities/celerity.lua index cbdbe8481c5..df67c8aa8cd 100644 --- a/scripts/actions/abilities/celerity.lua +++ b/scripts/actions/abilities/celerity.lua @@ -25,7 +25,7 @@ abilityObject.onAbilityCheck = function(player, target, ability) end abilityObject.onUseAbility = function(player, target, ability) - player:addStatusEffect(xi.effect.CELERITY, 1, 0, 60) + player:addStatusEffect(xi.effect.CELERITY, { power = 1, duration = 60, origin = player }) return xi.effect.CELERITY end diff --git a/scripts/actions/abilities/chocobo_jig.lua b/scripts/actions/abilities/chocobo_jig.lua index d0de140f2a3..fde38190708 100644 --- a/scripts/actions/abilities/chocobo_jig.lua +++ b/scripts/actions/abilities/chocobo_jig.lua @@ -23,7 +23,7 @@ abilityObject.onUseAbility = function(player, target, ability) player:delStatusEffect(xi.effect.WEIGHT) end - player:addStatusEffect(xi.effect.QUICKENING, 10, 0, finalDuration) + player:addStatusEffect(xi.effect.QUICKENING, { power = 10, duration = finalDuration, origin = player }) return xi.effect.QUICKENING end diff --git a/scripts/actions/abilities/chocobo_jig_ii.lua b/scripts/actions/abilities/chocobo_jig_ii.lua index 5c26147f72c..189d018e875 100644 --- a/scripts/actions/abilities/chocobo_jig_ii.lua +++ b/scripts/actions/abilities/chocobo_jig_ii.lua @@ -23,7 +23,7 @@ abilityObject.onUseAbility = function(player, target, ability) target:delStatusEffect(xi.effect.WEIGHT) end - target:addStatusEffect(xi.effect.QUICKENING, 10, 0, finalDuration) + target:addStatusEffect(xi.effect.QUICKENING, { power = 10, duration = finalDuration, origin = player }) return xi.effect.QUICKENING end diff --git a/scripts/actions/abilities/climactic_flourish.lua b/scripts/actions/abilities/climactic_flourish.lua index 3a43c22cc3b..0fa5c687896 100644 --- a/scripts/actions/abilities/climactic_flourish.lua +++ b/scripts/actions/abilities/climactic_flourish.lua @@ -26,7 +26,7 @@ end abilityObject.onUseAbility = function(player, target, ability) for move = xi.effect.FINISHING_MOVE_1, xi.effect.FINISHING_MOVE_5 do player:delStatusEffect(move) - player:addStatusEffect(xi.effect.CLIMACTIC_FLOURISH, 3, 0, 60) -- TODO: player:getMerit(xi.merit.CLIMACTIC_FLOURISH_EFFECT) This was here and maybe it refered to FLOURISH_III job points? + player:addStatusEffect(xi.effect.CLIMACTIC_FLOURISH, { power = 3, duration = 60, origin = player }) -- TODO: player:getMerit(xi.merit.CLIMACTIC_FLOURISH_EFFECT) This was here and maybe it refered to FLOURISH_III job points? end end diff --git a/scripts/actions/abilities/crooked_cards.lua b/scripts/actions/abilities/crooked_cards.lua index 822636f4113..69285b2b9bb 100644 --- a/scripts/actions/abilities/crooked_cards.lua +++ b/scripts/actions/abilities/crooked_cards.lua @@ -13,7 +13,7 @@ abilityObject.onAbilityCheck = function(player, target, ability) end abilityObject.onUseAbility = function(player, target, ability) - target:addStatusEffect(xi.effect.CROOKED_CARDS, 20, 0, 60) + target:addStatusEffect(xi.effect.CROOKED_CARDS, { power = 20, duration = 60, origin = player }) end return abilityObject diff --git a/scripts/actions/abilities/dark_arts.lua b/scripts/actions/abilities/dark_arts.lua index 77fc6c61ed7..c0cfa333926 100644 --- a/scripts/actions/abilities/dark_arts.lua +++ b/scripts/actions/abilities/dark_arts.lua @@ -36,7 +36,7 @@ abilityObject.onUseAbility = function(player, target, ability) helixbonus = math.floor(player:getMainLvl() / 4) end - player:addStatusEffect(xi.effect.DARK_ARTS, 1, 0, 7200, 0, helixbonus) + player:addStatusEffect(xi.effect.DARK_ARTS, { power = 1, duration = 7200, origin = player, subPower = helixbonus }) return xi.effect.DARK_ARTS end diff --git a/scripts/actions/abilities/dark_shot.lua b/scripts/actions/abilities/dark_shot.lua index 47dc33d2c34..f1568e2d1cc 100644 --- a/scripts/actions/abilities/dark_shot.lua +++ b/scripts/actions/abilities/dark_shot.lua @@ -70,7 +70,7 @@ abilityObject.onUseAbility = function(player, target, ability, action) power = power * 1.5 subpower = subpower * 1.5 target:delStatusEffectSilent(effectId) - target:addStatusEffect(effectId, power, tick, duration, subId, subpower, tier) + target:addStatusEffect(effectId, { power = power, duration = duration, origin = player, tick = tick, subType = subId, subPower = subpower, tier = tier }) local newEffect = target:getStatusEffect(effectId) if newEffect then diff --git a/scripts/actions/abilities/drain_samba.lua b/scripts/actions/abilities/drain_samba.lua index 8f51330b6be..872f317b7cd 100644 --- a/scripts/actions/abilities/drain_samba.lua +++ b/scripts/actions/abilities/drain_samba.lua @@ -30,7 +30,7 @@ abilityObject.onUseAbility = function(player, target, ability) player:delStatusEffect(xi.effect.HASTE_SAMBA) player:delStatusEffect(xi.effect.ASPIR_SAMBA) - player:addStatusEffect(xi.effect.DRAIN_SAMBA, 1, 0, duration) + player:addStatusEffect(xi.effect.DRAIN_SAMBA, { power = 1, duration = duration, origin = player }) return xi.effect.DRAIN_SAMBA end diff --git a/scripts/actions/abilities/drain_samba_ii.lua b/scripts/actions/abilities/drain_samba_ii.lua index feb566c0a77..d7e31541d35 100644 --- a/scripts/actions/abilities/drain_samba_ii.lua +++ b/scripts/actions/abilities/drain_samba_ii.lua @@ -29,7 +29,7 @@ abilityObject.onUseAbility = function(player, target, ability) duration = duration * (100 + player:getMod(xi.mod.SAMBA_PDURATION)) / 100 player:delStatusEffect(xi.effect.HASTE_SAMBA) player:delStatusEffect(xi.effect.ASPIR_SAMBA) - player:addStatusEffect(xi.effect.DRAIN_SAMBA, 2, 0, duration) + player:addStatusEffect(xi.effect.DRAIN_SAMBA, { power = 2, duration = duration, origin = player }) return xi.effect.DRAIN_SAMBA end diff --git a/scripts/actions/abilities/drain_samba_iii.lua b/scripts/actions/abilities/drain_samba_iii.lua index 65811342443..1c67c8071bc 100644 --- a/scripts/actions/abilities/drain_samba_iii.lua +++ b/scripts/actions/abilities/drain_samba_iii.lua @@ -29,7 +29,7 @@ abilityObject.onUseAbility = function(player, target, ability) duration = duration * (100 + player:getMod(xi.mod.SAMBA_PDURATION)) / 100 player:delStatusEffect(xi.effect.HASTE_SAMBA) player:delStatusEffect(xi.effect.ASPIR_SAMBA) - player:addStatusEffect(xi.effect.DRAIN_SAMBA, 3, 0, duration) + player:addStatusEffect(xi.effect.DRAIN_SAMBA, { power = 3, duration = duration, origin = player }) return xi.effect.DRAIN_SAMBA end diff --git a/scripts/actions/abilities/earth_shot.lua b/scripts/actions/abilities/earth_shot.lua index be3da7bbfb5..2ab25201abd 100644 --- a/scripts/actions/abilities/earth_shot.lua +++ b/scripts/actions/abilities/earth_shot.lua @@ -73,7 +73,7 @@ abilityObject.onUseAbility = function(player, target, ability, action) local subId = effect:getSubType() power = power * 1.2 target:delStatusEffectSilent(effectId) - target:addStatusEffect(effectId, power, tick, duration, subId, subpower, tier) + target:addStatusEffect(effectId, { power = power, duration = duration, origin = player, tick = tick, subType = subId, subPower = subpower, tier = tier }) local newEffect = target:getStatusEffect(effectId) if newEffect then diff --git a/scripts/actions/abilities/ebullience.lua b/scripts/actions/abilities/ebullience.lua index 79f82ec416f..852007f95df 100644 --- a/scripts/actions/abilities/ebullience.lua +++ b/scripts/actions/abilities/ebullience.lua @@ -25,7 +25,7 @@ abilityObject.onAbilityCheck = function(player, target, ability) end abilityObject.onUseAbility = function(player, target, ability) - player:addStatusEffect(xi.effect.EBULLIENCE, 1, 0, 60) + player:addStatusEffect(xi.effect.EBULLIENCE, { power = 1, duration = 60, origin = player }) return xi.effect.EBULLIENCE end diff --git a/scripts/actions/abilities/elemental_sforzo.lua b/scripts/actions/abilities/elemental_sforzo.lua index 33c3ad760fb..b19fc269e00 100644 --- a/scripts/actions/abilities/elemental_sforzo.lua +++ b/scripts/actions/abilities/elemental_sforzo.lua @@ -15,7 +15,7 @@ abilityObject.onAbilityCheck = function(player, target, ability) end abilityObject.onUseAbility = function(player, target, ability) - player:addStatusEffect(xi.effect.ELEMENTAL_SFORZO, 1, 0, 30) + player:addStatusEffect(xi.effect.ELEMENTAL_SFORZO, { power = 1, duration = 30, origin = player }) return xi.effect.ELEMENTAL_SFORZO end diff --git a/scripts/actions/abilities/embolden.lua b/scripts/actions/abilities/embolden.lua index 4fe928f299c..d8cd99cd7b9 100644 --- a/scripts/actions/abilities/embolden.lua +++ b/scripts/actions/abilities/embolden.lua @@ -13,7 +13,7 @@ abilityObject.onAbilityCheck = function(player, target, ability) end abilityObject.onUseAbility = function(player, target, ability, action) - target:addStatusEffect(xi.effect.EMBOLDEN, 0, 0, 60) -- effects handled in scripts/globals/spells/spell_enhancing.lua + target:addStatusEffect(xi.effect.EMBOLDEN, { duration = 60, origin = player }) -- effects handled in scripts/globals/spells/spell_enhancing.lua end return abilityObject diff --git a/scripts/actions/abilities/enlightenment.lua b/scripts/actions/abilities/enlightenment.lua index 2413f76291c..bd3f1b3cb3b 100644 --- a/scripts/actions/abilities/enlightenment.lua +++ b/scripts/actions/abilities/enlightenment.lua @@ -18,7 +18,7 @@ end abilityObject.onUseAbility = function(player, target, ability) local merit = (player:getMerit(xi.merit.ENLIGHTENMENT) - 5) - player:addStatusEffect(xi.effect.ENLIGHTENMENT, merit, 0, 60) + player:addStatusEffect(xi.effect.ENLIGHTENMENT, { power = merit, duration = 60, origin = player }) return xi.effect.ENLIGHTENMENT end diff --git a/scripts/actions/abilities/entrust.lua b/scripts/actions/abilities/entrust.lua index 8d91be65813..2f1721d689e 100644 --- a/scripts/actions/abilities/entrust.lua +++ b/scripts/actions/abilities/entrust.lua @@ -13,7 +13,7 @@ abilityObject.onAbilityCheck = function(player, target, ability) end abilityObject.onUseAbility = function(player, target, ability) - player:addStatusEffect(xi.effect.ENTRUST, 1, 0, 60) + player:addStatusEffect(xi.effect.ENTRUST, { power = 1, duration = 60, origin = player }) end return abilityObject diff --git a/scripts/actions/abilities/equanimity.lua b/scripts/actions/abilities/equanimity.lua index 108cea67d13..c766c47caba 100644 --- a/scripts/actions/abilities/equanimity.lua +++ b/scripts/actions/abilities/equanimity.lua @@ -25,7 +25,7 @@ abilityObject.onAbilityCheck = function(player, target, ability) end abilityObject.onUseAbility = function(player, target, ability) - player:addStatusEffect(xi.effect.EQUANIMITY, player:getMerit(xi.merit.EQUANIMITY), 0, 60) + player:addStatusEffect(xi.effect.EQUANIMITY, { power = player:getMerit(xi.merit.EQUANIMITY), duration = 60, origin = player }) return xi.effect.EQUANIMITY end diff --git a/scripts/actions/abilities/fan_dance.lua b/scripts/actions/abilities/fan_dance.lua index 45aad4ca90c..062aab973ed 100644 --- a/scripts/actions/abilities/fan_dance.lua +++ b/scripts/actions/abilities/fan_dance.lua @@ -13,7 +13,7 @@ abilityObject.onAbilityCheck = function(player, target, ability) end abilityObject.onUseAbility = function(player, target, ability) - player:addStatusEffect(xi.effect.FAN_DANCE, 9000, 0, 300) + player:addStatusEffect(xi.effect.FAN_DANCE, { power = 9000, duration = 300, origin = player }) end return abilityObject diff --git a/scripts/actions/abilities/fire_shot.lua b/scripts/actions/abilities/fire_shot.lua index cd5fd2b4793..a7e0ab5b128 100644 --- a/scripts/actions/abilities/fire_shot.lua +++ b/scripts/actions/abilities/fire_shot.lua @@ -69,7 +69,7 @@ abilityObject.onUseAbility = function(player, target, ability, action) power = power * 1.2 target:delStatusEffectSilent(effectId) - target:addStatusEffect(effectId, power, tick, duration, subId, subpower, tier) + target:addStatusEffect(effectId, { power = power, duration = duration, origin = player, tick = tick, subType = subId, subPower = subpower, tier = tier }) local newEffect = target:getStatusEffect(effectId) if newEffect then diff --git a/scripts/actions/abilities/focalization.lua b/scripts/actions/abilities/focalization.lua index c21dba8c2e0..ee6924e4eb1 100644 --- a/scripts/actions/abilities/focalization.lua +++ b/scripts/actions/abilities/focalization.lua @@ -25,7 +25,7 @@ abilityObject.onAbilityCheck = function(player, target, ability) end abilityObject.onUseAbility = function(player, target, ability) - player:addStatusEffect(xi.effect.FOCALIZATION, player:getMerit(xi.merit.FOCALIZATION), 0, 60) + player:addStatusEffect(xi.effect.FOCALIZATION, { power = player:getMerit(xi.merit.FOCALIZATION), duration = 60, origin = player }) return xi.effect.FOCALIZATION end diff --git a/scripts/actions/abilities/grand_pas.lua b/scripts/actions/abilities/grand_pas.lua index 7be278c28d7..907bad88695 100644 --- a/scripts/actions/abilities/grand_pas.lua +++ b/scripts/actions/abilities/grand_pas.lua @@ -15,7 +15,7 @@ abilityObject.onAbilityCheck = function(player, target, ability) end abilityObject.onUseAbility = function(player, target, ability) - target:addStatusEffect(xi.effect.GRAND_PAS, 19, 1, 30) + target:addStatusEffect(xi.effect.GRAND_PAS, { power = 19, duration = 30, origin = player, tick = 1 }) end return abilityObject diff --git a/scripts/actions/abilities/haste_samba.lua b/scripts/actions/abilities/haste_samba.lua index 35967b6a90d..cae912ca718 100644 --- a/scripts/actions/abilities/haste_samba.lua +++ b/scripts/actions/abilities/haste_samba.lua @@ -29,7 +29,7 @@ abilityObject.onUseAbility = function(player, target, ability) duration = duration * (100 + player:getMod(xi.mod.SAMBA_PDURATION)) / 100 player:delStatusEffect(xi.effect.DRAIN_SAMBA) player:delStatusEffect(xi.effect.ASPIR_SAMBA) - player:addStatusEffect(xi.effect.HASTE_SAMBA, 500 + player:getMerit(xi.merit.HASTE_SAMBA_EFFECT), 0, duration) + player:addStatusEffect(xi.effect.HASTE_SAMBA, { power = 500 + player:getMerit(xi.merit.HASTE_SAMBA_EFFECT), duration = duration, origin = player }) return xi.effect.HASTE_SAMBA end diff --git a/scripts/actions/abilities/ice_shot.lua b/scripts/actions/abilities/ice_shot.lua index 20ad30ca790..ad0083940d8 100644 --- a/scripts/actions/abilities/ice_shot.lua +++ b/scripts/actions/abilities/ice_shot.lua @@ -74,7 +74,7 @@ abilityObject.onUseAbility = function(player, target, ability, action) power = power * 1.2 target:delStatusEffectSilent(effectId) - target:addStatusEffect(effectId, power, tick, duration, subId, subpower, tier) + target:addStatusEffect(effectId, { power = power, duration = duration, origin = player, tick = tick, subType = subId, subPower = subpower, tier = tier }) local newEffect = target:getStatusEffect(effectId) if newEffect then diff --git a/scripts/actions/abilities/immanence.lua b/scripts/actions/abilities/immanence.lua index f85e653166b..7811facdc68 100644 --- a/scripts/actions/abilities/immanence.lua +++ b/scripts/actions/abilities/immanence.lua @@ -16,7 +16,7 @@ abilityObject.onAbilityCheck = function(player, target, ability) end abilityObject.onUseAbility = function(player, target, ability) - player:addStatusEffect(xi.effect.IMMANENCE, 1, 0, 60) + player:addStatusEffect(xi.effect.IMMANENCE, { power = 1, duration = 60, origin = player }) return xi.effect.IMMANENCE end diff --git a/scripts/actions/abilities/libra.lua b/scripts/actions/abilities/libra.lua index 9a5e37c58ca..e25f1d42254 100644 --- a/scripts/actions/abilities/libra.lua +++ b/scripts/actions/abilities/libra.lua @@ -12,7 +12,7 @@ abilityObject.onAbilityCheck = function(player, target, ability) end abilityObject.onUseAbility = function(player, target, ability) - -- player:addStatusEffect(xi.effect.LIBRA, 20, 1, 1) -- TODO: implement xi.effect.LIBRA + -- player:addStatusEffect(xi.effect.LIBRA, { power = 20, duration = 1, origin = player, tick = 1 }) -- TODO: implement xi.effect.LIBRA end return abilityObject diff --git a/scripts/actions/abilities/light_arts.lua b/scripts/actions/abilities/light_arts.lua index 10a4cb6addd..7f10570ba52 100644 --- a/scripts/actions/abilities/light_arts.lua +++ b/scripts/actions/abilities/light_arts.lua @@ -37,7 +37,7 @@ abilityObject.onUseAbility = function(player, target, ability) regenbonus = 3 * math.floor((player:getMainLvl() - 10) / 10) end - player:addStatusEffect(xi.effect.LIGHT_ARTS, effectbonus, 0, 7200, 0, regenbonus) + player:addStatusEffect(xi.effect.LIGHT_ARTS, { power = effectbonus, duration = 7200, origin = player, subPower = regenbonus }) return xi.effect.LIGHT_ARTS end diff --git a/scripts/actions/abilities/light_shot.lua b/scripts/actions/abilities/light_shot.lua index fd6684f04d2..7ac71334642 100644 --- a/scripts/actions/abilities/light_shot.lua +++ b/scripts/actions/abilities/light_shot.lua @@ -67,7 +67,7 @@ abilityObject.onUseAbility = function(player, target, ability, action) power = power * 1.5 subpower = subpower * 1.5 target:delStatusEffectSilent(effectId) - target:addStatusEffect(effectId, power, tick, duration, subId, subpower, tier) + target:addStatusEffect(effectId, { power = power, duration = duration, origin = player, tick = tick, subType = subId, subPower = subpower, tier = tier }) local newEffect = target:getStatusEffect(effectId) if newEffect then @@ -75,7 +75,7 @@ abilityObject.onUseAbility = function(player, target, ability, action) end end - if target:addStatusEffect(xi.effect.SLEEP_I, 1, 0, duration) then + if target:addStatusEffect(xi.effect.SLEEP_I, { power = 1, duration = duration, origin = player }) then ability:setMsg(xi.msg.basic.JA_ENFEEB_IS) else ability:setMsg(xi.msg.basic.JA_NO_EFFECT_2) diff --git a/scripts/actions/abilities/manifestation.lua b/scripts/actions/abilities/manifestation.lua index 4c61a811c30..75aa682bb92 100644 --- a/scripts/actions/abilities/manifestation.lua +++ b/scripts/actions/abilities/manifestation.lua @@ -25,7 +25,7 @@ abilityObject.onAbilityCheck = function(player, target, ability) end abilityObject.onUseAbility = function(player, target, ability) - player:addStatusEffect(xi.effect.MANIFESTATION, 1, 0, 60) + player:addStatusEffect(xi.effect.MANIFESTATION, { power = 1, duration = 60, origin = player }) return xi.effect.MANIFESTATION end diff --git a/scripts/actions/abilities/parsimony.lua b/scripts/actions/abilities/parsimony.lua index 043994e5450..ebf3ab611d3 100644 --- a/scripts/actions/abilities/parsimony.lua +++ b/scripts/actions/abilities/parsimony.lua @@ -25,7 +25,7 @@ abilityObject.onAbilityCheck = function(player, target, ability) end abilityObject.onUseAbility = function(player, target, ability) - player:addStatusEffect(xi.effect.PARSIMONY, 1, 0, 60) + player:addStatusEffect(xi.effect.PARSIMONY, { power = 1, duration = 60, origin = player }) return xi.effect.PARSIMONY end diff --git a/scripts/actions/abilities/penury.lua b/scripts/actions/abilities/penury.lua index 4a8a1df0b19..c2beaf418eb 100644 --- a/scripts/actions/abilities/penury.lua +++ b/scripts/actions/abilities/penury.lua @@ -25,7 +25,7 @@ abilityObject.onAbilityCheck = function(player, target, ability) end abilityObject.onUseAbility = function(player, target, ability) - player:addStatusEffect(xi.effect.PENURY, 1, 0, 60) + player:addStatusEffect(xi.effect.PENURY, { power = 1, duration = 60, origin = player }) return xi.effect.PENURY end diff --git a/scripts/actions/abilities/perpetuance.lua b/scripts/actions/abilities/perpetuance.lua index 1033b2a948c..755a8bf677f 100644 --- a/scripts/actions/abilities/perpetuance.lua +++ b/scripts/actions/abilities/perpetuance.lua @@ -25,7 +25,7 @@ abilityObject.onAbilityCheck = function(player, target, ability) end abilityObject.onUseAbility = function(player, target, ability) - player:addStatusEffect(xi.effect.PERPETUANCE, 1, 0, 60) + player:addStatusEffect(xi.effect.PERPETUANCE, { power = 1, duration = 60, origin = player }) return xi.effect.PERPETUANCE end diff --git a/scripts/actions/abilities/pets/aerial_armor.lua b/scripts/actions/abilities/pets/aerial_armor.lua index cea61488aa7..7091216a344 100644 --- a/scripts/actions/abilities/pets/aerial_armor.lua +++ b/scripts/actions/abilities/pets/aerial_armor.lua @@ -14,7 +14,7 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local typeEffect = xi.effect.BLINK target:delStatusEffect(typeEffect) - if target:addStatusEffect(typeEffect, 3, 0, 900) then + if target:addStatusEffect(typeEffect, { power = 3, duration = 900, origin = pet }) then if target:getID() == action:getPrimaryTargetID() then petskill:setMsg(xi.msg.basic.SKILL_GAIN_EFFECT_2) else diff --git a/scripts/actions/abilities/pets/altana_s_favor.lua b/scripts/actions/abilities/pets/altana_s_favor.lua index bc1962ae1bd..24f428ec05c 100644 --- a/scripts/actions/abilities/pets/altana_s_favor.lua +++ b/scripts/actions/abilities/pets/altana_s_favor.lua @@ -20,7 +20,7 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) if target:isDead() then target:sendRaise(4) -- arise - elseif target:addStatusEffect(xi.effect.RERAISE, 3, 0, 0) then -- Infinite duration http://wiki.ffo.jp/html/30976.html + elseif target:addStatusEffect(xi.effect.RERAISE, { power = 3, origin = pet }) then -- Infinite duration http://wiki.ffo.jp/html/30976.html petskill:setMsg(xi.msg.basic.JA_GAIN_EFFECT) return xi.effect.RERAISE else diff --git a/scripts/actions/abilities/pets/automaton/armor_shatterer.lua b/scripts/actions/abilities/pets/automaton/armor_shatterer.lua index 3be58d66d37..127adf68bb2 100644 --- a/scripts/actions/abilities/pets/automaton/armor_shatterer.lua +++ b/scripts/actions/abilities/pets/automaton/armor_shatterer.lua @@ -28,7 +28,7 @@ abilityObject.onAutomatonAbility = function(target, automaton, skill, master, ac if damage > 0 then local bonusduration = 1 + 0.00033 * (skill:getTP() - 1000) if not target:hasStatusEffect(xi.effect.DEFENSE_DOWN) then - target:addStatusEffect(xi.effect.DEFENSE_DOWN, 15, 0, 90 * bonusduration) + target:addStatusEffect(xi.effect.DEFENSE_DOWN, { power = 15, duration = 90 * bonusduration, origin = automaton }) end end diff --git a/scripts/actions/abilities/pets/automaton/bone_crusher.lua b/scripts/actions/abilities/pets/automaton/bone_crusher.lua index 8895f72435a..c69fd9255ef 100644 --- a/scripts/actions/abilities/pets/automaton/bone_crusher.lua +++ b/scripts/actions/abilities/pets/automaton/bone_crusher.lua @@ -43,7 +43,7 @@ abilityObject.onAutomatonAbility = function(target, automaton, skill, master, ac not target:hasStatusEffect(xi.effect.STUN) and chance >= math.random() * 100 then - target:addStatusEffect(xi.effect.STUN, 1, 0, 4) + target:addStatusEffect(xi.effect.STUN, { power = 1, duration = 4, origin = automaton }) end end diff --git a/scripts/actions/abilities/pets/automaton/daze.lua b/scripts/actions/abilities/pets/automaton/daze.lua index fe340c65278..fb1cc3cf2c1 100644 --- a/scripts/actions/abilities/pets/automaton/daze.lua +++ b/scripts/actions/abilities/pets/automaton/daze.lua @@ -35,7 +35,7 @@ abilityObject.onAutomatonAbility = function(target, automaton, skill, master, ac not target:hasStatusEffect(xi.effect.STUN) and chance >= math.random() * 100 then - target:addStatusEffect(xi.effect.STUN, 1, 0, 4) + target:addStatusEffect(xi.effect.STUN, { power = 1, duration = 4, origin = automaton }) end end diff --git a/scripts/actions/abilities/pets/automaton/flashbulb.lua b/scripts/actions/abilities/pets/automaton/flashbulb.lua index 6c46fda04a5..ac5c5afe29a 100644 --- a/scripts/actions/abilities/pets/automaton/flashbulb.lua +++ b/scripts/actions/abilities/pets/automaton/flashbulb.lua @@ -26,7 +26,7 @@ abilityObject.onAutomatonAbility = function(target, automaton, skill, master, ac local duration = 12 * resist if resist > 0.0625 then - if target:addStatusEffect(xi.effect.FLASH, 0, 0, duration) then -- power handled in hit rate calculations + if target:addStatusEffect(xi.effect.FLASH, { duration = duration, origin = automaton }) then -- power handled in hit rate calculations skill:setMsg(xi.msg.basic.SKILL_ENFEEB) else skill:setMsg(xi.msg.basic.SKILL_NO_EFFECT) diff --git a/scripts/actions/abilities/pets/automaton/mana_converter.lua b/scripts/actions/abilities/pets/automaton/mana_converter.lua index 5e3e7d8eca7..8415f28929d 100644 --- a/scripts/actions/abilities/pets/automaton/mana_converter.lua +++ b/scripts/actions/abilities/pets/automaton/mana_converter.lua @@ -19,7 +19,7 @@ abilityObject.onAutomatonAbility = function(target, automaton, skill, master, ac target:addMP(difference) -- To prevent possible loss of MP from flooring the refresh target:setHP(math.floor(hp / 2)) target:delStatusEffect(xi.effect.REFRESH) - target:addStatusEffect(xi.effect.REFRESH, amount, 3, duration) + target:addStatusEffect(xi.effect.REFRESH, { power = amount, duration = duration, origin = automaton, tick = 3 }) return xi.effect.REFRESH end diff --git a/scripts/actions/abilities/pets/automaton/reactive_shield.lua b/scripts/actions/abilities/pets/automaton/reactive_shield.lua index 068b54a4102..cdf4d278ddd 100644 --- a/scripts/actions/abilities/pets/automaton/reactive_shield.lua +++ b/scripts/actions/abilities/pets/automaton/reactive_shield.lua @@ -14,7 +14,7 @@ abilityObject.onAutomatonAbility = function(target, automaton, skill, master, ac local duration = 60 local power = math.floor((pMod / 56)^3 / 8) + 4 -- No idea how the actual formula used Automaton skill level, so heres a placeholder (4 @ lvl 1, 10 @ lvl 61, 20 @ lvl 75, 62 @ lvl 99) - if target:addStatusEffect(xi.effect.BLAZE_SPIKES, power, 0, duration) then + if target:addStatusEffect(xi.effect.BLAZE_SPIKES, { power = power, duration = duration, origin = automaton }) then skill:setMsg(xi.msg.basic.SKILL_GAIN_EFFECT) else skill:setMsg(xi.msg.basic.SKILL_NO_EFFECT) diff --git a/scripts/actions/abilities/pets/automaton/replicator.lua b/scripts/actions/abilities/pets/automaton/replicator.lua index 2dd323bab69..91dc447995b 100644 --- a/scripts/actions/abilities/pets/automaton/replicator.lua +++ b/scripts/actions/abilities/pets/automaton/replicator.lua @@ -14,7 +14,7 @@ abilityObject.onAutomatonAbility = function(target, automaton, skill, master, ac local duration = 300 local shadows = 1 + maneuvers -- math.floor(maneuvers * 3.5) currently on retail - if target:addStatusEffect(xi.effect.BLINK, shadows, 0, duration) then + if target:addStatusEffect(xi.effect.BLINK, { power = shadows, duration = duration, origin = automaton }) then skill:setMsg(xi.msg.basic.SKILL_GAIN_EFFECT) for i = 1, maneuvers do master:delStatusEffectSilent(xi.effect.WIND_MANEUVER) diff --git a/scripts/actions/abilities/pets/automaton/shield_bash.lua b/scripts/actions/abilities/pets/automaton/shield_bash.lua index 06dbabc5b5e..904abd99108 100644 --- a/scripts/actions/abilities/pets/automaton/shield_bash.lua +++ b/scripts/actions/abilities/pets/automaton/shield_bash.lua @@ -17,7 +17,7 @@ abilityObject.onAutomatonAbility = function(target, automaton, skill, master, ac chance = chance + (automaton:getMainLvl() - target:getMainLvl()) * 5 if math.random() * 100 < chance then - target:addStatusEffect(xi.effect.STUN, 1, 0, 6) + target:addStatusEffect(xi.effect.STUN, { power = 1, duration = 6, origin = automaton }) end local slowPower = automaton:getMod(xi.mod.AUTO_SHIELD_BASH_SLOW) @@ -31,7 +31,7 @@ abilityObject.onAutomatonAbility = function(target, automaton, skill, master, ac duration = math.random(70, 75) end - target:addStatusEffect(xi.effect.SLOW, slowPower * 100, 0, duration, 0, 0, 3) + target:addStatusEffect(xi.effect.SLOW, { power = slowPower * 100, duration = duration, origin = automaton, tier = 3 }) end -- randomize damage diff --git a/scripts/actions/abilities/pets/automaton/shock_absorber.lua b/scripts/actions/abilities/pets/automaton/shock_absorber.lua index 32a3d10c58a..e46bb576ace 100644 --- a/scripts/actions/abilities/pets/automaton/shock_absorber.lua +++ b/scripts/actions/abilities/pets/automaton/shock_absorber.lua @@ -44,7 +44,7 @@ abilityObject.onAutomatonAbility = function(target, automaton, skill, master, ac amount = amount + math.floor(bonus) - if target:addStatusEffect(xi.effect.STONESKIN, amount, 0, duration, 0, 0, 4) then + if target:addStatusEffect(xi.effect.STONESKIN, { power = amount, duration = duration, origin = automaton, tier = 4 }) then skill:setMsg(xi.msg.basic.SKILL_GAIN_EFFECT) else skill:setMsg(xi.msg.basic.SKILL_NO_EFFECT) diff --git a/scripts/actions/abilities/pets/chaotic_strike.lua b/scripts/actions/abilities/pets/chaotic_strike.lua index 4aae4ca899c..843e55b0cc6 100644 --- a/scripts/actions/abilities/pets/chaotic_strike.lua +++ b/scripts/actions/abilities/pets/chaotic_strike.lua @@ -18,7 +18,7 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local dmgmodsubsequent = 2 local info = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, dmgmodsubsequent, xi.mobskills.magicalTpBonus.NO_EFFECT, 1, 2, 3) local totaldamage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, numhits) - target:addStatusEffect(xi.effect.STUN, 1, 0, 2) + target:addStatusEffect(xi.effect.STUN, { power = 1, duration = 2, origin = pet }) target:takeDamage(totaldamage, pet, xi.attackType.PHYSICAL, xi.damageType.BLUNT) target:updateEnmityFromDamage(pet, totaldamage) return totaldamage diff --git a/scripts/actions/abilities/pets/clarsach_call.lua b/scripts/actions/abilities/pets/clarsach_call.lua index aee7ed4ee81..8b799accc9f 100644 --- a/scripts/actions/abilities/pets/clarsach_call.lua +++ b/scripts/actions/abilities/pets/clarsach_call.lua @@ -35,12 +35,12 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) summoner:setMP(0) - pet:addStatusEffect(xi.effect.ATTACK_BOOST, 25, 0, 180) - pet:addStatusEffect(xi.effect.DEFENSE_BOOST, 25, 0, 180) - pet:addStatusEffect(xi.effect.MAGIC_ATK_BOOST, 25, 0, 180) - pet:addStatusEffect(xi.effect.MAGIC_DEF_BOOST, 25, 0, 180) - pet:addStatusEffect(xi.effect.EVASION_BOOST, 50, 0, 180) - pet:addStatusEffect(xi.effect.MAGIC_EVASION_BOOST, 50, 0, 180) + pet:addStatusEffect(xi.effect.ATTACK_BOOST, { power = 25, duration = 180, origin = pet }) + pet:addStatusEffect(xi.effect.DEFENSE_BOOST, { power = 25, duration = 180, origin = pet }) + pet:addStatusEffect(xi.effect.MAGIC_ATK_BOOST, { power = 25, duration = 180, origin = pet }) + pet:addStatusEffect(xi.effect.MAGIC_DEF_BOOST, { power = 25, duration = 180, origin = pet }) + pet:addStatusEffect(xi.effect.EVASION_BOOST, { power = 50, duration = 180, origin = pet }) + pet:addStatusEffect(xi.effect.MAGIC_EVASION_BOOST, { power = 50, duration = 180, origin = pet }) return info.damage end diff --git a/scripts/actions/abilities/pets/crescent_fang.lua b/scripts/actions/abilities/pets/crescent_fang.lua index b69aed19b0b..c3a41f9eb91 100644 --- a/scripts/actions/abilities/pets/crescent_fang.lua +++ b/scripts/actions/abilities/pets/crescent_fang.lua @@ -19,7 +19,7 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local totaldamage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, numhits) if info.hitslanded > 0 then - target:addStatusEffect(xi.effect.PARALYSIS, 22.5, 0, 90) + target:addStatusEffect(xi.effect.PARALYSIS, { power = 22.5, duration = 90, origin = pet }) end target:takeDamage(totaldamage, pet, xi.attackType.PHYSICAL, xi.damageType.PIERCING) diff --git a/scripts/actions/abilities/pets/crimson_howl.lua b/scripts/actions/abilities/pets/crimson_howl.lua index c46d43a074e..7b165f46d7f 100644 --- a/scripts/actions/abilities/pets/crimson_howl.lua +++ b/scripts/actions/abilities/pets/crimson_howl.lua @@ -15,7 +15,7 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action) local typeEffect = xi.effect.WARCRY - if target:addStatusEffect(typeEffect, 9, 0, duration) then + if target:addStatusEffect(typeEffect, { power = 9, duration = duration, origin = pet }) then if target:getID() == action:getPrimaryTargetID() then petskill:setMsg(xi.msg.basic.SKILL_GAIN_EFFECT_2) else diff --git a/scripts/actions/abilities/pets/dream_shroud.lua b/scripts/actions/abilities/pets/dream_shroud.lua index 54fe2aba773..251da0094c4 100644 --- a/scripts/actions/abilities/pets/dream_shroud.lua +++ b/scripts/actions/abilities/pets/dream_shroud.lua @@ -16,8 +16,8 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local buffvalue = math.abs(12 - hour) + 1 target:delStatusEffect(xi.effect.MAGIC_ATK_BOOST) target:delStatusEffect(xi.effect.MAGIC_DEF_BOOST) - target:addStatusEffect(xi.effect.MAGIC_ATK_BOOST, buffvalue, 0, duration) - target:addStatusEffect(xi.effect.MAGIC_DEF_BOOST, 14 - buffvalue, 0, duration) + target:addStatusEffect(xi.effect.MAGIC_ATK_BOOST, { power = buffvalue, duration = duration, origin = pet }) + target:addStatusEffect(xi.effect.MAGIC_DEF_BOOST, { power = 14 - buffvalue, duration = duration, origin = pet }) if target:getID() == action:getPrimaryTargetID() then petskill:setMsg(xi.msg.basic.JA_RECEIVES_MAB_MDB) diff --git a/scripts/actions/abilities/pets/earthen_ward.lua b/scripts/actions/abilities/pets/earthen_ward.lua index 2f2add3670b..ebf29b2900e 100644 --- a/scripts/actions/abilities/pets/earthen_ward.lua +++ b/scripts/actions/abilities/pets/earthen_ward.lua @@ -15,7 +15,7 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action) local typeEffect = xi.effect.STONESKIN - if target:addStatusEffect(typeEffect, amount, 0, 900, 0, 0, 3) then + if target:addStatusEffect(typeEffect, { power = amount, duration = 900, origin = pet, tier = 3 }) then if target:getID() == action:getPrimaryTargetID() then petskill:setMsg(xi.msg.basic.SKILL_GAIN_EFFECT_2) else diff --git a/scripts/actions/abilities/pets/ecliptic_growl.lua b/scripts/actions/abilities/pets/ecliptic_growl.lua index 82623bf3f4d..4cd4e71a2e2 100644 --- a/scripts/actions/abilities/pets/ecliptic_growl.lua +++ b/scripts/actions/abilities/pets/ecliptic_growl.lua @@ -41,13 +41,13 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) target:delStatusEffect(xi.effect.MND_BOOST) target:delStatusEffect(xi.effect.CHR_BOOST) - target:addStatusEffect(xi.effect.STR_BOOST, buffValue, 0, duration) - target:addStatusEffect(xi.effect.DEX_BOOST, buffValue, 0, duration) - target:addStatusEffect(xi.effect.VIT_BOOST, buffValue, 0, duration) - target:addStatusEffect(xi.effect.AGI_BOOST, 8-buffValue, 0, duration) - target:addStatusEffect(xi.effect.INT_BOOST, 8-buffValue, 0, duration) - target:addStatusEffect(xi.effect.MND_BOOST, 8-buffValue, 0, duration) - target:addStatusEffect(xi.effect.CHR_BOOST, 8-buffValue, 0, duration) + target:addStatusEffect(xi.effect.STR_BOOST, { power = buffValue, duration = duration, origin = pet }) + target:addStatusEffect(xi.effect.DEX_BOOST, { power = buffValue, duration = duration, origin = pet }) + target:addStatusEffect(xi.effect.VIT_BOOST, { power = buffValue, duration = duration, origin = pet }) + target:addStatusEffect(xi.effect.AGI_BOOST, { power = 8-buffValue, duration = duration, origin = pet }) + target:addStatusEffect(xi.effect.INT_BOOST, { power = 8-buffValue, duration = duration, origin = pet }) + target:addStatusEffect(xi.effect.MND_BOOST, { power = 8-buffValue, duration = duration, origin = pet }) + target:addStatusEffect(xi.effect.CHR_BOOST, { power = 8-buffValue, duration = duration, origin = pet }) if target:getID() == action:getPrimaryTargetID() then petskill:setMsg(xi.msg.basic.STATUS_BOOST) diff --git a/scripts/actions/abilities/pets/ecliptic_howl.lua b/scripts/actions/abilities/pets/ecliptic_howl.lua index 8c8c2de846f..12fb1ffaade 100644 --- a/scripts/actions/abilities/pets/ecliptic_howl.lua +++ b/scripts/actions/abilities/pets/ecliptic_howl.lua @@ -36,8 +36,8 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) target:delStatusEffect(xi.effect.ACCURACY_BOOST) target:delStatusEffect(xi.effect.EVASION_BOOST) - target:addStatusEffect(xi.effect.ACCURACY_BOOST, buffValue, 0, duration) - target:addStatusEffect(xi.effect.EVASION_BOOST, 25-buffValue, 0, duration) + target:addStatusEffect(xi.effect.ACCURACY_BOOST, { power = buffValue, duration = duration, origin = pet }) + target:addStatusEffect(xi.effect.EVASION_BOOST, { power = 25-buffValue, duration = duration, origin = pet }) if target:getID() == action:getPrimaryTargetID() then petskill:setMsg(xi.msg.basic.ACC_EVA_BOOST) diff --git a/scripts/actions/abilities/pets/eerie_eye.lua b/scripts/actions/abilities/pets/eerie_eye.lua index 1b1291e8eb0..f300d869692 100644 --- a/scripts/actions/abilities/pets/eerie_eye.lua +++ b/scripts/actions/abilities/pets/eerie_eye.lua @@ -23,12 +23,12 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) -- https://wikiwiki.jp/ffxi/%E5%8F%AC%E5%96%9A%E9%AD%94%E6%B3%95 -- TL;DR base 30s silence and 10s amnesia (also amnesia is fire element) if resist >= 0.5 then --Do it! - if target:addStatusEffect(xi.effect.SILENCE, 1, 0, duration * resist) then + if target:addStatusEffect(xi.effect.SILENCE, { power = 1, duration = duration * resist, origin = pet }) then petskill:setMsg(xi.msg.basic.JA_GAIN_EFFECT) local resist2 = xi.combat.magicHitRate.calculateResistRate(pet, target, 0, xi.skill.ENFEEBLING_MAGIC, 0, xi.element.FIRE, 0, 0, bonus) if resist2 >= 0.5 and - target:addStatusEffect(xi.effect.AMNESIA, 1, 0, duration * resist2 / 3) + target:addStatusEffect(xi.effect.AMNESIA, { power = 1, duration = duration * resist2 / 3, origin = pet }) then returnEffect = xi.effect.AMNESIA else diff --git a/scripts/actions/abilities/pets/frost_armor.lua b/scripts/actions/abilities/pets/frost_armor.lua index 50cce6ddfa7..75f499422b6 100644 --- a/scripts/actions/abilities/pets/frost_armor.lua +++ b/scripts/actions/abilities/pets/frost_armor.lua @@ -17,7 +17,7 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local typeEffect = xi.effect.ICE_SPIKES target:delStatusEffect(typeEffect) - if target:addStatusEffect(typeEffect, 15, 0, duration) then + if target:addStatusEffect(typeEffect, { power = 15, duration = duration, origin = pet }) then if target:getID() == action:getPrimaryTargetID() then petskill:setMsg(xi.msg.basic.SKILL_GAIN_EFFECT_2) else diff --git a/scripts/actions/abilities/pets/glittering_ruby.lua b/scripts/actions/abilities/pets/glittering_ruby.lua index e1265925853..7562485a669 100644 --- a/scripts/actions/abilities/pets/glittering_ruby.lua +++ b/scripts/actions/abilities/pets/glittering_ruby.lua @@ -26,7 +26,7 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action) - target:addStatusEffect(effectId, effectPower, 0, 90) + target:addStatusEffect(effectId, { power = effectPower, duration = 90, origin = pet }) if target:getID() == action:getPrimaryTargetID() then petskill:setMsg(xi.msg.basic.SKILL_GAIN_EFFECT_2) diff --git a/scripts/actions/abilities/pets/hastega.lua b/scripts/actions/abilities/pets/hastega.lua index 4e133277109..d8d17f8169d 100644 --- a/scripts/actions/abilities/pets/hastega.lua +++ b/scripts/actions/abilities/pets/hastega.lua @@ -17,7 +17,7 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) -- Garuda's Hastega is a weird exception and uses 153/1024 instead of 150/1024 like Haste spell -- That's why it overwrites some things regular haste won't. 153/1024 ~14.94% local typeEffect = xi.effect.HASTE - if target:addStatusEffect(typeEffect, 1494, 0, duration) then + if target:addStatusEffect(typeEffect, { power = 1494, duration = duration, origin = pet }) then if target:getID() == action:getPrimaryTargetID() then petskill:setMsg(xi.msg.basic.SKILL_GAIN_EFFECT_2) else diff --git a/scripts/actions/abilities/pets/lightning_armor.lua b/scripts/actions/abilities/pets/lightning_armor.lua index b2e3937eb57..33857742843 100644 --- a/scripts/actions/abilities/pets/lightning_armor.lua +++ b/scripts/actions/abilities/pets/lightning_armor.lua @@ -17,7 +17,7 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local typeEffect = xi.effect.SHOCK_SPIKES target:delStatusEffect(typeEffect) - if target:addStatusEffect(typeEffect, 15, 0, duration) then + if target:addStatusEffect(typeEffect, { power = 15, duration = duration, origin = pet }) then if target:getID() == action:getPrimaryTargetID() then petskill:setMsg(xi.msg.basic.SKILL_GAIN_EFFECT_2) else diff --git a/scripts/actions/abilities/pets/lunar_cry.lua b/scripts/actions/abilities/pets/lunar_cry.lua index 053c43f13a5..721765b7afd 100644 --- a/scripts/actions/abilities/pets/lunar_cry.lua +++ b/scripts/actions/abilities/pets/lunar_cry.lua @@ -33,8 +33,8 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) target:delStatusEffect(xi.effect.ACCURACY_DOWN) target:delStatusEffect(xi.effect.EVASION_DOWN) - target:addStatusEffect(xi.effect.ACCURACY_DOWN, buffValue, 0, 180) - target:addStatusEffect(xi.effect.EVASION_DOWN, 32-buffValue, 0, 180) + target:addStatusEffect(xi.effect.ACCURACY_DOWN, { power = buffValue, duration = 180, origin = pet }) + target:addStatusEffect(xi.effect.EVASION_DOWN, { power = 32-buffValue, duration = 180, origin = pet }) if target:getID() == action:getPrimaryTargetID() then petskill:setMsg(xi.msg.basic.ACC_EVA_DOWN) diff --git a/scripts/actions/abilities/pets/mewing_lullaby.lua b/scripts/actions/abilities/pets/mewing_lullaby.lua index e4dd73b9485..35f3d29f299 100644 --- a/scripts/actions/abilities/pets/mewing_lullaby.lua +++ b/scripts/actions/abilities/pets/mewing_lullaby.lua @@ -37,7 +37,7 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local duration = math.floor(90 * resistRate) petskill:setMsg(xi.msg.basic.JA_GAIN_EFFECT) - target:addStatusEffect(xi.effect.SLEEP_I, 1, 0, duration) + target:addStatusEffect(xi.effect.SLEEP_I, { power = 1, duration = duration, origin = pet }) return xi.effect.SLEEP_I end diff --git a/scripts/actions/abilities/pets/moonlit_charge.lua b/scripts/actions/abilities/pets/moonlit_charge.lua index 870cae67e86..7d6cf5c5bb2 100644 --- a/scripts/actions/abilities/pets/moonlit_charge.lua +++ b/scripts/actions/abilities/pets/moonlit_charge.lua @@ -17,7 +17,7 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local info = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, 0, xi.mobskills.magicalTpBonus.NO_EFFECT, 1, 2, 3) local totaldamage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, numhits) - target:addStatusEffect(xi.effect.BLINDNESS, 20, 0, 30) + target:addStatusEffect(xi.effect.BLINDNESS, { power = 20, duration = 30, origin = pet }) target:takeDamage(totaldamage, pet, xi.attackType.PHYSICAL, xi.damageType.BLUNT) target:updateEnmityFromDamage(pet, totaldamage) diff --git a/scripts/actions/abilities/pets/nightmare.lua b/scripts/actions/abilities/pets/nightmare.lua index c4928b7161b..908a194be97 100644 --- a/scripts/actions/abilities/pets/nightmare.lua +++ b/scripts/actions/abilities/pets/nightmare.lua @@ -38,11 +38,11 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local duration = math.floor(90 * resistRate) -- Apply sleep and bio - if target:addStatusEffect(xi.effect.SLEEP_I, 1, 0, duration, 0, 2, 4) then + if target:addStatusEffect(xi.effect.SLEEP_I, { power = 1, duration = duration, origin = pet, subPower = 2, tier = 4 }) then petskill:setMsg(xi.msg.basic.JA_GAIN_EFFECT) target:delStatusEffectSilent(xi.effect.DIA) target:delStatusEffectSilent(xi.effect.BIO) - target:addStatusEffect(xi.effect.BIO, 2, 3, duration, 0, 10, 11) + target:addStatusEffect(xi.effect.BIO, { power = 2, duration = duration, origin = pet, tick = 3, subPower = 10, tier = 11 }) -- Miss else diff --git a/scripts/actions/abilities/pets/noctoshield.lua b/scripts/actions/abilities/pets/noctoshield.lua index 6c53f6a824d..66a7abf8a7c 100644 --- a/scripts/actions/abilities/pets/noctoshield.lua +++ b/scripts/actions/abilities/pets/noctoshield.lua @@ -13,7 +13,7 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local bonusTime = utils.clamp(summoner:getSkillLevel(xi.skill.SUMMONING_MAGIC) - 300, 0, 200) local duration = 180 + bonusTime - if target:addStatusEffect(xi.effect.PHALANX, 13, 0, duration) then + if target:addStatusEffect(xi.effect.PHALANX, { power = 13, duration = duration, origin = pet }) then if target:getID() == action:getPrimaryTargetID() then petskill:setMsg(xi.msg.basic.SKILL_GAIN_EFFECT_2) else diff --git a/scripts/actions/abilities/pets/perfect_defense.lua b/scripts/actions/abilities/pets/perfect_defense.lua index 7a833a00eac..ad04507fd11 100644 --- a/scripts/actions/abilities/pets/perfect_defense.lua +++ b/scripts/actions/abilities/pets/perfect_defense.lua @@ -31,7 +31,7 @@ abilityObject.onPetAbility = function(target, pet, skill, master, action) local subPower = math.floor(98 * power / 9000) target:delStatusEffect(xi.effect.PERFECT_DEFENSE) - target:addStatusEffect(xi.effect.PERFECT_DEFENSE, power, 3, duration, 0, subPower) + target:addStatusEffect(xi.effect.PERFECT_DEFENSE, { power = power, duration = duration, origin = pet, tick = 3, subPower = subPower }) -- Despawn Alexander after 6 seconds. pet:timer(6000, function() diff --git a/scripts/actions/abilities/pets/poison_nails.lua b/scripts/actions/abilities/pets/poison_nails.lua index 0624931648f..f389e948f17 100644 --- a/scripts/actions/abilities/pets/poison_nails.lua +++ b/scripts/actions/abilities/pets/poison_nails.lua @@ -25,7 +25,7 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) xi.summon.avatarPhysicalHit(petskill, totaldamage) and not target:hasStatusEffect(xi.effect.POISON) then - target:addStatusEffect(xi.effect.POISON, 1, 3, 60) + target:addStatusEffect(xi.effect.POISON, { power = 1, duration = 60, origin = pet, tick = 3 }) end return totaldamage diff --git a/scripts/actions/abilities/pets/reraise_ii.lua b/scripts/actions/abilities/pets/reraise_ii.lua index 86fd4d51fa6..d39e733f33e 100644 --- a/scripts/actions/abilities/pets/reraise_ii.lua +++ b/scripts/actions/abilities/pets/reraise_ii.lua @@ -13,7 +13,7 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) if not target:isPC() or - not target:addStatusEffect(xi.effect.RERAISE, 2, 0, 3600) + not target:addStatusEffect(xi.effect.RERAISE, { power = 2, duration = 3600, origin = pet }) then petskill:setMsg(xi.msg.basic.NO_EFFECT) return 0 diff --git a/scripts/actions/abilities/pets/shining_ruby.lua b/scripts/actions/abilities/pets/shining_ruby.lua index 55fc29778f1..14c994f973c 100644 --- a/scripts/actions/abilities/pets/shining_ruby.lua +++ b/scripts/actions/abilities/pets/shining_ruby.lua @@ -15,7 +15,7 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action) target:delStatusEffect(xi.effect.SHINING_RUBY) - target:addStatusEffect(xi.effect.SHINING_RUBY, 1, 0, duration) + target:addStatusEffect(xi.effect.SHINING_RUBY, { power = 1, duration = duration, origin = pet }) if target:getID() == action:getPrimaryTargetID() then petskill:setMsg(xi.msg.basic.SKILL_GAIN_EFFECT_2) diff --git a/scripts/actions/abilities/pets/shock_strike.lua b/scripts/actions/abilities/pets/shock_strike.lua index e7a8d488df7..b97533b172b 100644 --- a/scripts/actions/abilities/pets/shock_strike.lua +++ b/scripts/actions/abilities/pets/shock_strike.lua @@ -17,7 +17,7 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local info = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, 0, xi.mobskills.magicalTpBonus.NO_EFFECT, 1, 2, 3) local totaldamage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, numhits) - target:addStatusEffect(xi.effect.STUN, 1, 0, 2) + target:addStatusEffect(xi.effect.STUN, { power = 1, duration = 2, origin = pet }) target:takeDamage(totaldamage, pet, xi.attackType.PHYSICAL, xi.damageType.BLUNT) target:updateEnmityFromDamage(pet, totaldamage) diff --git a/scripts/actions/abilities/pets/sleepga.lua b/scripts/actions/abilities/pets/sleepga.lua index 94cac11b5b2..124495c155a 100644 --- a/scripts/actions/abilities/pets/sleepga.lua +++ b/scripts/actions/abilities/pets/sleepga.lua @@ -38,7 +38,7 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) -- Apply. local duration = math.floor(90 * resist) - target:addStatusEffect(xi.effect.SLEEP_I, 1, 0, duration) + target:addStatusEffect(xi.effect.SLEEP_I, { power = 1, duration = duration, origin = pet }) if target:getID() == action:getPrimaryTargetID() then petskill:setMsg(xi.msg.basic.JA_RECEIVES_EFFECT_2) else diff --git a/scripts/actions/abilities/pets/slowga.lua b/scripts/actions/abilities/pets/slowga.lua index ae01bdcb0c2..9f462771455 100644 --- a/scripts/actions/abilities/pets/slowga.lua +++ b/scripts/actions/abilities/pets/slowga.lua @@ -16,7 +16,7 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action) - if target:addStatusEffect(xi.effect.SLOW, 3000, 0, duration, 0, 0, 3) then + if target:addStatusEffect(xi.effect.SLOW, { power = 3000, duration = duration, origin = pet, tier = 3 }) then petskill:setMsg(xi.msg.basic.SKILL_ENFEEB_IS) else petskill:setMsg(xi.msg.basic.SKILL_NO_EFFECT) diff --git a/scripts/actions/abilities/pets/soothing_current.lua b/scripts/actions/abilities/pets/soothing_current.lua index f1e1cf11b5c..98902179773 100644 --- a/scripts/actions/abilities/pets/soothing_current.lua +++ b/scripts/actions/abilities/pets/soothing_current.lua @@ -11,7 +11,7 @@ end abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action) - if target:addStatusEffect(xi.effect.CURING_CONDUIT, 15, 0, 180) then + if target:addStatusEffect(xi.effect.CURING_CONDUIT, { power = 15, duration = 180, origin = pet }) then if target:getID() == action:getPrimaryTargetID() then petskill:setMsg(xi.msg.basic.SKILL_GAIN_EFFECT_2) else diff --git a/scripts/actions/abilities/pets/tail_whip.lua b/scripts/actions/abilities/pets/tail_whip.lua index ffe5d07ea63..3956d4b598b 100644 --- a/scripts/actions/abilities/pets/tail_whip.lua +++ b/scripts/actions/abilities/pets/tail_whip.lua @@ -33,7 +33,7 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) xi.summon.avatarPhysicalHit(petskill, totaldamage) and not target:hasStatusEffect(xi.effect.WEIGHT) then - target:addStatusEffect(xi.effect.WEIGHT, 50, 0, duration) + target:addStatusEffect(xi.effect.WEIGHT, { power = 50, duration = duration, origin = pet }) end return totaldamage diff --git a/scripts/actions/abilities/pets/tidal_roar.lua b/scripts/actions/abilities/pets/tidal_roar.lua index 3a5e765c923..9bed9ec87ae 100644 --- a/scripts/actions/abilities/pets/tidal_roar.lua +++ b/scripts/actions/abilities/pets/tidal_roar.lua @@ -12,7 +12,7 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action) if not target:getStatusEffect(xi.effect.ATTACK_DOWN) then - target:addStatusEffect(xi.effect.ATTACK_DOWN, 25, 0, 60) + target:addStatusEffect(xi.effect.ATTACK_DOWN, { power = 25, duration = 60, origin = pet }) -- The status effect requires the NO_LOSS_MESSAGE flag to be set local statusEffect = target:getStatusEffect(xi.effect.ATTACK_DOWN) diff --git a/scripts/actions/abilities/rapture.lua b/scripts/actions/abilities/rapture.lua index 549f2fa5885..8516be02b30 100644 --- a/scripts/actions/abilities/rapture.lua +++ b/scripts/actions/abilities/rapture.lua @@ -25,7 +25,7 @@ abilityObject.onAbilityCheck = function(player, target, ability) end abilityObject.onUseAbility = function(player, target, ability) - player:addStatusEffect(xi.effect.RAPTURE, 1, 0, 60) + player:addStatusEffect(xi.effect.RAPTURE, { power = 1, duration = 60, origin = player }) return xi.effect.RAPTURE end diff --git a/scripts/actions/abilities/saber_dance.lua b/scripts/actions/abilities/saber_dance.lua index 3c162eb2057..6ab671e9151 100644 --- a/scripts/actions/abilities/saber_dance.lua +++ b/scripts/actions/abilities/saber_dance.lua @@ -13,7 +13,7 @@ abilityObject.onAbilityCheck = function(player, target, ability) end abilityObject.onUseAbility = function(player, target, ability) - player:addStatusEffect(xi.effect.SABER_DANCE, 50, 3, 300) + player:addStatusEffect(xi.effect.SABER_DANCE, { power = 50, duration = 300, origin = player, tick = 3 }) end return abilityObject diff --git a/scripts/actions/abilities/snake_eye.lua b/scripts/actions/abilities/snake_eye.lua index 77f9fd6ff1f..a342f9e282c 100644 --- a/scripts/actions/abilities/snake_eye.lua +++ b/scripts/actions/abilities/snake_eye.lua @@ -13,7 +13,7 @@ abilityObject.onAbilityCheck = function(player, target, ability) end abilityObject.onUseAbility = function(player, target, ability) - player:addStatusEffect(xi.effect.SNAKE_EYE, (player:getMerit(xi.merit.SNAKE_EYE) - 10), 0, 60) + player:addStatusEffect(xi.effect.SNAKE_EYE, { power = (player:getMerit(xi.merit.SNAKE_EYE) - 10), duration = 60, origin = player }) return xi.effect.SNAKE_EYE end diff --git a/scripts/actions/abilities/spectral_jig.lua b/scripts/actions/abilities/spectral_jig.lua index dd6d63c28d8..e40c60a8272 100644 --- a/scripts/actions/abilities/spectral_jig.lua +++ b/scripts/actions/abilities/spectral_jig.lua @@ -19,8 +19,8 @@ abilityObject.onUseAbility = function(player, target, ability) local finalDuration = math.floor(baseDuration * durationMultiplier * xi.settings.main.SNEAK_INVIS_DURATION_MULTIPLIER) if not player:hasStatusEffect(xi.effect.SNEAK) then - player:addStatusEffect(xi.effect.SNEAK, 0, 10, finalDuration) - player:addStatusEffect(xi.effect.INVISIBLE, 0, 10, finalDuration) + player:addStatusEffect(xi.effect.SNEAK, { duration = finalDuration, origin = player, tick = 10 }) + player:addStatusEffect(xi.effect.INVISIBLE, { duration = finalDuration, origin = player, tick = 10 }) ability:setMsg(xi.msg.basic.SPECTRAL_JIG) -- Gains the effect of sneak and invisible else ability:setMsg(xi.msg.basic.NO_EFFECT) -- no effect on player. diff --git a/scripts/actions/abilities/striking_flourish.lua b/scripts/actions/abilities/striking_flourish.lua index e6810f5b7bc..1848e7a66f8 100644 --- a/scripts/actions/abilities/striking_flourish.lua +++ b/scripts/actions/abilities/striking_flourish.lua @@ -25,19 +25,19 @@ end abilityObject.onUseAbility = function(player, target, ability) if player:hasStatusEffect(xi.effect.FINISHING_MOVE_2) then player:delStatusEffect(xi.effect.FINISHING_MOVE_2) - player:addStatusEffect(xi.effect.STRIKING_FLOURISH, 2, 0, 60) + player:addStatusEffect(xi.effect.STRIKING_FLOURISH, { power = 2, duration = 60, origin = player }) elseif player:hasStatusEffect(xi.effect.FINISHING_MOVE_3) then player:delStatusEffect(xi.effect.FINISHING_MOVE_3) - player:addStatusEffect(xi.effect.FINISHING_MOVE_1, 1, 0, 7200) - player:addStatusEffect(xi.effect.STRIKING_FLOURISH, 3, 0, 60) + player:addStatusEffect(xi.effect.FINISHING_MOVE_1, { power = 1, duration = 7200, origin = player }) + player:addStatusEffect(xi.effect.STRIKING_FLOURISH, { power = 3, duration = 60, origin = player }) elseif player:hasStatusEffect(xi.effect.FINISHING_MOVE_4) then player:delStatusEffect(xi.effect.FINISHING_MOVE_4) - player:addStatusEffect(xi.effect.FINISHING_MOVE_2, 1, 0, 7200) - player:addStatusEffect(xi.effect.STRIKING_FLOURISH, 3, 0, 60) + player:addStatusEffect(xi.effect.FINISHING_MOVE_2, { power = 1, duration = 7200, origin = player }) + player:addStatusEffect(xi.effect.STRIKING_FLOURISH, { power = 3, duration = 60, origin = player }) elseif player:hasStatusEffect(xi.effect.FINISHING_MOVE_5) then player:delStatusEffect(xi.effect.FINISHING_MOVE_5) - player:addStatusEffect(xi.effect.FINISHING_MOVE_3, 1, 0, 7200) - player:addStatusEffect(xi.effect.STRIKING_FLOURISH, 3, 0, 60) + player:addStatusEffect(xi.effect.FINISHING_MOVE_3, { power = 1, duration = 7200, origin = player }) + player:addStatusEffect(xi.effect.STRIKING_FLOURISH, { power = 3, duration = 60, origin = player }) end end diff --git a/scripts/actions/abilities/sublimation.lua b/scripts/actions/abilities/sublimation.lua index bad251a6f38..651419ff722 100644 --- a/scripts/actions/abilities/sublimation.lua +++ b/scripts/actions/abilities/sublimation.lua @@ -42,7 +42,7 @@ abilityObject.onUseAbility = function(player, target, ability) local refreshTier = player:hasStatusEffect(xi.effect.REFRESH) and player:getStatusEffect(xi.effect.REFRESH):getTier() or 0 if refreshTier < 3 then player:delStatusEffect(xi.effect.REFRESH) - player:addStatusEffect(xi.effect.SUBLIMATION_ACTIVATED, 0, 3, 7200) + player:addStatusEffect(xi.effect.SUBLIMATION_ACTIVATED, { duration = 7200, origin = player, tick = 3 }) else ability:setMsg(xi.msg.basic.JA_NO_EFFECT_2) end diff --git a/scripts/actions/abilities/tabula_rasa.lua b/scripts/actions/abilities/tabula_rasa.lua index 068b5557707..a72432335cb 100644 --- a/scripts/actions/abilities/tabula_rasa.lua +++ b/scripts/actions/abilities/tabula_rasa.lua @@ -36,7 +36,7 @@ abilityObject.onUseAbility = function(player, target, ability) player:resetRecast(xi.recast.ABILITY, 228) player:resetRecast(xi.recast.ABILITY, 231) player:resetRecast(xi.recast.ABILITY, 232) - player:addStatusEffect(xi.effect.TABULA_RASA, math.floor(helixbonus * 1.5), 0, 180, 0, math.floor(regenbonus * 1.5)) + player:addStatusEffect(xi.effect.TABULA_RASA, { power = math.floor(helixbonus * 1.5), duration = 180, origin = player, subPower = math.floor(regenbonus * 1.5) }) return xi.effect.TABULA_RASA end diff --git a/scripts/actions/abilities/ternary_flourish.lua b/scripts/actions/abilities/ternary_flourish.lua index 7403d67b39c..b5ae710f2b0 100644 --- a/scripts/actions/abilities/ternary_flourish.lua +++ b/scripts/actions/abilities/ternary_flourish.lua @@ -24,15 +24,15 @@ end abilityObject.onUseAbility = function(player, target, ability) if player:hasStatusEffect(xi.effect.FINISHING_MOVE_3) then player:delStatusEffect(xi.effect.FINISHING_MOVE_3) - player:addStatusEffect(xi.effect.TERNARY_FLOURISH, 3, 0, 60) + player:addStatusEffect(xi.effect.TERNARY_FLOURISH, { power = 3, duration = 60, origin = player }) elseif player:hasStatusEffect(xi.effect.FINISHING_MOVE_4) then player:delStatusEffect(xi.effect.FINISHING_MOVE_4) - player:addStatusEffect(xi.effect.FINISHING_MOVE_1, 1, 0, 7200) - player:addStatusEffect(xi.effect.TERNARY_FLOURISH, 3, 0, 60) + player:addStatusEffect(xi.effect.FINISHING_MOVE_1, { power = 1, duration = 7200, origin = player }) + player:addStatusEffect(xi.effect.TERNARY_FLOURISH, { power = 3, duration = 60, origin = player }) elseif player:hasStatusEffect(xi.effect.FINISHING_MOVE_5) then player:delStatusEffect(xi.effect.FINISHING_MOVE_5) - player:addStatusEffect(xi.effect.FINISHING_MOVE_2, 1, 0, 7200) - player:addStatusEffect(xi.effect.TERNARY_FLOURISH, 3, 0, 60) + player:addStatusEffect(xi.effect.FINISHING_MOVE_2, { power = 1, duration = 7200, origin = player }) + player:addStatusEffect(xi.effect.TERNARY_FLOURISH, { power = 3, duration = 60, origin = player }) end end diff --git a/scripts/actions/abilities/thunder_shot.lua b/scripts/actions/abilities/thunder_shot.lua index 883ab30c4c5..b066191abea 100644 --- a/scripts/actions/abilities/thunder_shot.lua +++ b/scripts/actions/abilities/thunder_shot.lua @@ -71,7 +71,7 @@ abilityObject.onUseAbility = function(player, target, ability, action) power = power * 1.2 target:delStatusEffectSilent(effectId) - target:addStatusEffect(effectId, power, tick, duration, subId, subpower, tier) + target:addStatusEffect(effectId, { power = power, duration = duration, origin = player, tick = tick, subType = subId, subPower = subpower, tier = tier }) local newEffect = target:getStatusEffect(effectId) if newEffect then diff --git a/scripts/actions/abilities/trance.lua b/scripts/actions/abilities/trance.lua index 38477c391c8..f54348a1035 100644 --- a/scripts/actions/abilities/trance.lua +++ b/scripts/actions/abilities/trance.lua @@ -15,7 +15,7 @@ abilityObject.onAbilityCheck = function(player, target, ability) end abilityObject.onUseAbility = function(player, target, ability) - player:addStatusEffect(xi.effect.TRANCE, 1, 0, 60) + player:addStatusEffect(xi.effect.TRANCE, { power = 1, duration = 60, origin = player }) player:addTP(100 * player:getJobPointLevel(xi.jp.TRANCE_EFFECT)) end diff --git a/scripts/actions/abilities/tranquility.lua b/scripts/actions/abilities/tranquility.lua index a831d5c490c..2264aee7c6f 100644 --- a/scripts/actions/abilities/tranquility.lua +++ b/scripts/actions/abilities/tranquility.lua @@ -25,7 +25,7 @@ abilityObject.onAbilityCheck = function(player, target, ability) end abilityObject.onUseAbility = function(player, target, ability) - player:addStatusEffect(xi.effect.TRANQUILITY, player:getMerit(xi.merit.TRANQUILITY), 0, 60) + player:addStatusEffect(xi.effect.TRANQUILITY, { power = player:getMerit(xi.merit.TRANQUILITY), duration = 60, origin = player }) return xi.effect.TRANQUILITY end diff --git a/scripts/actions/abilities/triple_shot.lua b/scripts/actions/abilities/triple_shot.lua index 9270b0a81d9..dd3e95bcd18 100644 --- a/scripts/actions/abilities/triple_shot.lua +++ b/scripts/actions/abilities/triple_shot.lua @@ -13,7 +13,7 @@ abilityObject.onAbilityCheck = function(player, target, ability) end abilityObject.onUseAbility = function(player, target, ability) - player:addStatusEffect(xi.effect.TRIPLE_SHOT, 40, 0, 90) + player:addStatusEffect(xi.effect.TRIPLE_SHOT, { power = 40, duration = 90, origin = player }) return xi.effect.TRIPLE_SHOT end diff --git a/scripts/actions/abilities/water_shot.lua b/scripts/actions/abilities/water_shot.lua index e5f8ea2242f..cc206df3fb4 100644 --- a/scripts/actions/abilities/water_shot.lua +++ b/scripts/actions/abilities/water_shot.lua @@ -74,7 +74,7 @@ abilityObject.onUseAbility = function(player, target, ability, action) power = power * 1.2 target:delStatusEffectSilent(effectId) - target:addStatusEffect(effectId, power, tick, duration, subId, subpower, tier) + target:addStatusEffect(effectId, { power = power, duration = duration, origin = player, tick = tick, subType = subId, subPower = subpower, tier = tier }) local newEffect = target:getStatusEffect(effectId) if newEffect then diff --git a/scripts/actions/abilities/wind_shot.lua b/scripts/actions/abilities/wind_shot.lua index 42b6b5eb45f..ff456c04cf6 100644 --- a/scripts/actions/abilities/wind_shot.lua +++ b/scripts/actions/abilities/wind_shot.lua @@ -78,7 +78,7 @@ abilityObject.onUseAbility = function(player, target, ability, action) power = power * 1.2 target:delStatusEffectSilent(effectId) - target:addStatusEffect(effectId, power, tick, duration, subId, subpower, tier) + target:addStatusEffect(effectId, { power = power, duration = duration, origin = player, tick = tick, subType = subId, subPower = subpower, tier = tier }) local newEffect = target:getStatusEffect(effectId) if newEffect then diff --git a/scripts/actions/mobskills/Immortal_shield.lua b/scripts/actions/mobskills/Immortal_shield.lua index a87d163d55e..158a80ccb03 100644 --- a/scripts/actions/mobskills/Immortal_shield.lua +++ b/scripts/actions/mobskills/Immortal_shield.lua @@ -12,7 +12,7 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - mob:addStatusEffect(xi.effect.MAGIC_SHIELD, 0, 1, 0, 45) + mob:addStatusEffect(xi.effect.MAGIC_SHIELD, { origin = mob, tick = 1, subType = 45 }) skill:setMsg(xi.msg.basic.SKILL_GAIN_EFFECT) return xi.effect.MAGIC_SHIELD end diff --git a/scripts/actions/mobskills/bastion_of_twilight.lua b/scripts/actions/mobskills/bastion_of_twilight.lua index fbd63dc9405..8565f331cfa 100644 --- a/scripts/actions/mobskills/bastion_of_twilight.lua +++ b/scripts/actions/mobskills/bastion_of_twilight.lua @@ -17,7 +17,7 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - mob:addStatusEffect(xi.effect.MAGIC_SHIELD, 1, 0, 0) + mob:addStatusEffect(xi.effect.MAGIC_SHIELD, { power = 1, origin = mob }) skill:setFinalAnimationSub(2) skill:setMsg(xi.msg.basic.SKILL_GAIN_EFFECT) diff --git a/scripts/actions/mobskills/cimicine_discharge.lua b/scripts/actions/mobskills/cimicine_discharge.lua index 347c31427b6..cbeb87f7d8c 100644 --- a/scripts/actions/mobskills/cimicine_discharge.lua +++ b/scripts/actions/mobskills/cimicine_discharge.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local duration = math.random(60, 180) if not mob:hasStatusEffect(xi.effect.HASTE) then - mob:addStatusEffect(xi.effect.HASTE, 1500, 0, duration) + mob:addStatusEffect(xi.effect.HASTE, { power = 1500, duration = duration, origin = mob }) end skill:setMsg(xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.SLOW, power, 0, duration)) diff --git a/scripts/actions/mobskills/contagion_transfer.lua b/scripts/actions/mobskills/contagion_transfer.lua index 841edf2fd83..f709ab4721c 100644 --- a/scripts/actions/mobskills/contagion_transfer.lua +++ b/scripts/actions/mobskills/contagion_transfer.lua @@ -38,16 +38,9 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) for i = 1, #availableEffects do local effectId = availableEffects[i] local effect = target:getStatusEffect(effectId) - if effect and target:delStatusEffect(effectId) then - mob:addStatusEffect( - effectId, - effect:getPower(), - effect:getTick(), - math.ceil(effect:getTimeRemaining() / 1000), -- Gets the effects remaining time and converts it from milliseconds to seconds - effect:getSubType(), - effect:getSubPower(), - effect:getTier() - ) + if effect then + mob:copyStatusEffect(effect) + target:delStatusEffect(effectId) numEffectsTransferred = numEffectsTransferred + 1 end end diff --git a/scripts/actions/mobskills/contamination.lua b/scripts/actions/mobskills/contamination.lua index 7f9ae8561e3..11c1a0a561b 100644 --- a/scripts/actions/mobskills/contamination.lua +++ b/scripts/actions/mobskills/contamination.lua @@ -88,16 +88,9 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) for i = 1, #availableEffects do local effectId = availableEffects[i] local effect = mob:getStatusEffect(effectId) - if effect and mob:delStatusEffect(effectId) then - target:addStatusEffect( - effectId, - effect:getPower(), - effect:getTick(), - math.ceil(effect:getTimeRemaining() / 1000), -- Gets the effects remaining time and converts it from milliseconds to seconds - effect:getSubType(), - effect:getSubPower(), - effect:getTier() - ) + if effect then + target:copyStatusEffect(effect) + mob:delStatusEffect(effectId) numEffectsTransferred = numEffectsTransferred + 1 end end diff --git a/scripts/actions/mobskills/emetic_discharge.lua b/scripts/actions/mobskills/emetic_discharge.lua index e2836b60e1c..9143d071b1b 100644 --- a/scripts/actions/mobskills/emetic_discharge.lua +++ b/scripts/actions/mobskills/emetic_discharge.lua @@ -28,7 +28,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local statusEffect = mob:getStatusEffect(effect) if statusEffect then - target:addStatusEffect(effect, statusEffect:getPower(), statusEffect:getTick(), statusEffect:getDuration()) + target:addStatusEffect(effect, { power = statusEffect:getPower(), duration = statusEffect:getDuration(), origin = mob, tick = statusEffect:getTick() }) mob:delStatusEffect(effect) end end diff --git a/scripts/actions/mobskills/frog_cheer.lua b/scripts/actions/mobskills/frog_cheer.lua index f3b9cf00889..f6a9df17847 100644 --- a/scripts/actions/mobskills/frog_cheer.lua +++ b/scripts/actions/mobskills/frog_cheer.lua @@ -11,7 +11,7 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) skill:setMsg(xi.mobskills.mobBuffMove(target, xi.effect.MAGIC_ATK_BOOST, 25, 0, 300)) - target:addStatusEffect(xi.effect.ELEMENTAL_SEAL, 1, 0, 60) + target:addStatusEffect(xi.effect.ELEMENTAL_SEAL, { power = 1, duration = 60, origin = mob }) return xi.effect.MAGIC_ATK_BOOST end diff --git a/scripts/actions/mobskills/frog_chorus.lua b/scripts/actions/mobskills/frog_chorus.lua index d6d2062aa55..d879df2c437 100644 --- a/scripts/actions/mobskills/frog_chorus.lua +++ b/scripts/actions/mobskills/frog_chorus.lua @@ -20,7 +20,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local msg = xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.CHARM_I, 0, 3, 60) if msg == xi.msg.basic.SKILL_ENFEEB_IS then mob:charm(target) - target:addStatusEffect(xi.effect.COSTUME, 1812, 0, 60) + target:addStatusEffect(xi.effect.COSTUME, { power = 1812, duration = 60, origin = mob }) end skill:setMsg(msg) diff --git a/scripts/actions/mobskills/frog_song.lua b/scripts/actions/mobskills/frog_song.lua index 12830d65f75..2db637dde50 100644 --- a/scripts/actions/mobskills/frog_song.lua +++ b/scripts/actions/mobskills/frog_song.lua @@ -20,7 +20,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local msg = xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.CHARM_I, 0, 3, 60) if msg == xi.msg.basic.SKILL_ENFEEB_IS then mob:charm(target) - target:addStatusEffect(xi.effect.COSTUME, 1812, 0, 60) + target:addStatusEffect(xi.effect.COSTUME, { power = 1812, duration = 60, origin = mob }) end skill:setMsg(msg) diff --git a/scripts/actions/mobskills/frozen_mist.lua b/scripts/actions/mobskills/frozen_mist.lua index 54198c8fc53..3a967cfba23 100644 --- a/scripts/actions/mobskills/frozen_mist.lua +++ b/scripts/actions/mobskills/frozen_mist.lua @@ -31,7 +31,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill, action) -- Ice aura that provides special stoneskin that absorbs only physical damage skill:setFinalAnimationSub(1) mob:delStatusEffectSilent(xi.effect.STONESKIN) - mob:addStatusEffect(xi.effect.STONESKIN, 0, 0, 180, 1, 1500) + mob:addStatusEffect(xi.effect.STONESKIN, { duration = 180, origin = mob, subType = 1, subPower = 1500 }) return info.damage end diff --git a/scripts/actions/mobskills/glittering_ruby.lua b/scripts/actions/mobskills/glittering_ruby.lua index 130622574f8..ea2cd59b3d6 100644 --- a/scripts/actions/mobskills/glittering_ruby.lua +++ b/scripts/actions/mobskills/glittering_ruby.lua @@ -24,7 +24,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local effectId = utils.randomEntry(effects) local effectPower = math.random(12, 14) - target:addStatusEffect(effectId, effectPower, 0, 90) + target:addStatusEffect(effectId, { power = effectPower, duration = 90, origin = mob }) skill:setMsg(xi.msg.basic.SKILL_GAIN_EFFECT) return effectId diff --git a/scripts/actions/mobskills/hydro_wave.lua b/scripts/actions/mobskills/hydro_wave.lua index 7929833738f..314d6c3b0cc 100644 --- a/scripts/actions/mobskills/hydro_wave.lua +++ b/scripts/actions/mobskills/hydro_wave.lua @@ -34,7 +34,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill, action) -- TODO: Make a new function to handle stoneskin types. skill:setFinalAnimationSub(2) mob:delStatusEffectSilent(xi.effect.STONESKIN) - mob:addStatusEffect(xi.effect.STONESKIN, 0, 0, 180, 2, 1500) + mob:addStatusEffect(xi.effect.STONESKIN, { duration = 180, origin = mob, subType = 2, subPower = 1500 }) return info.damage end diff --git a/scripts/actions/mobskills/impulse_drive.lua b/scripts/actions/mobskills/impulse_drive.lua index c7d875ff379..f84406ce7ff 100644 --- a/scripts/actions/mobskills/impulse_drive.lua +++ b/scripts/actions/mobskills/impulse_drive.lua @@ -24,7 +24,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local resist = applyResistanceAddEffect(mob, target, xi.element.ICE, 0) if not target:hasStatusEffect(xi.effect.BIND) and resist >= 0.5 then local duration = (5 + 5) * resist - target:addStatusEffect(xi.effect.BIND, 1, 0, duration) + target:addStatusEffect(xi.effect.BIND, { power = 1, duration = duration, origin = mob }) end end diff --git a/scripts/actions/mobskills/luminous_lance.lua b/scripts/actions/mobskills/luminous_lance.lua index 334013fde8f..9febdb8e3c7 100644 --- a/scripts/actions/mobskills/luminous_lance.lua +++ b/scripts/actions/mobskills/luminous_lance.lua @@ -20,7 +20,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) if dmg > 0 then -- Cannot be resisted target:setAnimationSub(3) - target:addStatusEffect(xi.effect.TERROR, 0, 0, 30) + target:addStatusEffect(xi.effect.TERROR, { duration = 30, origin = mob }) end return dmg diff --git a/scripts/actions/mobskills/microspores.lua b/scripts/actions/mobskills/microspores.lua index 7c207e1ba32..5d2026d33ee 100644 --- a/scripts/actions/mobskills/microspores.lua +++ b/scripts/actions/mobskills/microspores.lua @@ -74,7 +74,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) -- HP/MP/TP Stat Downs xi.effect.MAX_TP_DOWN, xi.effect.MAX_MP_DOWN, - xi.effect.MAX_HP_DOWN + xi.effect.MAX_HP_DOWN, } -- Check which effects the mob actually has from our list @@ -84,23 +84,16 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) end end - -- Transfer only 1 random effect + -- Transfer only 1 random effect from mob to target if #availableEffects > 0 then -- Shuffle and pick the first one availableEffects = utils.shuffle(availableEffects) local effectId = availableEffects[1] - local effect = target:getStatusEffect(effectId) + local effect = mob:getStatusEffect(effectId) - if effect and target:delStatusEffect(effectId) then - target:addStatusEffect( - effectId, - effect:getPower(), - effect:getTick(), - math.ceil(effect:getTimeRemaining() / 1000), -- Gets the remaining time and converts milliseconds to seconds - effect:getSubType(), - effect:getSubPower(), - effect:getTier() - ) + if effect then + target:copyStatusEffect(effect) + mob:delStatusEffect(effectId) numEffectsTransferred = 1 end end diff --git a/scripts/actions/mobskills/mix_dragon_shield.lua b/scripts/actions/mobskills/mix_dragon_shield.lua index af0d1ce351f..79e4b9ada99 100644 --- a/scripts/actions/mobskills/mix_dragon_shield.lua +++ b/scripts/actions/mobskills/mix_dragon_shield.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) end if not target:hasStatusEffect(xi.effect.MAGIC_DEF_BOOST) then - target:addStatusEffect(xi.effect.MAGIC_DEF_BOOST, 10, 0, 60) + target:addStatusEffect(xi.effect.MAGIC_DEF_BOOST, { power = 10, duration = 60, origin = mob }) end return xi.effect.MAGIC_DEF_BOOST diff --git a/scripts/actions/mobskills/mix_elemental_power.lua b/scripts/actions/mobskills/mix_elemental_power.lua index e62cba50296..f34171c463b 100644 --- a/scripts/actions/mobskills/mix_elemental_power.lua +++ b/scripts/actions/mobskills/mix_elemental_power.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) end if not target:hasStatusEffect(xi.effect.MAGIC_ATK_BOOST) then - target:addStatusEffect(xi.effect.MAGIC_ATK_BOOST, 20, 0, 60) + target:addStatusEffect(xi.effect.MAGIC_ATK_BOOST, { power = 20, duration = 60, origin = mob }) return xi.effect.MAGIC_ATK_BOOST end diff --git a/scripts/actions/mobskills/mix_guard_drink.lua b/scripts/actions/mobskills/mix_guard_drink.lua index 0961674f2c6..88d1cccc5a2 100644 --- a/scripts/actions/mobskills/mix_guard_drink.lua +++ b/scripts/actions/mobskills/mix_guard_drink.lua @@ -16,8 +16,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) end -- TODO: what happens when this has no effect? - target:addStatusEffect(xi.effect.PROTECT, 220, 0, 300) - target:addStatusEffect(xi.effect.SHELL, 2930, 0, 300) + target:addStatusEffect(xi.effect.PROTECT, { power = 220, duration = 300, origin = mob }) + target:addStatusEffect(xi.effect.SHELL, { power = 2930, duration = 300, origin = mob }) return xi.effect.PROTECT -- Monberaux gains the effect of Protect. end diff --git a/scripts/actions/mobskills/mix_insomniant.lua b/scripts/actions/mobskills/mix_insomniant.lua index 7720f573dd1..50f0645cde7 100644 --- a/scripts/actions/mobskills/mix_insomniant.lua +++ b/scripts/actions/mobskills/mix_insomniant.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) skill:setMsg(194) if not target:hasStatusEffect(xi.effect.NEGATE_SLEEP) then - target:addStatusEffect(xi.effect.NEGATE_SLEEP, 10, 0, 60) + target:addStatusEffect(xi.effect.NEGATE_SLEEP, { power = 10, duration = 60, origin = mob }) end return xi.effect.NEGATE_SLEEP diff --git a/scripts/actions/mobskills/mix_life_water.lua b/scripts/actions/mobskills/mix_life_water.lua index c49df080877..189ca3c0efc 100644 --- a/scripts/actions/mobskills/mix_life_water.lua +++ b/scripts/actions/mobskills/mix_life_water.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) end if not target:hasStatusEffect(xi.effect.REGEN) then - target:addStatusEffect(xi.effect.REGEN, 20, 3, 60) + target:addStatusEffect(xi.effect.REGEN, { power = 20, duration = 60, origin = mob, tick = 3 }) return xi.effect.REGEN end diff --git a/scripts/actions/mobskills/mix_samsons_strength.lua b/scripts/actions/mobskills/mix_samsons_strength.lua index 750bf9f1c7d..281baf09f91 100644 --- a/scripts/actions/mobskills/mix_samsons_strength.lua +++ b/scripts/actions/mobskills/mix_samsons_strength.lua @@ -28,7 +28,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) for _, effect in pairs(statii) do if not target:hasStatusEffect(effect) then - target:addStatusEffect(effect, 10, 0, 60) + target:addStatusEffect(effect, { power = 10, duration = 60, origin = mob }) end end diff --git a/scripts/actions/mobskills/nightmare.lua b/scripts/actions/mobskills/nightmare.lua index 8cbf65b0c37..5b25dc6f545 100644 --- a/scripts/actions/mobskills/nightmare.lua +++ b/scripts/actions/mobskills/nightmare.lua @@ -43,7 +43,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) -- Handle special Bio target:delStatusEffectSilent(xi.effect.DIA) target:delStatusEffectSilent(xi.effect.BIO) - target:addStatusEffect(xi.effect.BIO, bioPower, 3, duration, 0, 10, effectTier) + target:addStatusEffect(xi.effect.BIO, { power = bioPower, duration = duration, origin = mob, tick = 3, subPower = 10, tier = effectTier }) return xi.effect.SLEEP_I end diff --git a/scripts/actions/mobskills/nocturnal_servitude.lua b/scripts/actions/mobskills/nocturnal_servitude.lua index 277dc67aa09..b00c56f4590 100644 --- a/scripts/actions/mobskills/nocturnal_servitude.lua +++ b/scripts/actions/mobskills/nocturnal_servitude.lua @@ -21,7 +21,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local msg = xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.CHARM_I, 0, 3, 60) if msg == xi.msg.basic.SKILL_ENFEEB_IS then mob:charm(target) - target:addStatusEffect(xi.effect.COSTUME, 256, 0, 60) -- bat costume + target:addStatusEffect(xi.effect.COSTUME, { power = 256, duration = 60, origin = mob }) -- bat costume end skill:setMsg(msg) diff --git a/scripts/actions/mobskills/nuclear_waste.lua b/scripts/actions/mobskills/nuclear_waste.lua index 0df8ea20e4c..9116f05a605 100644 --- a/scripts/actions/mobskills/nuclear_waste.lua +++ b/scripts/actions/mobskills/nuclear_waste.lua @@ -13,7 +13,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) mob:setLocalVar('nuclearWaste', 1) local resist = xi.combat.magicHitRate.calculateResistRate(mob, target, 0, 0, 0, xi.element.NONE, xi.mod.INT, xi.effect.ELEMENTALRES_DOWN, 0) if resist >= 0.25 then - target:addStatusEffectEx(xi.effect.ELEMENTALRES_DOWN, 0, 50, 0, 60) + target:addStatusEffect(xi.effect.ELEMENTALRES_DOWN, { power = 50, duration = 60, origin = mob, icon = 0 }) skill:setMsg(xi.msg.basic.NONE) else skill:setMsg(xi.msg.basic.SKILL_MISS) diff --git a/scripts/actions/mobskills/polar_bulwark.lua b/scripts/actions/mobskills/polar_bulwark.lua index 188353c4911..a17278776df 100644 --- a/scripts/actions/mobskills/polar_bulwark.lua +++ b/scripts/actions/mobskills/polar_bulwark.lua @@ -17,7 +17,7 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) skill:setMsg(xi.msg.basic.SKILL_GAIN_EFFECT) - mob:addStatusEffectEx(xi.effect.MAGIC_SHIELD, 0, 1, 0, 45) -- addStatusEffectEx to pervent dispel. + mob:addStatusEffect(xi.effect.MAGIC_SHIELD, { power = 1, duration = 45, origin = mob, icon = 0 }) return xi.effect.MAGIC_SHIELD end diff --git a/scripts/actions/mobskills/pyric_bulwark.lua b/scripts/actions/mobskills/pyric_bulwark.lua index 212f8a39505..4951493bc41 100644 --- a/scripts/actions/mobskills/pyric_bulwark.lua +++ b/scripts/actions/mobskills/pyric_bulwark.lua @@ -17,7 +17,7 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) skill:setMsg(xi.msg.basic.SKILL_GAIN_EFFECT) - mob:addStatusEffectEx(xi.effect.PHYSICAL_SHIELD, 0, 1, 0, 45) -- addStatusEffectEx to pervent dispel. + mob:addStatusEffect(xi.effect.PHYSICAL_SHIELD, { power = 1, duration = 45, origin = mob, icon = 0 }) return xi.effect.PHYSICAL_SHIELD end diff --git a/scripts/actions/mobskills/salaheem_spirit.lua b/scripts/actions/mobskills/salaheem_spirit.lua index 6dcbaa18d36..8ae2dd8fffe 100644 --- a/scripts/actions/mobskills/salaheem_spirit.lua +++ b/scripts/actions/mobskills/salaheem_spirit.lua @@ -24,13 +24,13 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) target:delStatusEffect(xi.effect.MND_BOOST) target:delStatusEffect(xi.effect.CHR_BOOST) - target:addStatusEffect(xi.effect.STR_BOOST, power, tick, duration + bonusTime) - target:addStatusEffect(xi.effect.DEX_BOOST, power, tick, duration + bonusTime) - target:addStatusEffect(xi.effect.VIT_BOOST, power, tick, duration + bonusTime) - target:addStatusEffect(xi.effect.AGI_BOOST, power, tick, duration + bonusTime) - target:addStatusEffect(xi.effect.INT_BOOST, power, tick, duration + bonusTime) - target:addStatusEffect(xi.effect.MND_BOOST, power, tick, duration + bonusTime) - target:addStatusEffect(xi.effect.CHR_BOOST, power, tick, duration + bonusTime) + target:addStatusEffect(xi.effect.STR_BOOST, { power = power, duration = duration + bonusTime, origin = mob, tick = tick }) + target:addStatusEffect(xi.effect.DEX_BOOST, { power = power, duration = duration + bonusTime, origin = mob, tick = tick }) + target:addStatusEffect(xi.effect.VIT_BOOST, { power = power, duration = duration + bonusTime, origin = mob, tick = tick }) + target:addStatusEffect(xi.effect.AGI_BOOST, { power = power, duration = duration + bonusTime, origin = mob, tick = tick }) + target:addStatusEffect(xi.effect.INT_BOOST, { power = power, duration = duration + bonusTime, origin = mob, tick = tick }) + target:addStatusEffect(xi.effect.MND_BOOST, { power = power, duration = duration + bonusTime, origin = mob, tick = tick }) + target:addStatusEffect(xi.effect.CHR_BOOST, { power = power, duration = duration + bonusTime, origin = mob, tick = tick }) skill:setMsg(xi.msg.basic.STATUS_BOOST_2) diff --git a/scripts/actions/mobskills/saucepan.lua b/scripts/actions/mobskills/saucepan.lua index 7c8cd2e6637..b6a926e5e4a 100644 --- a/scripts/actions/mobskills/saucepan.lua +++ b/scripts/actions/mobskills/saucepan.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) target:delStatusEffectSilent(xi.effect.FOOD) end - target:addStatusEffect(xi.effect.FOOD, 255, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, 0, mob:getID()) + target:addStatusEffect(xi.effect.FOOD, { power = 255, duration = 1800, origin = mob, sourceType = xi.effectSourceType.FOOD }) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/shiko_no_mitate.lua b/scripts/actions/mobskills/shiko_no_mitate.lua index c02ed598a2b..24c250b3a58 100644 --- a/scripts/actions/mobskills/shiko_no_mitate.lua +++ b/scripts/actions/mobskills/shiko_no_mitate.lua @@ -15,8 +15,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) -- Extra stuff for Trust: Gessho if mob:getObjType() == xi.objType.TRUST then - mob:addStatusEffect(xi.effect.ISSEKIGAN, 25, 0, 300) - mob:addStatusEffect(xi.effect.STONESKIN, 300, 0, 300) + mob:addStatusEffect(xi.effect.ISSEKIGAN, { power = 25, duration = 300, origin = mob }) + mob:addStatusEffect(xi.effect.STONESKIN, { power = 300, duration = 300, origin = mob }) end return xi.effect.DEFENSE_BOOST diff --git a/scripts/actions/mobskills/snatch_morsel.lua b/scripts/actions/mobskills/snatch_morsel.lua index 5945f8ec025..d69fb5eef9a 100644 --- a/scripts/actions/mobskills/snatch_morsel.lua +++ b/scripts/actions/mobskills/snatch_morsel.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) -- 99% sure retail doesn't do this. Uncomment if you want it to happen. -- local foodID = target:getStatusEffect(xi.effect.FOOD):getSourceTypeParam() -- local duration = target:getStatusEffect(xi.effect.FOOD):getDuration() - -- mob:addStatusEffect(xi.effect.FOOD, 0, 0, duration, 0, 0, 0, xi.effectSourceType.FOOD, foodID, mob:getID()) -- Gives Colibri the players food. + -- mob:addStatusEffect(xi.effect.FOOD, { duration = duration, origin = mob, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = foodID }) -- Gives Colibri the players food. target:delStatusEffectSilent(xi.effect.FOOD) skill:setMsg(xi.msg.basic.SKILL_ERASE) else diff --git a/scripts/actions/mobskills/strap_cutter.lua b/scripts/actions/mobskills/strap_cutter.lua index 4c3c6125e47..de7da3982bd 100644 --- a/scripts/actions/mobskills/strap_cutter.lua +++ b/scripts/actions/mobskills/strap_cutter.lua @@ -50,7 +50,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) target:delStatusEffectSilent(xi.effect.ENCUMBRANCE_I) end - target:addStatusEffectEx(xi.effect.ENCUMBRANCE_I, xi.effect.ENCUMBRANCE_I, power, 0, 60) + target:addStatusEffect(xi.effect.ENCUMBRANCE_I, { power = power, duration = 60, origin = mob }) skill:setMsg(xi.msg.basic.USES) end diff --git a/scripts/actions/mobskills/substitute.lua b/scripts/actions/mobskills/substitute.lua index e2f1d92c18e..db93ba947de 100644 --- a/scripts/actions/mobskills/substitute.lua +++ b/scripts/actions/mobskills/substitute.lua @@ -14,7 +14,7 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) skill:setMsg(xi.msg.basic.NONE) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.ESCAPE, 0, 3) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.ESCAPE, duration = 3, origin = mob, icon = 0 }) end return mobskillObject diff --git a/scripts/actions/mobskills/super_buff.lua b/scripts/actions/mobskills/super_buff.lua index 35d3614e6f1..32ccc5416bb 100644 --- a/scripts/actions/mobskills/super_buff.lua +++ b/scripts/actions/mobskills/super_buff.lua @@ -11,7 +11,7 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - target:addStatusEffectEx(xi.effect.SUPER_BUFF, 0, 25, 0, 30) + target:addStatusEffect(xi.effect.SUPER_BUFF, { power = 25, duration = 30, origin = mob, icon = 0 }) skill:setMsg(xi.msg.basic.NONE) return 0 end diff --git a/scripts/actions/mobskills/wheel_of_impregnability.lua b/scripts/actions/mobskills/wheel_of_impregnability.lua index f3d19037a58..d0cc326f477 100644 --- a/scripts/actions/mobskills/wheel_of_impregnability.lua +++ b/scripts/actions/mobskills/wheel_of_impregnability.lua @@ -16,7 +16,7 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - mob:addStatusEffect(xi.effect.PHYSICAL_SHIELD, 1, 0, 0) + mob:addStatusEffect(xi.effect.PHYSICAL_SHIELD, { power = 1, origin = mob }) skill:setFinalAnimationSub(1) skill:setMsg(xi.msg.basic.SKILL_GAIN_EFFECT) diff --git a/scripts/actions/spells/black/anemohelix.lua b/scripts/actions/spells/black/anemohelix.lua index 9a5d2e8b8cd..65f5a94f1e4 100644 --- a/scripts/actions/spells/black/anemohelix.lua +++ b/scripts/actions/spells/black/anemohelix.lua @@ -17,7 +17,7 @@ spellObject.onSpellCast = function(caster, target, spell) local power = utils.clamp(damage, 0, 9999) local duration = xi.spells.enfeebling.calculateDuration(caster, target, spell:getID(), xi.effect.HELIX, xi.skill.ELEMENTAL_MAGIC) - target:addStatusEffect(xi.effect.HELIX, power, 10, duration, 0, 0, 1) + target:addStatusEffect(xi.effect.HELIX, { power = power, duration = duration, origin = caster, tick = 10, tier = 1 }) end return damage diff --git a/scripts/actions/spells/black/anemohelix_ii.lua b/scripts/actions/spells/black/anemohelix_ii.lua index 19d4b068212..b8c28948015 100644 --- a/scripts/actions/spells/black/anemohelix_ii.lua +++ b/scripts/actions/spells/black/anemohelix_ii.lua @@ -17,7 +17,7 @@ spellObject.onSpellCast = function(caster, target, spell) local power = utils.clamp(damage, 0, 9999) local duration = xi.spells.enfeebling.calculateDuration(caster, target, spell:getID(), xi.effect.HELIX, xi.skill.ELEMENTAL_MAGIC) - target:addStatusEffect(xi.effect.HELIX, power, 10, duration, 0, 0, 2) + target:addStatusEffect(xi.effect.HELIX, { power = power, duration = duration, origin = caster, tick = 10, tier = 2 }) end return damage diff --git a/scripts/actions/spells/black/bio.lua b/scripts/actions/spells/black/bio.lua index e643b818e9f..04c51116ddb 100644 --- a/scripts/actions/spells/black/bio.lua +++ b/scripts/actions/spells/black/bio.lua @@ -26,7 +26,7 @@ spellObject.onSpellCast = function(caster, target, spell) power = math.ceil(power / 40) power = utils.clamp(power, 1, 3) - target:addStatusEffect(xi.effect.BIO, power, 3, 60, 0, 10, tier) + target:addStatusEffect(xi.effect.BIO, { power = power, duration = 60, origin = caster, tick = 3, subPower = 10, tier = tier }) end return damage diff --git a/scripts/actions/spells/black/bio_ii.lua b/scripts/actions/spells/black/bio_ii.lua index a6a7cf1776e..3a80466dc2b 100644 --- a/scripts/actions/spells/black/bio_ii.lua +++ b/scripts/actions/spells/black/bio_ii.lua @@ -26,7 +26,7 @@ spellObject.onSpellCast = function(caster, target, spell) power = math.floor((power + 29) / 40) power = utils.clamp(power, 3, 8) - target:addStatusEffect(xi.effect.BIO, power, 3, 120, 0, 15, tier) + target:addStatusEffect(xi.effect.BIO, { power = power, duration = 120, origin = caster, tick = 3, subPower = 15, tier = tier }) end return damage diff --git a/scripts/actions/spells/black/bio_iii.lua b/scripts/actions/spells/black/bio_iii.lua index bef4df318f6..17096754903 100644 --- a/scripts/actions/spells/black/bio_iii.lua +++ b/scripts/actions/spells/black/bio_iii.lua @@ -34,7 +34,7 @@ spellObject.onSpellCast = function(caster, target, spell) power = utils.clamp(power, 5, 17) - target:addStatusEffect(xi.effect.BIO, power, 3, 180, 0, 20, tier) + target:addStatusEffect(xi.effect.BIO, { power = power, duration = 180, origin = caster, tick = 3, subPower = 20, tier = tier }) end return damage diff --git a/scripts/actions/spells/black/bio_iv.lua b/scripts/actions/spells/black/bio_iv.lua index 9bd684fe713..cab4bbd45ce 100644 --- a/scripts/actions/spells/black/bio_iv.lua +++ b/scripts/actions/spells/black/bio_iv.lua @@ -24,7 +24,7 @@ spellObject.onSpellCast = function(caster, target, spell) -- Calculate DoT effect (rough, though fairly accurate) local power = 5 + math.floor(caster:getSkillLevel(xi.skill.DARK_MAGIC) / 60) - target:addStatusEffect(xi.effect.BIO, power, 3, 180, 0, 25, tier) + target:addStatusEffect(xi.effect.BIO, { power = power, duration = 180, origin = caster, tick = 3, subPower = 25, tier = tier }) end return damage diff --git a/scripts/actions/spells/black/bio_v.lua b/scripts/actions/spells/black/bio_v.lua index 9d89d7b5eca..d56b1a8e2ed 100644 --- a/scripts/actions/spells/black/bio_v.lua +++ b/scripts/actions/spells/black/bio_v.lua @@ -24,7 +24,7 @@ spellObject.onSpellCast = function(caster, target, spell) -- Calculate DoT effect (rough, though fairly accurate) local power = 5 + math.floor(caster:getSkillLevel(xi.skill.DARK_MAGIC) / 50) - target:addStatusEffect(xi.effect.BIO, power, 3, 180, 0, 25, tier) + target:addStatusEffect(xi.effect.BIO, { power = power, duration = 180, origin = caster, tick = 3, subPower = 25, tier = tier }) end return damage diff --git a/scripts/actions/spells/black/burst.lua b/scripts/actions/spells/black/burst.lua index e6b00ec0f8a..4ca80623cf4 100644 --- a/scripts/actions/spells/black/burst.lua +++ b/scripts/actions/spells/black/burst.lua @@ -9,7 +9,7 @@ spellObject.onMagicCastingCheck = function(caster, target, spell) end spellObject.onSpellCast = function(caster, target, spell) - target:addStatusEffectEx(xi.effect.NINJUTSU_ELE_DEBUFF, 0, 30, 0, 10, 0, xi.mod.EARTH_MEVA, 0) + target:addStatusEffect(xi.effect.NINJUTSU_ELE_DEBUFF, { power = 30, duration = 10, origin = caster, icon = 0, subPower = xi.mod.EARTH_MEVA }) return xi.spells.damage.useDamageSpell(caster, target, spell) end diff --git a/scripts/actions/spells/black/burst_ii.lua b/scripts/actions/spells/black/burst_ii.lua index 26880d29518..6cc47efb9d5 100644 --- a/scripts/actions/spells/black/burst_ii.lua +++ b/scripts/actions/spells/black/burst_ii.lua @@ -9,7 +9,7 @@ spellObject.onMagicCastingCheck = function(caster, target, spell) end spellObject.onSpellCast = function(caster, target, spell) - target:addStatusEffectEx(xi.effect.NINJUTSU_ELE_DEBUFF, 0, 30, 0, 10, 0, xi.mod.EARTH_MEVA, 0) + target:addStatusEffect(xi.effect.NINJUTSU_ELE_DEBUFF, { power = 30, duration = 10, origin = caster, icon = 0, subPower = xi.mod.EARTH_MEVA }) return xi.spells.damage.useDamageSpell(caster, target, spell) end diff --git a/scripts/actions/spells/black/cryohelix.lua b/scripts/actions/spells/black/cryohelix.lua index d814d6d7f69..22a2d1bff0f 100644 --- a/scripts/actions/spells/black/cryohelix.lua +++ b/scripts/actions/spells/black/cryohelix.lua @@ -17,7 +17,7 @@ spellObject.onSpellCast = function(caster, target, spell) local power = utils.clamp(damage, 0, 9999) local duration = xi.spells.enfeebling.calculateDuration(caster, target, spell:getID(), xi.effect.HELIX, xi.skill.ELEMENTAL_MAGIC) - target:addStatusEffect(xi.effect.HELIX, power, 10, duration, 0, 0, 1) + target:addStatusEffect(xi.effect.HELIX, { power = power, duration = duration, origin = caster, tick = 10, tier = 1 }) end return damage diff --git a/scripts/actions/spells/black/cryohelix_ii.lua b/scripts/actions/spells/black/cryohelix_ii.lua index 2b891d0675a..5fb17835902 100644 --- a/scripts/actions/spells/black/cryohelix_ii.lua +++ b/scripts/actions/spells/black/cryohelix_ii.lua @@ -17,7 +17,7 @@ spellObject.onSpellCast = function(caster, target, spell) local power = utils.clamp(damage, 0, 9999) local duration = xi.spells.enfeebling.calculateDuration(caster, target, spell:getID(), xi.effect.HELIX, xi.skill.ELEMENTAL_MAGIC) - target:addStatusEffect(xi.effect.HELIX, power, 10, duration, 0, 0, 2) + target:addStatusEffect(xi.effect.HELIX, { power = power, duration = duration, origin = caster, tick = 10, tier = 2 }) end return damage diff --git a/scripts/actions/spells/black/endark.lua b/scripts/actions/spells/black/endark.lua index 10a9ca29b3a..4c530db5bec 100644 --- a/scripts/actions/spells/black/endark.lua +++ b/scripts/actions/spells/black/endark.lua @@ -13,7 +13,7 @@ spellObject.onSpellCast = function(caster, target, spell) local magicskill = target:getSkillLevel(xi.skill.DARK_MAGIC) local potency = (magicskill / 8) + 12.5 - if target:addStatusEffect(effect, potency, 0, 180) then + if target:addStatusEffect(effect, { power = potency, duration = 180, origin = caster }) then spell:setMsg(xi.msg.basic.MAGIC_GAIN_EFFECT) else spell:setMsg(xi.msg.basic.MAGIC_NO_EFFECT) diff --git a/scripts/actions/spells/black/flare.lua b/scripts/actions/spells/black/flare.lua index b4a02223e0e..fc4ea994dac 100644 --- a/scripts/actions/spells/black/flare.lua +++ b/scripts/actions/spells/black/flare.lua @@ -9,7 +9,7 @@ spellObject.onMagicCastingCheck = function(caster, target, spell) end spellObject.onSpellCast = function(caster, target, spell) - target:addStatusEffectEx(xi.effect.NINJUTSU_ELE_DEBUFF, 0, 30, 0, 10, 0, xi.mod.WATER_MEVA, 0) + target:addStatusEffect(xi.effect.NINJUTSU_ELE_DEBUFF, { power = 30, duration = 10, origin = caster, icon = 0, subPower = xi.mod.WATER_MEVA }) return xi.spells.damage.useDamageSpell(caster, target, spell) end diff --git a/scripts/actions/spells/black/flare_ii.lua b/scripts/actions/spells/black/flare_ii.lua index eda1d1dcf44..2c787624188 100644 --- a/scripts/actions/spells/black/flare_ii.lua +++ b/scripts/actions/spells/black/flare_ii.lua @@ -9,7 +9,7 @@ spellObject.onMagicCastingCheck = function(caster, target, spell) end spellObject.onSpellCast = function(caster, target, spell) - target:addStatusEffectEx(xi.effect.NINJUTSU_ELE_DEBUFF, 0, 30, 0, 10, 0, xi.mod.WATER_MEVA, 0) + target:addStatusEffect(xi.effect.NINJUTSU_ELE_DEBUFF, { power = 30, duration = 10, origin = caster, icon = 0, subPower = xi.mod.WATER_MEVA }) return xi.spells.damage.useDamageSpell(caster, target, spell) end diff --git a/scripts/actions/spells/black/flood.lua b/scripts/actions/spells/black/flood.lua index fe063f6799a..c6c00c58230 100644 --- a/scripts/actions/spells/black/flood.lua +++ b/scripts/actions/spells/black/flood.lua @@ -9,7 +9,7 @@ spellObject.onMagicCastingCheck = function(caster, target, spell) end spellObject.onSpellCast = function(caster, target, spell) - target:addStatusEffectEx(xi.effect.NINJUTSU_ELE_DEBUFF, 0, 30, 0, 10, 0, xi.mod.THUNDER_MEVA, 0) + target:addStatusEffect(xi.effect.NINJUTSU_ELE_DEBUFF, { power = 30, duration = 10, origin = caster, icon = 0, subPower = xi.mod.THUNDER_MEVA }) return xi.spells.damage.useDamageSpell(caster, target, spell) end diff --git a/scripts/actions/spells/black/flood_ii.lua b/scripts/actions/spells/black/flood_ii.lua index 43d2b9175a7..4f750c86a01 100644 --- a/scripts/actions/spells/black/flood_ii.lua +++ b/scripts/actions/spells/black/flood_ii.lua @@ -9,7 +9,7 @@ spellObject.onMagicCastingCheck = function(caster, target, spell) end spellObject.onSpellCast = function(caster, target, spell) - target:addStatusEffectEx(xi.effect.NINJUTSU_ELE_DEBUFF, 0, 30, 0, 10, 0, xi.mod.THUNDER_MEVA, 0) + target:addStatusEffect(xi.effect.NINJUTSU_ELE_DEBUFF, { power = 30, duration = 10, origin = caster, icon = 0, subPower = xi.mod.THUNDER_MEVA }) return xi.spells.damage.useDamageSpell(caster, target, spell) end diff --git a/scripts/actions/spells/black/freeze.lua b/scripts/actions/spells/black/freeze.lua index 03017af283c..f716d52caf0 100644 --- a/scripts/actions/spells/black/freeze.lua +++ b/scripts/actions/spells/black/freeze.lua @@ -9,7 +9,7 @@ spellObject.onMagicCastingCheck = function(caster, target, spell) end spellObject.onSpellCast = function(caster, target, spell) - target:addStatusEffectEx(xi.effect.NINJUTSU_ELE_DEBUFF, 0, 30, 0, 10, 0, xi.mod.FIRE_MEVA, 0) + target:addStatusEffect(xi.effect.NINJUTSU_ELE_DEBUFF, { power = 30, duration = 10, origin = caster, icon = 0, subPower = xi.mod.FIRE_MEVA }) return xi.spells.damage.useDamageSpell(caster, target, spell) end diff --git a/scripts/actions/spells/black/freeze_ii.lua b/scripts/actions/spells/black/freeze_ii.lua index 1c3064f14ed..0293d36da02 100644 --- a/scripts/actions/spells/black/freeze_ii.lua +++ b/scripts/actions/spells/black/freeze_ii.lua @@ -9,7 +9,7 @@ spellObject.onMagicCastingCheck = function(caster, target, spell) end spellObject.onSpellCast = function(caster, target, spell) - target:addStatusEffectEx(xi.effect.NINJUTSU_ELE_DEBUFF, 0, 30, 0, 10, 0, xi.mod.FIRE_MEVA, 0) + target:addStatusEffect(xi.effect.NINJUTSU_ELE_DEBUFF, { power = 30, duration = 10, origin = caster, icon = 0, subPower = xi.mod.FIRE_MEVA }) return xi.spells.damage.useDamageSpell(caster, target, spell) end diff --git a/scripts/actions/spells/black/geohelix.lua b/scripts/actions/spells/black/geohelix.lua index 27de0b4a4c0..1cb5800bc62 100644 --- a/scripts/actions/spells/black/geohelix.lua +++ b/scripts/actions/spells/black/geohelix.lua @@ -17,7 +17,7 @@ spellObject.onSpellCast = function(caster, target, spell) local power = utils.clamp(damage, 0, 9999) local duration = xi.spells.enfeebling.calculateDuration(caster, target, spell:getID(), xi.effect.HELIX, xi.skill.ELEMENTAL_MAGIC) - target:addStatusEffect(xi.effect.HELIX, power, 10, duration, 0, 0, 1) + target:addStatusEffect(xi.effect.HELIX, { power = power, duration = duration, origin = caster, tick = 10, tier = 1 }) end return damage diff --git a/scripts/actions/spells/black/geohelix_ii.lua b/scripts/actions/spells/black/geohelix_ii.lua index f7659f3227f..d7d07103a90 100644 --- a/scripts/actions/spells/black/geohelix_ii.lua +++ b/scripts/actions/spells/black/geohelix_ii.lua @@ -17,7 +17,7 @@ spellObject.onSpellCast = function(caster, target, spell) local power = utils.clamp(damage, 0, 9999) local duration = xi.spells.enfeebling.calculateDuration(caster, target, spell:getID(), xi.effect.HELIX, xi.skill.ELEMENTAL_MAGIC) - target:addStatusEffect(xi.effect.HELIX, power, 10, duration, 0, 0, 2) + target:addStatusEffect(xi.effect.HELIX, { power = power, duration = duration, origin = caster, tick = 10, tier = 2 }) end return damage diff --git a/scripts/actions/spells/black/hydrohelix.lua b/scripts/actions/spells/black/hydrohelix.lua index cbbc405644a..78566a14037 100644 --- a/scripts/actions/spells/black/hydrohelix.lua +++ b/scripts/actions/spells/black/hydrohelix.lua @@ -17,7 +17,7 @@ spellObject.onSpellCast = function(caster, target, spell) local power = utils.clamp(damage, 0, 9999) local duration = xi.spells.enfeebling.calculateDuration(caster, target, spell:getID(), xi.effect.HELIX, xi.skill.ELEMENTAL_MAGIC) - target:addStatusEffect(xi.effect.HELIX, power, 10, duration, 0, 0, 1) + target:addStatusEffect(xi.effect.HELIX, { power = power, duration = duration, origin = caster, tick = 10, tier = 1 }) end return damage diff --git a/scripts/actions/spells/black/hydrohelix_ii.lua b/scripts/actions/spells/black/hydrohelix_ii.lua index 6763768f965..fd355eddde0 100644 --- a/scripts/actions/spells/black/hydrohelix_ii.lua +++ b/scripts/actions/spells/black/hydrohelix_ii.lua @@ -17,7 +17,7 @@ spellObject.onSpellCast = function(caster, target, spell) local power = utils.clamp(damage, 0, 9999) local duration = xi.spells.enfeebling.calculateDuration(caster, target, spell:getID(), xi.effect.HELIX, xi.skill.ELEMENTAL_MAGIC) - target:addStatusEffect(xi.effect.HELIX, power, 10, duration, 0, 0, 2) + target:addStatusEffect(xi.effect.HELIX, { power = power, duration = duration, origin = caster, tick = 10, tier = 2 }) end return damage diff --git a/scripts/actions/spells/black/impact.lua b/scripts/actions/spells/black/impact.lua index 842736418fc..6a0c3494fd4 100644 --- a/scripts/actions/spells/black/impact.lua +++ b/scripts/actions/spells/black/impact.lua @@ -32,7 +32,7 @@ spellObject.onSpellCast = function(caster, target, spell) if not target:hasStatusEffect(effectId) then local power = math.floor(target:getStat(effectTable[i][2]) / 5) local duration = math.floor(180 * resist) - target:addStatusEffect(effectId, power, 0, duration) + target:addStatusEffect(effectId, { power = power, duration = duration, origin = caster }) end end diff --git a/scripts/actions/spells/black/ionohelix.lua b/scripts/actions/spells/black/ionohelix.lua index 5f4f15e7a3a..3b79707e3fd 100644 --- a/scripts/actions/spells/black/ionohelix.lua +++ b/scripts/actions/spells/black/ionohelix.lua @@ -17,7 +17,7 @@ spellObject.onSpellCast = function(caster, target, spell) local power = utils.clamp(damage, 0, 9999) local duration = xi.spells.enfeebling.calculateDuration(caster, target, spell:getID(), xi.effect.HELIX, xi.skill.ELEMENTAL_MAGIC) - target:addStatusEffect(xi.effect.HELIX, power, 10, duration, 0, 0, 1) + target:addStatusEffect(xi.effect.HELIX, { power = power, duration = duration, origin = caster, tick = 10, tier = 1 }) end return damage diff --git a/scripts/actions/spells/black/ionohelix_ii.lua b/scripts/actions/spells/black/ionohelix_ii.lua index 88fcc6cbb23..3f6f8772ebb 100644 --- a/scripts/actions/spells/black/ionohelix_ii.lua +++ b/scripts/actions/spells/black/ionohelix_ii.lua @@ -17,7 +17,7 @@ spellObject.onSpellCast = function(caster, target, spell) local power = utils.clamp(damage, 0, 9999) local duration = xi.spells.enfeebling.calculateDuration(caster, target, spell:getID(), xi.effect.HELIX, xi.skill.ELEMENTAL_MAGIC) - target:addStatusEffect(xi.effect.HELIX, power, 10, duration, 0, 0, 2) + target:addStatusEffect(xi.effect.HELIX, { power = power, duration = duration, origin = caster, tick = 10, tier = 2 }) end return damage diff --git a/scripts/actions/spells/black/kaustra.lua b/scripts/actions/spells/black/kaustra.lua index b0143872d2a..a48c1f56a15 100644 --- a/scripts/actions/spells/black/kaustra.lua +++ b/scripts/actions/spells/black/kaustra.lua @@ -23,7 +23,7 @@ spellObject.onSpellCast = function(caster, target, spell) local power = math.floor(damage / 4) local duration = math.floor(3 * (1 + casterSkill / 11)) - target:addStatusEffect(xi.effect.KAUSTRA, power, 3, duration) + target:addStatusEffect(xi.effect.KAUSTRA, { power = power, duration = duration, origin = caster, tick = 3 }) end return damage diff --git a/scripts/actions/spells/black/klimaform.lua b/scripts/actions/spells/black/klimaform.lua index 35324c1c0aa..d7223786721 100644 --- a/scripts/actions/spells/black/klimaform.lua +++ b/scripts/actions/spells/black/klimaform.lua @@ -10,7 +10,7 @@ spellObject.onMagicCastingCheck = function(caster, target, spell) end spellObject.onSpellCast = function(caster, target, spell) - target:addStatusEffect(xi.effect.KLIMAFORM, 1, 0, 180) + target:addStatusEffect(xi.effect.KLIMAFORM, { power = 1, duration = 180, origin = caster }) return xi.effect.KLIMAFORM end diff --git a/scripts/actions/spells/black/luminohelix.lua b/scripts/actions/spells/black/luminohelix.lua index aa9e8f9e486..492e48a5e26 100644 --- a/scripts/actions/spells/black/luminohelix.lua +++ b/scripts/actions/spells/black/luminohelix.lua @@ -17,7 +17,7 @@ spellObject.onSpellCast = function(caster, target, spell) local power = utils.clamp(damage, 0, 9999) local duration = xi.spells.enfeebling.calculateDuration(caster, target, spell:getID(), xi.effect.HELIX, xi.skill.ELEMENTAL_MAGIC) - target:addStatusEffect(xi.effect.HELIX, power, 10, duration, 0, 0, 1) + target:addStatusEffect(xi.effect.HELIX, { power = power, duration = duration, origin = caster, tick = 10, tier = 1 }) end return damage diff --git a/scripts/actions/spells/black/luminohelix_ii.lua b/scripts/actions/spells/black/luminohelix_ii.lua index f6eea4eba87..d9454fe2935 100644 --- a/scripts/actions/spells/black/luminohelix_ii.lua +++ b/scripts/actions/spells/black/luminohelix_ii.lua @@ -17,7 +17,7 @@ spellObject.onSpellCast = function(caster, target, spell) local power = utils.clamp(damage, 0, 9999) local duration = xi.spells.enfeebling.calculateDuration(caster, target, spell:getID(), xi.effect.HELIX, xi.skill.ELEMENTAL_MAGIC) - target:addStatusEffect(xi.effect.HELIX, power, 10, duration, 0, 0, 2) + target:addStatusEffect(xi.effect.HELIX, { power = power, duration = duration, origin = caster, tick = 10, tier = 2 }) end return damage diff --git a/scripts/actions/spells/black/noctohelix.lua b/scripts/actions/spells/black/noctohelix.lua index bc312a4d862..a6004f37822 100644 --- a/scripts/actions/spells/black/noctohelix.lua +++ b/scripts/actions/spells/black/noctohelix.lua @@ -17,7 +17,7 @@ spellObject.onSpellCast = function(caster, target, spell) local power = utils.clamp(damage, 0, 9999) local duration = xi.spells.enfeebling.calculateDuration(caster, target, spell:getID(), xi.effect.HELIX, xi.skill.ELEMENTAL_MAGIC) - target:addStatusEffect(xi.effect.HELIX, power, 10, duration, 0, 0, 1) + target:addStatusEffect(xi.effect.HELIX, { power = power, duration = duration, origin = caster, tick = 10, tier = 1 }) end return damage diff --git a/scripts/actions/spells/black/noctohelix_ii.lua b/scripts/actions/spells/black/noctohelix_ii.lua index 437f39acbf2..09f204d1b97 100644 --- a/scripts/actions/spells/black/noctohelix_ii.lua +++ b/scripts/actions/spells/black/noctohelix_ii.lua @@ -17,7 +17,7 @@ spellObject.onSpellCast = function(caster, target, spell) local power = utils.clamp(damage, 0, 9999) local duration = xi.spells.enfeebling.calculateDuration(caster, target, spell:getID(), xi.effect.HELIX, xi.skill.ELEMENTAL_MAGIC) - target:addStatusEffect(xi.effect.HELIX, power, 10, duration, 0, 0, 2) + target:addStatusEffect(xi.effect.HELIX, { power = power, duration = duration, origin = caster, tick = 10, tier = 2 }) end return damage diff --git a/scripts/actions/spells/black/pyrohelix.lua b/scripts/actions/spells/black/pyrohelix.lua index 71caa1df8b3..daaff9632e9 100644 --- a/scripts/actions/spells/black/pyrohelix.lua +++ b/scripts/actions/spells/black/pyrohelix.lua @@ -17,7 +17,7 @@ spellObject.onSpellCast = function(caster, target, spell) local power = utils.clamp(damage, 0, 9999) local duration = xi.spells.enfeebling.calculateDuration(caster, target, spell:getID(), xi.effect.HELIX, xi.skill.ELEMENTAL_MAGIC) - target:addStatusEffect(xi.effect.HELIX, power, 10, duration, 0, 0, 1) + target:addStatusEffect(xi.effect.HELIX, { power = power, duration = duration, origin = caster, tick = 10, tier = 1 }) end return damage diff --git a/scripts/actions/spells/black/pyrohelix_ii.lua b/scripts/actions/spells/black/pyrohelix_ii.lua index 896affe88c1..13fc5c82eeb 100644 --- a/scripts/actions/spells/black/pyrohelix_ii.lua +++ b/scripts/actions/spells/black/pyrohelix_ii.lua @@ -17,7 +17,7 @@ spellObject.onSpellCast = function(caster, target, spell) local power = utils.clamp(damage, 0, 9999) local duration = xi.spells.enfeebling.calculateDuration(caster, target, spell:getID(), xi.effect.HELIX, xi.skill.ELEMENTAL_MAGIC) - target:addStatusEffect(xi.effect.HELIX, power, 10, duration, 0, 0, 2) + target:addStatusEffect(xi.effect.HELIX, { power = power, duration = duration, origin = caster, tick = 10, tier = 2 }) end return damage diff --git a/scripts/actions/spells/black/quake.lua b/scripts/actions/spells/black/quake.lua index 20003c819c6..81463627dab 100644 --- a/scripts/actions/spells/black/quake.lua +++ b/scripts/actions/spells/black/quake.lua @@ -9,7 +9,7 @@ spellObject.onMagicCastingCheck = function(caster, target, spell) end spellObject.onSpellCast = function(caster, target, spell) - target:addStatusEffectEx(xi.effect.NINJUTSU_ELE_DEBUFF, 0, 30, 0, 10, 0, xi.mod.WIND_MEVA, 0) + target:addStatusEffect(xi.effect.NINJUTSU_ELE_DEBUFF, { power = 30, duration = 10, origin = caster, icon = 0, subPower = xi.mod.WIND_MEVA }) return xi.spells.damage.useDamageSpell(caster, target, spell) end diff --git a/scripts/actions/spells/black/quake_ii.lua b/scripts/actions/spells/black/quake_ii.lua index 45031e2e9d5..05a0ae4fe0f 100644 --- a/scripts/actions/spells/black/quake_ii.lua +++ b/scripts/actions/spells/black/quake_ii.lua @@ -9,7 +9,7 @@ spellObject.onMagicCastingCheck = function(caster, target, spell) end spellObject.onSpellCast = function(caster, target, spell) - target:addStatusEffectEx(xi.effect.NINJUTSU_ELE_DEBUFF, 0, 30, 0, 10, 0, xi.mod.WIND_MEVA, 0) + target:addStatusEffect(xi.effect.NINJUTSU_ELE_DEBUFF, { power = 30, duration = 10, origin = caster, icon = 0, subPower = xi.mod.WIND_MEVA }) return xi.spells.damage.useDamageSpell(caster, target, spell) end diff --git a/scripts/actions/spells/black/tornado.lua b/scripts/actions/spells/black/tornado.lua index 271dd1a3600..c4a65d23173 100644 --- a/scripts/actions/spells/black/tornado.lua +++ b/scripts/actions/spells/black/tornado.lua @@ -9,7 +9,7 @@ spellObject.onMagicCastingCheck = function(caster, target, spell) end spellObject.onSpellCast = function(caster, target, spell) - target:addStatusEffectEx(xi.effect.NINJUTSU_ELE_DEBUFF, 0, 30, 0, 10, 0, xi.mod.ICE_MEVA, 0) + target:addStatusEffect(xi.effect.NINJUTSU_ELE_DEBUFF, { power = 30, duration = 10, origin = caster, icon = 0, subPower = xi.mod.ICE_MEVA }) return xi.spells.damage.useDamageSpell(caster, target, spell) end diff --git a/scripts/actions/spells/black/tornado_ii.lua b/scripts/actions/spells/black/tornado_ii.lua index c1dc902dc18..3e10b71ad83 100644 --- a/scripts/actions/spells/black/tornado_ii.lua +++ b/scripts/actions/spells/black/tornado_ii.lua @@ -9,7 +9,7 @@ spellObject.onMagicCastingCheck = function(caster, target, spell) end spellObject.onSpellCast = function(caster, target, spell) - target:addStatusEffectEx(xi.effect.NINJUTSU_ELE_DEBUFF, 0, 30, 0, 10, 0, xi.mod.ICE_MEVA, 0) + target:addStatusEffect(xi.effect.NINJUTSU_ELE_DEBUFF, { power = 30, duration = 10, origin = caster, icon = 0, subPower = xi.mod.ICE_MEVA }) return xi.spells.damage.useDamageSpell(caster, target, spell) end diff --git a/scripts/actions/spells/blue/amplification.lua b/scripts/actions/spells/blue/amplification.lua index e8308599304..07c4fb0eafb 100644 --- a/scripts/actions/spells/blue/amplification.lua +++ b/scripts/actions/spells/blue/amplification.lua @@ -24,8 +24,8 @@ spellObject.onSpellCast = function(caster, target, spell) local duration = xi.spells.blue.calculateDurationWithDiffusion(caster, 90) local returnEffect = xi.effect.MAGIC_ATK_BOOST - local actionOne = target:addStatusEffect(xi.effect.MAGIC_ATK_BOOST, 10, 0, duration) - local actionTwo = target:addStatusEffect(xi.effect.MAGIC_DEF_BOOST, 10, 0, duration) + local actionOne = target:addStatusEffect(xi.effect.MAGIC_ATK_BOOST, { power = 10, duration = duration, origin = caster }) + local actionTwo = target:addStatusEffect(xi.effect.MAGIC_DEF_BOOST, { power = 10, duration = duration, origin = caster }) if not actionOne and not actionTwo then -- both statuses fail to apply spell:setMsg(xi.msg.basic.MAGIC_NO_EFFECT) diff --git a/scripts/actions/spells/blue/animating_wail.lua b/scripts/actions/spells/blue/animating_wail.lua index e77a7595862..0091925d3de 100644 --- a/scripts/actions/spells/blue/animating_wail.lua +++ b/scripts/actions/spells/blue/animating_wail.lua @@ -24,7 +24,7 @@ spellObject.onSpellCast = function(caster, target, spell) local power = 1500 -- 15% local duration = xi.spells.blue.calculateDurationWithDiffusion(caster, 300) - if not target:addStatusEffect(xi.effect.HASTE, power, 0, duration) then + if not target:addStatusEffect(xi.effect.HASTE, { power = power, duration = duration, origin = caster }) then spell:setMsg(xi.msg.basic.MAGIC_NO_EFFECT) end diff --git a/scripts/actions/spells/blue/battery_charge.lua b/scripts/actions/spells/blue/battery_charge.lua index 7be1bb70bf8..f9a5a261eef 100644 --- a/scripts/actions/spells/blue/battery_charge.lua +++ b/scripts/actions/spells/blue/battery_charge.lua @@ -24,7 +24,7 @@ spellObject.onSpellCast = function(caster, target, spell) local power = 3 + caster:getMod(xi.mod.ENHANCES_REFRESH) local duration = xi.spells.blue.calculateDurationWithDiffusion(caster, 300) - if not target:addStatusEffect(xi.effect.REFRESH, power, 0, duration) then + if not target:addStatusEffect(xi.effect.REFRESH, { power = power, duration = duration, origin = caster }) then spell:setMsg(xi.msg.basic.MAGIC_NO_EFFECT) end diff --git a/scripts/actions/spells/blue/cocoon.lua b/scripts/actions/spells/blue/cocoon.lua index 44f73e735ae..c0cb9e15543 100644 --- a/scripts/actions/spells/blue/cocoon.lua +++ b/scripts/actions/spells/blue/cocoon.lua @@ -24,7 +24,7 @@ spellObject.onSpellCast = function(caster, target, spell) local power = 50 -- 50% local duration = xi.spells.blue.calculateDurationWithDiffusion(caster, 90) - if not target:addStatusEffect(xi.effect.DEFENSE_BOOST, power, 0, duration) then + if not target:addStatusEffect(xi.effect.DEFENSE_BOOST, { power = power, duration = duration, origin = caster }) then spell:setMsg(xi.msg.basic.MAGIC_NO_EFFECT) end diff --git a/scripts/actions/spells/blue/cold_wave.lua b/scripts/actions/spells/blue/cold_wave.lua index b3b8999a9d7..4c287629b2e 100644 --- a/scripts/actions/spells/blue/cold_wave.lua +++ b/scripts/actions/spells/blue/cold_wave.lua @@ -45,7 +45,7 @@ spellObject.onSpellCast = function(caster, target, spell) local dot = utils.clamp(math.floor((agiDown - 3) / 2), 0, 23) spell:setMsg(xi.msg.basic.MAGIC_NO_EFFECT) - if target:addStatusEffect(params.effect, dot, tick, duration * resist) then + if target:addStatusEffect(params.effect, { power = dot, duration = duration * resist, origin = caster, tick = tick }) then spell:setMsg(xi.msg.basic.MAGIC_ENFEEB_IS) end else diff --git a/scripts/actions/spells/blue/corrosive_ooze.lua b/scripts/actions/spells/blue/corrosive_ooze.lua index a5bcfc0d295..db7bd783e1c 100644 --- a/scripts/actions/spells/blue/corrosive_ooze.lua +++ b/scripts/actions/spells/blue/corrosive_ooze.lua @@ -42,8 +42,8 @@ spellObject.onSpellCast = function(caster, target, spell) local resist = xi.combat.magicHitRate.calculateResistRate(caster, target, spell:getSpellGroup(), xi.skill.BLUE_MAGIC, 0, spell:getElement(), xi.mod.INT, 0, 0) if resist >= 0.5 then - target:addStatusEffect(xi.effect.DEFENSE_DOWN, 5, 0, 90 * resist) - target:addStatusEffect(xi.effect.ATTACK_DOWN, 5, 0, 90 * resist) + target:addStatusEffect(xi.effect.DEFENSE_DOWN, { power = 5, duration = 90 * resist, origin = caster }) + target:addStatusEffect(xi.effect.ATTACK_DOWN, { power = 5, duration = 90 * resist, origin = caster }) end return damage diff --git a/scripts/actions/spells/blue/diamondhide.lua b/scripts/actions/spells/blue/diamondhide.lua index 2aaf4c695cc..6a02c88a5b7 100644 --- a/scripts/actions/spells/blue/diamondhide.lua +++ b/scripts/actions/spells/blue/diamondhide.lua @@ -25,7 +25,7 @@ spellObject.onSpellCast = function(caster, target, spell) local power = (blueSkill / 3) * 2 local duration = xi.spells.blue.calculateDurationWithDiffusion(caster, 300) - if not target:addStatusEffect(xi.effect.STONESKIN, power, 0, duration, 0, 0, 2) then + if not target:addStatusEffect(xi.effect.STONESKIN, { power = power, duration = duration, origin = caster, tier = 2 }) then spell:setMsg(xi.msg.basic.MAGIC_NO_EFFECT) end diff --git a/scripts/actions/spells/blue/enervation.lua b/scripts/actions/spells/blue/enervation.lua index 2bf91a05b72..6760685a26b 100644 --- a/scripts/actions/spells/blue/enervation.lua +++ b/scripts/actions/spells/blue/enervation.lua @@ -27,8 +27,8 @@ spellObject.onSpellCast = function(caster, target, spell) local resist = xi.combat.magicHitRate.calculateResistRate(caster, target, spell:getSpellGroup(), xi.skill.BLUE_MAGIC, 0, spell:getElement(), xi.mod.INT, xi.effect.DEFENSE_DOWN, 0) if resist >= resistThreshold then - local actionOne = target:addStatusEffect(xi.effect.DEFENSE_DOWN, 10, 0, duration * resist) - local actionTwo = target:addStatusEffect(xi.effect.MAGIC_DEF_DOWN, 8, 0, duration * resist) + local actionOne = target:addStatusEffect(xi.effect.DEFENSE_DOWN, { power = 10, duration = duration * resist, origin = caster }) + local actionTwo = target:addStatusEffect(xi.effect.MAGIC_DEF_DOWN, { power = 8, duration = duration * resist, origin = caster }) -- If at least one of effects got applied, set the message type if actionOne or actionTwo then diff --git a/scripts/actions/spells/blue/feather_barrier.lua b/scripts/actions/spells/blue/feather_barrier.lua index bf3f93dc89b..07264de5182 100644 --- a/scripts/actions/spells/blue/feather_barrier.lua +++ b/scripts/actions/spells/blue/feather_barrier.lua @@ -24,7 +24,7 @@ spellObject.onSpellCast = function(caster, target, spell) local power = 20 local duration = xi.spells.blue.calculateDurationWithDiffusion(caster, 30) - if not target:addStatusEffect(xi.effect.EVASION_BOOST, power, 0, duration) then + if not target:addStatusEffect(xi.effect.EVASION_BOOST, { power = power, duration = duration, origin = caster }) then spell:setMsg(xi.msg.basic.MAGIC_NO_EFFECT) end diff --git a/scripts/actions/spells/blue/light_of_penance.lua b/scripts/actions/spells/blue/light_of_penance.lua index 11213917614..207645acf11 100644 --- a/scripts/actions/spells/blue/light_of_penance.lua +++ b/scripts/actions/spells/blue/light_of_penance.lua @@ -28,8 +28,8 @@ spellObject.onSpellCast = function(caster, target, spell) spell:setMsg(xi.msg.basic.MAGIC_TP_REDUCE) -- this doesn't seem to do much target:delTP(100) - local actionOne = target:addStatusEffect(xi.effect.BLINDNESS, 10, 0, duration * resist) - local actionTwo = target:addStatusEffect(xi.effect.BIND, 1, 0, duration * resist) + local actionOne = target:addStatusEffect(xi.effect.BLINDNESS, { power = 10, duration = duration * resist, origin = caster }) + local actionTwo = target:addStatusEffect(xi.effect.BIND, { power = 1, duration = duration * resist, origin = caster }) -- Gaze move if target:isFacing(caster) and caster:isFacing(target) then diff --git a/scripts/actions/spells/blue/memento_mori.lua b/scripts/actions/spells/blue/memento_mori.lua index c3365779e49..ae6458ff095 100644 --- a/scripts/actions/spells/blue/memento_mori.lua +++ b/scripts/actions/spells/blue/memento_mori.lua @@ -23,7 +23,7 @@ spellObject.onSpellCast = function(caster, target, spell) local power = 20 local duration = xi.spells.blue.calculateDurationWithDiffusion(caster, 60) - if not target:addStatusEffect(xi.effect.MAGIC_ATK_BOOST, power, 0, duration) then + if not target:addStatusEffect(xi.effect.MAGIC_ATK_BOOST, { power = power, duration = duration, origin = caster }) then spell:setMsg(xi.msg.basic.MAGIC_NO_EFFECT) end diff --git a/scripts/actions/spells/blue/metallic_body.lua b/scripts/actions/spells/blue/metallic_body.lua index c169bb271bc..ea285d89302 100644 --- a/scripts/actions/spells/blue/metallic_body.lua +++ b/scripts/actions/spells/blue/metallic_body.lua @@ -25,7 +25,7 @@ spellObject.onSpellCast = function(caster, target, spell) local power = utils.clamp(0.375 * blueSkill + 12.5, 0, 150) local duration = xi.spells.blue.calculateDurationWithDiffusion(caster, 300) - if not target:addStatusEffect(xi.effect.STONESKIN, power, 0, duration, 0, 0, 2) then + if not target:addStatusEffect(xi.effect.STONESKIN, { power = power, duration = duration, origin = caster, tier = 2 }) then spell:setMsg(xi.msg.basic.MAGIC_NO_EFFECT) end diff --git a/scripts/actions/spells/blue/occultation.lua b/scripts/actions/spells/blue/occultation.lua index 66acb7af008..a3c1e495b6e 100644 --- a/scripts/actions/spells/blue/occultation.lua +++ b/scripts/actions/spells/blue/occultation.lua @@ -41,7 +41,7 @@ spellObject.onSpellCast = function(caster, target, spell) caster:delStatusEffect(xi.effect.DIFFUSION) end - if not target:addStatusEffect(xi.effect.BLINK, power, 0, duration) then + if not target:addStatusEffect(xi.effect.BLINK, { power = power, duration = duration, origin = caster }) then spell:setMsg(xi.msg.basic.MAGIC_NO_EFFECT) end diff --git a/scripts/actions/spells/blue/plasma_charge.lua b/scripts/actions/spells/blue/plasma_charge.lua index ad84e8c91e5..d66f99abe70 100644 --- a/scripts/actions/spells/blue/plasma_charge.lua +++ b/scripts/actions/spells/blue/plasma_charge.lua @@ -24,7 +24,7 @@ spellObject.onSpellCast = function(caster, target, spell) local power = 5 -- 5 dmg local duration = xi.spells.blue.calculateDurationWithDiffusion(caster, 60) - if not target:addStatusEffect(xi.effect.SHOCK_SPIKES, power, 0, duration) then + if not target:addStatusEffect(xi.effect.SHOCK_SPIKES, { power = power, duration = duration, origin = caster }) then spell:setMsg(xi.msg.basic.MAGIC_NO_EFFECT) end diff --git a/scripts/actions/spells/blue/plenilune_embrace.lua b/scripts/actions/spells/blue/plenilune_embrace.lua index f62aa79d6b2..1649584b814 100644 --- a/scripts/actions/spells/blue/plenilune_embrace.lua +++ b/scripts/actions/spells/blue/plenilune_embrace.lua @@ -36,8 +36,8 @@ spellObject.onSpellCast = function(caster, target, spell) local atkBoost = moonBuff.atk local mabBoost = moonBuff.mab - caster:addStatusEffect(xi.effect.ATTACK_BOOST, atkBoost, 0, duration) - caster:addStatusEffect(xi.effect.MAGIC_ATK_BOOST, mabBoost, 0, duration) + caster:addStatusEffect(xi.effect.ATTACK_BOOST, { power = atkBoost, duration = duration, origin = caster }) + caster:addStatusEffect(xi.effect.MAGIC_ATK_BOOST, { power = mabBoost, duration = duration, origin = caster }) local minCure = 350 diff --git a/scripts/actions/spells/blue/reactor_cool.lua b/scripts/actions/spells/blue/reactor_cool.lua index b4cc703838c..cfec251d3be 100644 --- a/scripts/actions/spells/blue/reactor_cool.lua +++ b/scripts/actions/spells/blue/reactor_cool.lua @@ -32,8 +32,8 @@ spellObject.onSpellCast = function(caster, target, spell) target:delStatusEffectSilent(xi.effect.ICE_SPIKES) end - target:addStatusEffect(xi.effect.DEFENSE_BOOST, 12, 0, duration) - target:addStatusEffect(xi.effect.ICE_SPIKES, 5, 0, duration) + target:addStatusEffect(xi.effect.DEFENSE_BOOST, { power = 12, duration = duration, origin = caster }) + target:addStatusEffect(xi.effect.ICE_SPIKES, { power = 5, duration = duration, origin = caster }) spell:setMsg(xi.msg.basic.MAGIC_GAIN_EFFECT) return xi.effect.DEFENSE_BOOST diff --git a/scripts/actions/spells/blue/refueling.lua b/scripts/actions/spells/blue/refueling.lua index 902085f9190..9f8be24d3ca 100644 --- a/scripts/actions/spells/blue/refueling.lua +++ b/scripts/actions/spells/blue/refueling.lua @@ -24,7 +24,7 @@ spellObject.onSpellCast = function(caster, target, spell) local power = 1000 -- 10% local duration = xi.spells.blue.calculateDurationWithDiffusion(caster, 300) - if not target:addStatusEffect(xi.effect.HASTE, power, 0, duration) then + if not target:addStatusEffect(xi.effect.HASTE, { power = power, duration = duration, origin = caster }) then spell:setMsg(xi.msg.basic.MAGIC_NO_EFFECT) end diff --git a/scripts/actions/spells/blue/regeneration.lua b/scripts/actions/spells/blue/regeneration.lua index 75cdf1f526b..aa335a5fc3d 100644 --- a/scripts/actions/spells/blue/regeneration.lua +++ b/scripts/actions/spells/blue/regeneration.lua @@ -41,7 +41,7 @@ spellObject.onSpellCast = function(caster, target, spell) target:delStatusEffect(xi.effect.REGEN) end - if not target:addStatusEffect(xi.effect.REGEN, power, 3, duration, 0, 0, 0) then + if not target:addStatusEffect(xi.effect.REGEN, { power = power, duration = duration, origin = caster, tick = 3 }) then spell:setMsg(xi.msg.basic.MAGIC_NO_EFFECT) end diff --git a/scripts/actions/spells/blue/saline_coat.lua b/scripts/actions/spells/blue/saline_coat.lua index ca0311722fd..08c5fa3b1b0 100644 --- a/scripts/actions/spells/blue/saline_coat.lua +++ b/scripts/actions/spells/blue/saline_coat.lua @@ -25,7 +25,7 @@ spellObject.onSpellCast = function(caster, target, spell) local tick = 4 -- decay by 1 every 4 seconds local duration = xi.spells.blue.calculateDurationWithDiffusion(caster, 180) - if not target:addStatusEffect(xi.effect.MAGIC_DEF_BOOST, power, tick, duration) then + if not target:addStatusEffect(xi.effect.MAGIC_DEF_BOOST, { power = power, duration = duration, origin = caster, tick = tick }) then spell:setMsg(xi.msg.basic.MAGIC_NO_EFFECT) end diff --git a/scripts/actions/spells/blue/self-destruct.lua b/scripts/actions/spells/blue/self-destruct.lua index 24b149a8570..2c3383c8307 100644 --- a/scripts/actions/spells/blue/self-destruct.lua +++ b/scripts/actions/spells/blue/self-destruct.lua @@ -31,7 +31,7 @@ spellObject.onSpellCast = function(caster, target, spell) damage = xi.spells.blue.applySpellDamage(caster, target, spell, damage, params) caster:setHP(1) caster:delStatusEffectSilent(xi.effect.WEAKNESS) - caster:addStatusEffect(xi.effect.WEAKNESS, 1, 0, 300) + caster:addStatusEffect(xi.effect.WEAKNESS, { power = 1, duration = 300, origin = caster }) else spell:setMsg(xi.msg.basic.MAGIC_NO_EFFECT) end diff --git a/scripts/actions/spells/blue/triumphant_roar.lua b/scripts/actions/spells/blue/triumphant_roar.lua index 25e970f8871..7a4eb778b61 100644 --- a/scripts/actions/spells/blue/triumphant_roar.lua +++ b/scripts/actions/spells/blue/triumphant_roar.lua @@ -23,7 +23,7 @@ spellObject.onSpellCast = function(caster, target, spell) local power = 15 local duration = xi.spells.blue.calculateDurationWithDiffusion(caster, 60) - if not target:addStatusEffect(xi.effect.ATTACK_BOOST, power, 0, duration) then + if not target:addStatusEffect(xi.effect.ATTACK_BOOST, { power = power, duration = duration, origin = caster }) then spell:setMsg(xi.msg.basic.MAGIC_NO_EFFECT) end diff --git a/scripts/actions/spells/blue/warm-up.lua b/scripts/actions/spells/blue/warm-up.lua index 96bcce0a067..231d83d9030 100644 --- a/scripts/actions/spells/blue/warm-up.lua +++ b/scripts/actions/spells/blue/warm-up.lua @@ -24,8 +24,8 @@ spellObject.onSpellCast = function(caster, target, spell) local duration = xi.spells.blue.calculateDurationWithDiffusion(caster, 180) local returnEffect = xi.effect.ACCURACY_BOOST - local actionOne = target:addStatusEffect(xi.effect.ACCURACY_BOOST, 10, 0, duration) - local actionTwo = target:addStatusEffect(xi.effect.EVASION_BOOST, 10, 0, duration) + local actionOne = target:addStatusEffect(xi.effect.ACCURACY_BOOST, { power = 10, duration = duration, origin = caster }) + local actionTwo = target:addStatusEffect(xi.effect.EVASION_BOOST, { power = 10, duration = duration, origin = caster }) if not actionOne and not actionTwo then -- both statuses fail to apply spell:setMsg(xi.msg.basic.MAGIC_NO_EFFECT) diff --git a/scripts/actions/spells/blue/zephyr_mantle.lua b/scripts/actions/spells/blue/zephyr_mantle.lua index 5c20810f266..4c73ba01b4a 100644 --- a/scripts/actions/spells/blue/zephyr_mantle.lua +++ b/scripts/actions/spells/blue/zephyr_mantle.lua @@ -25,7 +25,7 @@ spellObject.onSpellCast = function(caster, target, spell) local tick = 0 local duration = xi.spells.blue.calculateDurationWithDiffusion(caster, 300) - if not target:addStatusEffect(xi.effect.BLINK, power, tick, duration) then + if not target:addStatusEffect(xi.effect.BLINK, { power = power, duration = duration, origin = caster, tick = tick }) then spell:setMsg(xi.msg.basic.MAGIC_NO_EFFECT) end diff --git a/scripts/actions/spells/ninjutsu/doton_ichi.lua b/scripts/actions/spells/ninjutsu/doton_ichi.lua index e348d9cd559..fffe61809a7 100644 --- a/scripts/actions/spells/ninjutsu/doton_ichi.lua +++ b/scripts/actions/spells/ninjutsu/doton_ichi.lua @@ -10,7 +10,7 @@ end spellObject.onSpellCast = function(caster, target, spell) local duration = 15 + caster:getMerit(xi.merit.DOTON_EFFECT) -- T1 bonus debuff duration - target:addStatusEffectEx(xi.effect.NINJUTSU_ELE_DEBUFF, 0, 30, 0, duration, 0, xi.mod.WIND_MEVA, 0) + target:addStatusEffect(xi.effect.NINJUTSU_ELE_DEBUFF, { power = 30, duration = duration, origin = caster, icon = 0, subPower = xi.mod.WIND_MEVA }) return xi.spells.damage.useDamageSpell(caster, target, spell) end diff --git a/scripts/actions/spells/ninjutsu/doton_ni.lua b/scripts/actions/spells/ninjutsu/doton_ni.lua index 6c7cff5d1d7..3bd38fc4fb1 100644 --- a/scripts/actions/spells/ninjutsu/doton_ni.lua +++ b/scripts/actions/spells/ninjutsu/doton_ni.lua @@ -10,7 +10,7 @@ end spellObject.onSpellCast = function(caster, target, spell) local duration = 15 + caster:getMerit(xi.merit.DOTON_EFFECT) -- T1 bonus debuff duration - target:addStatusEffectEx(xi.effect.NINJUTSU_ELE_DEBUFF, 0, 30, 0, duration, 0, xi.mod.WIND_MEVA, 0) + target:addStatusEffect(xi.effect.NINJUTSU_ELE_DEBUFF, { power = 30, duration = duration, origin = caster, icon = 0, subPower = xi.mod.WIND_MEVA }) return xi.spells.damage.useDamageSpell(caster, target, spell) end diff --git a/scripts/actions/spells/ninjutsu/doton_san.lua b/scripts/actions/spells/ninjutsu/doton_san.lua index d3fb52ad6fd..4c249ee005e 100644 --- a/scripts/actions/spells/ninjutsu/doton_san.lua +++ b/scripts/actions/spells/ninjutsu/doton_san.lua @@ -10,7 +10,7 @@ end spellObject.onSpellCast = function(caster, target, spell) local duration = 15 + caster:getMerit(xi.merit.DOTON_EFFECT) -- T1 bonus debuff duration - target:addStatusEffectEx(xi.effect.NINJUTSU_ELE_DEBUFF, 0, 30, 0, duration, 0, xi.mod.WIND_MEVA, 0) + target:addStatusEffect(xi.effect.NINJUTSU_ELE_DEBUFF, { power = 30, duration = duration, origin = caster, icon = 0, subPower = xi.mod.WIND_MEVA }) return xi.spells.damage.useDamageSpell(caster, target, spell) end diff --git a/scripts/actions/spells/ninjutsu/huton_ichi.lua b/scripts/actions/spells/ninjutsu/huton_ichi.lua index 45c3b342d49..d91f40a2d2e 100644 --- a/scripts/actions/spells/ninjutsu/huton_ichi.lua +++ b/scripts/actions/spells/ninjutsu/huton_ichi.lua @@ -10,7 +10,7 @@ end spellObject.onSpellCast = function(caster, target, spell) local duration = 15 + caster:getMerit(xi.merit.HUTON_EFFECT) -- T1 bonus debuff duration - target:addStatusEffectEx(xi.effect.NINJUTSU_ELE_DEBUFF, 0, 30, 0, duration, 0, xi.mod.ICE_MEVA, 0) + target:addStatusEffect(xi.effect.NINJUTSU_ELE_DEBUFF, { power = 30, duration = duration, origin = caster, icon = 0, subPower = xi.mod.ICE_MEVA }) return xi.spells.damage.useDamageSpell(caster, target, spell) end diff --git a/scripts/actions/spells/ninjutsu/huton_ni.lua b/scripts/actions/spells/ninjutsu/huton_ni.lua index 037ae62f1b8..857851f1caf 100644 --- a/scripts/actions/spells/ninjutsu/huton_ni.lua +++ b/scripts/actions/spells/ninjutsu/huton_ni.lua @@ -10,7 +10,7 @@ end spellObject.onSpellCast = function(caster, target, spell) local duration = 15 + caster:getMerit(xi.merit.HUTON_EFFECT) -- T1 bonus debuff duration - target:addStatusEffectEx(xi.effect.NINJUTSU_ELE_DEBUFF, 0, 30, 0, duration, 0, xi.mod.ICE_MEVA, 0) + target:addStatusEffect(xi.effect.NINJUTSU_ELE_DEBUFF, { power = 30, duration = duration, origin = caster, icon = 0, subPower = xi.mod.ICE_MEVA }) return xi.spells.damage.useDamageSpell(caster, target, spell) end diff --git a/scripts/actions/spells/ninjutsu/huton_san.lua b/scripts/actions/spells/ninjutsu/huton_san.lua index 929398bc918..40f265204b0 100644 --- a/scripts/actions/spells/ninjutsu/huton_san.lua +++ b/scripts/actions/spells/ninjutsu/huton_san.lua @@ -10,7 +10,7 @@ end spellObject.onSpellCast = function(caster, target, spell) local duration = 15 + caster:getMerit(xi.merit.HUTON_EFFECT) -- T1 bonus debuff duration - target:addStatusEffectEx(xi.effect.NINJUTSU_ELE_DEBUFF, 0, 30, 0, duration, 0, xi.mod.ICE_MEVA, 0) + target:addStatusEffect(xi.effect.NINJUTSU_ELE_DEBUFF, { power = 30, duration = duration, origin = caster, icon = 0, subPower = xi.mod.ICE_MEVA }) return xi.spells.damage.useDamageSpell(caster, target, spell) end diff --git a/scripts/actions/spells/ninjutsu/hyoton_ichi.lua b/scripts/actions/spells/ninjutsu/hyoton_ichi.lua index 8fbd9bc6190..59016f5e2fb 100644 --- a/scripts/actions/spells/ninjutsu/hyoton_ichi.lua +++ b/scripts/actions/spells/ninjutsu/hyoton_ichi.lua @@ -10,7 +10,7 @@ end spellObject.onSpellCast = function(caster, target, spell) local duration = 15 + caster:getMerit(xi.merit.HYOTON_EFFECT) -- T1 bonus debuff duration - target:addStatusEffectEx(xi.effect.NINJUTSU_ELE_DEBUFF, 0, 30, 0, duration, 0, xi.mod.FIRE_MEVA, 0) + target:addStatusEffect(xi.effect.NINJUTSU_ELE_DEBUFF, { power = 30, duration = duration, origin = caster, icon = 0, subPower = xi.mod.FIRE_MEVA }) return xi.spells.damage.useDamageSpell(caster, target, spell) end diff --git a/scripts/actions/spells/ninjutsu/hyoton_ni.lua b/scripts/actions/spells/ninjutsu/hyoton_ni.lua index 5e8bcbb8712..eecaa6a699d 100644 --- a/scripts/actions/spells/ninjutsu/hyoton_ni.lua +++ b/scripts/actions/spells/ninjutsu/hyoton_ni.lua @@ -10,7 +10,7 @@ end spellObject.onSpellCast = function(caster, target, spell) local duration = 15 + caster:getMerit(xi.merit.HYOTON_EFFECT) -- T1 bonus debuff duration - target:addStatusEffectEx(xi.effect.NINJUTSU_ELE_DEBUFF, 0, 30, 0, duration, 0, xi.mod.FIRE_MEVA, 0) + target:addStatusEffect(xi.effect.NINJUTSU_ELE_DEBUFF, { power = 30, duration = duration, origin = caster, icon = 0, subPower = xi.mod.FIRE_MEVA }) return xi.spells.damage.useDamageSpell(caster, target, spell) end diff --git a/scripts/actions/spells/ninjutsu/hyoton_san.lua b/scripts/actions/spells/ninjutsu/hyoton_san.lua index 304ddc0e0f0..2f49918fc51 100644 --- a/scripts/actions/spells/ninjutsu/hyoton_san.lua +++ b/scripts/actions/spells/ninjutsu/hyoton_san.lua @@ -10,7 +10,7 @@ end spellObject.onSpellCast = function(caster, target, spell) local duration = 15 + caster:getMerit(xi.merit.HYOTON_EFFECT) -- T1 bonus debuff duration - target:addStatusEffectEx(xi.effect.NINJUTSU_ELE_DEBUFF, 0, 30, 0, duration, 0, xi.mod.FIRE_MEVA, 0) + target:addStatusEffect(xi.effect.NINJUTSU_ELE_DEBUFF, { power = 30, duration = duration, origin = caster, icon = 0, subPower = xi.mod.FIRE_MEVA }) return xi.spells.damage.useDamageSpell(caster, target, spell) end diff --git a/scripts/actions/spells/ninjutsu/katon_ichi.lua b/scripts/actions/spells/ninjutsu/katon_ichi.lua index e6d91633cfe..2f20e661182 100644 --- a/scripts/actions/spells/ninjutsu/katon_ichi.lua +++ b/scripts/actions/spells/ninjutsu/katon_ichi.lua @@ -10,7 +10,7 @@ end spellObject.onSpellCast = function(caster, target, spell) local duration = 15 + caster:getMerit(xi.merit.KATON_EFFECT) -- T1 bonus debuff duration - target:addStatusEffectEx(xi.effect.NINJUTSU_ELE_DEBUFF, 0, 30, 0, duration, 0, xi.mod.WATER_MEVA, 0) + target:addStatusEffect(xi.effect.NINJUTSU_ELE_DEBUFF, { power = 30, duration = duration, origin = caster, icon = 0, subPower = xi.mod.WATER_MEVA }) return xi.spells.damage.useDamageSpell(caster, target, spell) end diff --git a/scripts/actions/spells/ninjutsu/katon_ni.lua b/scripts/actions/spells/ninjutsu/katon_ni.lua index 67fc75cddfb..145175d276d 100644 --- a/scripts/actions/spells/ninjutsu/katon_ni.lua +++ b/scripts/actions/spells/ninjutsu/katon_ni.lua @@ -10,7 +10,7 @@ end spellObject.onSpellCast = function(caster, target, spell) local duration = 15 + caster:getMerit(xi.merit.KATON_EFFECT) -- T1 bonus debuff duration - target:addStatusEffectEx(xi.effect.NINJUTSU_ELE_DEBUFF, 0, 30, 0, duration, 0, xi.mod.WATER_MEVA, 0) + target:addStatusEffect(xi.effect.NINJUTSU_ELE_DEBUFF, { power = 30, duration = duration, origin = caster, icon = 0, subPower = xi.mod.WATER_MEVA }) return xi.spells.damage.useDamageSpell(caster, target, spell) end diff --git a/scripts/actions/spells/ninjutsu/katon_san.lua b/scripts/actions/spells/ninjutsu/katon_san.lua index 6ff10c0e55a..6b452f06602 100644 --- a/scripts/actions/spells/ninjutsu/katon_san.lua +++ b/scripts/actions/spells/ninjutsu/katon_san.lua @@ -10,7 +10,7 @@ end spellObject.onSpellCast = function(caster, target, spell) local duration = 15 + caster:getMerit(xi.merit.KATON_EFFECT) -- T1 bonus debuff duration - target:addStatusEffectEx(xi.effect.NINJUTSU_ELE_DEBUFF, 0, 30, 0, duration, 0, xi.mod.WATER_MEVA, 0) + target:addStatusEffect(xi.effect.NINJUTSU_ELE_DEBUFF, { power = 30, duration = duration, origin = caster, icon = 0, subPower = xi.mod.WATER_MEVA }) return xi.spells.damage.useDamageSpell(caster, target, spell) end diff --git a/scripts/actions/spells/ninjutsu/raiton_ichi.lua b/scripts/actions/spells/ninjutsu/raiton_ichi.lua index 94ebcd5fc05..b057bb17ef0 100644 --- a/scripts/actions/spells/ninjutsu/raiton_ichi.lua +++ b/scripts/actions/spells/ninjutsu/raiton_ichi.lua @@ -10,7 +10,7 @@ end spellObject.onSpellCast = function(caster, target, spell) local duration = 15 + caster:getMerit(xi.merit.RAITON_EFFECT) -- T1 bonus debuff duration - target:addStatusEffectEx(xi.effect.NINJUTSU_ELE_DEBUFF, 0, 30, 0, duration, 0, xi.mod.EARTH_MEVA, 0) + target:addStatusEffect(xi.effect.NINJUTSU_ELE_DEBUFF, { power = 30, duration = duration, origin = caster, icon = 0, subPower = xi.mod.EARTH_MEVA }) return xi.spells.damage.useDamageSpell(caster, target, spell) end diff --git a/scripts/actions/spells/ninjutsu/raiton_ni.lua b/scripts/actions/spells/ninjutsu/raiton_ni.lua index 94b04b686db..4a7731a8ade 100644 --- a/scripts/actions/spells/ninjutsu/raiton_ni.lua +++ b/scripts/actions/spells/ninjutsu/raiton_ni.lua @@ -10,7 +10,7 @@ end spellObject.onSpellCast = function(caster, target, spell) local duration = 15 + caster:getMerit(xi.merit.RAITON_EFFECT) -- T1 bonus debuff duration - target:addStatusEffectEx(xi.effect.NINJUTSU_ELE_DEBUFF, 0, 30, 0, duration, 0, xi.mod.EARTH_MEVA, 0) + target:addStatusEffect(xi.effect.NINJUTSU_ELE_DEBUFF, { power = 30, duration = duration, origin = caster, icon = 0, subPower = xi.mod.EARTH_MEVA }) return xi.spells.damage.useDamageSpell(caster, target, spell) end diff --git a/scripts/actions/spells/ninjutsu/raiton_san.lua b/scripts/actions/spells/ninjutsu/raiton_san.lua index 7732c885272..8b8264056b2 100644 --- a/scripts/actions/spells/ninjutsu/raiton_san.lua +++ b/scripts/actions/spells/ninjutsu/raiton_san.lua @@ -10,7 +10,7 @@ end spellObject.onSpellCast = function(caster, target, spell) local duration = 15 + caster:getMerit(xi.merit.RAITON_EFFECT) -- T1 bonus debuff duration - target:addStatusEffectEx(xi.effect.NINJUTSU_ELE_DEBUFF, 0, 30, 0, duration, 0, xi.mod.EARTH_MEVA, 0) + target:addStatusEffect(xi.effect.NINJUTSU_ELE_DEBUFF, { power = 30, duration = duration, origin = caster, icon = 0, subPower = xi.mod.EARTH_MEVA }) return xi.spells.damage.useDamageSpell(caster, target, spell) end diff --git a/scripts/actions/spells/ninjutsu/suiton_ichi.lua b/scripts/actions/spells/ninjutsu/suiton_ichi.lua index ce3a18c2b3b..bc3788a3e31 100644 --- a/scripts/actions/spells/ninjutsu/suiton_ichi.lua +++ b/scripts/actions/spells/ninjutsu/suiton_ichi.lua @@ -10,7 +10,7 @@ end spellObject.onSpellCast = function(caster, target, spell) local duration = 15 + caster:getMerit(xi.merit.SUITON_EFFECT) -- T1 bonus debuff duration - target:addStatusEffectEx(xi.effect.NINJUTSU_ELE_DEBUFF, 0, 30, 0, duration, 0, xi.mod.THUNDER_MEVA, 0) + target:addStatusEffect(xi.effect.NINJUTSU_ELE_DEBUFF, { power = 30, duration = duration, origin = caster, icon = 0, subPower = xi.mod.THUNDER_MEVA }) return xi.spells.damage.useDamageSpell(caster, target, spell) end diff --git a/scripts/actions/spells/ninjutsu/suiton_ni.lua b/scripts/actions/spells/ninjutsu/suiton_ni.lua index 221fc797e93..a6e2517ce2b 100644 --- a/scripts/actions/spells/ninjutsu/suiton_ni.lua +++ b/scripts/actions/spells/ninjutsu/suiton_ni.lua @@ -10,7 +10,7 @@ end spellObject.onSpellCast = function(caster, target, spell) local duration = 15 + caster:getMerit(xi.merit.SUITON_EFFECT) -- T1 bonus debuff duration - target:addStatusEffectEx(xi.effect.NINJUTSU_ELE_DEBUFF, 0, 30, 0, duration, 0, xi.mod.THUNDER_MEVA, 0) + target:addStatusEffect(xi.effect.NINJUTSU_ELE_DEBUFF, { power = 30, duration = duration, origin = caster, icon = 0, subPower = xi.mod.THUNDER_MEVA }) return xi.spells.damage.useDamageSpell(caster, target, spell) end diff --git a/scripts/actions/spells/ninjutsu/suiton_san.lua b/scripts/actions/spells/ninjutsu/suiton_san.lua index 987cf89ab7d..7be835432f3 100644 --- a/scripts/actions/spells/ninjutsu/suiton_san.lua +++ b/scripts/actions/spells/ninjutsu/suiton_san.lua @@ -10,7 +10,7 @@ end spellObject.onSpellCast = function(caster, target, spell) local duration = 15 + caster:getMerit(xi.merit.SUITON_EFFECT) -- T1 bonus debuff duration - target:addStatusEffectEx(xi.effect.NINJUTSU_ELE_DEBUFF, 0, 30, 0, duration, 0, xi.mod.THUNDER_MEVA, 0) + target:addStatusEffect(xi.effect.NINJUTSU_ELE_DEBUFF, { power = 30, duration = duration, origin = caster, icon = 0, subPower = xi.mod.THUNDER_MEVA }) return xi.spells.damage.useDamageSpell(caster, target, spell) end diff --git a/scripts/actions/spells/trust/ferreous_coffin.lua b/scripts/actions/spells/trust/ferreous_coffin.lua index f700510b78a..9f8636c773e 100644 --- a/scripts/actions/spells/trust/ferreous_coffin.lua +++ b/scripts/actions/spells/trust/ferreous_coffin.lua @@ -54,7 +54,7 @@ spellObject.onMobSpawn = function(mob) xi.trust.message(mobArg, xi.trust.messageOffset.SPECIAL_MOVE_1) end - mob:addStatusEffect(xi.effect.ACCURACY_BOOST, 20, 0, 20) -- Cheat in Relic AM ACC + mob:addStatusEffect(xi.effect.ACCURACY_BOOST, { power = 20, duration = 20, origin = mob }) -- Cheat in Relic AM ACC -- TODO: Expand Relic (Mjollnir) Handling (Occ. Double Damage, etc) end end) diff --git a/scripts/actions/spells/trust/moogle.lua b/scripts/actions/spells/trust/moogle.lua index 0bc26aac13e..efd5d84cc95 100644 --- a/scripts/actions/spells/trust/moogle.lua +++ b/scripts/actions/spells/trust/moogle.lua @@ -27,7 +27,7 @@ spellObject.onMobSpawn = function(mob) tick_amount = 1 end - mob:addStatusEffectEx(xi.effect.COLURE_ACTIVE, xi.effect.COLURE_ACTIVE, 6, 3, 0, xi.effect.GEO_REFRESH, tick_amount, xi.auraTarget.ALLIES, xi.effectFlag.AURA) + mob:addStatusEffect(xi.effect.COLURE_ACTIVE, { power = 6, origin = mob, tick = 3, subType = xi.effect.GEO_REFRESH, subPower = tick_amount, tier = xi.auraTarget.ALLIES, flag = xi.effectFlag.AURA }) mob:setAutoAttackEnabled(false) end diff --git a/scripts/actions/spells/trust/sakura.lua b/scripts/actions/spells/trust/sakura.lua index 30479edb92f..22cc57b2d78 100644 --- a/scripts/actions/spells/trust/sakura.lua +++ b/scripts/actions/spells/trust/sakura.lua @@ -31,7 +31,7 @@ spellObject.onMobSpawn = function(mob) tick_amount = 1 end - mob:addStatusEffectEx(xi.effect.COLURE_ACTIVE, xi.effect.COLURE_ACTIVE, 6, 3, 0, xi.effect.GEO_REGEN, tick_amount, xi.auraTarget.ALLIES, xi.effectFlag.AURA) + mob:addStatusEffect(xi.effect.COLURE_ACTIVE, { power = 6, origin = mob, tick = 3, subType = xi.effect.GEO_REGEN, subPower = tick_amount, tier = xi.auraTarget.ALLIES, flag = xi.effectFlag.AURA }) mob:setAutoAttackEnabled(false) end diff --git a/scripts/actions/spells/white/cure.lua b/scripts/actions/spells/white/cure.lua index 294efcb3358..cb1ef7a3128 100644 --- a/scripts/actions/spells/white/cure.lua +++ b/scripts/actions/spells/white/cure.lua @@ -83,7 +83,7 @@ spellObject.onSpellCast = function(caster, target, spell) solaceStoneskin = solaceStoneskin * (1 + caster:getMerit(xi.merit.ANIMUS_SOLACE) / 100) - target:addStatusEffect(xi.effect.STONESKIN, solaceStoneskin, 0, 25, 0, 0, 1) + target:addStatusEffect(xi.effect.STONESKIN, { power = solaceStoneskin, duration = 25, origin = caster, tier = 1 }) end final = final + (final * (target:getMod(xi.mod.CURE_POTENCY_RCVD) / 100)) diff --git a/scripts/actions/spells/white/cure_ii.lua b/scripts/actions/spells/white/cure_ii.lua index 5c9e75eb78f..dd3311d01cf 100644 --- a/scripts/actions/spells/white/cure_ii.lua +++ b/scripts/actions/spells/white/cure_ii.lua @@ -83,7 +83,7 @@ spellObject.onSpellCast = function(caster, target, spell) solaceStoneskin = solaceStoneskin * (1 + caster:getMerit(xi.merit.ANIMUS_SOLACE) / 100) - target:addStatusEffect(xi.effect.STONESKIN, solaceStoneskin, 0, 25, 0, 0, 1) + target:addStatusEffect(xi.effect.STONESKIN, { power = solaceStoneskin, duration = 25, origin = caster, tier = 1 }) end final = final + (final * (target:getMod(xi.mod.CURE_POTENCY_RCVD) / 100)) diff --git a/scripts/actions/spells/white/cure_iii.lua b/scripts/actions/spells/white/cure_iii.lua index 765996da685..d169f397069 100644 --- a/scripts/actions/spells/white/cure_iii.lua +++ b/scripts/actions/spells/white/cure_iii.lua @@ -79,7 +79,7 @@ spellObject.onSpellCast = function(caster, target, spell) solaceStoneskin = solaceStoneskin * (1 + caster:getMerit(xi.merit.ANIMUS_SOLACE) / 100) - target:addStatusEffect(xi.effect.STONESKIN, solaceStoneskin, 0, 25, 0, 0, 1) + target:addStatusEffect(xi.effect.STONESKIN, { power = solaceStoneskin, duration = 25, origin = caster, tier = 1 }) end final = final + (final * (target:getMod(xi.mod.CURE_POTENCY_RCVD) / 100)) diff --git a/scripts/actions/spells/white/cure_iv.lua b/scripts/actions/spells/white/cure_iv.lua index d651cdc7667..1961b8bc500 100644 --- a/scripts/actions/spells/white/cure_iv.lua +++ b/scripts/actions/spells/white/cure_iv.lua @@ -78,7 +78,7 @@ spellObject.onSpellCast = function(caster, target, spell) solaceStoneskin = solaceStoneskin * (1 + caster:getMerit(xi.merit.ANIMUS_SOLACE) / 100) - target:addStatusEffect(xi.effect.STONESKIN, solaceStoneskin, 0, 25, 0, 0, 1) + target:addStatusEffect(xi.effect.STONESKIN, { power = solaceStoneskin, duration = 25, origin = caster, tier = 1 }) end final = final + (final * (target:getMod(xi.mod.CURE_POTENCY_RCVD) / 100)) diff --git a/scripts/actions/spells/white/cure_v.lua b/scripts/actions/spells/white/cure_v.lua index 28648bee902..fff45cfb6ed 100644 --- a/scripts/actions/spells/white/cure_v.lua +++ b/scripts/actions/spells/white/cure_v.lua @@ -87,7 +87,7 @@ spellObject.onSpellCast = function(caster, target, spell) solaceStoneskin = solaceStoneskin * (1 + caster:getMerit(xi.merit.ANIMUS_SOLACE) / 100) - target:addStatusEffect(xi.effect.STONESKIN, solaceStoneskin, 0, 25, 0, 0, 1) + target:addStatusEffect(xi.effect.STONESKIN, { power = solaceStoneskin, duration = 25, origin = caster, tier = 1 }) end final = final + (final * (target:getMod(xi.mod.CURE_POTENCY_RCVD) / 100)) diff --git a/scripts/actions/spells/white/cure_vi.lua b/scripts/actions/spells/white/cure_vi.lua index 70f47b51d97..5584963fe57 100644 --- a/scripts/actions/spells/white/cure_vi.lua +++ b/scripts/actions/spells/white/cure_vi.lua @@ -65,7 +65,7 @@ spellObject.onSpellCast = function(caster, target, spell) solaceStoneskin = solaceStoneskin * (1 + caster:getMerit(xi.merit.ANIMUS_SOLACE) / 100) - target:addStatusEffect(xi.effect.STONESKIN, solaceStoneskin, 0, 25, 0, 0, 1) + target:addStatusEffect(xi.effect.STONESKIN, { power = solaceStoneskin, duration = 25, origin = caster, tier = 1 }) end final = final + (final * (target:getMod(xi.mod.CURE_POTENCY_RCVD) / 100)) diff --git a/scripts/actions/spells/white/dia.lua b/scripts/actions/spells/white/dia.lua index 5a0c17ebedd..ae609ef38e1 100644 --- a/scripts/actions/spells/white/dia.lua +++ b/scripts/actions/spells/white/dia.lua @@ -22,7 +22,7 @@ spellObject.onSpellCast = function(caster, target, spell) target:delStatusEffect(xi.effect.BIO) local power = 1 + caster:getMod(xi.mod.DIA_DOT) - target:addStatusEffect(xi.effect.DIA, power, 3, 60, 0, 10, tier) + target:addStatusEffect(xi.effect.DIA, { power = power, duration = 60, origin = caster, tick = 3, subPower = 10, tier = tier }) end return damage diff --git a/scripts/actions/spells/white/dia_ii.lua b/scripts/actions/spells/white/dia_ii.lua index 1618275f143..3f26cebada0 100644 --- a/scripts/actions/spells/white/dia_ii.lua +++ b/scripts/actions/spells/white/dia_ii.lua @@ -22,7 +22,7 @@ spellObject.onSpellCast = function(caster, target, spell) target:delStatusEffect(xi.effect.BIO) local power = 2 + caster:getMod(xi.mod.DIA_DOT) - target:addStatusEffect(xi.effect.DIA, power, 3, 120, 0, 15, tier) + target:addStatusEffect(xi.effect.DIA, { power = power, duration = 120, origin = caster, tick = 3, subPower = 15, tier = tier }) end return damage diff --git a/scripts/actions/spells/white/dia_iii.lua b/scripts/actions/spells/white/dia_iii.lua index aa898d40b78..1c44637cab1 100644 --- a/scripts/actions/spells/white/dia_iii.lua +++ b/scripts/actions/spells/white/dia_iii.lua @@ -22,7 +22,7 @@ spellObject.onSpellCast = function(caster, target, spell) target:delStatusEffect(xi.effect.BIO) local power = 3 + caster:getMod(xi.mod.DIA_DOT) - target:addStatusEffect(xi.effect.DIA, power, 3, 180, 0, 20, tier) + target:addStatusEffect(xi.effect.DIA, { power = power, duration = 180, origin = caster, tick = 3, subPower = 20, tier = tier }) end return damage diff --git a/scripts/actions/spells/white/dia_iv.lua b/scripts/actions/spells/white/dia_iv.lua index 5e5ee1cda0e..d26d9c88e70 100644 --- a/scripts/actions/spells/white/dia_iv.lua +++ b/scripts/actions/spells/white/dia_iv.lua @@ -22,7 +22,7 @@ spellObject.onSpellCast = function(caster, target, spell) target:delStatusEffect(xi.effect.BIO) local power = 4 + caster:getMod(xi.mod.DIA_DOT) - target:addStatusEffect(xi.effect.DIA, power, 3, 180, 0, 25, tier) + target:addStatusEffect(xi.effect.DIA, { power = power, duration = 180, origin = caster, tick = 3, subPower = 25, tier = tier }) end return damage diff --git a/scripts/actions/spells/white/dia_v.lua b/scripts/actions/spells/white/dia_v.lua index 82c827496c5..57c15cae0fa 100644 --- a/scripts/actions/spells/white/dia_v.lua +++ b/scripts/actions/spells/white/dia_v.lua @@ -22,7 +22,7 @@ spellObject.onSpellCast = function(caster, target, spell) target:delStatusEffect(xi.effect.BIO) local power = 5 + caster:getMod(xi.mod.DIA_DOT) - target:addStatusEffect(xi.effect.DIA, power, 3, 180, 0, 30, tier) + target:addStatusEffect(xi.effect.DIA, { power = power, duration = 180, origin = caster, tick = 3, subPower = 30, tier = tier }) end return damage diff --git a/scripts/actions/spells/white/diaga.lua b/scripts/actions/spells/white/diaga.lua index 7439c568fe9..73bdca6a230 100644 --- a/scripts/actions/spells/white/diaga.lua +++ b/scripts/actions/spells/white/diaga.lua @@ -22,7 +22,7 @@ spellObject.onSpellCast = function(caster, target, spell) target:delStatusEffect(xi.effect.BIO) local power = 1 + caster:getMod(xi.mod.DIA_DOT) - target:addStatusEffect(xi.effect.DIA, power, 3, 60, 0, 10, tier) + target:addStatusEffect(xi.effect.DIA, { power = power, duration = 60, origin = caster, tick = 3, subPower = 10, tier = tier }) end return damage diff --git a/scripts/actions/spells/white/diaga_ii.lua b/scripts/actions/spells/white/diaga_ii.lua index 9e0bf4055b7..39e5f09a3fa 100644 --- a/scripts/actions/spells/white/diaga_ii.lua +++ b/scripts/actions/spells/white/diaga_ii.lua @@ -22,7 +22,7 @@ spellObject.onSpellCast = function(caster, target, spell) target:delStatusEffect(xi.effect.BIO) local power = 2 + caster:getMod(xi.mod.DIA_DOT) - target:addStatusEffect(xi.effect.DIA, power, 3, 120, 0, 15, tier) + target:addStatusEffect(xi.effect.DIA, { power = power, duration = 120, origin = caster, tick = 3, subPower = 15, tier = tier }) end return damage diff --git a/scripts/actions/spells/white/diaga_iii.lua b/scripts/actions/spells/white/diaga_iii.lua index 4ca148e66ed..9f83891a54f 100644 --- a/scripts/actions/spells/white/diaga_iii.lua +++ b/scripts/actions/spells/white/diaga_iii.lua @@ -22,7 +22,7 @@ spellObject.onSpellCast = function(caster, target, spell) target:delStatusEffect(xi.effect.BIO) local power = 3 + caster:getMod(xi.mod.DIA_DOT) - target:addStatusEffect(xi.effect.DIA, power, 3, 180, 0, 20, tier) + target:addStatusEffect(xi.effect.DIA, { power = power, duration = 180, origin = caster, tick = 3, subPower = 20, tier = tier }) end return damage diff --git a/scripts/actions/spells/white/diaga_iv.lua b/scripts/actions/spells/white/diaga_iv.lua index e55ee2879b2..8489346d9d6 100644 --- a/scripts/actions/spells/white/diaga_iv.lua +++ b/scripts/actions/spells/white/diaga_iv.lua @@ -22,7 +22,7 @@ spellObject.onSpellCast = function(caster, target, spell) target:delStatusEffect(xi.effect.BIO) local power = 4 + caster:getMod(xi.mod.DIA_DOT) - target:addStatusEffect(xi.effect.DIA, power, 3, 180, 0, 25, tier) + target:addStatusEffect(xi.effect.DIA, { power = power, duration = 180, origin = caster, tick = 3, subPower = 25, tier = tier }) end return damage diff --git a/scripts/actions/spells/white/diaga_v.lua b/scripts/actions/spells/white/diaga_v.lua index d28cf18fead..50628ff6fbf 100644 --- a/scripts/actions/spells/white/diaga_v.lua +++ b/scripts/actions/spells/white/diaga_v.lua @@ -22,7 +22,7 @@ spellObject.onSpellCast = function(caster, target, spell) target:delStatusEffect(xi.effect.BIO) local power = 5 + caster:getMod(xi.mod.DIA_DOT) - target:addStatusEffect(xi.effect.DIA, power, 3, 180, 0, 30, tier) + target:addStatusEffect(xi.effect.DIA, { power = power, duration = 180, origin = caster, tick = 3, subPower = 30, tier = tier }) end return damage diff --git a/scripts/actions/spells/white/enlight.lua b/scripts/actions/spells/white/enlight.lua index eb6cf7f06ec..bed61f1f7ba 100644 --- a/scripts/actions/spells/white/enlight.lua +++ b/scripts/actions/spells/white/enlight.lua @@ -13,7 +13,7 @@ spellObject.onSpellCast = function(caster, target, spell) local magicskill = target:getSkillLevel(xi.skill.DIVINE_MAGIC) local potency = (magicskill / 8) + 12.5 - if target:addStatusEffect(effect, potency, 0, 180) then + if target:addStatusEffect(effect, { power = potency, duration = 180, origin = caster }) then spell:setMsg(xi.msg.basic.MAGIC_GAIN_EFFECT) else spell:setMsg(xi.msg.basic.MAGIC_NO_EFFECT) diff --git a/scripts/actions/spells/white/holy_ii.lua b/scripts/actions/spells/white/holy_ii.lua index fa041f1e596..f9d25895810 100644 --- a/scripts/actions/spells/white/holy_ii.lua +++ b/scripts/actions/spells/white/holy_ii.lua @@ -13,7 +13,7 @@ spellObject.onSpellCast = function(caster, target, spell) caster:hasStatusEffect(xi.effect.DIVINE_EMBLEM) and target:isUndead() then - target:addStatusEffect(xi.effect.AMNESIA, 1, 0, math.random(20, 25)) + target:addStatusEffect(xi.effect.AMNESIA, { power = 1, duration = math.random(20, 25), origin = caster }) end return xi.spells.damage.useDamageSpell(caster, target, spell) diff --git a/scripts/actions/spells/white/reraise.lua b/scripts/actions/spells/white/reraise.lua index ef7f1a30c6f..ccbdfa8f888 100644 --- a/scripts/actions/spells/white/reraise.lua +++ b/scripts/actions/spells/white/reraise.lua @@ -10,7 +10,7 @@ end spellObject.onSpellCast = function(caster, target, spell) --duration = 1800 - target:addStatusEffect(xi.effect.RERAISE, 1, 0, 3600) --reraise 1, 30min duration + target:addStatusEffect(xi.effect.RERAISE, { power = 1, duration = 3600, origin = caster }) --reraise 1, 30min duration return xi.effect.RERAISE end diff --git a/scripts/actions/spells/white/reraise_ii.lua b/scripts/actions/spells/white/reraise_ii.lua index 045c4f14b2c..81536c03beb 100644 --- a/scripts/actions/spells/white/reraise_ii.lua +++ b/scripts/actions/spells/white/reraise_ii.lua @@ -11,7 +11,7 @@ end spellObject.onSpellCast = function(caster, target, spell) --duration = 1800 target:delStatusEffect(xi.effect.RERAISE) - target:addStatusEffect(xi.effect.RERAISE, 2, 0, 3600) --reraise 2, 30min duration + target:addStatusEffect(xi.effect.RERAISE, { power = 2, duration = 3600, origin = caster }) --reraise 2, 30min duration return xi.effect.RERAISE end diff --git a/scripts/actions/spells/white/reraise_iii.lua b/scripts/actions/spells/white/reraise_iii.lua index 3737ce03f46..ce346863ebf 100644 --- a/scripts/actions/spells/white/reraise_iii.lua +++ b/scripts/actions/spells/white/reraise_iii.lua @@ -11,7 +11,7 @@ end spellObject.onSpellCast = function(caster, target, spell) --duration = 1800 target:delStatusEffect(xi.effect.RERAISE) - target:addStatusEffect(xi.effect.RERAISE, 3, 0, 3600) --reraise 3, 30min duration + target:addStatusEffect(xi.effect.RERAISE, { power = 3, duration = 3600, origin = caster }) --reraise 3, 30min duration return xi.effect.RERAISE end diff --git a/scripts/actions/spells/white/reraise_iv.lua b/scripts/actions/spells/white/reraise_iv.lua index d3c34dd9de4..6d78039c93c 100644 --- a/scripts/actions/spells/white/reraise_iv.lua +++ b/scripts/actions/spells/white/reraise_iv.lua @@ -11,7 +11,7 @@ end spellObject.onSpellCast = function(caster, target, spell) --duration = 1800 target:delStatusEffect(xi.effect.RERAISE) - target:addStatusEffect(xi.effect.RERAISE, 4, 0, 3600) --reraise 3, 30min duration + target:addStatusEffect(xi.effect.RERAISE, { power = 4, duration = 3600, origin = caster }) --reraise 3, 30min duration return xi.effect.RERAISE end diff --git a/scripts/actions/spells/white/sacrifice.lua b/scripts/actions/spells/white/sacrifice.lua index 3e03c54daa9..8082b221f9e 100644 --- a/scripts/actions/spells/white/sacrifice.lua +++ b/scripts/actions/spells/white/sacrifice.lua @@ -19,7 +19,7 @@ spellObject.onSpellCast = function(caster, target, spell) -- only add it to me if I don't have it if not caster:hasStatusEffect(effect) then - caster:addStatusEffect(effect, statusEffect:getPower(), statusEffect:getTick(), statusEffect:getDuration()) + caster:addStatusEffect(effect, { power = statusEffect:getPower(), duration = statusEffect:getDuration(), origin = caster, tick = statusEffect:getTick() }) end target:delStatusEffect(effect) diff --git a/scripts/commands/addeffect.lua b/scripts/commands/addeffect.lua index 9d75b378340..94266cdb7ad 100644 --- a/scripts/commands/addeffect.lua +++ b/scripts/commands/addeffect.lua @@ -84,7 +84,7 @@ commandObj.onTrigger = function(player, arg1, arg2, arg3, arg4, arg5, arg6) end -- add effect - if targ:addStatusEffect(id, power, 3, duration, subId, subPower) then + if targ:addStatusEffect(id, { power = power, duration = duration, origin = player, tick = 3, subType = subId, subPower = subPower }) then targ:messagePublic(280, targ, id, id) else targ:messagePublic(283, targ, id) diff --git a/scripts/commands/chocobo.lua b/scripts/commands/chocobo.lua index 41ad96e8071..d0c40ec0d96 100644 --- a/scripts/commands/chocobo.lua +++ b/scripts/commands/chocobo.lua @@ -55,7 +55,7 @@ commandObj.onTrigger = function(player, arg, arg2, arg3, arg4) player:registerChocobo(color, traits) player:delStatusEffectSilent(xi.effect.MOUNTED) - player:addStatusEffectEx(xi.effect.MOUNTED, xi.effect.MOUNTED, xi.mount.CHOCOBO, 0, 1800, 0, 64, true) + player:addStatusEffect(xi.effect.MOUNTED, { power = xi.mount.CHOCOBO, duration = 1800, origin = player, subPower = 64, silent = true }) end return commandObj diff --git a/scripts/commands/godmode.lua b/scripts/commands/godmode.lua index 7c4ee8752a8..ddd7454859a 100644 --- a/scripts/commands/godmode.lua +++ b/scripts/commands/godmode.lua @@ -14,18 +14,18 @@ commandObj.cmdprops = local godModeOn = function(player) -- Add bonus effects to the player.. - player:addStatusEffect(xi.effect.MAX_HP_BOOST, 1000, 0, 0) - player:addStatusEffect(xi.effect.MAX_MP_BOOST, 1000, 0, 0) - player:addStatusEffect(xi.effect.MIGHTY_STRIKES, 1, 0, 0) - player:addStatusEffect(xi.effect.HUNDRED_FISTS, 1, 0, 0) - player:addStatusEffect(xi.effect.CHAINSPELL, 1, 0, 0) - player:addStatusEffect(xi.effect.PERFECT_DODGE, 1, 0, 0) - player:addStatusEffect(xi.effect.INVINCIBLE, 1, 0, 0) - player:addStatusEffect(xi.effect.ELEMENTAL_SFORZO, 1, 0, 0) - player:addStatusEffect(xi.effect.MANAFONT, 1, 0, 0) - player:addStatusEffect(xi.effect.REGAIN, 300, 0, 0) - player:addStatusEffect(xi.effect.REFRESH, 99, 0, 0) - player:addStatusEffect(xi.effect.REGEN, 99, 0, 0) + player:addStatusEffect(xi.effect.MAX_HP_BOOST, { power = 1000, origin = player }) + player:addStatusEffect(xi.effect.MAX_MP_BOOST, { power = 1000, origin = player }) + player:addStatusEffect(xi.effect.MIGHTY_STRIKES, { power = 1, origin = player }) + player:addStatusEffect(xi.effect.HUNDRED_FISTS, { power = 1, origin = player }) + player:addStatusEffect(xi.effect.CHAINSPELL, { power = 1, origin = player }) + player:addStatusEffect(xi.effect.PERFECT_DODGE, { power = 1, origin = player }) + player:addStatusEffect(xi.effect.INVINCIBLE, { power = 1, origin = player }) + player:addStatusEffect(xi.effect.ELEMENTAL_SFORZO, { power = 1, origin = player }) + player:addStatusEffect(xi.effect.MANAFONT, { power = 1, origin = player }) + player:addStatusEffect(xi.effect.REGAIN, { power = 300, origin = player }) + player:addStatusEffect(xi.effect.REFRESH, { power = 99, origin = player }) + player:addStatusEffect(xi.effect.REGEN, { power = 99, origin = player }) -- Add bonus mods to the player.. player:addMod(xi.mod.RACC, 2500) @@ -72,12 +72,12 @@ end local godModeTierOneOn = function(player) -- Add bonus effects to the player.. - player:addStatusEffect(xi.effect.MAX_HP_BOOST, 200, 0, 0) - player:addStatusEffect(xi.effect.REGAIN, 50, 0, 0) - player:addStatusEffect(xi.effect.REFRESH, 999, 0, 0) - player:addStatusEffect(xi.effect.REGEN, 999, 0, 0) - player:addStatusEffect(xi.effect.CHAINSPELL, 1, 0, 0) - player:addStatusEffect(xi.effect.MANAFONT, 1, 0, 0) + player:addStatusEffect(xi.effect.MAX_HP_BOOST, { power = 200, origin = player }) + player:addStatusEffect(xi.effect.REGAIN, { power = 50, origin = player }) + player:addStatusEffect(xi.effect.REFRESH, { power = 999, origin = player }) + player:addStatusEffect(xi.effect.REGEN, { power = 999, origin = player }) + player:addStatusEffect(xi.effect.CHAINSPELL, { power = 1, origin = player }) + player:addStatusEffect(xi.effect.MANAFONT, { power = 1, origin = player }) -- Heal the player from the new buffs.. player:addHP(50000) diff --git a/scripts/commands/immortal.lua b/scripts/commands/immortal.lua index 4203d99023f..e3cc8b2392f 100644 --- a/scripts/commands/immortal.lua +++ b/scripts/commands/immortal.lua @@ -42,7 +42,7 @@ commandObj.onTrigger = function(player, target) targ:delStatusEffectSilent(0) targ:setCharVar('Immortal', 0) else - targ:addStatusEffectEx(0, xi.effect.TRANSCENDENCY, 0, 0, 0) + targ:addStatusEffect(xi.effect.NONE, { origin = player, icon = xi.effect.TRANSCENDENCY }) targ:setCharVar('Immortal', 1) immortal = true end diff --git a/scripts/commands/mount.lua b/scripts/commands/mount.lua index 00eeef0c18a..3f32823f825 100644 --- a/scripts/commands/mount.lua +++ b/scripts/commands/mount.lua @@ -37,7 +37,7 @@ commandObj.onTrigger = function(player, mount, target) end end - targ:addStatusEffectEx(xi.effect.MOUNTED, xi.effect.MOUNTED, mount, 0, 0, true) + targ:addStatusEffect(xi.effect.MOUNTED, { power = mount, origin = player, silent = true }) end return commandObj diff --git a/scripts/commands/petgodmode.lua b/scripts/commands/petgodmode.lua index 01d0ba2097d..dab7ada63a7 100644 --- a/scripts/commands/petgodmode.lua +++ b/scripts/commands/petgodmode.lua @@ -22,18 +22,18 @@ commandObj.onTrigger = function(player) pet:setLocalVar('GodMode', 1) -- Add bonus effects to the pet.. - pet:addStatusEffect(xi.effect.MAX_HP_BOOST, 1000, 0, 0) - pet:addStatusEffect(xi.effect.MAX_MP_BOOST, 1000, 0, 0) - pet:addStatusEffect(xi.effect.SENTINEL, 100, 0, 0) - pet:addStatusEffect(xi.effect.MIGHTY_STRIKES, 1, 0, 0) - pet:addStatusEffect(xi.effect.HUNDRED_FISTS, 1, 0, 0) - pet:addStatusEffect(xi.effect.CHAINSPELL, 1, 0, 0) - pet:addStatusEffect(xi.effect.PERFECT_DODGE, 1, 0, 0) - pet:addStatusEffect(xi.effect.INVINCIBLE, 1, 0, 0) - pet:addStatusEffect(xi.effect.MANAFONT, 1, 0, 0) - pet:addStatusEffect(xi.effect.REGAIN, 150, 1, 0) - pet:addStatusEffect(xi.effect.REFRESH, 99, 0, 0) - pet:addStatusEffect(xi.effect.REGEN, 99, 0, 0) + pet:addStatusEffect(xi.effect.MAX_HP_BOOST, { power = 1000, origin = player }) + pet:addStatusEffect(xi.effect.MAX_MP_BOOST, { power = 1000, origin = player }) + pet:addStatusEffect(xi.effect.SENTINEL, { power = 100, origin = player }) + pet:addStatusEffect(xi.effect.MIGHTY_STRIKES, { power = 1, origin = player }) + pet:addStatusEffect(xi.effect.HUNDRED_FISTS, { power = 1, origin = player }) + pet:addStatusEffect(xi.effect.CHAINSPELL, { power = 1, origin = player }) + pet:addStatusEffect(xi.effect.PERFECT_DODGE, { power = 1, origin = player }) + pet:addStatusEffect(xi.effect.INVINCIBLE, { power = 1, origin = player }) + pet:addStatusEffect(xi.effect.MANAFONT, { power = 1, origin = player }) + pet:addStatusEffect(xi.effect.REGAIN, { power = 150, origin = player, tick = 1 }) + pet:addStatusEffect(xi.effect.REFRESH, { power = 99, origin = player }) + pet:addStatusEffect(xi.effect.REGEN, { power = 99, origin = player }) -- Add bonus mods to the pet.. pet:addMod(xi.mod.RACC, 2500) diff --git a/scripts/commands/stun.lua b/scripts/commands/stun.lua index 311ba574e10..5a9c171680c 100644 --- a/scripts/commands/stun.lua +++ b/scripts/commands/stun.lua @@ -17,7 +17,7 @@ commandObj.onTrigger = function(player) local stun = targ:getStatusEffect(xi.effect.STUN) targ:delStatusEffect(xi.effect.STUN) if not stun or stun:getPower() ~= 69 then -- it's toggleable - targ:addStatusEffect(xi.effect.STUN, 69, 0, 3600) + targ:addStatusEffect(xi.effect.STUN, { power = 69, duration = 3600, origin = player }) player:printToPlayer('Gave target super Stun.') else player:printToPlayer('Removed target mob\'s super Stun.') diff --git a/scripts/effects/allied_tags.lua b/scripts/effects/allied_tags.lua index 4f57c4ccb51..e7c997199f2 100644 --- a/scripts/effects/allied_tags.lua +++ b/scripts/effects/allied_tags.lua @@ -6,7 +6,7 @@ local effectObject = {} effectObject.onEffectGain = function(target, effect) if target:getPet() then - target:getPet():addStatusEffect(effect) + target:getPet():copyStatusEffect(effect) end end diff --git a/scripts/effects/battlefield.lua b/scripts/effects/battlefield.lua index 547d2554117..d16f3720073 100644 --- a/scripts/effects/battlefield.lua +++ b/scripts/effects/battlefield.lua @@ -10,7 +10,7 @@ local effectObject = {} effectObject.onEffectGain = function(target, effect) if target:getPet() then - target:getPet():addStatusEffect(effect) + target:getPet():copyStatusEffect(effect) end if target:getObjType() == xi.objType.PC then diff --git a/scripts/effects/confrontation.lua b/scripts/effects/confrontation.lua index 82187201560..af67c70e1da 100644 --- a/scripts/effects/confrontation.lua +++ b/scripts/effects/confrontation.lua @@ -6,7 +6,7 @@ local effectObject = {} effectObject.onEffectGain = function(target, effect) if target:getPet() then - target:getPet():addStatusEffect(effect) + target:getPet():copyStatusEffect(effect) end end diff --git a/scripts/effects/leavegame.lua b/scripts/effects/leavegame.lua index 01e548313b8..a848644b781 100644 --- a/scripts/effects/leavegame.lua +++ b/scripts/effects/leavegame.lua @@ -28,7 +28,7 @@ effectObject.onEffectGain = function(target, effect) -- addStatusEffect (non-Ex) forces the icon to the effect ID... if not target:hasStatusEffect(xi.effect.HEALING) then - target:addStatusEffectEx(xi.effect.HEALING, 0, 0, xi.settings.map.HEALING_TICK_DELAY, 0, true) + target:addStatusEffect(xi.effect.HEALING, { origin = target, tick = xi.settings.map.HEALING_TICK_DELAY, icon = 0, silent = true }) end -- Note: Power stores the kind. diff --git a/scripts/effects/pennant.lua b/scripts/effects/pennant.lua index e3ec9248b82..694cf0d6f2c 100644 --- a/scripts/effects/pennant.lua +++ b/scripts/effects/pennant.lua @@ -6,7 +6,7 @@ local effectObject = {} effectObject.onEffectGain = function(target, effect) if target:getPet() then - target:getPet():addStatusEffect(effect) + target:getPet():copyStatusEffect(effect) end end diff --git a/scripts/effects/reive_mark.lua b/scripts/effects/reive_mark.lua index 1857a712d48..36e1c78a4bf 100644 --- a/scripts/effects/reive_mark.lua +++ b/scripts/effects/reive_mark.lua @@ -6,7 +6,7 @@ local effectObject = {} effectObject.onEffectGain = function(target, effect) if target:getPet() then - target:getPet():addStatusEffect(effect) + target:getPet():copyStatusEffect(effect) end end diff --git a/scripts/effects/sublimation_activated.lua b/scripts/effects/sublimation_activated.lua index 69a00d1c679..1040d96038e 100644 --- a/scripts/effects/sublimation_activated.lua +++ b/scripts/effects/sublimation_activated.lua @@ -57,7 +57,7 @@ effectObject.onEffectTick = function(target, effect) if complete then target:delStatusEffectSilent(xi.effect.SUBLIMATION_ACTIVATED) - target:addStatusEffect(xi.effect.SUBLIMATION_COMPLETE, store, 0, 7200) + target:addStatusEffect(xi.effect.SUBLIMATION_COMPLETE, { power = store, duration = 7200, origin = target }) else effect:setPower(store) end diff --git a/scripts/events/egg_hunt_egg-stravaganza.lua b/scripts/events/egg_hunt_egg-stravaganza.lua index d5e60e95383..6942e25f3f7 100644 --- a/scripts/events/egg_hunt_egg-stravaganza.lua +++ b/scripts/events/egg_hunt_egg-stravaganza.lua @@ -570,7 +570,7 @@ local regionControl = function(player, npc, trade) -- Beastmen controlled if owner == 3 then local costume = beastCostumes[math.random(#beastCostumes)] - player:addStatusEffect(xi.effect.COSTUME, costume, 0, utils.minutes(60)) + player:addStatusEffect(xi.effect.COSTUME, { power = costume, duration = utils.minutes(60), origin = player }) player:confirmTrade() return diff --git a/scripts/globals/abyssea.lua b/scripts/globals/abyssea.lua index 5cf2ba0a720..339a996235f 100644 --- a/scripts/globals/abyssea.lua +++ b/scripts/globals/abyssea.lua @@ -689,7 +689,7 @@ xi.abyssea.visionsCruorProspectorOnEventFinish = function(player, csid, option, if enhanceData[2] <= cruorTotal then for _, v in ipairs(enhanceData[1]) do - player:addStatusEffectEx(v[1], v[2], v[3] + xi.abyssea.getAbyssiteTotal(player, v[4]) * v[5], 0, 0) + player:addStatusEffect(v[1], { power = v[3] + xi.abyssea.getAbyssiteTotal(player, v[4]) * v[5], origin = player, icon = v[2] }) if v[1] == xi.effect.ABYSSEA_HP then player:addHP(v[3] + xi.abyssea.getAbyssiteTotal(player, v[4]) * v[5]) @@ -866,7 +866,7 @@ xi.abyssea.procMonster = function(mob, player, triggerType) end mob:weaknessTrigger(2) - mob:addStatusEffect(xi.effect.TERROR, 0, 0, 30) + mob:addStatusEffect(xi.effect.TERROR, { duration = 30, origin = player }) elseif triggerType == xi.abyssea.triggerType.YELLOW then if mob:getLocalVar('[AbysseaYellowProc]') == 0 then mob:setLocalVar('[AbysseaYellowProc]', 1) @@ -875,7 +875,7 @@ xi.abyssea.procMonster = function(mob, player, triggerType) end mob:weaknessTrigger(1) - mob:addStatusEffect(xi.effect.TERROR, 0, 0, 30) + mob:addStatusEffect(xi.effect.TERROR, { duration = 30, origin = player }) elseif triggerType == xi.abyssea.triggerType.BLUE then if mob:getLocalVar('[AbysseaBlueProc]') == 0 then mob:setLocalVar('[AbysseaBlueProc]', 1) @@ -884,7 +884,7 @@ xi.abyssea.procMonster = function(mob, player, triggerType) end mob:weaknessTrigger(0) - mob:addStatusEffect(xi.effect.TERROR, 0, 0, 30) + mob:addStatusEffect(xi.effect.TERROR, { duration = 30, origin = player }) end end end @@ -1154,7 +1154,7 @@ end xi.abyssea.onZoneIn = function(player) -- If the player is a GM, and has GM toggled active, give them permanent visitant status. if player:getGMLevel() > 0 and player:getVisibleGMLevel() >= 3 then - player:addStatusEffectEx(xi.effect.VISITANT, xi.effect.VISITANT, 0, 0, 0) + player:addStatusEffect(xi.effect.VISITANT, { origin = player }) end end @@ -1174,7 +1174,7 @@ xi.abyssea.afterZoneIn = function(player) -- the countdown timer for visitant status reach 0 before actually running out of time on -- the effect. if not player:hasStatusEffect(xi.effect.VISITANT) then - player:addStatusEffectEx(xi.effect.VISITANT, 0, 0, 3, 304) + player:addStatusEffect(xi.effect.VISITANT, { duration = 304, origin = player, tick = 3, icon = 0 }) end local visitantEffect = player:getStatusEffect(xi.effect.VISITANT) diff --git a/scripts/globals/abyssea/atma.lua b/scripts/globals/abyssea/atma.lua index 6aae86acc94..34efdc9f338 100644 --- a/scripts/globals/abyssea/atma.lua +++ b/scripts/globals/abyssea/atma.lua @@ -371,7 +371,7 @@ local function addAtma(player, selectedAtma) availableAtmaSlot > 0 and not hasDuplicateAtmaEffect(player, atmaValue) then - player:addStatusEffectEx(xi.effect.ATMA, xi.effect.ATMA, atmaValue, 0, 0, availableAtmaSlot) + player:addStatusEffect(xi.effect.ATMA, { power = atmaValue, origin = player, subType = availableAtmaSlot }) local atmaEffect = player:getStatusEffect(xi.effect.ATMA, availableAtmaSlot) atmaEffect:addEffectFlag(xi.effectFlag.ON_ZONE) diff --git a/scripts/globals/additional_effects.lua b/scripts/globals/additional_effects.lua index 9434ea71c0f..d2aff863817 100644 --- a/scripts/globals/additional_effects.lua +++ b/scripts/globals/additional_effects.lua @@ -281,7 +281,7 @@ xi.additionalEffect.procFunctions[xi.additionalEffect.procType.DEBUFF] = functio local tick = xi.additionalEffect.statusAttack(effectId, target) local duration = math.floor(params.duration * resistRate) - target:addStatusEffect(effectId, power, tick, duration) + target:addStatusEffect(effectId, { power = power, duration = duration, origin = actor, tick = tick }) return subEffect, xi.msg.basic.ADD_EFFECT_STATUS_2, effectId end @@ -442,12 +442,12 @@ xi.additionalEffect.procFunctions[xi.additionalEffect.procType.SELF_BUFF] = fun then return 0, 0, 0 else - attacker:addStatusEffect(xi.effect.BLINK, params.power, 0, params.duration) + attacker:addStatusEffect(xi.effect.BLINK, { power = params.power, duration = params.duration, origin = attacker }) msgID = xi.msg.basic.ADD_EFFECT_SELFBUFF msgParam = xi.effect.BLINK end elseif params.addStatus == xi.effect.HASTE then - attacker:addStatusEffect(xi.effect.HASTE, params.power, 0, params.duration, 0, 0) + attacker:addStatusEffect(xi.effect.HASTE, { power = params.power, duration = params.duration, origin = attacker }) -- Todo: verify power/duration/tier/overwrite etc msgID = xi.msg.basic.ADD_EFFECT_SELFBUFF msgParam = xi.effect.HASTE diff --git a/scripts/globals/aftermath.lua b/scripts/globals/aftermath.lua index f490059213e..b58652a5cb8 100644 --- a/scripts/globals/aftermath.lua +++ b/scripts/globals/aftermath.lua @@ -602,21 +602,21 @@ xi.aftermath.addStatusEffect = function(player, tp, weaponSlot, aftermathType) { -- Relic [1] = function(x) - player:addStatusEffect(xi.effect.AFTERMATH, id, 0, aftermath.duration(tp), 0, tp, aftermathType) + player:addStatusEffect(xi.effect.AFTERMATH, { power = id, duration = aftermath.duration(tp), origin = player, subPower = tp, tier = aftermathType }) end, -- Mythic [2] = function(x) local tier = math.floor(tp / 1000) local icon = xi.effect['AFTERMATH_LV'..tier] - player:addStatusEffectEx(xi.effect.AFTERMATH, icon, id, 0, aftermath.duration[tier], 0, tp, aftermathType) + player:addStatusEffect(xi.effect.AFTERMATH, { power = id, duration = aftermath.duration[tier], origin = player, icon = icon, subPower = tp, tier = aftermathType }) end, -- Empyrean [3] = function(x) local tier = math.floor(tp / 1000) local icon = xi.effect['AFTERMATH_LV'..tier] - player:addStatusEffectEx(xi.effect.AFTERMATH, icon, id, 0, aftermath.duration[tier], 0, tp, aftermathType) + player:addStatusEffect(xi.effect.AFTERMATH, { power = id, duration = aftermath.duration[tier], origin = player, icon = icon, subPower = tp, tier = aftermathType }) end } end @@ -639,7 +639,7 @@ xi.aftermath.onEffectGain = function(target, effect) then -- pets gain same mods as the player, so give them the effect without a loss message pet:delStatusEffectSilent(xi.effect.AFTERMATH) - pet:addStatusEffect(xi.effect.AFTERMATH, effect:getPower(), 0, effect:getDuration() / 1000, 0, effect:getSubPower(), effect:getTier()) + pet:addStatusEffect(xi.effect.AFTERMATH, { power = effect:getPower(), duration = effect:getDuration() / 1000, origin = target, subPower = effect:getSubPower(), tier = effect:getTier() }) pet:getStatusEffect(xi.effect.AFTERMATH):addEffectFlag(xi.effectFlag.NO_LOSS_MESSAGE) end @@ -656,7 +656,7 @@ xi.aftermath.onEffectGain = function(target, effect) if pet then -- pets gain same mods as the player, so give them the effect without a loss message pet:delStatusEffectSilent(xi.effect.AFTERMATH) - pet:addStatusEffect(xi.effect.AFTERMATH, effect:getPower(), 0, effect:getDuration() / 1000, 0, effect:getSubPower(), effect:getTier()) + pet:addStatusEffect(xi.effect.AFTERMATH, { power = effect:getPower(), duration = effect:getDuration() / 1000, origin = target, subPower = effect:getSubPower(), tier = effect:getTier() }) pet:getStatusEffect(xi.effect.AFTERMATH):addEffectFlag(xi.effectFlag.NO_LOSS_MESSAGE) end diff --git a/scripts/globals/assault.lua b/scripts/globals/assault.lua index 88e9d428b95..62a037db47e 100644 --- a/scripts/globals/assault.lua +++ b/scripts/globals/assault.lua @@ -87,7 +87,7 @@ xi.assault.afterInstanceRegister = function(player, fireFlies) player:addTempItem(fireFlies) if levelCap ~= 0 then - player:addStatusEffect(xi.effect.LEVEL_RESTRICTION, levelCap, 0, 0) + player:addStatusEffect(xi.effect.LEVEL_RESTRICTION, { power = levelCap, origin = player }) end for _, entity in pairs(ID.mob[assaultID].MOBS_START) do diff --git a/scripts/globals/automaton.lua b/scripts/globals/automaton.lua index 4d68515cb80..679a59c36ac 100644 --- a/scripts/globals/automaton.lua +++ b/scripts/globals/automaton.lua @@ -356,7 +356,7 @@ xi.automaton.onUseManeuver = function(player, target, ability, action) if overload ~= 0 then target:removeAllManeuvers() - target:addStatusEffect(xi.effect.OVERLOAD, 0, 0, overload) + target:addStatusEffect(xi.effect.OVERLOAD, { duration = overload, origin = player }) action:messageID(player:getID(), xi.msg.basic.AUTO_OVERLOADED) else local pupLevel @@ -373,7 +373,7 @@ xi.automaton.onUseManeuver = function(player, target, ability, action) end local duration = player:getPet():getLocalVar('MANEUVER_DURATION') - target:addStatusEffect(maneuverInfo[1], bonus, 0, utils.clamp(duration, 60, 300)) + target:addStatusEffect(maneuverInfo[1], { power = bonus, duration = utils.clamp(duration, 60, 300), origin = player }) end return target:getOverloadChance(maneuverInfo[2] - 1) diff --git a/scripts/globals/avatars_favor.lua b/scripts/globals/avatars_favor.lua index ad60f3de052..d5aa87048f6 100644 --- a/scripts/globals/avatars_favor.lua +++ b/scripts/globals/avatars_favor.lua @@ -134,7 +134,7 @@ xi.avatarsFavor.applyAvatarsFavorAuraToPet = function(target, effect) --Useful debug message --printf('Power %d, Effect %d', effect:getPower(), power) - pet:addStatusEffectEx(avatarEffect, avatarEffect, 6, 3, 15, avatarEffect, power, xi.auraTarget.ALLIES, bit.bor(xi.effectFlag.NO_LOSS_MESSAGE, xi.effectFlag.AURA)) + pet:addStatusEffect(avatarEffect, { power = 6, duration = 15, origin = pet, tick = 3, subType = avatarEffect, subPower = power, tier = xi.auraTarget.ALLIES, flag = bit.bor(xi.effectFlag.NO_LOSS_MESSAGE, xi.effectFlag.AURA) }) end end end diff --git a/scripts/globals/battlefield.lua b/scripts/globals/battlefield.lua index fb374c03cfd..d3424c19feb 100644 --- a/scripts/globals/battlefield.lua +++ b/scripts/globals/battlefield.lua @@ -885,7 +885,7 @@ function Battlefield:onEntryEventUpdate(player, csid, option, npc) not member:hasStatusEffect(xi.effect.BATTLEFIELD) and not member:getBattlefield() then - member:addStatusEffect(effect) + member:copyStatusEffect(effect) member:registerBattlefield(self.battlefieldId, area, player:getID(), self) end end diff --git a/scripts/globals/besieged.lua b/scripts/globals/besieged.lua index 616909ab662..285e0810cc6 100644 --- a/scripts/globals/besieged.lua +++ b/scripts/globals/besieged.lua @@ -215,7 +215,7 @@ xi.besieged.onEventFinish = function(player, csid, option, npc) player:delCurrency('imperial_standing', 100) player:delStatusEffectsByFlag(xi.effectFlag.INFLUENCE, true) - player:addStatusEffect(xi.effect.SANCTION, option / 16, 0, duration, subPower) + player:addStatusEffect(xi.effect.SANCTION, { power = option / 16, duration = duration, origin = player, subType = subPower }) player:messageSpecial(ID.text.SANCTION) -- Player bought a map diff --git a/scripts/globals/bluemagic.lua b/scripts/globals/bluemagic.lua index 12ba30d972d..15bcf548693 100644 --- a/scripts/globals/bluemagic.lua +++ b/scripts/globals/bluemagic.lua @@ -209,7 +209,7 @@ local function calculateNukeWallFactor(target, spellElement, finalDamage) local finalPotency = utils.clamp(math.floor(4000 * finalDamage / damageCap) + potency, 0, 4000) -- Renew status effect without messages. - target:addStatusEffectEx(xi.effect.NUKE_WALL, 0, finalPotency, 0, 5, 0, spellElement) + target:addStatusEffect(xi.effect.NUKE_WALL, { power = finalPotency, duration = 5, origin = target, icon = 0, subPower = spellElement }) ----------------------------------- -- We return JUST the factor based on previous nuke. This nuke only affects the next one. @@ -738,7 +738,7 @@ xi.spells.blue.useEnfeeblingSpell = function(caster, target, spell, params) return effect end - if target:addStatusEffect(effect, params.power, params.tick, math.floor(params.duration * resist)) then + if target:addStatusEffect(effect, { power = params.power, duration = math.floor(params.duration * resist), origin = caster, tick = params.tick }) then -- Add "Magic Burst!" message local _, skillchainCount = xi.magicburst.formMagicBurst(target, spellElement) -- External function. Not present in magic.lua. @@ -813,7 +813,7 @@ xi.spells.blue.applyBlueAdditionalEffect = function(caster, target, params, effe not xi.data.statusEffect.isTargetResistant(caster, target, effect) and -- Target didn't trigger a job trait resistance. not xi.data.statusEffect.isEffectNullified(target, effect, 0) -- Target doesn't have an status effect that nullifies current. TODO: Tier. then - target:addStatusEffect(effect, power, tick, math.floor(duration * resist)) + target:addStatusEffect(effect, { power = power, duration = math.floor(duration * resist), origin = caster, tick = tick }) end end end diff --git a/scripts/globals/brigands_chart.lua b/scripts/globals/brigands_chart.lua index 30728eaa6de..a75b57278b0 100644 --- a/scripts/globals/brigands_chart.lua +++ b/scripts/globals/brigands_chart.lua @@ -116,7 +116,7 @@ xi.brigandsChart.onEventUpdate = function(player, csid, option, npc) player:changeMusic(1, 136) player:changeMusic(2, 136) player:changeMusic(3, 136) - player:addStatusEffect(xi.effect.LEVEL_RESTRICTION, 20, 0, 0) -- level restriction removed by event end + player:addStatusEffect(xi.effect.LEVEL_RESTRICTION, { power = 20, origin = player }) -- level restriction removed by event end end end diff --git a/scripts/globals/campaign.lua b/scripts/globals/campaign.lua index d925ab39fb9..185fd211731 100644 --- a/scripts/globals/campaign.lua +++ b/scripts/globals/campaign.lua @@ -365,7 +365,7 @@ xi.campaign.sigilOnEventFinish = function(player, csid, option, npc) -- 3: EXP Loss Reduction player:delStatusEffectsByFlag(xi.effectFlag.INFLUENCE, true) - player:addStatusEffect(xi.effect.SIGIL, selectedEffects, 0, duration, 0, subPower, 0) + player:addStatusEffect(xi.effect.SIGIL, { power = selectedEffects, duration = duration, origin = player, subPower = subPower }) player:messageSpecial(zones[zoneId].text.ALLIED_SIGIL) if bonusCost > 0 then diff --git a/scripts/globals/chocobo.lua b/scripts/globals/chocobo.lua index a39ff98e16c..6ad85f8c154 100644 --- a/scripts/globals/chocobo.lua +++ b/scripts/globals/chocobo.lua @@ -244,7 +244,7 @@ xi.chocobo.renterOnEventFinish = function(player, csid, option, eventSucceed) end end - player:addStatusEffectEx(xi.effect.MOUNTED, xi.effect.MOUNTED, 0, 0, duration, true) + player:addStatusEffect(xi.effect.MOUNTED, { duration = duration, origin = player, silent = true }) -- Renting a chocobo force despawns every type of pets -- Note: This does not honor cooldown reductions offered otherwise when dismissing pets with full life. diff --git a/scripts/globals/combat/action_additional_effect_status.lua b/scripts/globals/combat/action_additional_effect_status.lua index 027f26bfe85..101c1709eac 100644 --- a/scripts/globals/combat/action_additional_effect_status.lua +++ b/scripts/globals/combat/action_additional_effect_status.lua @@ -92,7 +92,7 @@ xi.combat.action.executeAddEffectEnhancement = function(actor, target, fedData) end -- Apply effect. - if params.aeTarget:addStatusEffect(params.effectId, params.power, params.tick, params.duration, params.subType, params.subPower, params.tier) then + if params.aeTarget:addStatusEffect(params.effectId, { power = params.power, duration = params.duration, origin = actor, tick = params.tick, subType = params.subType, subPower = params.subPower, tier = params.tier }) then return params.animation, params.message, params.effectId end @@ -137,7 +137,7 @@ xi.combat.action.executeAddEffectEnfeeblement = function(actor, target, fedData) local totalDuration = math.floor(params.duration * resistanceRate) -- Apply effect. - if params.aeTarget:addStatusEffect(params.effectId, params.power, params.tick, totalDuration, params.subType, params.subPower, params.tier) then + if params.aeTarget:addStatusEffect(params.effectId, { power = params.power, duration = totalDuration, origin = actor, tick = params.tick, subType = params.subType, subPower = params.subPower, tier = params.tier }) then return params.animation, params.message, params.effectId end diff --git a/scripts/globals/combat/action_mobskill_status_effect.lua b/scripts/globals/combat/action_mobskill_status_effect.lua index df7db8a6672..1ed1dd0d26c 100644 --- a/scripts/globals/combat/action_mobskill_status_effect.lua +++ b/scripts/globals/combat/action_mobskill_status_effect.lua @@ -86,7 +86,7 @@ xi.combat.action.executeMobskillStatusEffect = function(actor, target, skill, ef local totalDuration = math.floor(params.duration * resistanceRate) -- Apply effect. - if target:addStatusEffect(params.effectId, params.power, params.tick, totalDuration, params.subType, params.subPower, params.tier) then + if target:addStatusEffect(params.effectId, { power = params.power, duration = totalDuration, origin = actor, tick = params.tick, subType = params.subType, subPower = params.subPower, tier = params.tier }) then return handleReturn(skill, setMessage, xi.msg.basic.SKILL_ENFEEB_IS, step.APPLICATION_SUCCESS) end diff --git a/scripts/globals/confrontation.lua b/scripts/globals/confrontation.lua index b97b2e34b84..c88e3981bd7 100644 --- a/scripts/globals/confrontation.lua +++ b/scripts/globals/confrontation.lua @@ -232,7 +232,7 @@ xi.confrontation.start = function(player, npc, mobIds, params) for _, member in ipairs(alliance) do -- Using the pop npc's ID as the 'key' - member:addStatusEffect(xi.effect.CONFRONTATION, lookupKey, 0, 0) + member:addStatusEffect(xi.effect.CONFRONTATION, { power = lookupKey, origin = member }) table.insert(registeredPlayerIds, member:getID()) end @@ -241,7 +241,7 @@ xi.confrontation.start = function(player, npc, mobIds, params) local mob = GetMobByID(mobId) if mob then - mob:addStatusEffect(xi.effect.CONFRONTATION, lookupKey, 0, 0) + mob:addStatusEffect(xi.effect.CONFRONTATION, { power = lookupKey, origin = mob }) mob:addListener('DEATH', 'CONFRONTATION_DEATH', function(mobArg) mobArg:removeListener('CONFRONTATION_DEATH') xi.confrontation.check(lookupKey, false) diff --git a/scripts/globals/conquest.lua b/scripts/globals/conquest.lua index 9706e9a6b14..91692bdcfe2 100644 --- a/scripts/globals/conquest.lua +++ b/scripts/globals/conquest.lua @@ -1353,7 +1353,7 @@ xi.conquest.overseerOnEventFinish = function(player, csid, option, guardNation, if option == 1 then local duration = (pRank + GetNationRank(pNation) + 3) * 3600 player:delStatusEffectsByFlag(xi.effectFlag.INFLUENCE, true) - player:addStatusEffect(xi.effect.SIGNET, 0, 0, duration) + player:addStatusEffect(xi.effect.SIGNET, { duration = duration, origin = player }) player:messageSpecial(mOffset + 1) -- 'You've received your nation's Signet!' if player:getEminenceProgress(3367) then @@ -1474,11 +1474,11 @@ xi.conquest.vendorOnEventFinish = function(player, option, vendorRegion) xi.shop.outpost(player) elseif option == 2 then if player:delGil(fee) then - player:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.HOME_NATION, 0, 1, 0, vendorRegion) + player:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.HOME_NATION, duration = 1, origin = player, icon = 0, subPower = vendorRegion }) end elseif option == 6 then player:delCP(fee) - player:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.HOME_NATION, 0, 1, 0, vendorRegion) + player:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.HOME_NATION, duration = 1, origin = player, icon = 0, subPower = vendorRegion }) end end @@ -1517,7 +1517,7 @@ xi.conquest.teleporterOnEventFinish = function(player, csid, option, teleporterE xi.conquest.canTeleportToOutpost(player, region) and player:delGil(fee) then - player:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.OUTPOST, 0, 1, 0, region) + player:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.OUTPOST, duration = 1, origin = player, icon = 0, subPower = region }) end -- TELEPORT WITH CP @@ -1530,7 +1530,7 @@ xi.conquest.teleporterOnEventFinish = function(player, csid, option, teleporterE player:getCP() >= cpFee then player:delCP(cpFee) - player:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.OUTPOST, 0, 1, 0, region) + player:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.OUTPOST, duration = 1, origin = player, icon = 0, subPower = region }) end end end diff --git a/scripts/globals/dynamis.lua b/scripts/globals/dynamis.lua index 8bf04d06099..9b06a3805a4 100644 --- a/scripts/globals/dynamis.lua +++ b/scripts/globals/dynamis.lua @@ -465,10 +465,10 @@ xi.dynamis.zoneOnZoneIn = function(player, prevZone) playerArg:messageBasic(xi.msg.basic.UNABLE_TO_ACCESS_SJ) end) - player:addStatusEffect(xi.effect.SJ_RESTRICTION, 0, 0, 0, 0, 0) + player:addStatusEffect(xi.effect.SJ_RESTRICTION, { origin = player }) end - player:addStatusEffectEx(xi.effect.DYNAMIS, 0, 0, 3, 3600) + player:addStatusEffect(xi.effect.DYNAMIS, { duration = 3600, origin = player, tick = 3, icon = 0 }) player:timer(5500, function(playerArg) playerArg:messageSpecial(ID.text.DYNAMIS_TIME_BEGIN, 60, xi.ki.PRISMATIC_HOURGLASS) end) @@ -827,19 +827,19 @@ xi.dynamis.procMonster = function(mob, player) math.random(1, 100) == 1 then mob:setLocalVar('dynamis_proc', 4) - mob:addStatusEffect(xi.effect.TERROR, 0, 0, 30) + mob:addStatusEffect(xi.effect.TERROR, { duration = 30, origin = player }) mob:weaknessTrigger(3) elseif extensions == 5 then mob:setLocalVar('dynamis_proc', 3) - mob:addStatusEffect(xi.effect.TERROR, 0, 0, 30) + mob:addStatusEffect(xi.effect.TERROR, { duration = 30, origin = player }) mob:weaknessTrigger(2) elseif extensions == 4 then mob:setLocalVar('dynamis_proc', 2) - mob:addStatusEffect(xi.effect.TERROR, 0, 0, 30) + mob:addStatusEffect(xi.effect.TERROR, { duration = 30, origin = player }) mob:weaknessTrigger(1) elseif extensions == 3 then mob:setLocalVar('dynamis_proc', 1) - mob:addStatusEffect(xi.effect.TERROR, 0, 0, 30) + mob:addStatusEffect(xi.effect.TERROR, { duration = 30, origin = player }) mob:weaknessTrigger(0) end end diff --git a/scripts/globals/garrison.lua b/scripts/globals/garrison.lua index 8f8812a0ac2..ecc4bd238a8 100644 --- a/scripts/globals/garrison.lua +++ b/scripts/globals/garrison.lua @@ -92,7 +92,7 @@ xi.garrison.addLevelCap = function(entity, definedCap) end -- Note the level restriction does not wear on death. - entity:addStatusEffectEx(xi.effect.LEVEL_RESTRICTION, xi.effect.LEVEL_RESTRICTION, cap, 0, 0, 0, 0, 0, xi.effectFlag.ON_ZONE + xi.effectFlag.CONFRONTATION) + entity:addStatusEffect(xi.effect.LEVEL_RESTRICTION, { power = cap, origin = entity, flag = xi.effectFlag.ON_ZONE + xi.effectFlag.CONFRONTATION }) end ----------------------------------- diff --git a/scripts/globals/harvest_festivals.lua b/scripts/globals/harvest_festivals.lua index bb5cf5192f2..68e991f0435 100644 --- a/scripts/globals/harvest_festivals.lua +++ b/scripts/globals/harvest_festivals.lua @@ -195,7 +195,7 @@ xi.events.harvestFestival.onHalloweenTrade = function(player, trade, npc) local halloweenCostumeList = { quadav, orc, yagudo, shade, ghost, hound, skeleton, darkStalker } local costumePicked = halloweenCostumeList[math.random(1, #halloweenCostumeList)] -- will randomly pick one of the costumes in the list - player:addStatusEffect(xi.effect.COSTUME, costumePicked, 0, 3600) + player:addStatusEffect(xi.effect.COSTUME, { power = costumePicked, duration = 3600, origin = player }) -- pitchForkCostumeList defines the special costumes per zone that can trigger the pitch fork requirement -- zone, costumeID diff --git a/scripts/globals/hobbies/crafting/image_support.lua b/scripts/globals/hobbies/crafting/image_support.lua index cc41060c5e2..a9508b4e0a8 100644 --- a/scripts/globals/hobbies/crafting/image_support.lua +++ b/scripts/globals/hobbies/crafting/image_support.lua @@ -57,9 +57,9 @@ local function freeImageSupport(player, effectId) player:delStatusEffectsByFlag(xi.effectFlag.SYNTH_SUPPORT, true) if effectId == xi.effect.FISHING_IMAGERY then - player:addStatusEffect(effectId, 1, 0, 3600) + player:addStatusEffect(effectId, { power = 1, duration = 3600, origin = player }) else - player:addStatusEffect(effectId, 1, 0, 120) + player:addStatusEffect(effectId, { power = 1, duration = 120, origin = player }) end end @@ -68,9 +68,9 @@ local function advancedImageSupport(player, effectId) player:delStatusEffectsByFlag(xi.effectFlag.SYNTH_SUPPORT, true) if effectId == xi.effect.FISHING_IMAGERY then - player:addStatusEffect(effectId, 2, 0, 7200) + player:addStatusEffect(effectId, { power = 2, duration = 7200, origin = player }) else - player:addStatusEffect(effectId, 3, 0, 480, 10) + player:addStatusEffect(effectId, { power = 3, duration = 480, origin = player, subType = 10 }) end end diff --git a/scripts/globals/item_utils.lua b/scripts/globals/item_utils.lua index 5275b557d8d..dd955eaba91 100644 --- a/scripts/globals/item_utils.lua +++ b/scripts/globals/item_utils.lua @@ -167,7 +167,7 @@ xi.itemUtils.addItemShield = function(target, power, duration, effect, subPower) target:delStatusEffect(xi.effect.PHYSICAL_SHIELD) target:delStatusEffect(xi.effect.MAGIC_SHIELD) - target:addStatusEffect(effect, power, 0, duration, 0, subPower) + target:addStatusEffect(effect, { power = power, duration = duration, origin = target, subPower = subPower }) target:messageBasic(xi.msg.basic.GAINS_EFFECT_OF_STATUS, effect) end @@ -179,10 +179,10 @@ xi.itemUtils.addItemEffect = function(target, effect, power, duration, subpower) if effectpower > power then target:messageBasic(xi.msg.basic.NO_EFFECT) else - target:addStatusEffect(effect, power, 0, duration, 0, subpower) + target:addStatusEffect(effect, { power = power, duration = duration, origin = target, subPower = subpower }) end else - target:addStatusEffect(effect, power, 0, duration, 0, subpower) + target:addStatusEffect(effect, { power = power, duration = duration, origin = target, subPower = subpower }) end end @@ -194,10 +194,10 @@ xi.itemUtils.addTwoItemEffects = function(target, effect1, effect2, power1, powe if effectpower > power1 then target:messageBasic(xi.msg.basic.NO_EFFECT) else - target:addStatusEffect(effect1, power1, 0, duration, 0, power1) + target:addStatusEffect(effect1, { power = power1, duration = duration, origin = target, subPower = power1 }) end else - target:addStatusEffect(effect1, power1, 0, duration, 0, power1) + target:addStatusEffect(effect1, { power = power1, duration = duration, origin = target, subPower = power1 }) end if target:hasStatusEffect(effect2) then @@ -207,10 +207,10 @@ xi.itemUtils.addTwoItemEffects = function(target, effect1, effect2, power1, powe if effectpower > power2 then target:messageBasic(xi.msg.basic.NO_EFFECT) else - target:addStatusEffect(effect2, power2, 0, duration, 0, power2) + target:addStatusEffect(effect2, { power = power2, duration = duration, origin = target, subPower = power2 }) end else - target:addStatusEffect(effect2, power2, 0, duration, 0, power2) + target:addStatusEffect(effect2, { power = power2, duration = duration, origin = target, subPower = power2 }) end end @@ -229,11 +229,11 @@ xi.itemUtils.addItemExpEffect = function(target, effect, power, duration, subpow target:messageBasic(xi.msg.basic.NO_EFFECT) else target:delStatusEffectSilent(deleffect) - target:addStatusEffect(effect, power, 0, duration, 0, subpower) + target:addStatusEffect(effect, { power = power, duration = duration, origin = target, subPower = subpower }) end else target:delStatusEffectSilent(deleffect) - target:addStatusEffect(effect, power, 0, duration, 0, subpower) + target:addStatusEffect(effect, { power = power, duration = duration, origin = target, subPower = subpower }) end end diff --git a/scripts/globals/job_utils/bard.lua b/scripts/globals/job_utils/bard.lua index 714f1df3bc1..81971f3cd82 100644 --- a/scripts/globals/job_utils/bard.lua +++ b/scripts/globals/job_utils/bard.lua @@ -24,44 +24,44 @@ end -- Ability Use Functions ----------------------------------- xi.job_utils.bard.useSoulVoice = function(player, target, ability) - player:addStatusEffect(xi.effect.SOUL_VOICE, 1, 0, 180) + player:addStatusEffect(xi.effect.SOUL_VOICE, { power = 1, duration = 180, origin = player }) return xi.effect.SOUL_VOICE end xi.job_utils.bard.usePianissimo = function(player, target, ability) - player:addStatusEffect(xi.effect.PIANISSIMO, 0, 0, 60) + player:addStatusEffect(xi.effect.PIANISSIMO, { duration = 60, origin = player }) return xi.effect.PIANISSIMO end xi.job_utils.bard.useNightingale = function(player, target, ability) - player:addStatusEffect(xi.effect.NIGHTINGALE, 0, 0, 60) + player:addStatusEffect(xi.effect.NIGHTINGALE, { duration = 60, origin = player }) return xi.effect.NIGHTINGALE end xi.job_utils.bard.useTroubadour = function(player, target, ability) - player:addStatusEffect(xi.effect.TROUBADOUR, 0, 0, 60) + player:addStatusEffect(xi.effect.TROUBADOUR, { duration = 60, origin = player }) return xi.effect.TROUBADOUR end xi.job_utils.bard.useTenuto = function(player, target, ability) -- TODO: Implement this ability - player:addStatusEffect(xi.effect.TENUTO, 0, 0, 60) + player:addStatusEffect(xi.effect.TENUTO, { duration = 60, origin = player }) return xi.effect.TENUTO end xi.job_utils.bard.useMarcato = function(player, target, ability) - player:addStatusEffect(xi.effect.MARCATO, 50, 0, 60) + player:addStatusEffect(xi.effect.MARCATO, { power = 50, duration = 60, origin = player }) return xi.effect.MARCATO end xi.job_utils.bard.useClarionCall = function(player, target, ability) - player:addStatusEffect(xi.effect.CLARION_CALL, 10, 0, 180) + player:addStatusEffect(xi.effect.CLARION_CALL, { power = 10, duration = 180, origin = player }) return xi.effect.CLARION_CALL end diff --git a/scripts/globals/job_utils/beastmaster.lua b/scripts/globals/job_utils/beastmaster.lua index ecf77a59394..1ecca2b8b45 100644 --- a/scripts/globals/job_utils/beastmaster.lua +++ b/scripts/globals/job_utils/beastmaster.lua @@ -158,7 +158,7 @@ xi.job_utils.beastmaster.attemptCharm = function(charmer, target) then local resist = applyResistanceAddEffect(charmer, target, xi.element.ICE, 0) if not target:hasStatusEffect(xi.effect.BIND) and resist >= 0.5 then - target:addStatusEffect(xi.effect.BIND, 1, 0, math.random(1, 5)) + target:addStatusEffect(xi.effect.BIND, { power = 1, duration = math.random(1, 5), origin = charmer }) return xi.msg.basic.JA_ENFEEB_IS else return xi.msg.basic.JA_MISS @@ -583,7 +583,7 @@ xi.job_utils.beastmaster.useReward = function(player, target, ability) -- Apply regen xi.effect. pet:delStatusEffect(xi.effect.REGEN) - pet:addStatusEffect(xi.effect.REGEN, regenAmount, 3, regenTime) -- 3 = tick, each 3 seconds. + pet:addStatusEffect(xi.effect.REGEN, { power = regenAmount, duration = regenTime, origin = player, tick = 3 }) -- 3 = tick, each 3 seconds. player:removeAmmo(1) pet:updateEnmityFromCure(pet, totalHealing) @@ -592,7 +592,7 @@ xi.job_utils.beastmaster.useReward = function(player, target, ability) end xi.job_utils.beastmaster.useUnleash = function(player, target, ability) - player:addStatusEffect(xi.effect.UNLEASH, 9, 0, 60) + player:addStatusEffect(xi.effect.UNLEASH, { power = 9, duration = 60, origin = player }) return xi.effect.UNLEASH end @@ -654,7 +654,7 @@ xi.job_utils.beastmaster.useStay = function(player, target, ability) local tick = 10 - math.ceil(math.max(0, level / 20)) - pet:addStatusEffectEx(xi.effect.HEALING, 0, 0, tick, 0) + pet:addStatusEffect(xi.effect.HEALING, { origin = player, tick = tick, icon = 0 }) pet:setAnimation(0) end end @@ -678,7 +678,7 @@ xi.job_utils.beastmaster.useKillerInstinct = function(player, target, ability, a local power = 10 local duration = 180 + (player:getMerit(xi.merit.KILLER_INSTINCT) - 10) - target:addStatusEffect(xi.effect.KILLER_INSTINCT, power, 0, duration, 0, petEcosystem) + target:addStatusEffect(xi.effect.KILLER_INSTINCT, { power = power, duration = duration, origin = player, subPower = petEcosystem }) return xi.effect.KILLER_INSTINCT end @@ -688,7 +688,7 @@ xi.job_utils.beastmaster.useSpur = function(player) local subpower = player:getJobPointLevel(xi.jp.SPUR_EFFECT) * 3 -- bonus attack local pet = player:getPet() if pet then - pet:addStatusEffect(xi.effect.SPUR, power, 0, 90, 0, subpower) + pet:addStatusEffect(xi.effect.SPUR, { power = power, duration = 90, origin = player, subPower = subpower }) end end @@ -741,7 +741,7 @@ xi.job_utils.beastmaster.useFeralHowl = function(player, target, ability, action local resistanceRate = xi.combat.magicHitRate.calculateResistRate(player, target, 0, 0, xi.skillRank.B_MINUS, xi.element.DARK, xi.mod.CHR, xi.effect.TERROR, modAcc) if xi.data.statusEffect.isResistRateSuccessfull(xi.effect.TERROR, resistanceRate, 0) then - target:addStatusEffect(xi.effect.TERROR, 1, 0, duration * resistanceRate) + target:addStatusEffect(xi.effect.TERROR, { power = 1, duration = duration * resistanceRate, origin = player }) end end diff --git a/scripts/globals/job_utils/black_mage.lua b/scripts/globals/job_utils/black_mage.lua index c691136f951..d166bf3397c 100644 --- a/scripts/globals/job_utils/black_mage.lua +++ b/scripts/globals/job_utils/black_mage.lua @@ -22,13 +22,13 @@ end -- Ability Use Functions ----------------------------------- xi.job_utils.black_mage.useCascade = function(player, target, ability) - player:addStatusEffect(xi.effect.CASCADE, 1, 0, 60) + player:addStatusEffect(xi.effect.CASCADE, { power = 1, duration = 60, origin = player }) return xi.effect.CASCADE end xi.job_utils.black_mage.useElementalSeal = function(player, target, ability) - player:addStatusEffect(xi.effect.ELEMENTAL_SEAL, 1, 0, 60) + player:addStatusEffect(xi.effect.ELEMENTAL_SEAL, { power = 1, duration = 60, origin = player }) return xi.effect.ELEMENTAL_SEAL end @@ -41,25 +41,25 @@ xi.job_utils.black_mage.useEnmityDouse = function(player, target, ability) end xi.job_utils.black_mage.useManafont = function(player, target, ability) - player:addStatusEffect(xi.effect.MANAFONT, 1, 0, 60) + player:addStatusEffect(xi.effect.MANAFONT, { power = 1, duration = 60, origin = player }) return xi.effect.MANAFONT end xi.job_utils.black_mage.useManaWall = function(player, target, ability) - player:addStatusEffect(xi.effect.MANA_WALL, 1, 0, 300) + player:addStatusEffect(xi.effect.MANA_WALL, { power = 1, duration = 300, origin = player }) return xi.effect.MANA_WALL end xi.job_utils.black_mage.useManawell = function(player, target, ability) - target:addStatusEffect(xi.effect.MANAWELL, 1, 0, 60) + target:addStatusEffect(xi.effect.MANAWELL, { power = 1, duration = 60, origin = player }) return xi.effect.MANAWELL end xi.job_utils.black_mage.useSubtleSorcery = function(player, target, ability) - player:addStatusEffect(xi.effect.SUBTLE_SORCERY, 1, 0, 60) + player:addStatusEffect(xi.effect.SUBTLE_SORCERY, { power = 1, duration = 60, origin = player }) return xi.effect.SUBTLE_SORCERY end diff --git a/scripts/globals/job_utils/blue_mage.lua b/scripts/globals/job_utils/blue_mage.lua index 94e52e6d836..0fbb199c00f 100644 --- a/scripts/globals/job_utils/blue_mage.lua +++ b/scripts/globals/job_utils/blue_mage.lua @@ -58,45 +58,45 @@ end ----------------------------------- xi.job_utils.blue_mage.useAzureLore = function(player, target, ability, action) - player:addStatusEffect(xi.effect.AZURE_LORE, 1, 0, 30) + player:addStatusEffect(xi.effect.AZURE_LORE, { power = 1, duration = 30, origin = player }) return xi.effect.AZURE_LORE end xi.job_utils.blue_mage.useBurstAffinity = function(player, target, ability, action) - player:addStatusEffect(xi.effect.BURST_AFFINITY, 1, 0, 30) + player:addStatusEffect(xi.effect.BURST_AFFINITY, { power = 1, duration = 30, origin = player }) return xi.effect.BURST_AFFINITY end xi.job_utils.blue_mage.useChainAffinity = function(player, target, ability, action) - player:addStatusEffect(xi.effect.CHAIN_AFFINITY, 1, 0, 30) + player:addStatusEffect(xi.effect.CHAIN_AFFINITY, { power = 1, duration = 30, origin = player }) return xi.effect.CHAIN_AFFINITY end xi.job_utils.blue_mage.useDiffusion = function(player, target, ability, action) - player:addStatusEffect(xi.effect.DIFFUSION, 1, 0, 60) + player:addStatusEffect(xi.effect.DIFFUSION, { power = 1, duration = 60, origin = player }) return xi.effect.DIFFUSION end xi.job_utils.blue_mage.useConvergence = function(player, target, ability, action) - player:addStatusEffect(xi.effect.CONVERGENCE, 1, 0, 60) + player:addStatusEffect(xi.effect.CONVERGENCE, { power = 1, duration = 60, origin = player }) return xi.effect.CONVERGENCE end xi.job_utils.blue_mage.useEfflux = function(player, target, ability, action) - player:addStatusEffect(xi.effect.EFFLUX, 16, 1, 60) + player:addStatusEffect(xi.effect.EFFLUX, { power = 16, duration = 60, origin = player, tick = 1 }) return xi.effect.EFFLUX end xi.job_utils.blue_mage.useUnbridledWisdom = function(player, target, ability, action) - target:addStatusEffect(xi.effect.UNBRIDLED_WISDOM, 16, 1, 30) + target:addStatusEffect(xi.effect.UNBRIDLED_WISDOM, { power = 16, duration = 30, origin = player, tick = 1 }) return xi.effect.UNBRIDLED_WISDOM end xi.job_utils.blue_mage.useUnbridledLearning = function(player, target, ability, action) - target:addStatusEffect(xi.effect.UNBRIDLED_LEARNING, 16, 1, 60) + target:addStatusEffect(xi.effect.UNBRIDLED_LEARNING, { power = 16, duration = 60, origin = player, tick = 1 }) return xi.effect.UNBRIDLED_LEARNING end diff --git a/scripts/globals/job_utils/corsair.lua b/scripts/globals/job_utils/corsair.lua index a18f86d72c8..3bb239a654c 100644 --- a/scripts/globals/job_utils/corsair.lua +++ b/scripts/globals/job_utils/corsair.lua @@ -117,7 +117,7 @@ local function corsairSetup(caster, ability, action, effect, job) local roll = math.random(1, 6) caster:delStatusEffectSilent(xi.effect.DOUBLE_UP_CHANCE) - caster:addStatusEffectEx(xi.effect.DOUBLE_UP_CHANCE, xi.effect.DOUBLE_UP_CHANCE, roll, 0, 45, 0, effect, job, 0, xi.effectSourceType.CORSAIR_ROLL, ability:getID(), caster:getID(), true) + caster:addStatusEffect(xi.effect.DOUBLE_UP_CHANCE, { power = roll, duration = 45, origin = caster, subPower = effect, tier = job, sourceType = xi.effectSourceType.CORSAIR_ROLL, sourceTypeParam = ability:getID(), silent = true }) caster:setLocalVar('corsairRollTotal', roll) caster:setLocalVar('corsairDuEffect', effect) action:info(caster:getID(), roll) diff --git a/scripts/globals/job_utils/dancer.lua b/scripts/globals/job_utils/dancer.lua index 620980a983f..bcaae0e5598 100644 --- a/scripts/globals/job_utils/dancer.lua +++ b/scripts/globals/job_utils/dancer.lua @@ -131,7 +131,7 @@ local function setFinishingMoves(player, numMoves) finishingEffect:setDuration(2 * 60 * 60 * 1000) end else - player:addStatusEffectEx(xi.effect.FINISHING_MOVE_1, getFinishingMoveIcon(numMoves), numMoves, 0, 7200) + player:addStatusEffect(xi.effect.FINISHING_MOVE_1, { power = numMoves, duration = 7200, origin = player, icon = getFinishingMoveIcon(numMoves) }) end end @@ -303,7 +303,7 @@ xi.job_utils.dancer.useStepAbility = function(player, target, ability, action, s end if maxSteps >= origDebuffStacks then - target:addStatusEffect(stepEffect, debuffStacks, 0, debuffDuration) + target:addStatusEffect(stepEffect, { power = debuffStacks, duration = debuffDuration, origin = player }) else ability:setMsg(xi.msg.basic.JA_NO_EFFECT) end @@ -332,7 +332,7 @@ xi.job_utils.dancer.useStepAbility = function(player, target, ability, action, s end xi.job_utils.dancer.usePrestoAbility = function(player, target, ability, action) - target:addStatusEffect(xi.effect.PRESTO, 19, 3, 30) + target:addStatusEffect(xi.effect.PRESTO, { power = 19, duration = 30, origin = player, tick = 3 }) return xi.effect.PRESTO end @@ -395,7 +395,7 @@ xi.job_utils.dancer.useDesperateFlourishAbility = function(player, target, abili not xi.data.statusEffect.isTargetResistant(player, target, xi.effect.WEIGHT) and -- Check resistance trigger. not xi.data.statusEffect.isEffectNullified(target, xi.effect.WEIGHT, 0) and -- Check conflicting effect. resistRate > 0.25 and -- Check actual resistance. - target:addStatusEffect(xi.effect.WEIGHT, 50, 0, 60 * resistRate) -- Check effect power. + target:addStatusEffect(xi.effect.WEIGHT, { power = 50, duration = 60 * resistRate, origin = player }) -- Check effect power. then ability:setMsg(xi.msg.basic.JA_ENFEEB_IS) else @@ -454,7 +454,7 @@ xi.job_utils.dancer.useViolentFlourishAbility = function(player, target, ability not xi.data.statusEffect.isEffectNullified(target, xi.effect.STUN, 0) and -- check conflicting effect. xi.data.statusEffect.isResistRateSuccessfull(xi.effect.STUN, resistRate, 0) -- Check actual resistance. then - target:addStatusEffect(xi.effect.STUN, 1, 0, 2) + target:addStatusEffect(xi.effect.STUN, { power = 1, duration = 2, origin = player }) else ability:setMsg(xi.msg.basic.JA_DAMAGE) end @@ -477,7 +477,7 @@ xi.job_utils.dancer.useBuildingFlourishAbility = function(player, target, abilit local availableMoves = player:getStatusEffect(xi.effect.FINISHING_MOVE_1):getPower() local power = utils.clamp(availableMoves, 0, 3) - player:addStatusEffect(xi.effect.BUILDING_FLOURISH, power, 0, 60, 0, flourishMerits) + player:addStatusEffect(xi.effect.BUILDING_FLOURISH, { power = power, duration = 60, origin = player, subPower = flourishMerits }) setFinishingMoves(player, availableMoves - power) end @@ -491,7 +491,7 @@ xi.job_utils.dancer.useWildFlourishAbility = function(player, target, ability, a not target:hasStatusEffect(xi.effect.SKILLCHAIN, 0) then infoValue = actionInfo[ability:getID()][2] - target:addStatusEffectEx(xi.effect.CHAINBOUND, 0, 1, 0, 10, 0, 1) + target:addStatusEffect(xi.effect.CHAINBOUND, { power = 1, duration = 10, origin = player, icon = 0, subPower = 1 }) else ability:setMsg(xi.msg.basic.JA_NO_EFFECT) end @@ -504,7 +504,7 @@ xi.job_utils.dancer.useWildFlourishAbility = function(player, target, ability, a end xi.job_utils.dancer.useContradanceAbility = function(player, target, ability) - player:addStatusEffect(xi.effect.CONTRADANCE, 0, 0, 60) + player:addStatusEffect(xi.effect.CONTRADANCE, { duration = 60, origin = player }) return xi.effect.CONTRADANCE end diff --git a/scripts/globals/job_utils/dark_knight.lua b/scripts/globals/job_utils/dark_knight.lua index bef4b2a0615..f785553251c 100644 --- a/scripts/globals/job_utils/dark_knight.lua +++ b/scripts/globals/job_utils/dark_knight.lua @@ -65,7 +65,7 @@ xi.job_utils.dark_knight.useArcaneCircle = function(player, target, ability) ability:setMsg(xi.msg.basic.FORTIFIED_ARCANA) end - target:addStatusEffect(xi.effect.ARCANE_CIRCLE, power, 0, duration) + target:addStatusEffect(xi.effect.ARCANE_CIRCLE, { power = power, duration = duration, origin = player }) return xi.effect.ARCANE_CIRCLE end @@ -74,20 +74,20 @@ xi.job_utils.dark_knight.useArcaneCrest = function(player, target, ability) local power = 20 local duration = 180 + player:getJobPointLevel(xi.jp.ARCANE_CREST_DURATION) - target:addStatusEffect(xi.effect.ARCANE_CREST, power, 0, duration) + target:addStatusEffect(xi.effect.ARCANE_CREST, { power = power, duration = duration, origin = player }) end xi.job_utils.dark_knight.useBloodWeapon = function(player, target, ability) local power = 1 local duration = 30 + player:getMod(xi.mod.ENHANCES_BLOOD_WEAPON) - target:addStatusEffect(xi.effect.BLOOD_WEAPON, power, 0, duration) + target:addStatusEffect(xi.effect.BLOOD_WEAPON, { power = power, duration = duration, origin = player }) return xi.effect.BLOOD_WEAPON end xi.job_utils.dark_knight.useConsumeMana = function(player, target, ability) - player:addStatusEffect(xi.effect.CONSUME_MANA, 1, 0, 60) + player:addStatusEffect(xi.effect.CONSUME_MANA, { power = 1, duration = 60, origin = player }) return xi.effect.CONSUME_MANA end @@ -98,7 +98,7 @@ xi.job_utils.dark_knight.useDarkSeal = function(player, target, ability, action) local power = player:getMerit(xi.merit.DARK_SEAL) - 10 local subPower = player:getMerit(xi.merit.DARK_SEAL) * player:getMod(xi.mod.ENHANCES_DARK_SEAL) / 10 - player:addStatusEffect(xi.effect.DARK_SEAL, power, 0, 60, 0, subPower) + player:addStatusEffect(xi.effect.DARK_SEAL, { power = power, duration = 60, origin = player, subPower = subPower }) return xi.effect.DARK_SEAL end @@ -107,13 +107,13 @@ xi.job_utils.dark_knight.useDiabolicEye = function(player, target, ability, acti local power = 15 + player:getMerit(xi.merit.DIABOLIC_EYE) * 5 local duration = 180 + player:getMerit(xi.merit.DIABOLIC_EYE) * player:getMod(xi.mod.ENHANCES_DIABOLIC_EYE) - player:addStatusEffect(xi.effect.DIABOLIC_EYE, power, 0, duration) + player:addStatusEffect(xi.effect.DIABOLIC_EYE, { power = power, duration = duration, origin = player }) return xi.effect.DIABOLIC_EYE end xi.job_utils.dark_knight.useLastResort = function(player, target, ability) - player:addStatusEffect(xi.effect.LAST_RESORT, 0, 0, 180) + player:addStatusEffect(xi.effect.LAST_RESORT, { duration = 180, origin = player }) return xi.effect.LAST_RESORT end @@ -122,7 +122,7 @@ xi.job_utils.dark_knight.useNetherVoid = function(player, target, ability) local power = 50 + player:getMod(xi.mod.ENHANCES_NETHER_VOID) + 2 * player:getJobPointLevel(xi.jp.NETHER_VOID_EFFECT) local duration = 60 - player:addStatusEffect(xi.effect.NETHER_VOID, power, 0, duration) + player:addStatusEffect(xi.effect.NETHER_VOID, { power = power, duration = duration, origin = player }) return xi.effect.NETHER_VOID end @@ -130,13 +130,13 @@ end xi.job_utils.dark_knight.useScarletDelirium = function(player, target, ability) local duration = 90 + player:getJobPointLevel(xi.jp.SCARLET_DELIRIUM_DURATION) - player:addStatusEffect(xi.effect.SCARLET_DELIRIUM, 0, 0, duration) + player:addStatusEffect(xi.effect.SCARLET_DELIRIUM, { duration = duration, origin = player }) return xi.effect.SCARLET_DELIRIUM end xi.job_utils.dark_knight.useSoulEnslavement = function(player, target, ability) - player:addStatusEffect(xi.effect.SOUL_ENSLAVEMENT, 0, 0, 30) + player:addStatusEffect(xi.effect.SOUL_ENSLAVEMENT, { duration = 30, origin = player }) return xi.effect.SOUL_ENSLAVEMENT end @@ -145,7 +145,7 @@ xi.job_utils.dark_knight.useSouleater = function(player, target, ability) local duration = 60 + target:getJobPointLevel(xi.jp.SOULEATER_DURATION) local subPower = target:getMod(xi.mod.ENHANCES_MUTED_SOUL) * target:getMerit(xi.merit.MUTED_SOUL) / 10 -- Origin: Abyss Flanchard +2 - player:addStatusEffect(xi.effect.SOULEATER, 1, 0, duration, 0, subPower) + player:addStatusEffect(xi.effect.SOULEATER, { power = 1, duration = duration, origin = player, subPower = subPower }) return xi.effect.SOULEATER end @@ -166,7 +166,7 @@ xi.job_utils.dark_knight.useWeaponBash = function(player, target, ability, actio then local resistanceRate = xi.combat.magicHitRate.calculateResistRate(player, target, 0, 0, xi.skillRank.A_PLUS, xi.element.THUNDER, xi.mod.INT, xi.effect.STUN, 0) if xi.data.statusEffect.isResistRateSuccessfull(xi.effect.STUN, resistanceRate, 0) then - target:addStatusEffect(xi.effect.STUN, 1, 0, math.random(2, 8) * resistanceRate) + target:addStatusEffect(xi.effect.STUN, { power = 1, duration = math.random(2, 8) * resistanceRate, origin = player }) end end diff --git a/scripts/globals/job_utils/dragoon.lua b/scripts/globals/job_utils/dragoon.lua index 76c0f869ff5..6b3805273b7 100644 --- a/scripts/globals/job_utils/dragoon.lua +++ b/scripts/globals/job_utils/dragoon.lua @@ -204,7 +204,7 @@ xi.job_utils.dragoon.useSpiritSurge = function(player, target, ability) target:resetRecast(xi.recast.ABILITY, 159) -- High Jump target:resetRecast(xi.recast.ABILITY, 160) -- Super Jump - target:addStatusEffect(xi.effect.SPIRIT_SURGE, maxHPBoost, 0, duration, 0, strBoost) + target:addStatusEffect(xi.effect.SPIRIT_SURGE, { power = maxHPBoost, duration = duration, origin = player, subPower = strBoost }) target:addHP(petHP) -- Add in wyvern's remaining HP before the wyvern was despawned end @@ -223,7 +223,7 @@ xi.job_utils.dragoon.useAncientCircle = function(player, target, ability) power = power + player:getMod(xi.mod.ANCIENT_CIRCLE_POTENCY) - target:addStatusEffect(xi.effect.ANCIENT_CIRCLE, power, 0, duration) + target:addStatusEffect(xi.effect.ANCIENT_CIRCLE, { power = power, duration = duration, origin = player }) return xi.effect.ANCIENT_CIRCLE end @@ -244,7 +244,7 @@ xi.job_utils.dragoon.useJump = function(player, target, ability, action) player:hasStatusEffect(xi.effect.SPIRIT_SURGE) and not target:hasStatusEffect(xi.effect.DEFENSE_DOWN) -- Does this overwrite itself? then - target:addStatusEffect(xi.effect.DEFENSE_DOWN, 20, 0, 60) + target:addStatusEffect(xi.effect.DEFENSE_DOWN, { power = 20, duration = 60, origin = player }) end return damage @@ -358,12 +358,12 @@ xi.job_utils.dragoon.useSpiritLink = function(player, target, ability, action) wyvern:delStatusEffectSilent(copyEffect:getEffectType()) end - wyvern:addStatusEffect(copyEffect:getEffectType(), copyEffect:getPower(), copyEffect:getTick(), math.ceil((copyEffect:getTimeRemaining()) / 1000)) -- id, power, tick, duration(convert ms to s) + wyvern:copyStatusEffect(copyEffect) copyi = copyi + 1 end end - wyvern:addStatusEffect(xi.effect.REGEN, regenAmount, 3, 90, 0, 0, 0) -- 90 seconds of regen + wyvern:addStatusEffect(xi.effect.REGEN, { power = regenAmount, duration = 90, origin = player, tick = 3 }) -- 90 seconds of regen player:addTP(petTP / 2) -- add half wyvern tp to you wyvern:delTP(petTP / 2) -- remove half tp from wyvern @@ -497,7 +497,7 @@ end xi.job_utils.dragoon.useAngon = function(player, target, ability) local duration = 15 + player:getMerit(xi.merit.ANGON) -- This will return 30 sec at one investment because merit power is 15. - if not target:addStatusEffect(xi.effect.DEFENSE_DOWN, 20, 0, duration) then + if not target:addStatusEffect(xi.effect.DEFENSE_DOWN, { power = 20, duration = duration, origin = player }) then ability:setMsg(xi.msg.basic.MAGIC_NO_EFFECT) end @@ -511,12 +511,12 @@ xi.job_utils.dragoon.useDeepBreathing = function(player, target, ability) local wyvern = getWyvern(player) if wyvern then - wyvern:addStatusEffect(xi.effect.MAGIC_ATK_BOOST, 0, 0, 180) -- Message when effect is lost is 'Magic Attack boost wears off.' + wyvern:addStatusEffect(xi.effect.MAGIC_ATK_BOOST, { duration = 180, origin = player }) -- Message when effect is lost is 'Magic Attack boost wears off.' end end xi.job_utils.dragoon.useSpiritBond = function(player, target, ability) - player:addStatusEffect(xi.effect.SPIRIT_BOND, 0, 0, 180) + player:addStatusEffect(xi.effect.SPIRIT_BOND, { duration = 180, origin = player }) return xi.effect.SPIRIT_BOND end @@ -561,7 +561,7 @@ xi.job_utils.dragoon.useSoulJump = function(player, target, ability, action) end xi.job_utils.dragoon.useDragonBreaker = function(player, target, ability) - target:addStatusEffect(xi.effect.DRAGON_BREAKER, 20, 0, 180) + target:addStatusEffect(xi.effect.DRAGON_BREAKER, { power = 20, duration = 180, origin = player }) end xi.job_utils.dragoon.useFlyHigh = function(player, target, ability) @@ -572,7 +572,7 @@ xi.job_utils.dragoon.useFlyHigh = function(player, target, ability) target:resetRecast(xi.recast.ABILITY, 166) -- Spirit Jump target:resetRecast(xi.recast.ABILITY, 167) -- Soul Jump - player:addStatusEffect(xi.effect.FLY_HIGH, 0, 0, 30) + player:addStatusEffect(xi.effect.FLY_HIGH, { duration = 30, origin = player }) return xi.effect.FLY_HIGH end @@ -584,7 +584,7 @@ xi.job_utils.dragoon.useSteadyWing = function(player, target, ability, action) if wyvern then local power = wyvern:getMaxHP() * 0.3 + wyvern:getMaxHP() - wyvern:getHP() - if wyvern:addStatusEffect(xi.effect.STONESKIN, power, 0, 300) then + if wyvern:addStatusEffect(xi.effect.STONESKIN, { power = power, duration = 300, origin = player }) then local effect = wyvern:getStatusEffect(xi.effect.STONESKIN) if effect then diff --git a/scripts/globals/job_utils/geomancer.lua b/scripts/globals/job_utils/geomancer.lua index afc91c29b24..608c2e958b1 100644 --- a/scripts/globals/job_utils/geomancer.lua +++ b/scripts/globals/job_utils/geomancer.lua @@ -290,7 +290,7 @@ end ----------------------------------- xi.job_utils.geomancer.bolster = function(player, target, ability) local bonusTime = player:getMod(xi.mod.BOLSTER_EFFECT) - player:addStatusEffect(xi.effect.BOLSTER, 0, 3, 240 + bonusTime) + player:addStatusEffect(xi.effect.BOLSTER, { duration = 240 + bonusTime, origin = player, tick = 3 }) return xi.effect.BOLSTER end @@ -368,7 +368,7 @@ xi.job_utils.geomancer.eclipticAttrition = function(player, target, ability, act end xi.job_utils.geomancer.collimatedFervor = function(player, target, ability) - target:addStatusEffect(xi.effect.COLLIMATED_FERVOR, 0, 0, 60) + target:addStatusEffect(xi.effect.COLLIMATED_FERVOR, { duration = 60, origin = player }) return xi.effect.COLLIMATED_FERVOR end @@ -395,7 +395,7 @@ xi.job_utils.geomancer.lifeCycle = function(player, target, ability, action) end xi.job_utils.geomancer.blazeOfGlory = function(player, target, ability) - player:addStatusEffect(xi.effect.BLAZE_OF_GLORY, 0, 3, 60) + player:addStatusEffect(xi.effect.BLAZE_OF_GLORY, { duration = 60, origin = player, tick = 3 }) return xi.effect.BLAZE_OF_GLORY end @@ -403,7 +403,7 @@ end xi.job_utils.geomancer.dematerialize = function(player, target, ability, action) local luopan = getLuopan(player) if luopan then - luopan:addStatusEffect(xi.effect.DEMATERIALIZE, 0, 3, 60) + luopan:addStatusEffect(xi.effect.DEMATERIALIZE, { duration = 60, origin = player, tick = 3 }) -- Self-cast ability but reports effect on Luopan action:ID(player:getID(), luopan:getID()) end @@ -412,13 +412,13 @@ xi.job_utils.geomancer.dematerialize = function(player, target, ability, action) end xi.job_utils.geomancer.theurgicFocus = function(player, target, ability) - player:addStatusEffect(xi.effect.THEURGIC_FOCUS, 1, 0, 60) + player:addStatusEffect(xi.effect.THEURGIC_FOCUS, { power = 1, duration = 60, origin = player }) return xi.effect.THEURGIC_FOCUS end xi.job_utils.geomancer.widenedCompass = function(player, target, ability) - player:addStatusEffect(xi.effect.WIDENED_COMPASS, 0, 3, 60) + player:addStatusEffect(xi.effect.WIDENED_COMPASS, { duration = 60, origin = player, tick = 3 }) return xi.effect.WIDENED_COMPASS end @@ -461,7 +461,7 @@ end -- xi.auraTarget.ALLIES or xi.auraTarget.ENEMIES ----------------------------------- xi.job_utils.geomancer.addAura = function(target, duration, tickEffect, tickPower, targetType) - target:addStatusEffectEx(xi.effect.COLURE_ACTIVE, xi.effect.COLURE_ACTIVE, 0, 3, duration, tickEffect, tickPower, targetType, xi.effectFlag.AURA) + target:addStatusEffect(xi.effect.COLURE_ACTIVE, { duration = duration, origin = target, tick = 3, subType = tickEffect, subPower = tickPower, tier = targetType, flag = xi.effectFlag.AURA }) end ----------------------------------- @@ -484,7 +484,7 @@ xi.job_utils.geomancer.doIndiSpell = function(caster, target, spell) windenedCompassCheck(caster) - target:addStatusEffectEx(xi.effect.COLURE_ACTIVE, xi.effect.COLURE_ACTIVE, visualEffect, 3, duration, effect, potency, targetType, xi.effectFlag.AURA) + target:addStatusEffect(xi.effect.COLURE_ACTIVE, { power = visualEffect, duration = duration, origin = caster, tick = 3, subType = effect, subPower = potency, tier = targetType, flag = xi.effectFlag.AURA }) if caster:hasStatusEffect(xi.effect.ENTRUST) then caster:delStatusEffectSilent(xi.effect.ENTRUST) diff --git a/scripts/globals/job_utils/monk.lua b/scripts/globals/job_utils/monk.lua index 4f3dd290370..97674f0b41e 100644 --- a/scripts/globals/job_utils/monk.lua +++ b/scripts/globals/job_utils/monk.lua @@ -39,7 +39,7 @@ xi.job_utils.monk.useBoost = function(player, target, ability) effect:setPower(effect:getPower() + power) -- Store updated power in boost for zoning effect:addMod(xi.mod.ATTP, power) else - player:addStatusEffect(xi.effect.BOOST, power, 0, 180) + player:addStatusEffect(xi.effect.BOOST, { power = power, duration = 180, origin = player }) end end @@ -69,7 +69,7 @@ xi.job_utils.monk.useChakra = function(player, target, ability) player:delStatusEffect(xi.effect.REGEN) end - player:addStatusEffect(xi.effect.REGEN, 10, 0, merits, 0, 0, 1) + player:addStatusEffect(xi.effect.REGEN, { power = 10, duration = merits, origin = player, tier = 1 }) end return recoveryAmount @@ -79,7 +79,7 @@ xi.job_utils.monk.useChiBlast = function(player, target, ability) local penanceMerits = player:getMerit(xi.merit.PENANCE) -- 20/40/60/80/100 if penanceMerits > 0 then target:delStatusEffectSilent(xi.effect.INHIBIT_TP) - target:addStatusEffect(xi.effect.INHIBIT_TP, 25, 0, penanceMerits) + target:addStatusEffect(xi.effect.INHIBIT_TP, { power = 25, duration = penanceMerits, origin = player }) end local boost = player:getStatusEffect(xi.effect.BOOST) @@ -102,7 +102,7 @@ xi.job_utils.monk.useCounterstance = function(player, target, ability) local power = 45 + player:getMod(xi.mod.COUNTERSTANCE_EFFECT) target:delStatusEffect(xi.effect.COUNTERSTANCE) --if not found this will do nothing - target:addStatusEffect(xi.effect.COUNTERSTANCE, power, 0, 300) + target:addStatusEffect(xi.effect.COUNTERSTANCE, { power = power, duration = 300, origin = player }) return xi.effect.COUNTERSTANCE end @@ -110,7 +110,7 @@ end xi.job_utils.monk.useDodge = function(player, target, ability) local jpLevel = target:getJobPointLevel(xi.jp.DODGE_EFFECT) local dodgeMod = target:getMod(xi.mod.DODGE_EFFECT) - player:addStatusEffect(xi.effect.DODGE, jpLevel + dodgeMod, 0, 30) + player:addStatusEffect(xi.effect.DODGE, { power = jpLevel + dodgeMod, duration = 30, origin = player }) return xi.effect.DODGE end @@ -118,7 +118,7 @@ end xi.job_utils.monk.useFocus = function(player, target, ability) local jpLevel = target:getJobPointLevel(xi.jp.FOCUS_EFFECT) local focusMod = target:getMod(xi.mod.FOCUS_EFFECT) - player:addStatusEffect(xi.effect.FOCUS, jpLevel + focusMod, 0, 30) + player:addStatusEffect(xi.effect.FOCUS, { power = jpLevel + focusMod, duration = 30, origin = player }) return xi.effect.FOCUS end @@ -127,19 +127,19 @@ xi.job_utils.monk.useFootwork = function(player, target, ability) local kickDmg = 20 + player:getWeaponDmg() local kickAttPercent = 25 + player:getMod(xi.mod.FOOTWORK_ATT_BONUS) - player:addStatusEffect(xi.effect.FOOTWORK, kickDmg, 0, 60, 0, kickAttPercent) + player:addStatusEffect(xi.effect.FOOTWORK, { power = kickDmg, duration = 60, origin = player, subPower = kickAttPercent }) return xi.effect.FOOTWORK end xi.job_utils.monk.useFormlessStrikes = function(player, target, ability) - player:addStatusEffect(xi.effect.FORMLESS_STRIKES, 1, 0, 180) + player:addStatusEffect(xi.effect.FORMLESS_STRIKES, { power = 1, duration = 180, origin = player }) return xi.effect.FORMLESS_STRIKES end xi.job_utils.monk.useHundredFists = function(player, target, ability) - player:addStatusEffect(xi.effect.HUNDRED_FISTS, 1, 0, 45) + player:addStatusEffect(xi.effect.HUNDRED_FISTS, { power = 1, duration = 45, origin = player }) return xi.effect.HUNDRED_FISTS end @@ -195,13 +195,13 @@ xi.job_utils.monk.impetusHitListener = function(attacker, victim, attack) end xi.job_utils.monk.useImpetus = function(player, target, ability) - player:addStatusEffect(xi.effect.IMPETUS, 0, 0, 180) + player:addStatusEffect(xi.effect.IMPETUS, { duration = 180, origin = player }) return xi.effect.IMPETUS end xi.job_utils.monk.useInnerStrength = function(player, target, ability) - player:addStatusEffect(xi.effect.INNER_STRENGTH, 2, 0, 30) + player:addStatusEffect(xi.effect.INNER_STRENGTH, { power = 2, duration = 30, origin = player }) return xi.effect.INNER_STRENGTH end @@ -210,13 +210,13 @@ xi.job_utils.monk.useMantra = function(player, target, ability) local merits = player:getMerit(xi.merit.MANTRA) target:delStatusEffect(xi.effect.MAX_HP_BOOST) -- TODO: confirm which versions of HP boost mantra can overwrite - target:addStatusEffect(xi.effect.MAX_HP_BOOST, merits, 0, 180) + target:addStatusEffect(xi.effect.MAX_HP_BOOST, { power = merits, duration = 180, origin = player }) return 0 -- xi.effect.MANTRA -- TODO: implement xi.effect.MANTRA end xi.job_utils.monk.usePerfectCounter = function(player, target, ability) - player:addStatusEffect(xi.effect.PERFECT_COUNTER, 2, 0, 30) + player:addStatusEffect(xi.effect.PERFECT_COUNTER, { power = 2, duration = 30, origin = player }) return xi.effect.PERFECT_COUNTER end diff --git a/scripts/globals/job_utils/ninja.lua b/scripts/globals/job_utils/ninja.lua index 870806c6525..b2c4df345f2 100644 --- a/scripts/globals/job_utils/ninja.lua +++ b/scripts/globals/job_utils/ninja.lua @@ -64,7 +64,7 @@ end xi.job_utils.ninja.useYonin = function(player, target, ability, action) target:delStatusEffect(xi.effect.INNIN) target:delStatusEffect(xi.effect.YONIN) - target:addStatusEffect(xi.effect.YONIN, 30, 15, 300, 0, 0) + target:addStatusEffect(xi.effect.YONIN, { power = 30, duration = 300, origin = player, tick = 15 }) return xi.effect.YONIN end @@ -72,32 +72,32 @@ end xi.job_utils.ninja.useInnin = function(player, target, ability, action) target:delStatusEffect(xi.effect.INNIN) target:delStatusEffect(xi.effect.YONIN) - target:addStatusEffect(xi.effect.INNIN, 30, 15, 300, 0, 20) + target:addStatusEffect(xi.effect.INNIN, { power = 30, duration = 300, origin = player, tick = 15, subPower = 20 }) return xi.effect.INNIN end xi.job_utils.ninja.useSange = function(player, target, ability, action) local potency = player:getMerit(xi.merit.SANGE)-1 - player:addStatusEffect(xi.effect.SANGE, potency * 25, 0, 60) + player:addStatusEffect(xi.effect.SANGE, { power = potency * 25, duration = 60, origin = player }) return xi.effect.SANGE end xi.job_utils.ninja.useFutae = function(player, target, ability, action) - target:addStatusEffect(xi.effect.FUTAE, 0, 0, 60) + target:addStatusEffect(xi.effect.FUTAE, { duration = 60, origin = player }) return xi.effect.FUTAE end xi.job_utils.ninja.useIssekigan = function(player, target, ability, action) - target:addStatusEffect(xi.effect.ISSEKIGAN, 25, 0, 60) + target:addStatusEffect(xi.effect.ISSEKIGAN, { power = 25, duration = 60, origin = player }) return xi.effect.ISSEKIGAN end xi.job_utils.ninja.useMikage = function(player, target, ability, action) - target:addStatusEffect(xi.effect.MIKAGE, 0, 0, 45) + target:addStatusEffect(xi.effect.MIKAGE, { duration = 45, origin = player }) return xi.effect.MIKAGE end diff --git a/scripts/globals/job_utils/paladin.lua b/scripts/globals/job_utils/paladin.lua index bebbe1d7056..2deed9656b0 100644 --- a/scripts/globals/job_utils/paladin.lua +++ b/scripts/globals/job_utils/paladin.lua @@ -76,7 +76,7 @@ xi.job_utils.paladin.useCover = function(player, target, ability) local jpValue = player:getJobPointLevel(xi.jp.COVER_DURATION) local duration = baseDuration + bonusTime + player:getMerit(xi.merit.COVER_EFFECT_LENGTH) + player:getMod(xi.mod.COVER_DURATION) + jpValue - player:addStatusEffect(xi.effect.COVER, player:getMod(xi.mod.COVER_TO_MP), 0, duration) + player:addStatusEffect(xi.effect.COVER, { power = player:getMod(xi.mod.COVER_TO_MP), duration = duration, origin = player }) player:setLocalVar('COVER_ABILITY_TARGET', target:getID()) ability:setMsg(xi.msg.basic.COVER_SUCCESS) end @@ -85,7 +85,7 @@ xi.job_utils.paladin.useDivineEmblem = function(player, target, ability) -- Divine Magic bonus damage handled in globals/magic.lua local power = 50 + player:getMod(xi.mod.ENHANCES_DIVINE_EMBLEM) -- 50% increase to enmity - player:addStatusEffect(xi.effect.DIVINE_EMBLEM, power, 0, 60) + player:addStatusEffect(xi.effect.DIVINE_EMBLEM, { power = power, duration = 60, origin = player }) return xi.effect.DIVINE_EMBLEM end @@ -95,7 +95,7 @@ xi.job_utils.paladin.useFealty = function(player, target, ability) local enhFealty = (player:getMerit(xi.merit.FEALTY) / 5) * player:getMod(xi.mod.ENHANCES_FEALTY) local duration = 60 + merits + enhFealty - player:addStatusEffect(xi.effect.FEALTY, 1, 0, duration) + player:addStatusEffect(xi.effect.FEALTY, { power = 1, duration = duration, origin = player }) return xi.effect.FEALTY end @@ -115,7 +115,7 @@ xi.job_utils.paladin.useHolyCircle = function(player, target, ability) power = power + player:getMod(xi.mod.HOLY_CIRCLE_POTENCY) - target:addStatusEffect(xi.effect.HOLY_CIRCLE, power, 0, duration) + target:addStatusEffect(xi.effect.HOLY_CIRCLE, { power = power, duration = duration, origin = player }) return xi.effect.HOLY_CIRCLE end @@ -136,19 +136,19 @@ xi.job_utils.paladin.useIntervene = function(player, target, ability) damage = damage * jpValue - target:addStatusEffect(xi.effect.INTERVENE, 1, 0, 30) + target:addStatusEffect(xi.effect.INTERVENE, { power = 1, duration = 30, origin = player }) return damage end xi.job_utils.paladin.useInvincible = function(player, target, ability) - player:addStatusEffect(xi.effect.INVINCIBLE, 1, 0, 30) + player:addStatusEffect(xi.effect.INVINCIBLE, { power = 1, duration = 30, origin = player }) return xi.effect.INVINCIBLE end xi.job_utils.paladin.useMajesty = function(player, target, ability) - player:addStatusEffect(xi.effect.MAJESTY, 25, 0, 180) + player:addStatusEffect(xi.effect.MAJESTY, { power = 25, duration = 180, origin = player }) return xi.effect.MAJESTY end @@ -157,7 +157,7 @@ xi.job_utils.paladin.usePalisade = function(player, target, ability) local jpValue = player:getJobPointLevel(xi.jp.PALISADE_EFFECT) local power = 30 + jpValue - player:addStatusEffect(xi.effect.PALISADE, power, 0, 60) + player:addStatusEffect(xi.effect.PALISADE, { power = power, duration = 60, origin = player }) return xi.effect.PALISADE end @@ -165,7 +165,7 @@ end xi.job_utils.paladin.useRampart = function(player, target, ability) local duration = 30 + player:getMod(xi.mod.RAMPART_DURATION) - target:addStatusEffect(xi.effect.RAMPART, 2500, 0, duration) + target:addStatusEffect(xi.effect.RAMPART, { power = 2500, duration = duration, origin = player }) return xi.effect.RAMPART end @@ -180,7 +180,7 @@ xi.job_utils.paladin.useSentinel = function(player, target, ability) local duration = 30 + enhGuardian -- Sent as positive power because UINTs, man. - player:addStatusEffect(xi.effect.SENTINEL, power, 3, duration, 0, guardian + jpValue) + player:addStatusEffect(xi.effect.SENTINEL, { power = power, duration = duration, origin = player, tick = 3, subPower = guardian + jpValue }) return xi.effect.SENTINEL end @@ -190,7 +190,7 @@ xi.job_utils.paladin.useSepulcher = function(player, target, ability) local jpValue = player:getJobPointLevel(xi.jp.SEPULCHER_DURATION) local duration = 180 + jpValue - target:addStatusEffect(xi.effect.SEPULCHER, power, 0, duration) + target:addStatusEffect(xi.effect.SEPULCHER, { power = power, duration = duration, origin = player }) end xi.job_utils.paladin.useShieldBash = function(player, target, ability) @@ -221,7 +221,7 @@ xi.job_utils.paladin.useShieldBash = function(player, target, ability) chance = chance + (player:getMainLvl() - target:getMainLvl()) * 5 if math.random(1, 100) <= chance then - target:addStatusEffect(xi.effect.STUN, 1, 0, 6) + target:addStatusEffect(xi.effect.STUN, { power = 1, duration = 6, origin = player }) end -- Randomize damage diff --git a/scripts/globals/job_utils/puppetmaster.lua b/scripts/globals/job_utils/puppetmaster.lua index 32b8dd60c74..a2e0eeb12c6 100644 --- a/scripts/globals/job_utils/puppetmaster.lua +++ b/scripts/globals/job_utils/puppetmaster.lua @@ -57,7 +57,7 @@ end -- On Ability Use Overdrive xi.job_utils.puppetmaster.onAbilityUseOverdrive = function(player, target, ability) - player:addStatusEffect(xi.effect.OVERDRIVE, 0, 0, 60) + player:addStatusEffect(xi.effect.OVERDRIVE, { duration = 60, origin = player }) return xi.effect.OVERDRIVE end @@ -199,7 +199,7 @@ xi.job_utils.puppetmaster.onAbilityUseRepair = function(player, target, ability, pet:wakeUp() pet:delStatusEffect(xi.effect.REGEN) - pet:addStatusEffect(xi.effect.REGEN, regenAmount, 3, regenTime) -- 3 = tick, each 3 seconds. + pet:addStatusEffect(xi.effect.REGEN, { power = regenAmount, duration = regenTime, origin = player, tick = 3 }) -- 3 = tick, each 3 seconds. player:removeAmmo(1) return totalHealing end @@ -331,7 +331,7 @@ end -- On Ability Use Tactical Switch xi.job_utils.puppetmaster.onAbilityUseTacticalSwitch = function(player, target, ability) - -- target:addStatusEffect(xi.effect.TACTICAL_SWITCH, 18, 1, 1) -- TODO: implement xi.effect.TACTICAL_SWITCH + -- target:addStatusEffect(xi.effect.TACTICAL_SWITCH, { power = 18, duration = 1, origin = player, tick = 1 }) -- TODO: implement xi.effect.TACTICAL_SWITCH end -- On Ability Check Cooldown @@ -367,7 +367,7 @@ end -- On Ability Use Heady Artiface xi.job_utils.puppetmaster.onAbilityUseHeadyArtiface = function(player, target, ability) - -- target:addStatusEffect(xi.effect.HEADY_ARTIFICE, 18, 1, 1) -- TODO: implement xi.effect.HEADY_ARTIFICE + -- target:addStatusEffect(xi.effect.HEADY_ARTIFICE, { power = 18, duration = 1, origin = player, tick = 1 }) -- TODO: implement xi.effect.HEADY_ARTIFICE end -- On Ability Check Deploy diff --git a/scripts/globals/job_utils/ranger.lua b/scripts/globals/job_utils/ranger.lua index 93a5aa93d96..f38df038ed8 100644 --- a/scripts/globals/job_utils/ranger.lua +++ b/scripts/globals/job_utils/ranger.lua @@ -188,14 +188,14 @@ xi.job_utils.ranger.useEagleEyeShot = function(player, target, ability, action) end xi.job_utils.ranger.useVelocityShot = function(player, target, ability, action) - player:addStatusEffect(xi.effect.VELOCITY_SHOT, 1, 0, 7200) + player:addStatusEffect(xi.effect.VELOCITY_SHOT, { power = 1, duration = 7200, origin = player }) return xi.effect.VELOCITY_SHOT end xi.job_utils.ranger.useSharpshot = function(player, target, ability, action) local power = 40 + player:getMod(xi.mod.SHARPSHOT) - player:addStatusEffect(xi.effect.SHARPSHOT, power, 0, 60) + player:addStatusEffect(xi.effect.SHARPSHOT, { power = power, duration = 60, origin = player }) return xi.effect.SHARPSHOT end @@ -235,13 +235,13 @@ end xi.job_utils.ranger.useCamouflage = function(player, target, ability, action) local duration = math.random(30, 300) * (1 + 0.01 * player:getMod(xi.mod.CAMOUFLAGE_DURATION)) - player:addStatusEffect(xi.effect.CAMOUFLAGE, 1, 0, math.floor(duration * xi.settings.main.SNEAK_INVIS_DURATION_MULTIPLIER)) + player:addStatusEffect(xi.effect.CAMOUFLAGE, { power = 1, duration = math.floor(duration * xi.settings.main.SNEAK_INVIS_DURATION_MULTIPLIER), origin = player }) return xi.effect.CAMOUFLAGE end xi.job_utils.ranger.useBarrage = function(player, target, ability, action) - player:addStatusEffect(xi.effect.BARRAGE, 0, 0, 60) + player:addStatusEffect(xi.effect.BARRAGE, { duration = 60, origin = player }) return xi.effect.BARRAGE end @@ -258,7 +258,7 @@ xi.job_utils.ranger.useShadowbind = function(player, target, ability, action) math.random(0, 99) >= target:getMod(xi.mod.BIND_MEVA) and not target:hasStatusEffect(xi.effect.BIND) then - target:addStatusEffect(xi.effect.BIND, 0, 0, duration) + target:addStatusEffect(xi.effect.BIND, { duration = duration, origin = player }) ability:setMsg(xi.msg.basic.IS_EFFECT) -- Target is bound. else ability:setMsg(xi.msg.basic.JA_MISS) -- Player uses Shadowbind, but misses. @@ -272,26 +272,26 @@ xi.job_utils.ranger.useShadowbind = function(player, target, ability, action) end xi.job_utils.ranger.useUnlimitedShot = function(player, target, ability, action) - player:addStatusEffect(xi.effect.UNLIMITED_SHOT, 1, 0, 60) + player:addStatusEffect(xi.effect.UNLIMITED_SHOT, { power = 1, duration = 60, origin = player }) return xi.effect.UNLIMITED_SHOT end xi.job_utils.ranger.useFlashyShot = function(player, target, ability, action) -- TODO: Flashy Shot should add "D" damage to the next ranged attack - player:addStatusEffect(xi.effect.FLASHY_SHOT, 1, 0, 60) + player:addStatusEffect(xi.effect.FLASHY_SHOT, { power = 1, duration = 60, origin = player }) return xi.effect.FLASHY_SHOT end xi.job_utils.ranger.useStealthShot = function(player, target, ability, action) - player:addStatusEffect(xi.effect.STEALTH_SHOT, 1, 0, 60) + player:addStatusEffect(xi.effect.STEALTH_SHOT, { power = 1, duration = 60, origin = player }) return xi.effect.STEALTH_SHOT end xi.job_utils.ranger.useDoubleShot = function(player, target, ability, action) - player:addStatusEffect(xi.effect.DOUBLE_SHOT, 40, 0, 90) + player:addStatusEffect(xi.effect.DOUBLE_SHOT, { power = 40, duration = 90, origin = player }) return xi.effect.DOUBLE_SHOT end @@ -367,7 +367,7 @@ xi.job_utils.ranger.useBountyShot = function(player, target, ability, action) end xi.job_utils.ranger.useDecoyShot = function(player, target, ability, action) - target:addStatusEffect(xi.effect.DECOY_SHOT, 11, 1, 30) + target:addStatusEffect(xi.effect.DECOY_SHOT, { power = 11, duration = 30, origin = player, tick = 1 }) return xi.effect.DECOY_SHOT end @@ -377,7 +377,7 @@ xi.job_utils.ranger.useHoverShot = function(player, target, ability, action) end xi.job_utils.ranger.useOverkill = function(player, target, ability, action) - player:addStatusEffect(xi.effect.OVERKILL, 11, 1, 60) + player:addStatusEffect(xi.effect.OVERKILL, { power = 11, duration = 60, origin = player, tick = 1 }) return xi.effect.OVERKILL end diff --git a/scripts/globals/job_utils/red_mage.lua b/scripts/globals/job_utils/red_mage.lua index 2bb56c1dd56..302c6b4b418 100644 --- a/scripts/globals/job_utils/red_mage.lua +++ b/scripts/globals/job_utils/red_mage.lua @@ -22,14 +22,14 @@ end -- Ability Use Functions ----------------------------------- xi.job_utils.red_mage.useChainspell = function(player, target, ability) - player:addStatusEffect(xi.effect.CHAINSPELL, 1, 0, 60) + player:addStatusEffect(xi.effect.CHAINSPELL, { power = 1, duration = 60, origin = player }) return xi.effect.CHAINSPELL end xi.job_utils.red_mage.useComposure = function(player, target, ability) player:delStatusEffect(xi.effect.COMPOSURE) - player:addStatusEffect(xi.effect.COMPOSURE, 1, 0, 7200) + player:addStatusEffect(xi.effect.COMPOSURE, { power = 1, duration = 7200, origin = player }) return xi.effect.COMPOSURE end @@ -54,19 +54,19 @@ xi.job_utils.red_mage.useConvert = function(player, target, ability) end xi.job_utils.red_mage.useSaboteur = function(player, target, ability) - player:addStatusEffect(xi.effect.SABOTEUR, 1, 0, 60) + player:addStatusEffect(xi.effect.SABOTEUR, { power = 1, duration = 60, origin = player }) return xi.effect.SABOTEUR end xi.job_utils.red_mage.useSpontaneity = function(player, target, ability) - target:addStatusEffect(xi.effect.SPONTANEITY, 1, 0, 60) + target:addStatusEffect(xi.effect.SPONTANEITY, { power = 1, duration = 60, origin = player }) return xi.effect.SPONTANEITY end xi.job_utils.red_mage.useStymie = function(player, target, ability) - target:addStatusEffect(xi.effect.STYMIE, 1, 0, 60) + target:addStatusEffect(xi.effect.STYMIE, { power = 1, duration = 60, origin = player }) return xi.effect.STYMIE end diff --git a/scripts/globals/job_utils/rune_fencer.lua b/scripts/globals/job_utils/rune_fencer.lua index d2172e5f426..a93fbc151e1 100644 --- a/scripts/globals/job_utils/rune_fencer.lua +++ b/scripts/globals/job_utils/rune_fencer.lua @@ -27,7 +27,7 @@ local function applyRuneEnhancement(effectType, player) -- see https://www.bg-wiki.com/ffxi/Category:Rune local power = math.floor((49 * runLevel / 99) + 5.5) + meritBonus + jobPointBonus - player:addStatusEffect(effectType, power, 0, 300) + player:addStatusEffect(effectType, { power = power, duration = 300, origin = player }) end local function enforceRuneCounts(target) @@ -290,7 +290,7 @@ local function getAnimationEffusion(weaponSkillType, offset) -- verified via ret end local function applyVallationValianceSDTMods(target, SDTTypes, power, effect, duration) -- Vallation/Valiance can apply up to N where N is total rune different elemental resistances, or power*N for singular element, or any combination thereof. - local effectAdded = target:addStatusEffect(effect, power, 0, duration) + local effectAdded = target:addStatusEffect(effect, { power = power, duration = duration, origin = target }) if effectAdded then local newEffect = target:getStatusEffect(effect) @@ -302,7 +302,7 @@ local function applyVallationValianceSDTMods(target, SDTTypes, power, effect, du end local function applyGambitSDTMods(target, SDTTypes, power, effect, duration) -- Gambit can apply up to N where N is total rune different elemental resistance decreases, or power*N for singular element, or any combination thereof. - local effectAdded = target:addStatusEffect(effect, power, 0, duration) + local effectAdded = target:addStatusEffect(effect, { power = power, duration = duration, origin = target }) if effectAdded then local newEffect = target:getStatusEffect(effect) @@ -327,7 +327,7 @@ xi.job_utils.rune_fencer.useSwordplay = function(player, target, ability) local subPower = player:getMerit(xi.merit.MERIT_SLEIGHT_OF_SWORD) -- Each merit adds 5 "Subtle Blow". subPower = subPower + (subPower / 5) * player:getMod(xi.mod.AUGMENTS_SLEIGHT_OF_SWORD) -- Add augment effect IF player has augment. - player:addStatusEffect(xi.effect.SWORDPLAY, power, 3, 120, 0, subPower, 0) + player:addStatusEffect(xi.effect.SWORDPLAY, { power = power, duration = 120, origin = player, tick = 3, subPower = subPower }) return xi.effect.SWORDPLAY end @@ -448,7 +448,7 @@ xi.job_utils.rune_fencer.useVallationValiance = function(player, target, ability applyVallationValianceSDTMods(member, sdtTypes, sdtPower, xi.effect.VALIANCE, duration) if inspirationFCBonus > 0 then -- Inspiration FC is not applied unless Valiance is applied, tested on retail with 2 RUN in a party - member:addStatusEffect(xi.effect.FAST_CAST, inspirationFCBonus, 0, duration) + member:addStatusEffect(xi.effect.FAST_CAST, { power = inspirationFCBonus, duration = duration, origin = player }) end elseif member:getID() == player:getID() then -- caster has Vallation, set no effect message. ability:setMsg(xi.msg.basic.JA_NO_EFFECT_2) -- " uses Valiance.\nNo effect on ." @@ -464,7 +464,7 @@ xi.job_utils.rune_fencer.useVallationValiance = function(player, target, ability applyVallationValianceSDTMods(target, sdtTypes, sdtPower, xi.effect.VALLATION, duration) if inspirationFCBonus > 0 then - target:addStatusEffect(xi.effect.FAST_CAST, inspirationFCBonus, 0, duration) + target:addStatusEffect(xi.effect.FAST_CAST, { power = inspirationFCBonus, duration = duration, origin = player }) end return xi.effect.VALLATION @@ -493,7 +493,7 @@ xi.job_utils.rune_fencer.useBattuta = function(player, target, ability, action) local highestRune = target:getHighestRuneEffect() action:info(target:getID(), getSpecEffectElementWard(highestRune)) -- set element color for animation. - target:addStatusEffect(xi.effect.BATTUTA, inquartataPower, 0, 90, 0, math.floor(spikesPower * modBonus), 0) + target:addStatusEffect(xi.effect.BATTUTA, { power = inquartataPower, duration = 90, origin = player, subPower = math.floor(spikesPower * modBonus) }) return xi.effect.BATTUTA end @@ -728,7 +728,7 @@ xi.job_utils.rune_fencer.usePflug = function(player, target, ability, action) action:info(target:getID(), getSpecEffectElementWard(highestRune)) - player:addStatusEffect(xi.effect.PFLUG, baseStrength, 0, 120, 0, meritBonus) + player:addStatusEffect(xi.effect.PFLUG, { power = baseStrength, duration = 120, origin = player, subPower = meritBonus }) return xi.effect.PFLUG end @@ -777,7 +777,7 @@ xi.job_utils.rune_fencer.useRayke = function(player, target, ability, action) action:info(target:getID(), getSpecEffectElementEffusion(highestRune)) -- set element color for animation. action:setAnimation(target:getID(), getAnimationEffusion(weaponSkillType, 20)) -- set animation for currently equipped weapon - local effectAdded = target:addStatusEffect(xi.effect.RAYKE, 0, 0, duration + modDuration) + local effectAdded = target:addStatusEffect(xi.effect.RAYKE, { duration = duration + modDuration, origin = player }) if effectAdded then local effect = target:getStatusEffect(xi.effect.RAYKE) @@ -820,11 +820,11 @@ xi.job_utils.rune_fencer.useOneForAll = function(player, target, ability, action for _, member in pairs(party) do member:delStatusEffectSilent(xi.effect.ONE_FOR_ALL) -- remove old, apparently the newest OFA always wins. - member:addStatusEffect(xi.effect.ONE_FOR_ALL, power, 0, duration) + member:addStatusEffect(xi.effect.ONE_FOR_ALL, { power = power, duration = duration, origin = player }) end end -local function applyLiementEffect(target, absorbTypes, absorbPower, duration) +local function applyLiementEffect(target, absorbTypes, absorbPower, duration, caster) local absorbBits = 0 local i = 0 @@ -841,7 +841,7 @@ local function applyLiementEffect(target, absorbTypes, absorbPower, duration) target:delStatusEffectSilent(xi.effect.VALIANCE) -- Liement overwrites Valiance target:delStatusEffectSilent(xi.effect.LIEMENT) -- Remove Liement if it's already up. The new one will overwrite regardless of strength. - target:addStatusEffect(xi.effect.LIEMENT, absorbPower, 0, duration, 0, absorbBits) + target:addStatusEffect(xi.effect.LIEMENT, { power = absorbPower, duration = duration, origin = caster, subPower = absorbBits }) return xi.effect.LIEMENT end @@ -872,10 +872,10 @@ xi.job_utils.rune_fencer.useLiement = function(player, target, ability, action) local party = player:getParty() for _, member in pairs(party) do - applyLiementEffect(member, absorbTypes, absorbPower, duration) + applyLiementEffect(member, absorbTypes, absorbPower, duration, player) end else -- apply effects to self only - applyLiementEffect(target, absorbTypes, absorbPower, duration) + applyLiementEffect(target, absorbTypes, absorbPower, duration, player) end return xi.effect.LIEMENT diff --git a/scripts/globals/job_utils/samurai.lua b/scripts/globals/job_utils/samurai.lua index 4e71961ef4f..a1b03fc4ee9 100644 --- a/scripts/globals/job_utils/samurai.lua +++ b/scripts/globals/job_utils/samurai.lua @@ -82,14 +82,14 @@ end ----------------------------------- xi.job_utils.samurai.useMeikyoShisui = function(player, target, ability) - player:addStatusEffect(xi.effect.MEIKYO_SHISUI, 1, 0, 30) + player:addStatusEffect(xi.effect.MEIKYO_SHISUI, { power = 1, duration = 30, origin = player }) player:addTP(3000) return 0 end xi.job_utils.samurai.useYaegasumi = function(player, target, ability) - player:addStatusEffect(xi.effect.YAEGASUMI, 12, 0, 45) + player:addStatusEffect(xi.effect.YAEGASUMI, { power = 12, duration = 45, origin = player }) return xi.effect.YAEGASUMI end @@ -109,7 +109,7 @@ xi.job_utils.samurai.useWardingCircle = function(player, target, ability) ability:setMsg(xi.msg.basic.FORTIFIED_DEMONS) end - target:addStatusEffect(xi.effect.WARDING_CIRCLE, power, 0, duration) + target:addStatusEffect(xi.effect.WARDING_CIRCLE, { power = power, duration = duration, origin = player }) return xi.effect.WARDING_CIRCLE end @@ -122,7 +122,7 @@ xi.job_utils.samurai.useThirdEye = function(player, target, ability) -- Returns "no effect" message when Copy Image is active when Third Eye is used. ability:setMsg(xi.msg.basic.JA_NO_EFFECT) else - player:addStatusEffect(xi.effect.THIRD_EYE, 0, 0, 30) -- Power keeps track of procs + player:addStatusEffect(xi.effect.THIRD_EYE, { duration = 30, origin = player }) -- Power keeps track of procs end return xi.effect.THIRD_EYE @@ -140,7 +140,7 @@ xi.job_utils.samurai.useHasso = function(player, target, ability) if strboost > 0 then target:delStatusEffect(xi.effect.HASSO) target:delStatusEffect(xi.effect.SEIGAN) - target:addStatusEffect(xi.effect.HASSO, strboost, 0, 300) + target:addStatusEffect(xi.effect.HASSO, { power = strboost, duration = 300, origin = player }) end return xi.effect.HASSO @@ -154,7 +154,7 @@ xi.job_utils.samurai.useMeditate = function(player, target, ability) amount = 20 + player:getJobPointLevel(xi.jp.MEDITATE_EFFECT) * 5 end - player:addStatusEffectEx(xi.effect.MEDITATE, 0, amount, 3, duration) + player:addStatusEffect(xi.effect.MEDITATE, { power = amount, duration = duration, origin = player, tick = 3, icon = 0 }) return xi.effect.MEDITATE end @@ -163,7 +163,7 @@ xi.job_utils.samurai.useSeigan = function(player, target, ability) if target:isWeaponTwoHanded() then target:delStatusEffect(xi.effect.HASSO) target:delStatusEffect(xi.effect.SEIGAN) - target:addStatusEffect(xi.effect.SEIGAN, 0, 0, 300) + target:addStatusEffect(xi.effect.SEIGAN, { duration = 300, origin = player }) end return xi.effect.SEIGAN @@ -171,7 +171,7 @@ end xi.job_utils.samurai.useSekkanoki = function(player, target, ability) target:delStatusEffect(xi.effect.SEKKANOKI) - target:addStatusEffect(xi.effect.SEKKANOKI, 1, 0, 60) + target:addStatusEffect(xi.effect.SEKKANOKI, { power = 1, duration = 60, origin = player }) return xi.effect.SEKKANOKI end @@ -189,7 +189,7 @@ xi.job_utils.samurai.useKonzenIttai = function(player, target, ability, action) not target:hasStatusEffect(xi.effect.SKILLCHAIN, 0) then infoValue = params.hit - target:addStatusEffectEx(xi.effect.CHAINBOUND, 0, 2, 0, 10, 0, 1) + target:addStatusEffect(xi.effect.CHAINBOUND, { power = 2, duration = 10, origin = player, icon = 0, subPower = 1 }) else ability:setMsg(xi.msg.basic.JA_NO_EFFECT) end @@ -227,7 +227,7 @@ xi.job_utils.samurai.useBladeBash = function(player, target, ability, action) then local resistanceRate = xi.combat.magicHitRate.calculateResistRate(player, target, 0, 0, xi.skillRank.A_PLUS, xi.element.THUNDER, xi.mod.INT, xi.effect.STUN, 0) if xi.data.statusEffect.isResistRateSuccessfull(xi.effect.STUN, resistanceRate, 0) then - target:addStatusEffect(xi.effect.STUN, 1, 0, 6 * resistanceRate) + target:addStatusEffect(xi.effect.STUN, { power = 1, duration = 6 * resistanceRate, origin = player }) end end @@ -240,7 +240,7 @@ xi.job_utils.samurai.useBladeBash = function(player, target, ability, action) local resistanceRate = xi.combat.magicHitRate.calculateResistRate(player, target, 0, 0, xi.skillRank.A_PLUS, xi.element.FIRE, xi.mod.INT, xi.effect.PLAGUE, 0) if xi.data.statusEffect.isResistRateSuccessfull(xi.effect.PLAGUE, resistanceRate, 0) then local duration = (15 + player:getMerit(xi.merit.BLADE_BASH)) * resistanceRate - target:addStatusEffect(xi.effect.PLAGUE, 5, 0, duration) + target:addStatusEffect(xi.effect.PLAGUE, { power = 5, duration = duration, origin = player }) end end @@ -276,7 +276,7 @@ xi.job_utils.samurai.useShikikoyo = function(player, target, ability, action) end xi.job_utils.samurai.useSengikori = function(player, target, ability) - player:addStatusEffect(xi.effect.SENGIKORI, 25, 0, 60) + player:addStatusEffect(xi.effect.SENGIKORI, { power = 25, duration = 60, origin = player }) return xi.effect.SENGIKORI end @@ -284,14 +284,14 @@ end xi.job_utils.samurai.useHamanoha = function(player, target, ability) local jpValue = target:getJobPointLevel(xi.jp.HAMANOHA_DURATION) - target:addStatusEffect(xi.effect.HAMANOHA, 12, 0, 180 + jpValue) + target:addStatusEffect(xi.effect.HAMANOHA, { power = 12, duration = 180 + jpValue, origin = player }) return xi.effect.HAMANOHA end xi.job_utils.samurai.useHagakure = function(player, target, ability) player:delStatusEffect(xi.effect.HAGAKURE) - player:addStatusEffect(xi.effect.HAGAKURE, 400, 0, 60, 0, 1000) + player:addStatusEffect(xi.effect.HAGAKURE, { power = 400, duration = 60, origin = player, subPower = 1000 }) return xi.effect.HAGAKURE end diff --git a/scripts/globals/job_utils/thief.lua b/scripts/globals/job_utils/thief.lua index 72333cc3435..b38f8701a61 100644 --- a/scripts/globals/job_utils/thief.lua +++ b/scripts/globals/job_utils/thief.lua @@ -146,7 +146,7 @@ xi.job_utils.thief.useAssassinsCharge = function(player, target, ability, action crit = merits / 5 end - player:addStatusEffect(xi.effect.ASSASSINS_CHARGE, merits - 5, 0, 60, 0, crit) + player:addStatusEffect(xi.effect.ASSASSINS_CHARGE, { power = merits - 5, duration = 60, origin = player, subPower = crit }) return xi.effect.ASSASSINS_CHARGE end @@ -154,7 +154,7 @@ end xi.job_utils.thief.useBully = function(player, target, ability) local jpValue = player:getJobPointLevel(xi.jp.BULLY_EFFECT) - target:addStatusEffectEx(xi.effect.DOUBT, xi.effect.INTIMIDATE, 15 + jpValue, 0, 30) + target:addStatusEffect(xi.effect.DOUBT, { power = 15 + jpValue, duration = 30, origin = player, icon = xi.effect.INTIMIDATE }) return xi.effect.INTIMIDATE end @@ -191,7 +191,7 @@ xi.job_utils.thief.useConspirator = function(player, target, ability) end end - target:addStatusEffect(xi.effect.CONSPIRATOR, subtleBlow * scale, 0, 60, 0, accuracy * scale) + target:addStatusEffect(xi.effect.CONSPIRATOR, { power = subtleBlow * scale, duration = 60, origin = player, subPower = accuracy * scale }) return xi.effect.CONSPIRATOR end @@ -241,7 +241,7 @@ xi.job_utils.thief.useDespoil = function(player, target, ability, action) local power = processDebuff(player, target, ability, debuff) -- Also sets ability message - target:addStatusEffect(debuff, power, 0, 90) + target:addStatusEffect(debuff, { power = power, duration = 90, origin = player }) else action:setAnimation(target:getID(), 182) ability:setMsg(xi.msg.basic.STEAL_FAIL) -- Failed @@ -254,7 +254,7 @@ xi.job_utils.thief.useFeint = function(player, target, ability, action) local bonus = player:getMod(xi.mod.AUGMENTS_FEINT) * player:getMerit(xi.merit.FEINT) / 25 -- Divide by the merit value (feint is 25) to get the number of merit points -- Subpower is the proc rate bonus for TH procs - player:addStatusEffect(xi.effect.FEINT, 150 + bonus, 0, 60, 0, player:getMerit(xi.merit.FEINT) - 25) -- -150 Evasion base, 0% base TREASURE_HUNTER_PROC, every merit past 1 gives 25% + player:addStatusEffect(xi.effect.FEINT, { power = 150 + bonus, duration = 60, origin = player, subPower = player:getMerit(xi.merit.FEINT) - 25 }) -- -150 Evasion base, 0% base TREASURE_HUNTER_PROC, every merit past 1 gives 25% end xi.job_utils.thief.useFlee = function(player, target, ability) @@ -265,7 +265,7 @@ xi.job_utils.thief.useFlee = function(player, target, ability) player:delStatusEffect(xi.effect.WEIGHT) end - player:addStatusEffect(xi.effect.FLEE, 10000, 0, duration) + player:addStatusEffect(xi.effect.FLEE, { power = 10000, duration = duration, origin = player }) return xi.effect.FLEE end @@ -275,7 +275,7 @@ xi.job_utils.thief.useHide = function(player, target, ability) duration = duration * (1 + player:getMod(xi.mod.HIDE_DURATION) / 100) - player:addStatusEffect(xi.effect.HIDE, 1, 0, math.floor(duration * xi.settings.main.SNEAK_INVIS_DURATION_MULTIPLIER)) + player:addStatusEffect(xi.effect.HIDE, { power = 1, duration = math.floor(duration * xi.settings.main.SNEAK_INVIS_DURATION_MULTIPLIER), origin = player }) return xi.effect.HIDE end @@ -314,7 +314,7 @@ xi.job_utils.thief.useLarceny = function(player, target, ability, action) local newTier = effectStolen:getTier() local newFlags = effectStolen:getEffectFlags() - player:addStatusEffectEx(newID, newIcon, newPower, newTick, newDuration, newSubType, newSubPower, newTier, newFlags) + player:addStatusEffect(newID, { power = newPower, duration = newDuration, origin = player, tick = newTick, icon = newIcon, subType = newSubType, subPower = newSubPower, tier = newTier, flag = newFlags }) target:delStatusEffect(newID) effectID = newID @@ -392,13 +392,13 @@ end xi.job_utils.thief.usePerfectDodge = function(player, target, ability) local duration = 30 + player:getMod(xi.mod.PERFECT_DODGE) - player:addStatusEffect(xi.effect.PERFECT_DODGE, 1, 0, duration) + player:addStatusEffect(xi.effect.PERFECT_DODGE, { power = 1, duration = duration, origin = player }) return xi.effect.PERFECT_DODGE end xi.job_utils.thief.useSneakAttack = function(player, target, ability) - player:addStatusEffect(xi.effect.SNEAK_ATTACK, 1, 0, 60) + player:addStatusEffect(xi.effect.SNEAK_ATTACK, { power = 1, duration = 60, origin = player }) return xi.effect.SNEAK_ATTACK end @@ -472,7 +472,7 @@ xi.job_utils.thief.useSteal = function(player, target, ability, action) end xi.job_utils.thief.useTrickAttack = function(player, target, ability) - player:addStatusEffect(xi.effect.TRICK_ATTACK, 1, 0, 60) + player:addStatusEffect(xi.effect.TRICK_ATTACK, { power = 1, duration = 60, origin = player }) return xi.effect.TRICK_ATTACK end diff --git a/scripts/globals/job_utils/warrior.lua b/scripts/globals/job_utils/warrior.lua index d7173bd3eca..2cf74514899 100644 --- a/scripts/globals/job_utils/warrior.lua +++ b/scripts/globals/job_utils/warrior.lua @@ -34,7 +34,7 @@ end xi.job_utils.warrior.useAggressor = function(player, target, ability) local merits = player:getMerit(xi.merit.AGGRESSIVE_AIM) - player:addStatusEffect(xi.effect.AGGRESSOR, merits, 0, 180 + player:getMod(xi.mod.AGGRESSOR_DURATION)) + player:addStatusEffect(xi.effect.AGGRESSOR, { power = merits, duration = 180 + player:getMod(xi.mod.AGGRESSOR_DURATION), origin = player }) return xi.effect.AGGRESSOR end @@ -48,7 +48,7 @@ xi.job_utils.warrior.useBerserk = function(player, target, ability) local power = 25 + player:getMod(xi.mod.BERSERK_POTENCY) + utils.clamp(levelScale, 0, 10) local duration = 180 + player:getMod(xi.mod.BERSERK_DURATION) - player:addStatusEffect(xi.effect.BERSERK, power, 0, duration) + player:addStatusEffect(xi.effect.BERSERK, { power = power, duration = duration, origin = player }) return xi.effect.BERSERK end @@ -57,7 +57,7 @@ xi.job_utils.warrior.useBloodRage = function(player, target, ability) local power = 20 + player:getJobPointLevel(xi.jp.BLOOD_RAGE_EFFECT) local duration = 30 + player:getMod(xi.mod.ENHANCES_BLOOD_RAGE) - target:addStatusEffect(xi.effect.BLOOD_RAGE, power, 0, duration) + target:addStatusEffect(xi.effect.BLOOD_RAGE, { power = power, duration = duration, origin = player }) if player:getID() ~= target:getID() then ability:setMsg(xi.msg.basic.JA_GAIN_EFFECT) @@ -67,7 +67,7 @@ xi.job_utils.warrior.useBloodRage = function(player, target, ability) end xi.job_utils.warrior.useBrazenRush = function(player, target, ability) - player:addStatusEffect(xi.effect.BRAZEN_RUSH, 100, 3, 30) + player:addStatusEffect(xi.effect.BRAZEN_RUSH, { power = 100, duration = 30, origin = player, tick = 3 }) return xi.effect.BRAZEN_RUSH end @@ -81,25 +81,25 @@ xi.job_utils.warrior.useDefender = function(player, target, ability) local power = 25 + utils.clamp(levelScale, 0, 10) local duration = 180 + player:getMod(xi.mod.DEFENDER_DURATION) - player:addStatusEffect(xi.effect.DEFENDER, power, 0, duration) + player:addStatusEffect(xi.effect.DEFENDER, { power = power, duration = duration, origin = player }) return xi.effect.DEFENDER end xi.job_utils.warrior.useMightyStrikes = function(player, target, ability) - player:addStatusEffect(xi.effect.MIGHTY_STRIKES, 1, 0, 45) + player:addStatusEffect(xi.effect.MIGHTY_STRIKES, { power = 1, duration = 45, origin = player }) return xi.effect.MIGHTY_STRIKES end xi.job_utils.warrior.useRestraint = function(player, target, ability) - player:addStatusEffect(xi.effect.RESTRAINT, 0, 0, 300) + player:addStatusEffect(xi.effect.RESTRAINT, { duration = 300, origin = player }) return xi.effect.RESTRAINT end xi.job_utils.warrior.useRetaliation = function(player, target, ability) - player:addStatusEffect(xi.effect.RETALIATION, 1, 0, 180) + player:addStatusEffect(xi.effect.RETALIATION, { power = 1, duration = 180, origin = player }) return xi.effect.RETALIATION end @@ -108,7 +108,7 @@ xi.job_utils.warrior.useTomahawk = function(player, target, ability) local merits = player:getMerit(xi.merit.TOMAHAWK) - 15 local duration = 30 + merits - target:addStatusEffectEx(xi.effect.TOMAHAWK, 0, 25, 3, duration, 0, 0, 0) + target:addStatusEffect(xi.effect.TOMAHAWK, { power = 25, duration = duration, origin = player, tick = 3, icon = 0 }) player:removeAmmo(1) end @@ -120,7 +120,7 @@ xi.job_utils.warrior.useWarcry = function(player, target, ability) duration = duration + player:getMod(xi.mod.WARCRY_DURATION) - target:addStatusEffect(xi.effect.WARCRY, power, 0, duration, 0, merit) + target:addStatusEffect(xi.effect.WARCRY, { power = power, duration = duration, origin = player, subPower = merit }) if player:getID() ~= target:getID() then ability:setMsg(xi.msg.basic.JA_ATK_ENHANCED) @@ -132,7 +132,7 @@ end xi.job_utils.warrior.useWarriorsCharge = function(player, target, ability, action) local merits = player:getMerit(xi.merit.WARRIORS_CHARGE) - player:addStatusEffect(xi.effect.WARRIORS_CHARGE, merits - 5, 0, 60) + player:addStatusEffect(xi.effect.WARRIORS_CHARGE, { power = merits - 5, duration = 60, origin = player }) return xi.effect.WARRIORS_CHARGE end diff --git a/scripts/globals/job_utils/white_mage.lua b/scripts/globals/job_utils/white_mage.lua index b2aa8a45f2e..15c2460a1be 100644 --- a/scripts/globals/job_utils/white_mage.lua +++ b/scripts/globals/job_utils/white_mage.lua @@ -59,7 +59,7 @@ end xi.job_utils.white_mage.useAfflatusMisery = function(player, target, ability) target:delStatusEffect(xi.effect.AFFLATUS_SOLACE) target:delStatusEffect(xi.effect.AFFLATUS_MISERY) - target:addStatusEffect(xi.effect.AFFLATUS_MISERY, 8, 0, 7200) + target:addStatusEffect(xi.effect.AFFLATUS_MISERY, { power = 8, duration = 7200, origin = player }) return xi.effect.AFFLATUS_MISERY end @@ -67,13 +67,13 @@ end xi.job_utils.white_mage.useAfflatusSolace = function(player, target, ability) target:delStatusEffect(xi.effect.AFFLATUS_SOLACE) target:delStatusEffect(xi.effect.AFFLATUS_MISERY) - target:addStatusEffect(xi.effect.AFFLATUS_SOLACE, 8, 0, 7200) + target:addStatusEffect(xi.effect.AFFLATUS_SOLACE, { power = 8, duration = 7200, origin = player }) return xi.effect.AFFLATUS_SOLACE end xi.job_utils.white_mage.useAsylum = function(player, target, ability) - target:addStatusEffect(xi.effect.ASYLUM, 3, 0, 30) + target:addStatusEffect(xi.effect.ASYLUM, { power = 3, duration = 30, origin = player }) return xi.effect.ASYLUM end @@ -126,13 +126,13 @@ xi.job_utils.white_mage.useDevotion = function(player, target, ability, action) end xi.job_utils.white_mage.useDivineCaress = function(player, target, ability) - player:addStatusEffect(xi.effect.DIVINE_CARESS_I, 3, 0, 60) + player:addStatusEffect(xi.effect.DIVINE_CARESS_I, { power = 3, duration = 60, origin = player }) return xi.effect.DIVINE_CARESS_I end xi.job_utils.white_mage.useDivineSeal = function(player, target, ability) - player:addStatusEffect(xi.effect.DIVINE_SEAL, 1, 0, 60) + player:addStatusEffect(xi.effect.DIVINE_SEAL, { power = 1, duration = 60, origin = player }) return xi.effect.DIVINE_SEAL end @@ -158,7 +158,7 @@ xi.job_utils.white_mage.useMartyr = function(player, target, ability, action) end xi.job_utils.white_mage.useSacrosanctity = function(player, target, ability) - target:addStatusEffect(xi.effect.SACROSANCTITY, 3, 0, 60) + target:addStatusEffect(xi.effect.SACROSANCTITY, { power = 3, duration = 60, origin = player }) return xi.effect.SACROSANCTITY end diff --git a/scripts/globals/mobs.lua b/scripts/globals/mobs.lua index 48ea8c0337f..090615bf25d 100644 --- a/scripts/globals/mobs.lua +++ b/scripts/globals/mobs.lua @@ -473,7 +473,7 @@ local addEffectStatus = function(mob, target, ae, params) duration = utils.clamp(duration, ae.minDuration, ae.maxDuration) * resist - target:addStatusEffect(ae.eff, power, tick, duration) + target:addStatusEffect(ae.eff, { power = power, duration = duration, origin = mob, tick = tick }) if params.code then params.code(mob, target, power) diff --git a/scripts/globals/mobskills.lua b/scripts/globals/mobskills.lua index c5686b84d15..4478a32cea6 100644 --- a/scripts/globals/mobskills.lua +++ b/scripts/globals/mobskills.lua @@ -1077,7 +1077,7 @@ xi.mobskills.mobDrainAttribute = function(mob, target, typeEffect, power, tick, local results = xi.mobskills.mobStatusEffectMove(mob, target, typeEffect, power, tick, duration) if results == xi.msg.basic.SKILL_ENFEEB_IS then - mob:addStatusEffect(drainEffectCorrelation[typeEffect], power, tick, duration) + mob:addStatusEffect(drainEffectCorrelation[typeEffect], { power = power, duration = duration, origin = mob, tick = tick }) return xi.msg.basic.ATTR_DRAINED end @@ -1122,7 +1122,7 @@ xi.mobskills.mobStatusEffectMove = function(mob, target, typeEffect, power, tick local resistRate = xi.combat.magicHitRate.calculateResistRate(mob, target, 0, 0, 0, element, xi.mod.INT, typeEffect, 0) if resistRate >= 0.25 then local totalDuration = math.floor(duration * resistRate) - target:addStatusEffect(typeEffect, power, tick, totalDuration, subType, subPower, tier) + target:addStatusEffect(typeEffect, { power = power, duration = totalDuration, origin = mob, tick = tick, subType = subType, subPower = subPower, tier = tier }) return xi.msg.basic.SKILL_ENFEEB_IS end @@ -1155,7 +1155,7 @@ xi.mobskills.mobGazeMove = function(mob, target, typeEffect, power, tick, durati end xi.mobskills.mobBuffMove = function(mob, typeEffect, power, tick, duration, subType, subPower) - if mob:addStatusEffect(typeEffect, power, tick, duration, subType, subPower) then + if mob:addStatusEffect(typeEffect, { power = power, duration = duration, origin = mob, tick = tick, subType = subType, subPower = subPower }) then return xi.msg.basic.SKILL_GAIN_EFFECT end diff --git a/scripts/globals/monstrosity.lua b/scripts/globals/monstrosity.lua index aee276ee783..55bbb0b835b 100644 --- a/scripts/globals/monstrosity.lua +++ b/scripts/globals/monstrosity.lua @@ -1495,7 +1495,7 @@ xi.monstrosity.teyrnonOnEventFinish = function(player, csid, option, npc) end player:delStatusEffectSilent(xi.effect.REGEN) - player:addStatusEffect(xi.effect.REGEN, 1, 3, 3600) + player:addStatusEffect(xi.effect.REGEN, { power = 1, duration = 3600, origin = player, tick = 3 }) end, -- 3: Refresh @@ -1505,7 +1505,7 @@ xi.monstrosity.teyrnonOnEventFinish = function(player, csid, option, npc) end player:delStatusEffectSilent(xi.effect.REFRESH) - player:addStatusEffect(xi.effect.REFRESH, 1, 3, 3600) -- Does indeed get overwriten by regular refresh. + player:addStatusEffect(xi.effect.REFRESH, { power = 1, duration = 3600, origin = player, tick = 3 }) -- Does indeed get overwriten by regular refresh. end, -- 4: Protect @@ -1539,7 +1539,7 @@ xi.monstrosity.teyrnonOnEventFinish = function(player, csid, option, npc) power = power + (bonus * tier) player:delStatusEffectSilent(xi.effect.PROTECT) - player:addStatusEffect(xi.effect.PROTECT, power, 0, 1800, 0, 0, tier) + player:addStatusEffect(xi.effect.PROTECT, { power = power, duration = 1800, origin = player, tier = tier }) end, -- 5: Shell @@ -1575,13 +1575,13 @@ xi.monstrosity.teyrnonOnEventFinish = function(player, csid, option, npc) power = power + (bonus * tier) player:delStatusEffectSilent(xi.effect.SHELL) - player:addStatusEffect(xi.effect.SHELL, power, 0, 1800, 0, 0, tier) + player:addStatusEffect(xi.effect.SHELL, { power = power, duration = 1800, origin = player, tier = tier }) end, -- 6: Haste [6] = function() player:delStatusEffectSilent(xi.effect.HASTE) - player:addStatusEffect(xi.effect.HASTE, 1000, 0, 600) + player:addStatusEffect(xi.effect.HASTE, { power = 1000, duration = 600, origin = player }) end, } end diff --git a/scripts/globals/nyzul/pathos.lua b/scripts/globals/nyzul/pathos.lua index a46be82b459..06627959ad7 100644 --- a/scripts/globals/nyzul/pathos.lua +++ b/scripts/globals/nyzul/pathos.lua @@ -122,14 +122,14 @@ local function addGearPenalty(mob) end end - player:addStatusEffect(effect, power, 0, 0) + player:addStatusEffect(effect, { power = power, origin = player }) handlePathosEffectFlags(player, effect) player:messageSpecial(ID.text.MALFUNCTION) player:messageSpecial(pathos.textId) if player:hasPet() then local pet = player:getPet() - pet:addStatusEffectEx(effect, effect, power, 0, 0) + pet:addStatusEffect(effect, { power = power, origin = player }) handlePathosEffectFlags(pet, effect) end end @@ -175,7 +175,7 @@ xi.nyzul.addFloorPathos = function(instance) for _, player in pairs(chars) do -- Player pathos addition. - player:addStatusEffect(pathos.effect, pathos.power, 0, 0) + player:addStatusEffect(pathos.effect, { power = pathos.power, origin = player }) handlePathosEffectFlags(player, pathos.effect) player:messageSpecial(pathos.textId) @@ -184,7 +184,7 @@ xi.nyzul.addFloorPathos = function(instance) if player:hasPet() then local pet = player:getPet() - pet:addStatusEffectEx(pathos.effect, pathos.effect, pathos.power, 0, 0) + pet:addStatusEffect(pathos.effect, { power = pathos.power, origin = player }) handlePathosEffectFlags(pet, pathos.effect) end end @@ -202,7 +202,7 @@ xi.nyzul.addPetSpawnPathos = function(player) if utils.mask.getBit(floorPathos, i) then local pathos = xi.nyzul.pathos[i] - pet:addStatusEffectEx(pathos.effect, pathos.effect, pathos.power, 0, 0) + pet:addStatusEffect(pathos.effect, { power = pathos.power, origin = player }) handlePathosEffectFlags(pet, pathos.effect) end end diff --git a/scripts/globals/pirates_chart.lua b/scripts/globals/pirates_chart.lua index 7376d726d3d..21486ec2e45 100644 --- a/scripts/globals/pirates_chart.lua +++ b/scripts/globals/pirates_chart.lua @@ -320,7 +320,7 @@ xi.piratesChart.onEventUpdate = function(player, csid, option, npc) member:delStatusEffectsByFlag(xi.effectFlag.DISPELABLE) member:delStatusEffect(xi.effect.RERAISE) member:delContainerItems(xi.inv.TEMPITEMS) - member:addStatusEffect(xi.effect.LEVEL_RESTRICTION, 20, 0, 0, 0, 0) + member:addStatusEffect(xi.effect.LEVEL_RESTRICTION, { power = 20, origin = player }) end end diff --git a/scripts/globals/player.lua b/scripts/globals/player.lua index e28a030d921..145b546a2df 100644 --- a/scripts/globals/player.lua +++ b/scripts/globals/player.lua @@ -190,18 +190,18 @@ xi.player.onGameIn = function(player, firstLogin, zoning) -- god mode if player:getCharVar('GodMode') == 1 then - player:addStatusEffect(xi.effect.MAX_HP_BOOST, 1000, 0, 0) - player:addStatusEffect(xi.effect.MAX_MP_BOOST, 1000, 0, 0) - player:addStatusEffect(xi.effect.MIGHTY_STRIKES, 1, 0, 0) - player:addStatusEffect(xi.effect.HUNDRED_FISTS, 1, 0, 0) - player:addStatusEffect(xi.effect.CHAINSPELL, 1, 0, 0) - player:addStatusEffect(xi.effect.PERFECT_DODGE, 1, 0, 0) - player:addStatusEffect(xi.effect.INVINCIBLE, 1, 0, 0) - player:addStatusEffect(xi.effect.ELEMENTAL_SFORZO, 1, 0, 0) - player:addStatusEffect(xi.effect.MANAFONT, 1, 0, 0) - player:addStatusEffect(xi.effect.REGAIN, 300, 0, 0) - player:addStatusEffect(xi.effect.REFRESH, 99, 0, 0) - player:addStatusEffect(xi.effect.REGEN, 99, 0, 0) + player:addStatusEffect(xi.effect.MAX_HP_BOOST, { power = 1000, origin = player }) + player:addStatusEffect(xi.effect.MAX_MP_BOOST, { power = 1000, origin = player }) + player:addStatusEffect(xi.effect.MIGHTY_STRIKES, { power = 1, origin = player }) + player:addStatusEffect(xi.effect.HUNDRED_FISTS, { power = 1, origin = player }) + player:addStatusEffect(xi.effect.CHAINSPELL, { power = 1, origin = player }) + player:addStatusEffect(xi.effect.PERFECT_DODGE, { power = 1, origin = player }) + player:addStatusEffect(xi.effect.INVINCIBLE, { power = 1, origin = player }) + player:addStatusEffect(xi.effect.ELEMENTAL_SFORZO, { power = 1, origin = player }) + player:addStatusEffect(xi.effect.MANAFONT, { power = 1, origin = player }) + player:addStatusEffect(xi.effect.REGAIN, { power = 300, origin = player }) + player:addStatusEffect(xi.effect.REFRESH, { power = 99, origin = player }) + player:addStatusEffect(xi.effect.REGEN, { power = 99, origin = player }) player:addMod(xi.mod.RACC, 2500) player:addMod(xi.mod.RATT, 2500) player:addMod(xi.mod.ACC, 2500) diff --git a/scripts/globals/regimes.lua b/scripts/globals/regimes.lua index f24fe805638..99da05fe926 100644 --- a/scripts/globals/regimes.lua +++ b/scripts/globals/regimes.lua @@ -1039,7 +1039,7 @@ local function addGovProwessBonusEffect(player) end -- set effect - player:addStatusEffectEx(p.effect, 0, power, 0, 0) + player:addStatusEffect(p.effect, { power = power, origin = player, icon = 0 }) player:messageBasic(p.effect - 168) end end @@ -1188,43 +1188,43 @@ xi.regime.bookOnEventFinish = function(player, option, regimeType) end, ['REPATRIATION'] = function() - player:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.HOME_NATION, 0, 1) + player:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.HOME_NATION, duration = 1, origin = player, icon = 0 }) end, ['CIRCUMSPECTION'] = function() player:delStatusEffectSilent(xi.effect.SNEAK) - player:addStatusEffect(xi.effect.SNEAK, 0, 10, 900 * xi.settings.main.SNEAK_INVIS_DURATION_MULTIPLIER) + player:addStatusEffect(xi.effect.SNEAK, { duration = 900 * xi.settings.main.SNEAK_INVIS_DURATION_MULTIPLIER, origin = player, tick = 10 }) player:delStatusEffectSilent(xi.effect.INVISIBLE) - player:addStatusEffect(xi.effect.INVISIBLE, 0, 10, 900 * xi.settings.main.SNEAK_INVIS_DURATION_MULTIPLIER) + player:addStatusEffect(xi.effect.INVISIBLE, { duration = 900 * xi.settings.main.SNEAK_INVIS_DURATION_MULTIPLIER, origin = player, tick = 10 }) end, ['HOMING_INSTINCT'] = function() - player:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.WARP, 0, 3) + player:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.WARP, duration = 3, origin = player, icon = 0 }) end, ['RERAISE'] = function() player:delStatusEffectSilent(xi.effect.RERAISE) - player:addStatusEffect(xi.effect.RERAISE, 1, 0, 7200) + player:addStatusEffect(xi.effect.RERAISE, { power = 1, duration = 7200, origin = player }) end, ['RERAISE_II'] = function() player:delStatusEffectSilent(xi.effect.RERAISE) - player:addStatusEffect(xi.effect.RERAISE, 2, 0, 7200) + player:addStatusEffect(xi.effect.RERAISE, { power = 2, duration = 7200, origin = player }) end, ['RERAISE_III'] = function() player:delStatusEffectSilent(xi.effect.RERAISE) - player:addStatusEffect(xi.effect.RERAISE, 3, 0, 7200) + player:addStatusEffect(xi.effect.RERAISE, { power = 3, duration = 7200, origin = player }) end, ['REGEN'] = function() player:delStatusEffectSilent(xi.effect.REGEN) - player:addStatusEffect(xi.effect.REGEN, 1, 3, 3600) + player:addStatusEffect(xi.effect.REGEN, { power = 1, duration = 3600, origin = player, tick = 3 }) end, ['REFRESH'] = function() player:delStatusEffectSilent(xi.effect.REFRESH) - player:addStatusEffect(xi.effect.REFRESH, 1, 3, 3600) -- Does indeed get overwriten by regular refresh. + player:addStatusEffect(xi.effect.REFRESH, { power = 1, duration = 3600, origin = player, tick = 3 }) -- Does indeed get overwriten by regular refresh. end, ['PROTECT'] = function() @@ -1253,7 +1253,7 @@ xi.regime.bookOnEventFinish = function(player, option, regimeType) power = power + (bonus * tier) player:delStatusEffectSilent(xi.effect.PROTECT) - player:addStatusEffect(xi.effect.PROTECT, power, 0, 1800, 0, 0, tier) + player:addStatusEffect(xi.effect.PROTECT, { power = power, duration = 1800, origin = player, tier = tier }) end, ['SHELL'] = function() @@ -1284,36 +1284,36 @@ xi.regime.bookOnEventFinish = function(player, option, regimeType) power = power + (bonus * tier) player:delStatusEffectSilent(xi.effect.SHELL) - player:addStatusEffect(xi.effect.SHELL, power, 0, 1800, 0, 0, tier) + player:addStatusEffect(xi.effect.SHELL, { power = power, duration = 1800, origin = player, tier = tier }) end, ['HASTE'] = function() player:delStatusEffectSilent(xi.effect.HASTE) - player:addStatusEffect(xi.effect.HASTE, 1000, 0, 600) + player:addStatusEffect(xi.effect.HASTE, { power = 1000, duration = 600, origin = player }) end, ['DRIED_MEAT'] = function() - player:addStatusEffect(xi.effect.FOOD, 1, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, 0, player:getID()) + player:addStatusEffect(xi.effect.FOOD, { power = 1, duration = 1800, origin = player, sourceType = xi.effectSourceType.FOOD }) end, ['SALTED_FISH'] = function() - player:addStatusEffect(xi.effect.FOOD, 2, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, 0, player:getID()) + player:addStatusEffect(xi.effect.FOOD, { power = 2, duration = 1800, origin = player, sourceType = xi.effectSourceType.FOOD }) end, ['HARD_COOKIE'] = function() - player:addStatusEffect(xi.effect.FOOD, 3, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, 0, player:getID()) + player:addStatusEffect(xi.effect.FOOD, { power = 3, duration = 1800, origin = player, sourceType = xi.effectSourceType.FOOD }) end, ['INSTANT_NOODLES'] = function() - player:addStatusEffect(xi.effect.FOOD, 4, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, 0, player:getID()) + player:addStatusEffect(xi.effect.FOOD, { power = 4, duration = 1800, origin = player, sourceType = xi.effectSourceType.FOOD }) end, ['DRIED_AGARICUS'] = function() - player:addStatusEffect(xi.effect.FOOD, 5, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, 0, player:getID()) + player:addStatusEffect(xi.effect.FOOD, { power = 5, duration = 1800, origin = player, sourceType = xi.effectSourceType.FOOD }) end, ['INSTANT_RICE'] = function() - player:addStatusEffect(xi.effect.FOOD, 6, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, 0, player:getID()) + player:addStatusEffect(xi.effect.FOOD, { power = 6, duration = 1800, origin = player, sourceType = xi.effectSourceType.FOOD }) end, ['CIPHER_SAKURA'] = function() @@ -1461,11 +1461,11 @@ xi.regime.checkRegime = function(player, mob, regimeId, index, regimeType) -- increment clears player:delStatusEffectSilent(xi.effect.PROWESS) - player:addStatusEffect(xi.effect.PROWESS, govClears + 1, 0, 0) + player:addStatusEffect(xi.effect.PROWESS, { power = govClears + 1, origin = player }) else -- keep track of number of clears - player:addStatusEffect(xi.effect.PROWESS, 1, 0, 0) + player:addStatusEffect(xi.effect.PROWESS, { power = 1, origin = player }) end end diff --git a/scripts/globals/salvage.lua b/scripts/globals/salvage.lua index 9e71f54b103..4d09bf39a5b 100644 --- a/scripts/globals/salvage.lua +++ b/scripts/globals/salvage.lua @@ -24,14 +24,14 @@ end xi.salvage.onCellItemUse = function(target, effect, value, offset) local statusEffect = target:getStatusEffect(effect) local power = statusEffect:getPower() + local duration = math.floor(statusEffect:getTimeRemaining() / 1000) local newpower = bit.band(power, bit.bnot(value)) local pet = target:getPet() local instance = target:getInstance() target:delStatusEffectSilent(effect) if newpower > 0 then - local duration = math.floor(statusEffect:getTimeRemaining() / 1000) - target:addStatusEffectEx(effect, effect, newpower, 0, duration) + target:addStatusEffect(effect, { power = newpower, duration = duration, origin = target }) end if @@ -44,8 +44,7 @@ xi.salvage.onCellItemUse = function(target, effect, value, offset) then pet:delStatusEffectSilent(effect) if newpower > 0 then - local duration = math.floor(statusEffect:getTimeRemaining() / 1000) - pet:addStatusEffectEx(effect, effect, newpower, 0, duration) + pet:addStatusEffect(effect, { power = newpower, duration = duration, origin = target }) end end @@ -58,11 +57,11 @@ xi.salvage.instanceRegister = function(player, fireFlies) player:unequipItem(i) end - player:addStatusEffectEx(xi.effect.ENCUMBRANCE_I, xi.effect.ENCUMBRANCE_I, 65535, 0, 6000) - player:addStatusEffectEx(xi.effect.OBLIVISCENCE, xi.effect.OBLIVISCENCE, 1, 0, 6000) - player:addStatusEffectEx(xi.effect.OMERTA, xi.effect.OMERTA, 63, 0, 6000) - player:addStatusEffectEx(xi.effect.IMPAIRMENT, xi.effect.IMPAIRMENT, 3, 0, 6000) - player:addStatusEffectEx(xi.effect.DEBILITATION, xi.effect.DEBILITATION, 511, 0, 6000) + player:addStatusEffect(xi.effect.ENCUMBRANCE_I, { power = 65535, duration = 6000, origin = player }) + player:addStatusEffect(xi.effect.OBLIVISCENCE, { power = 1, duration = 6000, origin = player }) + player:addStatusEffect(xi.effect.OMERTA, { power = 63, duration = 6000, origin = player }) + player:addStatusEffect(xi.effect.IMPAIRMENT, { power = 3, duration = 6000, origin = player }) + player:addStatusEffect(xi.effect.DEBILITATION, { power = 511, duration = 6000, origin = player }) player:addTempItem(fireFlies) player:delKeyItem(xi.ki.REMNANTS_PERMIT) end diff --git a/scripts/globals/spells/absorb_spell.lua b/scripts/globals/spells/absorb_spell.lua index 9353d036619..047f7bac1be 100644 --- a/scripts/globals/spells/absorb_spell.lua +++ b/scripts/globals/spells/absorb_spell.lua @@ -57,13 +57,13 @@ xi.spells.absorb.doAbsorbStatSpell = function(caster, target, spell) local finalDuration = math.floor(baseDuration * darkDurationMultiplier * durationGearMultiplier) + caster:getMod(xi.mod.ENHANCES_ABSORB_EFFECTS) -- Assume additive. TODO: Testing needed. -- Apply debuff and buff if needed. Absorb effects can be overwriten via higher potency. - if target:addStatusEffect(enfeeblingEffect, finalPotency, 0, finalDuration) then + if target:addStatusEffect(enfeeblingEffect, { power = finalPotency, duration = finalDuration, origin = caster }) then -- Set associated message. spell:setMsg(absorbStatData[spellId].msg) -- Force-overwrite associated buff. caster:delStatusEffect(enhancingEffect) - caster:addStatusEffect(enhancingEffect, finalPotency, 0, finalDuration) + caster:addStatusEffect(enhancingEffect, { power = finalPotency, duration = finalDuration, origin = caster }) else spell:setMsg(xi.msg.basic.MAGIC_NO_EFFECT) end @@ -195,7 +195,7 @@ xi.spells.absorb.doDrainingSpell = function(caster, target, spell) then local duration = 180 + 180 * caster:getMod(xi.mod.DARK_MAGIC_DURATION) / 100 caster:delStatusEffect(xi.effect.MAX_HP_BOOST) - caster:addStatusEffect(xi.effect.MAX_HP_BOOST, 0, 0, duration, 0, overflow) + caster:addStatusEffect(xi.effect.MAX_HP_BOOST, { duration = duration, origin = caster, subPower = overflow }) end end end diff --git a/scripts/globals/spells/damage_spell.lua b/scripts/globals/spells/damage_spell.lua index a4ee1807ffd..127e8a05081 100644 --- a/scripts/globals/spells/damage_spell.lua +++ b/scripts/globals/spells/damage_spell.lua @@ -1051,7 +1051,7 @@ local function calculateNukeWallFactor(target, spellElement, finalDamage) local finalPotency = utils.clamp(math.floor(4000 * finalDamage / damageCap) + potency, 0, 4000) -- Renew status effect without messages. - target:addStatusEffectEx(xi.effect.NUKE_WALL, 0, finalPotency, 0, 5, 0, spellElement) + target:addStatusEffect(xi.effect.NUKE_WALL, { power = finalPotency, duration = 5, origin = target, icon = 0, subPower = spellElement }) ----------------------------------- -- We return JUST the factor based on previous nuke. This nuke only affects the next one. diff --git a/scripts/globals/spells/enfeebling_song.lua b/scripts/globals/spells/enfeebling_song.lua index 57d3e863bc6..474c1fe01fe 100644 --- a/scripts/globals/spells/enfeebling_song.lua +++ b/scripts/globals/spells/enfeebling_song.lua @@ -227,7 +227,7 @@ xi.spells.enfeebling.useEnfeeblingSong = function(caster, target, spell) -- Virelai applies a charm. Quit early. elseif spellEffect == xi.effect.CHARM_I then - target:addStatusEffect(xi.effect.CHARM_I, 0, 0, duration) + target:addStatusEffect(xi.effect.CHARM_I, { duration = duration, origin = caster }) caster:charm(target) if caster:isPC() then spell:setMsg(xi.msg.basic.MAGIC_ENFEEB) @@ -241,7 +241,7 @@ xi.spells.enfeebling.useEnfeeblingSong = function(caster, target, spell) ------------------------------ -- STEP 5: Attempt to apply the status effect. Check for magic burst. ------------------------------ - if target:addStatusEffect(spellEffect, power, tick, duration, 0, subEffect, spellTier) then + if target:addStatusEffect(spellEffect, { power = power, duration = duration, origin = caster, tick = tick, subPower = subEffect, tier = spellTier }) then local _, skillchainCount = xi.magicburst.formMagicBurst(target, spellElement) if skillchainCount > 0 then spell:setMsg(xi.msg.basic.MAGIC_BURST_ENFEEB) diff --git a/scripts/globals/spells/enfeebling_spell.lua b/scripts/globals/spells/enfeebling_spell.lua index 90fa3449a18..21fb38b4f2f 100644 --- a/scripts/globals/spells/enfeebling_spell.lua +++ b/scripts/globals/spells/enfeebling_spell.lua @@ -494,7 +494,7 @@ xi.spells.enfeebling.useEnfeeblingSpell = function(caster, target, spell) ------------------------------ -- STEP 6: Final Operations. ------------------------------ - if target:addStatusEffect(spellEffect, potency, tick, duration, 0, subpotency, tier) then + if target:addStatusEffect(spellEffect, { power = potency, duration = duration, origin = caster, tick = tick, subPower = subpotency, tier = tier }) then -- Delete Stymie effect if skillType == xi.skill.ENFEEBLING_MAGIC and diff --git a/scripts/globals/spells/enhancing_ninjutsu.lua b/scripts/globals/spells/enhancing_ninjutsu.lua index d4723663316..2344df769db 100644 --- a/scripts/globals/spells/enhancing_ninjutsu.lua +++ b/scripts/globals/spells/enhancing_ninjutsu.lua @@ -100,7 +100,7 @@ xi.spells.enhancing.useEnhancingNinjutsu = function(caster, target, spell) ------------------------------------------------------------ if alwaysOverwrite then target:delStatusEffect(spellEffect) - target:addStatusEffect(spellEffect, power, paramThree, duration, 0, subPower) + target:addStatusEffect(spellEffect, { power = power, duration = duration, origin = caster, tick = paramThree, subPower = subPower }) -- Utsusemi exception. elseif not alwaysOverwrite and spellEffect == xi.effect.COPY_IMAGE then @@ -114,14 +114,14 @@ xi.spells.enhancing.useEnhancingNinjutsu = function(caster, target, spell) paramThree = pTable[spellId][column.EFFECT_POWER] - 2 if targetEffect == nil or targetEffect:getPower() <= paramThree then - target:addStatusEffectEx(xi.effect.COPY_IMAGE, subPower, paramThree, duration, 900, 0, power) -- Not a mistake. + target:addStatusEffect(xi.effect.COPY_IMAGE, { power = paramThree, duration = 900, origin = caster, tick = duration, icon = subPower, subPower = power }) -- Not a mistake. spell:setMsg(xi.msg.basic.MAGIC_GAIN_EFFECT) else spell:setMsg(xi.msg.basic.MAGIC_NO_EFFECT) end else - if target:addStatusEffect(spellEffect, power, paramThree, duration, 0, subPower) then + if target:addStatusEffect(spellEffect, { power = power, duration = duration, origin = caster, tick = paramThree, subPower = subPower }) then spell:setMsg(xi.msg.basic.MAGIC_GAIN_EFFECT) else spell:setMsg(xi.msg.basic.MAGIC_NO_EFFECT) -- No effect. diff --git a/scripts/globals/spells/enhancing_spell.lua b/scripts/globals/spells/enhancing_spell.lua index 84b95744f8b..39a64739fb0 100644 --- a/scripts/globals/spells/enhancing_spell.lua +++ b/scripts/globals/spells/enhancing_spell.lua @@ -593,9 +593,9 @@ xi.spells.enhancing.useEnhancingSpell = function(caster, target, spell) ------------------------------------------------------------ if alwaysOverwrite then target:delStatusEffect(spellEffect) - target:addStatusEffect(spellEffect, finalPower, tickTime, duration, 0, subPower, tier) + target:addStatusEffect(spellEffect, { power = finalPower, duration = duration, origin = caster, tick = tickTime, subPower = subPower, tier = tier }) else - if target:addStatusEffect(spellEffect, finalPower, tickTime, duration, 0, subPower, tier) then + if target:addStatusEffect(spellEffect, { power = finalPower, duration = duration, origin = caster, tick = tickTime, subPower = subPower, tier = tier }) then spell:setMsg(xi.msg.basic.MAGIC_GAIN_EFFECT) else spell:setMsg(xi.msg.basic.MAGIC_NO_EFFECT) -- No effect. diff --git a/scripts/globals/spells/enhancing_teleport.lua b/scripts/globals/spells/enhancing_teleport.lua index 4f309c48a78..727539e713d 100644 --- a/scripts/globals/spells/enhancing_teleport.lua +++ b/scripts/globals/spells/enhancing_teleport.lua @@ -56,7 +56,7 @@ xi.spells.enhancing.useTeleportSpell = function(caster, target, spell) (keyItem == 0 or (keyItem > 0 and target:hasKeyItem(keyItem))) and (not campaign or (campaign and target:getCampaignAllegiance() > 0)) then - target:addStatusEffectEx(xi.effect.TELEPORT, 0, teleportId, 0, duration) + target:addStatusEffect(xi.effect.TELEPORT, { power = teleportId, duration = duration, origin = caster, icon = 0 }) spell:setMsg(xi.msg.basic.MAGIC_TELEPORT) else spell:setMsg(xi.msg.basic.NONE) diff --git a/scripts/globals/treasure.lua b/scripts/globals/treasure.lua index 9efc5cea868..58de332e354 100644 --- a/scripts/globals/treasure.lua +++ b/scripts/globals/treasure.lua @@ -1822,7 +1822,7 @@ xi.treasure.onTrade = function(player, npc, trade, bypassType, bypassReward) weaknessDuration = math.floor(weaknessDuration / 5) weaknessDuration = utils.clamp(weaknessDuration, 5, 60) * 60 -- Clamp and convert to seconds. - playerEntity:addStatusEffect(xi.effect.WEAKNESS, 1, 0, weaknessDuration) + playerEntity:addStatusEffect(xi.effect.WEAKNESS, { power = 1, duration = weaknessDuration, origin = player }) playerEntity:messageSpecial(ID.text.CHEST_UNLOCKED + 2) npc:entityAnimationPacket(xi.animationString.OPEN_CRATE_SMOKE) moveTreasure(npc, respawnType.REGULAR) diff --git a/scripts/globals/voidwalker.lua b/scripts/globals/voidwalker.lua index 225fc9509d0..1a343230d04 100644 --- a/scripts/globals/voidwalker.lua +++ b/scripts/globals/voidwalker.lua @@ -340,12 +340,12 @@ end local modByMobName = { ['Krabkatoa'] = function(mob) - mob:addStatusEffect(xi.effect.REGAIN, 10, 0, 0) + mob:addStatusEffect(xi.effect.REGAIN, { power = 10, origin = mob }) mob:addMod(xi.mod.DOUBLE_ATTACK, 10) end, ['Tammuz'] = function(mob) - mob:addStatusEffect(xi.effect.MIGHTY_STRIKES, 1, 0, 0) + mob:addStatusEffect(xi.effect.MIGHTY_STRIKES, { power = 1, origin = mob }) end, ['Erebus'] = function(mob) @@ -415,7 +415,7 @@ local mixinByMobName = mob:hasStatusEffect(xi.effect.BLOOD_WEAPON) and not mob:hasStatusEffect(xi.effect.HUNDRED_FISTS) then - mob:addStatusEffect(xi.effect.HUNDRED_FISTS, 1, 0, 30) + mob:addStatusEffect(xi.effect.HUNDRED_FISTS, { power = 1, duration = 30, origin = mob }) end end, diff --git a/scripts/globals/weaponskills.lua b/scripts/globals/weaponskills.lua index ade633e8ca4..99e9961e7ed 100644 --- a/scripts/globals/weaponskills.lua +++ b/scripts/globals/weaponskills.lua @@ -1082,6 +1082,6 @@ xi.weaponskills.handleWeaponskillEffect = function(actor, target, effectId, acti not xi.data.statusEffect.isTargetResistant(actor, target, effectId) and not xi.data.statusEffect.isEffectNullified(target, effectId, 0) then - target:addStatusEffect(effectId, power, 0, duration) + target:addStatusEffect(effectId, { power = power, duration = duration, origin = actor }) end end diff --git a/scripts/items/absorbing_shield.lua b/scripts/items/absorbing_shield.lua index cf87014786a..a67ec598782 100644 --- a/scripts/items/absorbing_shield.lua +++ b/scripts/items/absorbing_shield.lua @@ -38,16 +38,9 @@ itemObject.onItemUse = function(target, user, item, action) local effectId = availableEffects[1] local effect = target:getStatusEffect(effectId) - if effect and target:delStatusEffect(effectId) then - user:addStatusEffect( - effectId, - effect:getPower(), - effect:getTick(), - math.ceil(effect:getTimeRemaining() / 1000), -- Gets the remaining time and converts milliseconds to seconds - effect:getSubType(), - effect:getSubPower(), - effect:getTier() - ) + if effect then + user:copyStatusEffect(effect) + target:delStatusEffect(effectId) numEffectsTransferred = 1 end end diff --git a/scripts/items/acorn_cookie.lua b/scripts/items/acorn_cookie.lua index 43ef385ec7f..5e6b48e71b7 100644 --- a/scripts/items/acorn_cookie.lua +++ b/scripts/items/acorn_cookie.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 180, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 180, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/acrobats_belt.lua b/scripts/items/acrobats_belt.lua index 884cdd49b7b..1396ea951d3 100644 --- a/scripts/items/acrobats_belt.lua +++ b/scripts/items/acrobats_belt.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.ACROBATS_BELT) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 60, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.ACROBATS_BELT) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 60, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.ACROBATS_BELT }) end end diff --git a/scripts/items/agaricus_mushroom.lua b/scripts/items/agaricus_mushroom.lua index 2b82dcc9f69..774d389c396 100644 --- a/scripts/items/agaricus_mushroom.lua +++ b/scripts/items/agaricus_mushroom.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/agility_potion.lua b/scripts/items/agility_potion.lua index 6a33a9453e9..2dd8ca9fae2 100644 --- a/scripts/items/agility_potion.lua +++ b/scripts/items/agility_potion.lua @@ -14,9 +14,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.AGI_BOOST, 7, 0, 180) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 900) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.AGI_BOOST, { power = 7, duration = 180, origin = user }) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 900, origin = user }) end return itemObject diff --git a/scripts/items/aileens_delight.lua b/scripts/items/aileens_delight.lua index bb90e9645ea..875c59daf3a 100644 --- a/scripts/items/aileens_delight.lua +++ b/scripts/items/aileens_delight.lua @@ -22,7 +22,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/aiming_gloves.lua b/scripts/items/aiming_gloves.lua index 8dda8227109..8bff0d9516c 100644 --- a/scripts/items/aiming_gloves.lua +++ b/scripts/items/aiming_gloves.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.AIMING_GLOVES) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 60, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.AIMING_GLOVES) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 60, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.AIMING_GLOVES }) end end diff --git a/scripts/items/alabaligi.lua b/scripts/items/alabaligi.lua index aeb7412314d..53ea07d4c26 100644 --- a/scripts/items/alabaligi.lua +++ b/scripts/items/alabaligi.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/alchemists_belt.lua b/scripts/items/alchemists_belt.lua index 1e1a24a0672..1933f579ac8 100644 --- a/scripts/items/alchemists_belt.lua +++ b/scripts/items/alchemists_belt.lua @@ -16,8 +16,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.ALCHEMY_IMAGERY, 3, 0, 480) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.ALCHEMY_IMAGERY, { power = 3, duration = 480, origin = user }) end return itemObject diff --git a/scripts/items/altanas_repast.lua b/scripts/items/altanas_repast.lua index 473782a7bfe..7f2db332f22 100644 --- a/scripts/items/altanas_repast.lua +++ b/scripts/items/altanas_repast.lua @@ -33,7 +33,7 @@ end itemObject.onItemUse = function(target, user, item, action) target:forMembersInRange(30, function(member) if not member:hasStatusEffect(xi.effect.FOOD) then - member:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + member:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end end) end diff --git a/scripts/items/altanas_repast_+1.lua b/scripts/items/altanas_repast_+1.lua index 34765b77c8e..10bcc8e5ee5 100644 --- a/scripts/items/altanas_repast_+1.lua +++ b/scripts/items/altanas_repast_+1.lua @@ -33,7 +33,7 @@ end itemObject.onItemUse = function(target, user, item, action) target:forMembersInRange(30, function(member) if not member:hasStatusEffect(xi.effect.FOOD) then - member:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + member:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end end) end diff --git a/scripts/items/altanas_repast_+2.lua b/scripts/items/altanas_repast_+2.lua index 01725fdb626..195a77855e9 100644 --- a/scripts/items/altanas_repast_+2.lua +++ b/scripts/items/altanas_repast_+2.lua @@ -33,7 +33,7 @@ end itemObject.onItemUse = function(target, user, item, action) target:forMembersInRange(30, function(member) if not member:hasStatusEffect(xi.effect.FOOD) then - member:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + member:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end end) end diff --git a/scripts/items/anchovy_pizza.lua b/scripts/items/anchovy_pizza.lua index 868294c1e62..c18c5428880 100644 --- a/scripts/items/anchovy_pizza.lua +++ b/scripts/items/anchovy_pizza.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/anchovy_pizza_+1.lua b/scripts/items/anchovy_pizza_+1.lua index 59a128691c9..001dcf3da88 100644 --- a/scripts/items/anchovy_pizza_+1.lua +++ b/scripts/items/anchovy_pizza_+1.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/angler_stewpot.lua b/scripts/items/angler_stewpot.lua index 9351cfdec98..621a813b095 100644 --- a/scripts/items/angler_stewpot.lua +++ b/scripts/items/angler_stewpot.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/anglers_cassoulet.lua b/scripts/items/anglers_cassoulet.lua index 22f00d15138..31d061b504a 100644 --- a/scripts/items/anglers_cassoulet.lua +++ b/scripts/items/anglers_cassoulet.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/anubiss_knife.lua b/scripts/items/anubiss_knife.lua index a92acf37720..b2a4f20c71f 100644 --- a/scripts/items/anubiss_knife.lua +++ b/scripts/items/anubiss_knife.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.POISON) then - target:addStatusEffect(xi.effect.POISON, 1, 3, 180) + target:addStatusEffect(xi.effect.POISON, { power = 1, duration = 180, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/apingaut_snow_cone.lua b/scripts/items/apingaut_snow_cone.lua index 640b4e2d89d..6e97e835166 100644 --- a/scripts/items/apingaut_snow_cone.lua +++ b/scripts/items/apingaut_snow_cone.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/apkallu_egg.lua b/scripts/items/apkallu_egg.lua index 6997e7dc3fc..4560778f0a5 100644 --- a/scripts/items/apkallu_egg.lua +++ b/scripts/items/apkallu_egg.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/apple_pie.lua b/scripts/items/apple_pie.lua index 723ce8bc836..ca1b35f7460 100644 --- a/scripts/items/apple_pie.lua +++ b/scripts/items/apple_pie.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/apple_pie_+1.lua b/scripts/items/apple_pie_+1.lua index 09c7531cf4e..5159c4253d4 100644 --- a/scripts/items/apple_pie_+1.lua +++ b/scripts/items/apple_pie_+1.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/aries_mantle.lua b/scripts/items/aries_mantle.lua index 857a6c76cce..45308f92de8 100644 --- a/scripts/items/aries_mantle.lua +++ b/scripts/items/aries_mantle.lua @@ -10,7 +10,7 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasStatusEffect(xi.effect.SLEEP_I) or target:hasStatusEffect(xi.effect.SLEEP_II) or @@ -18,7 +18,7 @@ itemObject.onItemUse = function(target) then target:messageBasic(xi.msg.basic.NO_EFFECT) else - target:addStatusEffect(xi.effect.SLEEP_I, 0, 0, 30) + target:addStatusEffect(xi.effect.SLEEP_I, { duration = 30, origin = user }) end end diff --git a/scripts/items/armored_ring.lua b/scripts/items/armored_ring.lua index 537ad7e6d19..6122bef828c 100644 --- a/scripts/items/armored_ring.lua +++ b/scripts/items/armored_ring.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.ARMORED_RING) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.ARMORED_RING) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 1800, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.ARMORED_RING }) end end diff --git a/scripts/items/army_biscuit.lua b/scripts/items/army_biscuit.lua index 3dcf471d3e0..9093e07db7d 100644 --- a/scripts/items/army_biscuit.lua +++ b/scripts/items/army_biscuit.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/assailants_axe.lua b/scripts/items/assailants_axe.lua index 12f7b84e67f..f8b17d52057 100644 --- a/scripts/items/assailants_axe.lua +++ b/scripts/items/assailants_axe.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.ASSAILANTS_AXE) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.ASSAILANTS_AXE) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 1800, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.ASSAILANTS_AXE }) end end diff --git a/scripts/items/assassins_ring.lua b/scripts/items/assassins_ring.lua index 974fcac5919..a722c0cb320 100644 --- a/scripts/items/assassins_ring.lua +++ b/scripts/items/assassins_ring.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.ASSASSINS_RING) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.ASSASSINS_RING) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.ASSASSINS_RING }) end end diff --git a/scripts/items/astral_pot.lua b/scripts/items/astral_pot.lua index 0504d37a063..38764c6196e 100644 --- a/scripts/items/astral_pot.lua +++ b/scripts/items/astral_pot.lua @@ -18,10 +18,10 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) local pet = target:getPet() if target:hasEquipped(xi.item.ASTRAL_POT) and pet ~= nil then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 300, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.ASTRAL_POT) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 300, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.ASTRAL_POT }) end end diff --git a/scripts/items/augmenting_belt.lua b/scripts/items/augmenting_belt.lua index ac4d6220eac..d053b127dcc 100644 --- a/scripts/items/augmenting_belt.lua +++ b/scripts/items/augmenting_belt.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.AUGMENTING_BELT) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.AUGMENTING_BELT) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 1800, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.AUGMENTING_BELT }) end end diff --git a/scripts/items/b.e.w._pitaru.lua b/scripts/items/b.e.w._pitaru.lua index d397859ecdc..88247622985 100644 --- a/scripts/items/b.e.w._pitaru.lua +++ b/scripts/items/b.e.w._pitaru.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bag_of_wyvern_feed.lua b/scripts/items/bag_of_wyvern_feed.lua index 85020f4f9f1..bd350f8a036 100644 --- a/scripts/items/bag_of_wyvern_feed.lua +++ b/scripts/items/bag_of_wyvern_feed.lua @@ -19,10 +19,10 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) local pet = target:getPet() if target:hasEquipped(xi.item.BAG_OF_WYVERN_FEED) and pet ~= nil then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.BAG_OF_WYVERN_FEED) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.BAG_OF_WYVERN_FEED }) end end diff --git a/scripts/items/baked_apple.lua b/scripts/items/baked_apple.lua index 0fc7e951946..2422afffa17 100644 --- a/scripts/items/baked_apple.lua +++ b/scripts/items/baked_apple.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/baked_popoto.lua b/scripts/items/baked_popoto.lua index 1186b5d846e..9abb7daa48f 100644 --- a/scripts/items/baked_popoto.lua +++ b/scripts/items/baked_popoto.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/balik_sandvici.lua b/scripts/items/balik_sandvici.lua index 3d19c210225..e256c804c83 100644 --- a/scripts/items/balik_sandvici.lua +++ b/scripts/items/balik_sandvici.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/balik_sandvici_+1.lua b/scripts/items/balik_sandvici_+1.lua index ec56738d1df..688dbfc209f 100644 --- a/scripts/items/balik_sandvici_+1.lua +++ b/scripts/items/balik_sandvici_+1.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/balik_sis.lua b/scripts/items/balik_sis.lua index cce64e11c68..22d53d408ff 100644 --- a/scripts/items/balik_sis.lua +++ b/scripts/items/balik_sis.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/balik_sis_+1.lua b/scripts/items/balik_sis_+1.lua index 0d25e9ebcc7..3a57fe57c92 100644 --- a/scripts/items/balik_sis_+1.lua +++ b/scripts/items/balik_sis_+1.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bannaret_mail.lua b/scripts/items/bannaret_mail.lua index 3004406c031..5717212996f 100644 --- a/scripts/items/bannaret_mail.lua +++ b/scripts/items/bannaret_mail.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.BANNARET_MAIL) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.BANNARET_MAIL) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 1800, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.BANNARET_MAIL }) end end diff --git a/scripts/items/bar_of_campfire_chocolate.lua b/scripts/items/bar_of_campfire_chocolate.lua index 9a8124c4db1..f7915ee2f63 100644 --- a/scripts/items/bar_of_campfire_chocolate.lua +++ b/scripts/items/bar_of_campfire_chocolate.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bastok_mines_gate_glyph.lua b/scripts/items/bastok_mines_gate_glyph.lua index 03bd5849bef..3c02569bc1f 100644 --- a/scripts/items/bastok_mines_gate_glyph.lua +++ b/scripts/items/bastok_mines_gate_glyph.lua @@ -10,8 +10,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.BASTOK_MINES_GLYPH, 0, 3) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.BASTOK_MINES_GLYPH, duration = 3, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/bastore_bream.lua b/scripts/items/bastore_bream.lua index 6dbed43d86d..fc373e30699 100644 --- a/scripts/items/bastore_bream.lua +++ b/scripts/items/bastore_bream.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bastore_sardine.lua b/scripts/items/bastore_sardine.lua index 18fbfb13554..9719f4886e9 100644 --- a/scripts/items/bastore_sardine.lua +++ b/scripts/items/bastore_sardine.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bastore_sweeper.lua b/scripts/items/bastore_sweeper.lua index bcd92f3518b..fd54cebcde9 100644 --- a/scripts/items/bastore_sweeper.lua +++ b/scripts/items/bastore_sweeper.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bataquiche.lua b/scripts/items/bataquiche.lua index fadcd31d134..a625fcde652 100644 --- a/scripts/items/bataquiche.lua +++ b/scripts/items/bataquiche.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bataquiche_+1.lua b/scripts/items/bataquiche_+1.lua index ab3b078e3d4..e14a3bf6b2f 100644 --- a/scripts/items/bataquiche_+1.lua +++ b/scripts/items/bataquiche_+1.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bean_daifuku.lua b/scripts/items/bean_daifuku.lua index 561f5cc0cc4..39b38467a54 100644 --- a/scripts/items/bean_daifuku.lua +++ b/scripts/items/bean_daifuku.lua @@ -23,7 +23,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bean_daifuku_+1.lua b/scripts/items/bean_daifuku_+1.lua index 6dcc88a096b..146b72027af 100644 --- a/scripts/items/bean_daifuku_+1.lua +++ b/scripts/items/bean_daifuku_+1.lua @@ -23,7 +23,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/beef_stewpot.lua b/scripts/items/beef_stewpot.lua index 7dbc1d3e4b5..11dd139541b 100644 --- a/scripts/items/beef_stewpot.lua +++ b/scripts/items/beef_stewpot.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/behemoth_steak.lua b/scripts/items/behemoth_steak.lua index 95e44ab9e2a..d78cc46d01e 100644 --- a/scripts/items/behemoth_steak.lua +++ b/scripts/items/behemoth_steak.lua @@ -21,7 +21,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/behemoth_steak_+1.lua b/scripts/items/behemoth_steak_+1.lua index 2ad5e72929f..643075fb842 100644 --- a/scripts/items/behemoth_steak_+1.lua +++ b/scripts/items/behemoth_steak_+1.lua @@ -21,7 +21,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/berry_snow_cone.lua b/scripts/items/berry_snow_cone.lua index db5646ab4ee..0c0969a9234 100644 --- a/scripts/items/berry_snow_cone.lua +++ b/scripts/items/berry_snow_cone.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/betta.lua b/scripts/items/betta.lua index 8bfdd3ccc34..889068866b9 100644 --- a/scripts/items/betta.lua +++ b/scripts/items/betta.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bibiki_slug.lua b/scripts/items/bibiki_slug.lua index c722e80969a..0132b2525ce 100644 --- a/scripts/items/bibiki_slug.lua +++ b/scripts/items/bibiki_slug.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bibikibo.lua b/scripts/items/bibikibo.lua index af9427edd9b..6aa47cc192b 100644 --- a/scripts/items/bibikibo.lua +++ b/scripts/items/bibikibo.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bijou_glace.lua b/scripts/items/bijou_glace.lua index c887b0197d6..8e4158acdf2 100644 --- a/scripts/items/bijou_glace.lua +++ b/scripts/items/bijou_glace.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bird_egg.lua b/scripts/items/bird_egg.lua index 6856cb50f25..561e8c20b6f 100644 --- a/scripts/items/bird_egg.lua +++ b/scripts/items/bird_egg.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/black_bubble-eye.lua b/scripts/items/black_bubble-eye.lua index 2daa8d8eedd..e5b1a7f7328 100644 --- a/scripts/items/black_bubble-eye.lua +++ b/scripts/items/black_bubble-eye.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/black_chocobo_cap.lua b/scripts/items/black_chocobo_cap.lua index 4b2f08ba75b..be67d370941 100644 --- a/scripts/items/black_chocobo_cap.lua +++ b/scripts/items/black_chocobo_cap.lua @@ -10,8 +10,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.CHOCO_UPPER_JEUNO, 0, 4) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.CHOCO_UPPER_JEUNO, duration = 4, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/black_curry_bun.lua b/scripts/items/black_curry_bun.lua index ff6827ab3c9..9eadb3ceee3 100644 --- a/scripts/items/black_curry_bun.lua +++ b/scripts/items/black_curry_bun.lua @@ -23,7 +23,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end local dataTable = diff --git a/scripts/items/black_curry_bun_+1.lua b/scripts/items/black_curry_bun_+1.lua index 47e804b424a..ed30e5dbe6a 100644 --- a/scripts/items/black_curry_bun_+1.lua +++ b/scripts/items/black_curry_bun_+1.lua @@ -24,7 +24,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/black_drop.lua b/scripts/items/black_drop.lua index 2281ecb1ff2..714ee6f9317 100644 --- a/scripts/items/black_drop.lua +++ b/scripts/items/black_drop.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 3600, origin = user }) target:warp() end diff --git a/scripts/items/black_eel.lua b/scripts/items/black_eel.lua index 0dcb076c5e2..ca6e3163acb 100644 --- a/scripts/items/black_eel.lua +++ b/scripts/items/black_eel.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/black_ghost.lua b/scripts/items/black_ghost.lua index 9aaa156ceaf..850483ce2c0 100644 --- a/scripts/items/black_ghost.lua +++ b/scripts/items/black_ghost.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/black_prawn.lua b/scripts/items/black_prawn.lua index de89c0f33bf..45109fce3d0 100644 --- a/scripts/items/black_prawn.lua +++ b/scripts/items/black_prawn.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/black_sole.lua b/scripts/items/black_sole.lua index 0ee132c63cb..3ae8bfcec07 100644 --- a/scripts/items/black_sole.lua +++ b/scripts/items/black_sole.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/blackened_frog.lua b/scripts/items/blackened_frog.lua index c5697edd702..087054df8e0 100644 --- a/scripts/items/blackened_frog.lua +++ b/scripts/items/blackened_frog.lua @@ -20,7 +20,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/blackened_newt.lua b/scripts/items/blackened_newt.lua index f3857cbf01d..a92a92cad40 100644 --- a/scripts/items/blackened_newt.lua +++ b/scripts/items/blackened_newt.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/blackened_toad.lua b/scripts/items/blackened_toad.lua index c6d3c633173..f6eb435c8f1 100644 --- a/scripts/items/blackened_toad.lua +++ b/scripts/items/blackened_toad.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/blacksmiths_belt.lua b/scripts/items/blacksmiths_belt.lua index f087d11ff9f..cee570449d3 100644 --- a/scripts/items/blacksmiths_belt.lua +++ b/scripts/items/blacksmiths_belt.lua @@ -16,8 +16,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.SMITHING_IMAGERY, 3, 0, 480) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.SMITHING_IMAGERY, { power = 3, duration = 480, origin = user }) end return itemObject diff --git a/scripts/items/blaze_feather.lua b/scripts/items/blaze_feather.lua index 6e4a5d7e12b..39fa2c2f985 100644 --- a/scripts/items/blaze_feather.lua +++ b/scripts/items/blaze_feather.lua @@ -10,8 +10,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.BLAZE_SPIKES, 10, 0, 90) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.BLAZE_SPIKES, { power = 10, duration = 90, origin = user }) end return itemObject diff --git a/scripts/items/blaze_hose.lua b/scripts/items/blaze_hose.lua index dbde7e1daeb..0c54e53a387 100644 --- a/scripts/items/blaze_hose.lua +++ b/scripts/items/blaze_hose.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) target:delStatusEffect(xi.effect.BLAZE_SPIKES) - target:addStatusEffect(xi.effect.BLAZE_SPIKES, 15, 0, 180) + target:addStatusEffect(xi.effect.BLAZE_SPIKES, { power = 15, duration = 180, origin = user }) end return itemObject diff --git a/scripts/items/blindfish.lua b/scripts/items/blindfish.lua index f436ef33876..9cb50f42c79 100644 --- a/scripts/items/blindfish.lua +++ b/scripts/items/blindfish.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/blink_band.lua b/scripts/items/blink_band.lua index d0cce97db8e..9d852be1b9e 100644 --- a/scripts/items/blink_band.lua +++ b/scripts/items/blink_band.lua @@ -10,14 +10,14 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasStatusEffect(xi.effect.COPY_IMAGE) or target:hasStatusEffect(xi.effect.THIRD_EYE) then target:messageBasic(xi.msg.basic.NO_EFFECT) else - target:addStatusEffect(xi.effect.BLINK, 3, 0, 300) + target:addStatusEffect(xi.effect.BLINK, { power = 3, duration = 300, origin = user }) target:messageBasic(xi.msg.basic.GAINS_EFFECT_OF_STATUS, xi.effect.BLINK) end end diff --git a/scripts/items/block_of_rock_cheese.lua b/scripts/items/block_of_rock_cheese.lua index db5b32d26e5..87ad069cf7c 100644 --- a/scripts/items/block_of_rock_cheese.lua +++ b/scripts/items/block_of_rock_cheese.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/block_of_stone_cheese.lua b/scripts/items/block_of_stone_cheese.lua index 01ad5e93467..f2ceb59fc75 100644 --- a/scripts/items/block_of_stone_cheese.lua +++ b/scripts/items/block_of_stone_cheese.lua @@ -13,7 +13,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/blowfish.lua b/scripts/items/blowfish.lua index c5f29da1c47..5bed60e9c87 100644 --- a/scripts/items/blowfish.lua +++ b/scripts/items/blowfish.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/blue_drop.lua b/scripts/items/blue_drop.lua index dcfd259cd92..aad908b038d 100644 --- a/scripts/items/blue_drop.lua +++ b/scripts/items/blue_drop.lua @@ -14,9 +14,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.MND_BOOST, 5, 0, 900) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.MND_BOOST, { power = 5, duration = 900, origin = user }) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/bluetail.lua b/scripts/items/bluetail.lua index 28d0cbbbda1..2a3589e8c05 100644 --- a/scripts/items/bluetail.lua +++ b/scripts/items/bluetail.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/boiled_crab.lua b/scripts/items/boiled_crab.lua index 99d3ef26131..ee1f07ac1ef 100644 --- a/scripts/items/boiled_crab.lua +++ b/scripts/items/boiled_crab.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/boiled_crayfish.lua b/scripts/items/boiled_crayfish.lua index 9ebae2d83a9..80afa7115c7 100644 --- a/scripts/items/boiled_crayfish.lua +++ b/scripts/items/boiled_crayfish.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/boiled_tuna_head.lua b/scripts/items/boiled_tuna_head.lua index 3a882e63eca..e574d2440d8 100644 --- a/scripts/items/boiled_tuna_head.lua +++ b/scripts/items/boiled_tuna_head.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bonanza_biscuit.lua b/scripts/items/bonanza_biscuit.lua index 6a888448e38..3ac48519e7e 100644 --- a/scripts/items/bonanza_biscuit.lua +++ b/scripts/items/bonanza_biscuit.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 3581, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { power = 3581, duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/boneworkers_belt.lua b/scripts/items/boneworkers_belt.lua index 4ccb68ea077..62018d0a105 100644 --- a/scripts/items/boneworkers_belt.lua +++ b/scripts/items/boneworkers_belt.lua @@ -16,8 +16,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.BONECRAFT_IMAGERY, 3, 0, 480) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.BONECRAFT_IMAGERY, { power = 3, duration = 480, origin = user }) end return itemObject diff --git a/scripts/items/bottle_of_amrita.lua b/scripts/items/bottle_of_amrita.lua index c95654439fe..cba32c95fa8 100644 --- a/scripts/items/bottle_of_amrita.lua +++ b/scripts/items/bottle_of_amrita.lua @@ -10,15 +10,15 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) local worked = false if not target:hasStatusEffect(xi.effect.REGEN) then - target:addStatusEffect(xi.effect.REGEN, 5, 3, 300) + target:addStatusEffect(xi.effect.REGEN, { power = 5, duration = 300, origin = user, tick = 3 }) worked = true end if not target:hasStatusEffect(xi.effect.REFRESH) then - target:addStatusEffect(xi.effect.REFRESH, 5, 3, 300) + target:addStatusEffect(xi.effect.REFRESH, { power = 5, duration = 300, origin = user, tick = 3 }) worked = true end diff --git a/scripts/items/bottle_of_apple_juice.lua b/scripts/items/bottle_of_apple_juice.lua index 28c72a5f6f0..4e5c54ca025 100644 --- a/scripts/items/bottle_of_apple_juice.lua +++ b/scripts/items/bottle_of_apple_juice.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.REFRESH) then - target:addStatusEffect(xi.effect.REFRESH, 1, 3, 135) + target:addStatusEffect(xi.effect.REFRESH, { power = 1, duration = 135, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/bottle_of_body_boost.lua b/scripts/items/bottle_of_body_boost.lua index a5a57e4a89d..3402897bc4b 100644 --- a/scripts/items/bottle_of_body_boost.lua +++ b/scripts/items/bottle_of_body_boost.lua @@ -10,10 +10,10 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) local duration = 900 target:delStatusEffect(xi.effect.MAX_HP_BOOST) - target:addStatusEffect(xi.effect.MAX_HP_BOOST, 50, 0, duration) + target:addStatusEffect(xi.effect.MAX_HP_BOOST, { power = 50, duration = duration, origin = user }) end return itemObject diff --git a/scripts/items/bottle_of_bravers_drink.lua b/scripts/items/bottle_of_bravers_drink.lua index c4dbc693e08..e686c8f008b 100644 --- a/scripts/items/bottle_of_bravers_drink.lua +++ b/scripts/items/bottle_of_bravers_drink.lua @@ -11,7 +11,7 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) local power = 15 local duration = 180 @@ -27,7 +27,7 @@ itemObject.onItemUse = function(target) } for _, effect in ipairs(effects) do - target:addStatusEffect(effect, power, 0, duration) + target:addStatusEffect(effect, { power = power, duration = duration, origin = user }) end end diff --git a/scripts/items/bottle_of_buffalo_bonanza_milk.lua b/scripts/items/bottle_of_buffalo_bonanza_milk.lua index b2bd46e9348..f77b6c06e45 100644 --- a/scripts/items/bottle_of_buffalo_bonanza_milk.lua +++ b/scripts/items/bottle_of_buffalo_bonanza_milk.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.REGEN) then - target:addStatusEffect(xi.effect.REGEN, 2, 1, 60) + target:addStatusEffect(xi.effect.REGEN, { power = 2, duration = 60, origin = user, tick = 1 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/bottle_of_cantarella.lua b/scripts/items/bottle_of_cantarella.lua index 733a960ca14..c7bc7b9b497 100644 --- a/scripts/items/bottle_of_cantarella.lua +++ b/scripts/items/bottle_of_cantarella.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.POISON) then - target:addStatusEffect(xi.effect.POISON, 10, 3, 600) + target:addStatusEffect(xi.effect.POISON, { power = 10, duration = 600, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/bottle_of_cursed_beverage.lua b/scripts/items/bottle_of_cursed_beverage.lua index 23ae9fbbfc4..ec8abb5c025 100644 --- a/scripts/items/bottle_of_cursed_beverage.lua +++ b/scripts/items/bottle_of_cursed_beverage.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.POISON) then - target:addStatusEffect(xi.effect.POISON, 25, 3, 180) + target:addStatusEffect(xi.effect.POISON, { power = 25, duration = 180, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/bottle_of_ether_drops.lua b/scripts/items/bottle_of_ether_drops.lua index b9a2e8f4fa4..7f506e2dc14 100644 --- a/scripts/items/bottle_of_ether_drops.lua +++ b/scripts/items/bottle_of_ether_drops.lua @@ -14,9 +14,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) target:addMP(15 * xi.settings.main.ITEM_POWER) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 300) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 300, origin = user }) end return itemObject diff --git a/scripts/items/bottle_of_frontier_soda.lua b/scripts/items/bottle_of_frontier_soda.lua index 2424ec6c45b..d9fb0fe4563 100644 --- a/scripts/items/bottle_of_frontier_soda.lua +++ b/scripts/items/bottle_of_frontier_soda.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.REGAIN) then - target:addStatusEffect(xi.effect.REGAIN, 1, 3, 60) + target:addStatusEffect(xi.effect.REGAIN, { power = 1, duration = 60, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/bottle_of_giants_drink.lua b/scripts/items/bottle_of_giants_drink.lua index cbe7fa74553..4c9dd40fe4f 100644 --- a/scripts/items/bottle_of_giants_drink.lua +++ b/scripts/items/bottle_of_giants_drink.lua @@ -10,10 +10,10 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) local duration = 900 target:delStatusEffect(xi.effect.MAX_HP_BOOST) - target:addStatusEffect(xi.effect.MAX_HP_BOOST, 100, 0, duration) + target:addStatusEffect(xi.effect.MAX_HP_BOOST, { power = 100, duration = duration, origin = user }) end return itemObject diff --git a/scripts/items/bottle_of_goblin_drink.lua b/scripts/items/bottle_of_goblin_drink.lua index 5737f13e734..29f92714453 100644 --- a/scripts/items/bottle_of_goblin_drink.lua +++ b/scripts/items/bottle_of_goblin_drink.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.FOOD) then - target:addStatusEffect(xi.effect.FOOD, 1, 3, 10800, 4541) + target:addStatusEffect(xi.effect.FOOD, { power = 1, duration = 10800, origin = user, tick = 3, subType = 4541 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/bottle_of_grape_juice.lua b/scripts/items/bottle_of_grape_juice.lua index 25a440a3ff7..fe722437841 100644 --- a/scripts/items/bottle_of_grape_juice.lua +++ b/scripts/items/bottle_of_grape_juice.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.REFRESH) then - target:addStatusEffect(xi.effect.REFRESH, 2, 3, 90) + target:addStatusEffect(xi.effect.REFRESH, { power = 2, duration = 90, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/bottle_of_hi-ether_drops.lua b/scripts/items/bottle_of_hi-ether_drops.lua index 65e337eee94..cf44017140c 100644 --- a/scripts/items/bottle_of_hi-ether_drops.lua +++ b/scripts/items/bottle_of_hi-ether_drops.lua @@ -14,9 +14,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) target:addMP(45 * xi.settings.main.ITEM_POWER) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 300) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 300, origin = user }) end return itemObject diff --git a/scripts/items/bottle_of_hi-potion_drops.lua b/scripts/items/bottle_of_hi-potion_drops.lua index 55855b60a33..d73de72703a 100644 --- a/scripts/items/bottle_of_hi-potion_drops.lua +++ b/scripts/items/bottle_of_hi-potion_drops.lua @@ -14,9 +14,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) target:addHP(110 * xi.settings.main.ITEM_POWER) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 300) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 300, origin = user }) end return itemObject diff --git a/scripts/items/bottle_of_hysteroanima.lua b/scripts/items/bottle_of_hysteroanima.lua index 6ef3b9eff1e..ffbee6d676b 100644 --- a/scripts/items/bottle_of_hysteroanima.lua +++ b/scripts/items/bottle_of_hysteroanima.lua @@ -21,7 +21,7 @@ end itemObject.onItemUse = function(target, player) target:delStatusEffectSilent(xi.effect.HYSTERIA) - target:addStatusEffectEx(xi.effect.HYSTERIA, xi.effect.HYSTERIA, 1, 0, math.random(25, 32), 0, 0, 0, xi.effectFlag.NO_LOSS_MESSAGE) + target:addStatusEffect(xi.effect.HYSTERIA, { power = 1, duration = math.random(25, 32), origin = player, flag = xi.effectFlag.NO_LOSS_MESSAGE }) end return itemObject diff --git a/scripts/items/bottle_of_kitron_juice.lua b/scripts/items/bottle_of_kitron_juice.lua index a46ec4175f2..dac63d88499 100644 --- a/scripts/items/bottle_of_kitron_juice.lua +++ b/scripts/items/bottle_of_kitron_juice.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.REFRESH) then - target:addStatusEffect(xi.effect.REFRESH, 3, 3, 180) + target:addStatusEffect(xi.effect.REFRESH, { power = 3, duration = 180, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/bottle_of_mana_boost.lua b/scripts/items/bottle_of_mana_boost.lua index 7490feebba0..e353c6e2ad1 100644 --- a/scripts/items/bottle_of_mana_boost.lua +++ b/scripts/items/bottle_of_mana_boost.lua @@ -10,10 +10,10 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) local duration = 900 target:delStatusEffect(xi.effect.MAX_MP_BOOST) - target:addStatusEffect(xi.effect.MAX_MP_BOOST, 50, 0, duration) + target:addStatusEffect(xi.effect.MAX_MP_BOOST, { power = 50, duration = duration, origin = user }) end return itemObject diff --git a/scripts/items/bottle_of_melon_juice.lua b/scripts/items/bottle_of_melon_juice.lua index 07caf5a5f55..0c127e95cc3 100644 --- a/scripts/items/bottle_of_melon_juice.lua +++ b/scripts/items/bottle_of_melon_juice.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.REFRESH) then - target:addStatusEffect(xi.effect.REFRESH, 2, 3, 135) + target:addStatusEffect(xi.effect.REFRESH, { power = 2, duration = 135, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/bottle_of_movalpolos_water.lua b/scripts/items/bottle_of_movalpolos_water.lua index 234ef44c00b..9cc60bedec0 100644 --- a/scripts/items/bottle_of_movalpolos_water.lua +++ b/scripts/items/bottle_of_movalpolos_water.lua @@ -15,7 +15,7 @@ end -- That was proven wrong simply by using a movalpolos water on lightsday. It gives a food effect just like JP wiki claims -- https://wiki.ffo.jp/html/1657.html itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 30 * 60, 5165) + target:addStatusEffect(xi.effect.FOOD, { duration = 30 * 60, origin = user, subType = 5165 }) end return itemObject diff --git a/scripts/items/bottle_of_orange_juice.lua b/scripts/items/bottle_of_orange_juice.lua index c7eee736192..2f2a860c50d 100644 --- a/scripts/items/bottle_of_orange_juice.lua +++ b/scripts/items/bottle_of_orange_juice.lua @@ -10,7 +10,7 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) local power = 1 local legs = target:getEquipID(xi.slot.LEGS) if legs == 11966 or legs == 11968 then -- Dream Trousers +1 & Dream Pants +1 @@ -18,7 +18,7 @@ itemObject.onItemUse = function(target) end if not target:hasStatusEffect(xi.effect.REFRESH) then - target:addStatusEffect(xi.effect.REFRESH, power, 3, 90) + target:addStatusEffect(xi.effect.REFRESH, { power = power, duration = 90, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/bottle_of_pineapple_juice.lua b/scripts/items/bottle_of_pineapple_juice.lua index 95ddc42ab1b..3bf8eafa671 100644 --- a/scripts/items/bottle_of_pineapple_juice.lua +++ b/scripts/items/bottle_of_pineapple_juice.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.REFRESH) then - target:addStatusEffect(xi.effect.REFRESH, 1, 3, 240) + target:addStatusEffect(xi.effect.REFRESH, { power = 1, duration = 240, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/bottle_of_potion_drops.lua b/scripts/items/bottle_of_potion_drops.lua index 719587d3c26..dded099fbed 100644 --- a/scripts/items/bottle_of_potion_drops.lua +++ b/scripts/items/bottle_of_potion_drops.lua @@ -14,9 +14,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) target:addHP(60 * xi.settings.main.ITEM_POWER) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 300) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 300, origin = user }) end return itemObject diff --git a/scripts/items/bottle_of_psychoanima.lua b/scripts/items/bottle_of_psychoanima.lua index 872d4b4f865..4626abe831a 100644 --- a/scripts/items/bottle_of_psychoanima.lua +++ b/scripts/items/bottle_of_psychoanima.lua @@ -19,7 +19,7 @@ end itemObject.onItemUse = function(target, player) target:delStatusEffectSilent(xi.effect.INTIMIDATE) - target:addStatusEffect(xi.effect.INTIMIDATE, 100, 0, math.random(25, 32)) + target:addStatusEffect(xi.effect.INTIMIDATE, { power = 100, duration = math.random(25, 32), origin = player }) end return itemObject diff --git a/scripts/items/bottle_of_strange_juice.lua b/scripts/items/bottle_of_strange_juice.lua index 5efb811ae23..df44f85d3c1 100644 --- a/scripts/items/bottle_of_strange_juice.lua +++ b/scripts/items/bottle_of_strange_juice.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.REFRESH) then - target:addStatusEffect(xi.effect.REFRESH, 2, 3, 300) + target:addStatusEffect(xi.effect.REFRESH, { power = 2, duration = 300, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/bottle_of_tomato_juice.lua b/scripts/items/bottle_of_tomato_juice.lua index 7ed57a8e588..10e60e16ccd 100644 --- a/scripts/items/bottle_of_tomato_juice.lua +++ b/scripts/items/bottle_of_tomato_juice.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.REFRESH) then - target:addStatusEffect(xi.effect.REFRESH, 1, 3, 180) + target:addStatusEffect(xi.effect.REFRESH, { power = 1, duration = 180, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/bottle_of_vampire_juice.lua b/scripts/items/bottle_of_vampire_juice.lua index 8405d5662a7..5312330da47 100644 --- a/scripts/items/bottle_of_vampire_juice.lua +++ b/scripts/items/bottle_of_vampire_juice.lua @@ -10,15 +10,15 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) local worked = false if not target:hasStatusEffect(xi.effect.REGEN) then - target:addStatusEffect(xi.effect.REGEN, 2, 3, 90) + target:addStatusEffect(xi.effect.REGEN, { power = 2, duration = 90, origin = user, tick = 3 }) worked = true end if not target:hasStatusEffect(xi.effect.REFRESH) then - target:addStatusEffect(xi.effect.REFRESH, 2, 3, 90) + target:addStatusEffect(xi.effect.REFRESH, { power = 2, duration = 90, origin = user, tick = 3 }) worked = true end diff --git a/scripts/items/bottle_of_viper_potion.lua b/scripts/items/bottle_of_viper_potion.lua index 9efde397509..7918ade1950 100644 --- a/scripts/items/bottle_of_viper_potion.lua +++ b/scripts/items/bottle_of_viper_potion.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.POISON) then - target:addStatusEffect(xi.effect.POISON, 5, 3, 180) + target:addStatusEffect(xi.effect.POISON, { power = 5, duration = 180, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/bottle_of_wizards_drink.lua b/scripts/items/bottle_of_wizards_drink.lua index 64e42ad7733..e61d3c2e78a 100644 --- a/scripts/items/bottle_of_wizards_drink.lua +++ b/scripts/items/bottle_of_wizards_drink.lua @@ -10,10 +10,10 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) local duration = 900 target:delStatusEffect(xi.effect.MAX_MP_BOOST) - target:addStatusEffect(xi.effect.MAX_MP_BOOST, 100, 0, duration) + target:addStatusEffect(xi.effect.MAX_MP_BOOST, { power = 100, duration = duration, origin = user }) end return itemObject diff --git a/scripts/items/bottle_of_yagudo_drink.lua b/scripts/items/bottle_of_yagudo_drink.lua index f7d725f8ea3..f77e098b1be 100644 --- a/scripts/items/bottle_of_yagudo_drink.lua +++ b/scripts/items/bottle_of_yagudo_drink.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.REFRESH) then - target:addStatusEffect(xi.effect.REFRESH, 2, 3, 180) + target:addStatusEffect(xi.effect.REFRESH, { power = 2, duration = 180, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/bottle_of_yellow_liquid.lua b/scripts/items/bottle_of_yellow_liquid.lua index 36b74e1afc7..b2f43bc02b2 100644 --- a/scripts/items/bottle_of_yellow_liquid.lua +++ b/scripts/items/bottle_of_yellow_liquid.lua @@ -11,7 +11,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 30, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 30, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end return itemObject diff --git a/scripts/items/bowl_of_adamantoise_soup.lua b/scripts/items/bowl_of_adamantoise_soup.lua index a5a023b9ac8..dd469592b6c 100644 --- a/scripts/items/bowl_of_adamantoise_soup.lua +++ b/scripts/items/bowl_of_adamantoise_soup.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_adoulinian_soup.lua b/scripts/items/bowl_of_adoulinian_soup.lua index d71bd5ff298..7c2a33807dd 100644 --- a/scripts/items/bowl_of_adoulinian_soup.lua +++ b/scripts/items/bowl_of_adoulinian_soup.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_adoulinian_soup_+1.lua b/scripts/items/bowl_of_adoulinian_soup_+1.lua index 12eab0e6210..bd647f7a412 100644 --- a/scripts/items/bowl_of_adoulinian_soup_+1.lua +++ b/scripts/items/bowl_of_adoulinian_soup_+1.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_ambrosia.lua b/scripts/items/bowl_of_ambrosia.lua index 1e0acbae731..9d9ead1b3b2 100644 --- a/scripts/items/bowl_of_ambrosia.lua +++ b/scripts/items/bowl_of_ambrosia.lua @@ -29,7 +29,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_boiled_cockatrice.lua b/scripts/items/bowl_of_boiled_cockatrice.lua index 56a5b180908..89d508f4cc4 100644 --- a/scripts/items/bowl_of_boiled_cockatrice.lua +++ b/scripts/items/bowl_of_boiled_cockatrice.lua @@ -21,7 +21,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_brain_stew.lua b/scripts/items/bowl_of_brain_stew.lua index ae523e3f10b..85083fdc61e 100644 --- a/scripts/items/bowl_of_brain_stew.lua +++ b/scripts/items/bowl_of_brain_stew.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_cursed_soup.lua b/scripts/items/bowl_of_cursed_soup.lua index 415fe26aacf..ff19a5239a8 100644 --- a/scripts/items/bowl_of_cursed_soup.lua +++ b/scripts/items/bowl_of_cursed_soup.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_delicious_puls.lua b/scripts/items/bowl_of_delicious_puls.lua index 216402bee05..bf8b2c13a18 100644 --- a/scripts/items/bowl_of_delicious_puls.lua +++ b/scripts/items/bowl_of_delicious_puls.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_dhalmel_stew.lua b/scripts/items/bowl_of_dhalmel_stew.lua index 8e0a845c6c0..fc66b4de320 100644 --- a/scripts/items/bowl_of_dhalmel_stew.lua +++ b/scripts/items/bowl_of_dhalmel_stew.lua @@ -20,7 +20,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_dragon_soup.lua b/scripts/items/bowl_of_dragon_soup.lua index d7b85615727..34d26bb3476 100644 --- a/scripts/items/bowl_of_dragon_soup.lua +++ b/scripts/items/bowl_of_dragon_soup.lua @@ -23,7 +23,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_egg_soup.lua b/scripts/items/bowl_of_egg_soup.lua index 0286ebf7e5f..6d622c15e43 100644 --- a/scripts/items/bowl_of_egg_soup.lua +++ b/scripts/items/bowl_of_egg_soup.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_emerald_soup.lua b/scripts/items/bowl_of_emerald_soup.lua index 6753c2ac778..1ac92cda605 100644 --- a/scripts/items/bowl_of_emerald_soup.lua +++ b/scripts/items/bowl_of_emerald_soup.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_eyeball_soup.lua b/scripts/items/bowl_of_eyeball_soup.lua index 0fa2d6d2dd9..f9173b9568d 100644 --- a/scripts/items/bowl_of_eyeball_soup.lua +++ b/scripts/items/bowl_of_eyeball_soup.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_goblin_stew.lua b/scripts/items/bowl_of_goblin_stew.lua index 6cfc5c81a6d..1e5268c16a1 100644 --- a/scripts/items/bowl_of_goblin_stew.lua +++ b/scripts/items/bowl_of_goblin_stew.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_goulash.lua b/scripts/items/bowl_of_goulash.lua index 54bff316213..e72a673b75d 100644 --- a/scripts/items/bowl_of_goulash.lua +++ b/scripts/items/bowl_of_goulash.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_goulash_+1.lua b/scripts/items/bowl_of_goulash_+1.lua index 27386d4ece1..27dc9aa6618 100644 --- a/scripts/items/bowl_of_goulash_+1.lua +++ b/scripts/items/bowl_of_goulash_+1.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_homemade_stew.lua b/scripts/items/bowl_of_homemade_stew.lua index d82542ee148..35b59712cc4 100644 --- a/scripts/items/bowl_of_homemade_stew.lua +++ b/scripts/items/bowl_of_homemade_stew.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_humpty_soup.lua b/scripts/items/bowl_of_humpty_soup.lua index 66b3033970f..d4e5ba28b74 100644 --- a/scripts/items/bowl_of_humpty_soup.lua +++ b/scripts/items/bowl_of_humpty_soup.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_jack-o-soup.lua b/scripts/items/bowl_of_jack-o-soup.lua index 465ce33daaa..7ec738c36ba 100644 --- a/scripts/items/bowl_of_jack-o-soup.lua +++ b/scripts/items/bowl_of_jack-o-soup.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_loach_gruel.lua b/scripts/items/bowl_of_loach_gruel.lua index 884446dfd8a..5d048dd0fb9 100644 --- a/scripts/items/bowl_of_loach_gruel.lua +++ b/scripts/items/bowl_of_loach_gruel.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_loach_slop.lua b/scripts/items/bowl_of_loach_slop.lua index 622ea5ac8c9..85b7c7dc943 100644 --- a/scripts/items/bowl_of_loach_slop.lua +++ b/scripts/items/bowl_of_loach_slop.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_loach_soup.lua b/scripts/items/bowl_of_loach_soup.lua index 2dbbd861135..2e11754baa6 100644 --- a/scripts/items/bowl_of_loach_soup.lua +++ b/scripts/items/bowl_of_loach_soup.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_medicinal_gruel.lua b/scripts/items/bowl_of_medicinal_gruel.lua index a3af15fafa8..d1190bb943e 100644 --- a/scripts/items/bowl_of_medicinal_gruel.lua +++ b/scripts/items/bowl_of_medicinal_gruel.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_miso_ramen.lua b/scripts/items/bowl_of_miso_ramen.lua index b70e5d26b7d..e69d1311069 100644 --- a/scripts/items/bowl_of_miso_ramen.lua +++ b/scripts/items/bowl_of_miso_ramen.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_miso_ramen_+1.lua b/scripts/items/bowl_of_miso_ramen_+1.lua index fafb70d4db3..90333f48ea1 100644 --- a/scripts/items/bowl_of_miso_ramen_+1.lua +++ b/scripts/items/bowl_of_miso_ramen_+1.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_miso_soup.lua b/scripts/items/bowl_of_miso_soup.lua index 39fc9834615..f9dd6fc6e62 100644 --- a/scripts/items/bowl_of_miso_soup.lua +++ b/scripts/items/bowl_of_miso_soup.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_miso_soup_+1.lua b/scripts/items/bowl_of_miso_soup_+1.lua index 295078368b1..a6b4af04e05 100644 --- a/scripts/items/bowl_of_miso_soup_+1.lua +++ b/scripts/items/bowl_of_miso_soup_+1.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_mog_pudding.lua b/scripts/items/bowl_of_mog_pudding.lua index b8b92fea5cd..5bcb869eec7 100644 --- a/scripts/items/bowl_of_mog_pudding.lua +++ b/scripts/items/bowl_of_mog_pudding.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_moogurt.lua b/scripts/items/bowl_of_moogurt.lua index 7199020ac73..18084538ded 100644 --- a/scripts/items/bowl_of_moogurt.lua +++ b/scripts/items/bowl_of_moogurt.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_mushroom_soup.lua b/scripts/items/bowl_of_mushroom_soup.lua index 9e02f912085..a4e3c6b1547 100644 --- a/scripts/items/bowl_of_mushroom_soup.lua +++ b/scripts/items/bowl_of_mushroom_soup.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_mushroom_stew.lua b/scripts/items/bowl_of_mushroom_stew.lua index c21dc7e29db..a9a74871569 100644 --- a/scripts/items/bowl_of_mushroom_stew.lua +++ b/scripts/items/bowl_of_mushroom_stew.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_nashmau_stew.lua b/scripts/items/bowl_of_nashmau_stew.lua index d53ad896091..0e66f20d2c2 100644 --- a/scripts/items/bowl_of_nashmau_stew.lua +++ b/scripts/items/bowl_of_nashmau_stew.lua @@ -23,7 +23,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_navarin.lua b/scripts/items/bowl_of_navarin.lua index cced92bb02d..086d8473b9c 100644 --- a/scripts/items/bowl_of_navarin.lua +++ b/scripts/items/bowl_of_navarin.lua @@ -22,7 +22,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_ocean_soup.lua b/scripts/items/bowl_of_ocean_soup.lua index 805aa91a6f7..df7c942d59c 100644 --- a/scripts/items/bowl_of_ocean_soup.lua +++ b/scripts/items/bowl_of_ocean_soup.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_oceanfin_soup.lua b/scripts/items/bowl_of_oceanfin_soup.lua index 29b0f84d74d..978094c2bca 100644 --- a/scripts/items/bowl_of_oceanfin_soup.lua +++ b/scripts/items/bowl_of_oceanfin_soup.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_oden.lua b/scripts/items/bowl_of_oden.lua index 91343c867a4..216a54a3b17 100644 --- a/scripts/items/bowl_of_oden.lua +++ b/scripts/items/bowl_of_oden.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_oden_+1.lua b/scripts/items/bowl_of_oden_+1.lua index eaaa2142961..f5207f65b14 100644 --- a/scripts/items/bowl_of_oden_+1.lua +++ b/scripts/items/bowl_of_oden_+1.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_optical_soup.lua b/scripts/items/bowl_of_optical_soup.lua index 0ca88fff94a..fd6d7abcc2d 100644 --- a/scripts/items/bowl_of_optical_soup.lua +++ b/scripts/items/bowl_of_optical_soup.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_pea_soup.lua b/scripts/items/bowl_of_pea_soup.lua index f4b7037de53..5b44080ef6d 100644 --- a/scripts/items/bowl_of_pea_soup.lua +++ b/scripts/items/bowl_of_pea_soup.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_pebble_soup.lua b/scripts/items/bowl_of_pebble_soup.lua index 9bbfc2d1d96..55ae1d2ac6f 100644 --- a/scripts/items/bowl_of_pebble_soup.lua +++ b/scripts/items/bowl_of_pebble_soup.lua @@ -13,7 +13,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_pomodoro_sauce.lua b/scripts/items/bowl_of_pomodoro_sauce.lua index 07f7e68e9e8..1f5c3a7387a 100644 --- a/scripts/items/bowl_of_pomodoro_sauce.lua +++ b/scripts/items/bowl_of_pomodoro_sauce.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_puls.lua b/scripts/items/bowl_of_puls.lua index eb32f77ad73..cd427c47ecc 100644 --- a/scripts/items/bowl_of_puls.lua +++ b/scripts/items/bowl_of_puls.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_pumpkin_soup.lua b/scripts/items/bowl_of_pumpkin_soup.lua index 1af2c99b1bc..a5f36cfc107 100644 --- a/scripts/items/bowl_of_pumpkin_soup.lua +++ b/scripts/items/bowl_of_pumpkin_soup.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_quadav_stew.lua b/scripts/items/bowl_of_quadav_stew.lua index cbae94a7f35..44d296b56ab 100644 --- a/scripts/items/bowl_of_quadav_stew.lua +++ b/scripts/items/bowl_of_quadav_stew.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_riverfin_soup.lua b/scripts/items/bowl_of_riverfin_soup.lua index 500ccb6170a..b7fe070b7b6 100644 --- a/scripts/items/bowl_of_riverfin_soup.lua +++ b/scripts/items/bowl_of_riverfin_soup.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_salt_ramen.lua b/scripts/items/bowl_of_salt_ramen.lua index 1a4fe0a0238..5eb0b502c86 100644 --- a/scripts/items/bowl_of_salt_ramen.lua +++ b/scripts/items/bowl_of_salt_ramen.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_salt_ramen_+1.lua b/scripts/items/bowl_of_salt_ramen_+1.lua index ea658a355f9..2ceec4f54d8 100644 --- a/scripts/items/bowl_of_salt_ramen_+1.lua +++ b/scripts/items/bowl_of_salt_ramen_+1.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_seafood_stew.lua b/scripts/items/bowl_of_seafood_stew.lua index 91f3606655e..a51e171eb0e 100644 --- a/scripts/items/bowl_of_seafood_stew.lua +++ b/scripts/items/bowl_of_seafood_stew.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_shark_fin_soup.lua b/scripts/items/bowl_of_shark_fin_soup.lua index 1456b8717c6..6f294037d31 100644 --- a/scripts/items/bowl_of_shark_fin_soup.lua +++ b/scripts/items/bowl_of_shark_fin_soup.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_shimmy_soup.lua b/scripts/items/bowl_of_shimmy_soup.lua index 2908b9b5752..02ed3646704 100644 --- a/scripts/items/bowl_of_shimmy_soup.lua +++ b/scripts/items/bowl_of_shimmy_soup.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_sopa_de_pez_blanco.lua b/scripts/items/bowl_of_sopa_de_pez_blanco.lua index 4206c8ec979..1879b3225aa 100644 --- a/scripts/items/bowl_of_sopa_de_pez_blanco.lua +++ b/scripts/items/bowl_of_sopa_de_pez_blanco.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_sophic_stew.lua b/scripts/items/bowl_of_sophic_stew.lua index b182dddb9a8..1bfddfa73ed 100644 --- a/scripts/items/bowl_of_sophic_stew.lua +++ b/scripts/items/bowl_of_sophic_stew.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_soy_ramen.lua b/scripts/items/bowl_of_soy_ramen.lua index 17291f7e65c..da02651d637 100644 --- a/scripts/items/bowl_of_soy_ramen.lua +++ b/scripts/items/bowl_of_soy_ramen.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_soy_ramen_+1.lua b/scripts/items/bowl_of_soy_ramen_+1.lua index 4c7a56818fd..56040cfff72 100644 --- a/scripts/items/bowl_of_soy_ramen_+1.lua +++ b/scripts/items/bowl_of_soy_ramen_+1.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_sprightly_soup.lua b/scripts/items/bowl_of_sprightly_soup.lua index 26bc74bc568..aec2aad5e51 100644 --- a/scripts/items/bowl_of_sprightly_soup.lua +++ b/scripts/items/bowl_of_sprightly_soup.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_stamina_soup.lua b/scripts/items/bowl_of_stamina_soup.lua index 886b786419f..6219d128d19 100644 --- a/scripts/items/bowl_of_stamina_soup.lua +++ b/scripts/items/bowl_of_stamina_soup.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_sunset_soup.lua b/scripts/items/bowl_of_sunset_soup.lua index 00a737f3693..62f23be234a 100644 --- a/scripts/items/bowl_of_sunset_soup.lua +++ b/scripts/items/bowl_of_sunset_soup.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_sutlac.lua b/scripts/items/bowl_of_sutlac.lua index be00714ee73..59f5e7019d5 100644 --- a/scripts/items/bowl_of_sutlac.lua +++ b/scripts/items/bowl_of_sutlac.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_sutlac_+1.lua b/scripts/items/bowl_of_sutlac_+1.lua index 602b90ad6d5..09ce8493434 100644 --- a/scripts/items/bowl_of_sutlac_+1.lua +++ b/scripts/items/bowl_of_sutlac_+1.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_tender_navarin.lua b/scripts/items/bowl_of_tender_navarin.lua index 06d008cb7a4..51391e56437 100644 --- a/scripts/items/bowl_of_tender_navarin.lua +++ b/scripts/items/bowl_of_tender_navarin.lua @@ -20,7 +20,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_tomato_soup.lua b/scripts/items/bowl_of_tomato_soup.lua index a1aa2c700d3..bc850228d79 100644 --- a/scripts/items/bowl_of_tomato_soup.lua +++ b/scripts/items/bowl_of_tomato_soup.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_turtle_soup.lua b/scripts/items/bowl_of_turtle_soup.lua index 0d1cec19b78..ec630e507de 100644 --- a/scripts/items/bowl_of_turtle_soup.lua +++ b/scripts/items/bowl_of_turtle_soup.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_ulbuconut_milk.lua b/scripts/items/bowl_of_ulbuconut_milk.lua index eb5ff38282f..3761eac7d28 100644 --- a/scripts/items/bowl_of_ulbuconut_milk.lua +++ b/scripts/items/bowl_of_ulbuconut_milk.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 180, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 180, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_ulbuconut_milk_+1.lua b/scripts/items/bowl_of_ulbuconut_milk_+1.lua index dfbba47cae7..7b0b5b8d862 100644 --- a/scripts/items/bowl_of_ulbuconut_milk_+1.lua +++ b/scripts/items/bowl_of_ulbuconut_milk_+1.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 180, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 180, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_vegetable_broth.lua b/scripts/items/bowl_of_vegetable_broth.lua index 43c1c336de6..b94beeb470d 100644 --- a/scripts/items/bowl_of_vegetable_broth.lua +++ b/scripts/items/bowl_of_vegetable_broth.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_vegetable_gruel.lua b/scripts/items/bowl_of_vegetable_gruel.lua index 679844b0a5c..e32d0c4650c 100644 --- a/scripts/items/bowl_of_vegetable_gruel.lua +++ b/scripts/items/bowl_of_vegetable_gruel.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_vegetable_soup.lua b/scripts/items/bowl_of_vegetable_soup.lua index ac9cc44930d..ebccbfa9f6d 100644 --- a/scripts/items/bowl_of_vegetable_soup.lua +++ b/scripts/items/bowl_of_vegetable_soup.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_whitefish_stew.lua b/scripts/items/bowl_of_whitefish_stew.lua index 6ab9051bcba..341a55aed1a 100644 --- a/scripts/items/bowl_of_whitefish_stew.lua +++ b/scripts/items/bowl_of_whitefish_stew.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_wild_stew.lua b/scripts/items/bowl_of_wild_stew.lua index 308385cab44..23597bdca7b 100644 --- a/scripts/items/bowl_of_wild_stew.lua +++ b/scripts/items/bowl_of_wild_stew.lua @@ -20,7 +20,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_wisdom_soup.lua b/scripts/items/bowl_of_wisdom_soup.lua index 350261b8db8..63da3b67bee 100644 --- a/scripts/items/bowl_of_wisdom_soup.lua +++ b/scripts/items/bowl_of_wisdom_soup.lua @@ -22,7 +22,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_witch_soup.lua b/scripts/items/bowl_of_witch_soup.lua index 8949e090891..09892a02dcf 100644 --- a/scripts/items/bowl_of_witch_soup.lua +++ b/scripts/items/bowl_of_witch_soup.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_witch_stew.lua b/scripts/items/bowl_of_witch_stew.lua index e4ecf17fe73..623f74b4207 100644 --- a/scripts/items/bowl_of_witch_stew.lua +++ b/scripts/items/bowl_of_witch_stew.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_yayla_corbasi.lua b/scripts/items/bowl_of_yayla_corbasi.lua index 8aa2c6f5b58..12ed483d3ba 100644 --- a/scripts/items/bowl_of_yayla_corbasi.lua +++ b/scripts/items/bowl_of_yayla_corbasi.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_yayla_corbasi_+1.lua b/scripts/items/bowl_of_yayla_corbasi_+1.lua index f53f77d50c8..9cbbac54402 100644 --- a/scripts/items/bowl_of_yayla_corbasi_+1.lua +++ b/scripts/items/bowl_of_yayla_corbasi_+1.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_yogurt.lua b/scripts/items/bowl_of_yogurt.lua index 4956b0bfd26..82b52a2aba7 100644 --- a/scripts/items/bowl_of_yogurt.lua +++ b/scripts/items/bowl_of_yogurt.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.REGEN) then - target:addStatusEffect(xi.effect.REGEN, 1, 3, 180) + target:addStatusEffect(xi.effect.REGEN, { power = 1, duration = 180, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/bowl_of_zesty_zoni.lua b/scripts/items/bowl_of_zesty_zoni.lua index f815d7018d3..cb0ecf696bd 100644 --- a/scripts/items/bowl_of_zesty_zoni.lua +++ b/scripts/items/bowl_of_zesty_zoni.lua @@ -25,7 +25,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bowl_of_zoni_broth.lua b/scripts/items/bowl_of_zoni_broth.lua index f40db4c716e..b149210da8e 100644 --- a/scripts/items/bowl_of_zoni_broth.lua +++ b/scripts/items/bowl_of_zoni_broth.lua @@ -25,7 +25,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/branch_of_gnatbane.lua b/scripts/items/branch_of_gnatbane.lua index 5478835a52c..3162a64f5da 100644 --- a/scripts/items/branch_of_gnatbane.lua +++ b/scripts/items/branch_of_gnatbane.lua @@ -12,9 +12,9 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) if not target:hasStatusEffect(xi.effect.POISON) then - target:addStatusEffect(xi.effect.POISON, 10, 3, 600) + target:addStatusEffect(xi.effect.POISON, { power = 10, duration = 600, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/brass_loach.lua b/scripts/items/brass_loach.lua index c16bc1e1f44..4af84e695c8 100644 --- a/scripts/items/brass_loach.lua +++ b/scripts/items/brass_loach.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/breath_mantle.lua b/scripts/items/breath_mantle.lua index 2aa35eba4e3..7fe3af080ea 100644 --- a/scripts/items/breath_mantle.lua +++ b/scripts/items/breath_mantle.lua @@ -14,9 +14,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.BREATH_MANTLE) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.BREATH_MANTLE) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 1800, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.BREATH_MANTLE }) end end diff --git a/scripts/items/bretzel.lua b/scripts/items/bretzel.lua index c44c884bdb5..644d57f743c 100644 --- a/scripts/items/bretzel.lua +++ b/scripts/items/bretzel.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 180, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 180, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/broiled_carp.lua b/scripts/items/broiled_carp.lua index 060931da72e..94dfbdfb229 100644 --- a/scripts/items/broiled_carp.lua +++ b/scripts/items/broiled_carp.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/broiled_eel.lua b/scripts/items/broiled_eel.lua index c95682afd94..a64fc574d45 100644 --- a/scripts/items/broiled_eel.lua +++ b/scripts/items/broiled_eel.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/broiled_pipira.lua b/scripts/items/broiled_pipira.lua index 50e9795eda7..72e893de218 100644 --- a/scripts/items/broiled_pipira.lua +++ b/scripts/items/broiled_pipira.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/broiled_trout.lua b/scripts/items/broiled_trout.lua index bf9c616fda9..77e7c110011 100644 --- a/scripts/items/broiled_trout.lua +++ b/scripts/items/broiled_trout.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bunch_of_azouph_greens.lua b/scripts/items/bunch_of_azouph_greens.lua index 961239260cc..8f5b989ea0b 100644 --- a/scripts/items/bunch_of_azouph_greens.lua +++ b/scripts/items/bunch_of_azouph_greens.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bunch_of_buburimu_grapes.lua b/scripts/items/bunch_of_buburimu_grapes.lua index 0cc9bd525f0..56565a65ec9 100644 --- a/scripts/items/bunch_of_buburimu_grapes.lua +++ b/scripts/items/bunch_of_buburimu_grapes.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bunch_of_fortune_fruits.lua b/scripts/items/bunch_of_fortune_fruits.lua index 8e52235627f..c993b7c05fd 100644 --- a/scripts/items/bunch_of_fortune_fruits.lua +++ b/scripts/items/bunch_of_fortune_fruits.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bunch_of_gysahl_greens.lua b/scripts/items/bunch_of_gysahl_greens.lua index e793dadc6ff..7afa8ed65ee 100644 --- a/scripts/items/bunch_of_gysahl_greens.lua +++ b/scripts/items/bunch_of_gysahl_greens.lua @@ -17,7 +17,7 @@ end itemObject.onItemUse = function(target, user, item, action) local chocoboShirt = target:getMod(xi.mod.APPRECIATE_GYSAHL_GREENS) - target:addStatusEffect(xi.effect.FOOD, chocoboShirt, 0, 300, 4545) + target:addStatusEffect(xi.effect.FOOD, { power = chocoboShirt, duration = 300, origin = user, subType = 4545 }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bunch_of_pamamas.lua b/scripts/items/bunch_of_pamamas.lua index 15a3c7a2ab9..a5766be7627 100644 --- a/scripts/items/bunch_of_pamamas.lua +++ b/scripts/items/bunch_of_pamamas.lua @@ -25,7 +25,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bunch_of_royal_grapes.lua b/scripts/items/bunch_of_royal_grapes.lua index 76dafe567c5..b53b6c89662 100644 --- a/scripts/items/bunch_of_royal_grapes.lua +++ b/scripts/items/bunch_of_royal_grapes.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bunch_of_san_dorian_grapes.lua b/scripts/items/bunch_of_san_dorian_grapes.lua index 24861abbe3b..e79bf10bc9b 100644 --- a/scripts/items/bunch_of_san_dorian_grapes.lua +++ b/scripts/items/bunch_of_san_dorian_grapes.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bunch_of_sharug_greens.lua b/scripts/items/bunch_of_sharug_greens.lua index 5b4a038c63a..a06bc93579a 100644 --- a/scripts/items/bunch_of_sharug_greens.lua +++ b/scripts/items/bunch_of_sharug_greens.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bunch_of_wild_pamamas.lua b/scripts/items/bunch_of_wild_pamamas.lua index 1624a68579e..b971e5e1fe1 100644 --- a/scripts/items/bunch_of_wild_pamamas.lua +++ b/scripts/items/bunch_of_wild_pamamas.lua @@ -25,7 +25,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bundle_of_shirataki.lua b/scripts/items/bundle_of_shirataki.lua index 1106a25b7c9..24bba503710 100644 --- a/scripts/items/bundle_of_shirataki.lua +++ b/scripts/items/bundle_of_shirataki.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/bunny_ball.lua b/scripts/items/bunny_ball.lua index 86702b02f04..cc5b45ec5b3 100644 --- a/scripts/items/bunny_ball.lua +++ b/scripts/items/bunny_ball.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/burdock_root.lua b/scripts/items/burdock_root.lua index 0501d5fb79e..cf170470950 100644 --- a/scripts/items/burdock_root.lua +++ b/scripts/items/burdock_root.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/butter_crepe.lua b/scripts/items/butter_crepe.lua index 5edc079dd36..ac27a65017a 100644 --- a/scripts/items/butter_crepe.lua +++ b/scripts/items/butter_crepe.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/buttered_nebimonite.lua b/scripts/items/buttered_nebimonite.lua index 5bdc745d8f7..d56d29564b7 100644 --- a/scripts/items/buttered_nebimonite.lua +++ b/scripts/items/buttered_nebimonite.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/butterpear.lua b/scripts/items/butterpear.lua index f5fc3e7aeda..f7b3d470a4c 100644 --- a/scripts/items/butterpear.lua +++ b/scripts/items/butterpear.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/ca_cuong.lua b/scripts/items/ca_cuong.lua index 25f2f5a3c78..bc053220ac9 100644 --- a/scripts/items/ca_cuong.lua +++ b/scripts/items/ca_cuong.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/caedarva_frog.lua b/scripts/items/caedarva_frog.lua index d98ecd6430c..fcc7e9c19b5 100644 --- a/scripts/items/caedarva_frog.lua +++ b/scripts/items/caedarva_frog.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/cage_of_a_remnants_fireflies.lua b/scripts/items/cage_of_a_remnants_fireflies.lua index 698c5477290..8997be649a4 100644 --- a/scripts/items/cage_of_a_remnants_fireflies.lua +++ b/scripts/items/cage_of_a_remnants_fireflies.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return xi.msg.basic.ITEM_UNABLE_TO_USE_2 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.A_REM, 0, 1) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.A_REM, duration = 1, origin = user, icon = 0 }) end itemObject.onItemDrop = function(target, item) diff --git a/scripts/items/cage_of_azouph_fireflies.lua b/scripts/items/cage_of_azouph_fireflies.lua index a1440d367a4..d001a5d3a5d 100644 --- a/scripts/items/cage_of_azouph_fireflies.lua +++ b/scripts/items/cage_of_azouph_fireflies.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return xi.msg.basic.ITEM_UNABLE_TO_USE_2 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.AZOUPH, 0, 1) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.AZOUPH, duration = 1, origin = user, icon = 0 }) end itemObject.onItemDrop = function(target, item) diff --git a/scripts/items/cage_of_b_remnants_fireflies.lua b/scripts/items/cage_of_b_remnants_fireflies.lua index 1a10d49cb78..7f57beb5962 100644 --- a/scripts/items/cage_of_b_remnants_fireflies.lua +++ b/scripts/items/cage_of_b_remnants_fireflies.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return xi.msg.basic.ITEM_UNABLE_TO_USE_2 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.B_REM, 0, 1) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.B_REM, duration = 1, origin = user, icon = 0 }) end itemObject.onItemDrop = function(target, item) diff --git a/scripts/items/cage_of_bhaflau_fireflies.lua b/scripts/items/cage_of_bhaflau_fireflies.lua index 66fa16d320d..723ba706098 100644 --- a/scripts/items/cage_of_bhaflau_fireflies.lua +++ b/scripts/items/cage_of_bhaflau_fireflies.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return xi.msg.basic.ITEM_UNABLE_TO_USE_2 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.BHAFLAU, 0, 1) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.BHAFLAU, duration = 1, origin = user, icon = 0 }) end itemObject.onItemDrop = function(target, item) diff --git a/scripts/items/cage_of_cutter_fireflies.lua b/scripts/items/cage_of_cutter_fireflies.lua index 5ff44d05965..7c0e9f1c586 100644 --- a/scripts/items/cage_of_cutter_fireflies.lua +++ b/scripts/items/cage_of_cutter_fireflies.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return xi.msg.basic.ITEM_UNABLE_TO_USE_2 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.CUTTER, 0, 1) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.CUTTER, duration = 1, origin = user, icon = 0 }) end itemObject.onItemDrop = function(target, item) diff --git a/scripts/items/cage_of_dvucca_fireflies.lua b/scripts/items/cage_of_dvucca_fireflies.lua index 5b9ba607426..e6ac5817c91 100644 --- a/scripts/items/cage_of_dvucca_fireflies.lua +++ b/scripts/items/cage_of_dvucca_fireflies.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return xi.msg.basic.ITEM_UNABLE_TO_USE_2 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.DVUCCA, 0, 1) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.DVUCCA, duration = 1, origin = user, icon = 0 }) end itemObject.onItemDrop = function(target, item) diff --git a/scripts/items/cage_of_reef_fireflies.lua b/scripts/items/cage_of_reef_fireflies.lua index e563c986689..b959ce23f41 100644 --- a/scripts/items/cage_of_reef_fireflies.lua +++ b/scripts/items/cage_of_reef_fireflies.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return xi.msg.basic.ITEM_UNABLE_TO_USE_2 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.REEF, 0, 1) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.REEF, duration = 1, origin = user, icon = 0 }) end itemObject.onItemDrop = function(target, item) diff --git a/scripts/items/cage_of_s_remnants_fireflies.lua b/scripts/items/cage_of_s_remnants_fireflies.lua index afcd70ed791..ffadf2eaf86 100644 --- a/scripts/items/cage_of_s_remnants_fireflies.lua +++ b/scripts/items/cage_of_s_remnants_fireflies.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return xi.msg.basic.ITEM_UNABLE_TO_USE_2 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.S_REM, 0, 1) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.S_REM, duration = 1, origin = user, icon = 0 }) end itemObject.onItemDrop = function(target, item) diff --git a/scripts/items/cage_of_undersea_ruins_fireflies.lua b/scripts/items/cage_of_undersea_ruins_fireflies.lua index 6b02aac893b..94fc1fb77ee 100644 --- a/scripts/items/cage_of_undersea_ruins_fireflies.lua +++ b/scripts/items/cage_of_undersea_ruins_fireflies.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return xi.msg.basic.ITEM_UNABLE_TO_USE_2 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.ALZADAAL, 0, 1) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.ALZADAAL, duration = 1, origin = user, icon = 0 }) end itemObject.onItemDrop = function(target, item) diff --git a/scripts/items/cage_of_z_remnants_fireflies.lua b/scripts/items/cage_of_z_remnants_fireflies.lua index 110d937fa95..ceed97718ca 100644 --- a/scripts/items/cage_of_z_remnants_fireflies.lua +++ b/scripts/items/cage_of_z_remnants_fireflies.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return xi.msg.basic.ITEM_UNABLE_TO_USE_2 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.Z_REM, 0, 1) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.Z_REM, duration = 1, origin = user, icon = 0 }) end itemObject.onItemDrop = function(target, item) diff --git a/scripts/items/cage_of_zhayolm_fireflies.lua b/scripts/items/cage_of_zhayolm_fireflies.lua index 2382e48d26b..14a4a242019 100644 --- a/scripts/items/cage_of_zhayolm_fireflies.lua +++ b/scripts/items/cage_of_zhayolm_fireflies.lua @@ -13,8 +13,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return xi.msg.basic.ITEM_UNABLE_TO_USE_2 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.ZHAYOLM, 0, 1) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.ZHAYOLM, duration = 1, origin = user, icon = 0 }) end itemObject.onItemDrop = function(target, item) diff --git a/scripts/items/calico_comet.lua b/scripts/items/calico_comet.lua index bb739df4565..5739704645f 100644 --- a/scripts/items/calico_comet.lua +++ b/scripts/items/calico_comet.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/candy_cane.lua b/scripts/items/candy_cane.lua index 5e04a2ac1b0..b92bffea3f8 100644 --- a/scripts/items/candy_cane.lua +++ b/scripts/items/candy_cane.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/candy_ring.lua b/scripts/items/candy_ring.lua index 590a3029a28..21945431a40 100644 --- a/scripts/items/candy_ring.lua +++ b/scripts/items/candy_ring.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/carp_sushi.lua b/scripts/items/carp_sushi.lua index e2ff7a124ee..71c71d9d2f5 100644 --- a/scripts/items/carp_sushi.lua +++ b/scripts/items/carp_sushi.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/carpenters_belt.lua b/scripts/items/carpenters_belt.lua index d12fb2907af..cea968fc67a 100644 --- a/scripts/items/carpenters_belt.lua +++ b/scripts/items/carpenters_belt.lua @@ -16,8 +16,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.WOODWORKING_IMAGERY, 3, 0, 480) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.WOODWORKING_IMAGERY, { power = 3, duration = 480, origin = user }) end return itemObject diff --git a/scripts/items/cathedral_salad.lua b/scripts/items/cathedral_salad.lua index 0745f95cda1..ab5e1a76098 100644 --- a/scripts/items/cathedral_salad.lua +++ b/scripts/items/cathedral_salad.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/ccb_polymer_pump.lua b/scripts/items/ccb_polymer_pump.lua index ebe9df97f8e..e5e301ba661 100644 --- a/scripts/items/ccb_polymer_pump.lua +++ b/scripts/items/ccb_polymer_pump.lua @@ -23,8 +23,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return result end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.AMNESIA, 1, 0, 60) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.AMNESIA, { power = 1, duration = 60, origin = user }) end return itemObject diff --git a/scripts/items/cehuetzi_snow_cone.lua b/scripts/items/cehuetzi_snow_cone.lua index 1089c40eff8..d6b37eae608 100644 --- a/scripts/items/cehuetzi_snow_cone.lua +++ b/scripts/items/cehuetzi_snow_cone.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/charisma_potion.lua b/scripts/items/charisma_potion.lua index 3a0d74e6f04..f7185d9c9d0 100644 --- a/scripts/items/charisma_potion.lua +++ b/scripts/items/charisma_potion.lua @@ -14,9 +14,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.CHR_BOOST, 7, 0, 180) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 900) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.CHR_BOOST, { power = 7, duration = 180, origin = user }) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 900, origin = user }) end return itemObject diff --git a/scripts/items/charred_salisbury_steak.lua b/scripts/items/charred_salisbury_steak.lua index 9e2d2306f00..0a8224d91e1 100644 --- a/scripts/items/charred_salisbury_steak.lua +++ b/scripts/items/charred_salisbury_steak.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/cheese_sandwich.lua b/scripts/items/cheese_sandwich.lua index b2a113d4625..8722b4b24ff 100644 --- a/scripts/items/cheese_sandwich.lua +++ b/scripts/items/cheese_sandwich.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/cheese_sandwich_+1.lua b/scripts/items/cheese_sandwich_+1.lua index ece2517452c..e797e4ac908 100644 --- a/scripts/items/cheese_sandwich_+1.lua +++ b/scripts/items/cheese_sandwich_+1.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/cherry_macaron.lua b/scripts/items/cherry_macaron.lua index 0b0739926cc..28fcefc834b 100644 --- a/scripts/items/cherry_macaron.lua +++ b/scripts/items/cherry_macaron.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/cherry_muffin.lua b/scripts/items/cherry_muffin.lua index 531f888f890..c43cf875a67 100644 --- a/scripts/items/cherry_muffin.lua +++ b/scripts/items/cherry_muffin.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/cherry_muffin_+1.lua b/scripts/items/cherry_muffin_+1.lua index 98514c4e350..b96b4b16bf7 100644 --- a/scripts/items/cherry_muffin_+1.lua +++ b/scripts/items/cherry_muffin_+1.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/cheval_salmon.lua b/scripts/items/cheval_salmon.lua index 67c743ad09a..142747ce4f6 100644 --- a/scripts/items/cheval_salmon.lua +++ b/scripts/items/cheval_salmon.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/chicken_knife.lua b/scripts/items/chicken_knife.lua index 185e693c081..b6208c4a56f 100644 --- a/scripts/items/chicken_knife.lua +++ b/scripts/items/chicken_knife.lua @@ -17,7 +17,7 @@ itemObject.onItemEquip = function(player, item) effect:resetStartTime() effect:setIcon(xi.effect.FLEE) else - player:addStatusEffect(xi.effect.FLEE, 100, 0, 30) + player:addStatusEffect(xi.effect.FLEE, { power = 100, duration = 30, origin = player }) end end end diff --git a/scripts/items/choco-katana.lua b/scripts/items/choco-katana.lua index bdaf17f0990..97925773b66 100644 --- a/scripts/items/choco-katana.lua +++ b/scripts/items/choco-katana.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 180, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 180, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/choco-ligar.lua b/scripts/items/choco-ligar.lua index 19eda0dafc8..f6adbad038a 100644 --- a/scripts/items/choco-ligar.lua +++ b/scripts/items/choco-ligar.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 180, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 180, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/choco-scroll.lua b/scripts/items/choco-scroll.lua index 3b614c4310c..87185888b07 100644 --- a/scripts/items/choco-scroll.lua +++ b/scripts/items/choco-scroll.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 180, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 180, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/chocobiscuit.lua b/scripts/items/chocobiscuit.lua index 000aacbc6cd..346761a8f42 100644 --- a/scripts/items/chocobiscuit.lua +++ b/scripts/items/chocobiscuit.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 180, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 180, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/chocobo_pullus_torque.lua b/scripts/items/chocobo_pullus_torque.lua index ad9634b3d6b..96701c40136 100644 --- a/scripts/items/chocobo_pullus_torque.lua +++ b/scripts/items/chocobo_pullus_torque.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 1997, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { power = 1997, duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/chocobo_whistle.lua b/scripts/items/chocobo_whistle.lua index e407dc46571..49568bf9b5c 100644 --- a/scripts/items/chocobo_whistle.lua +++ b/scripts/items/chocobo_whistle.lua @@ -19,10 +19,10 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) -- Base duration 30 min, in seconds. local duration = 1800 + (target:getMod(xi.mod.CHOCOBO_RIDING_TIME) * 60) - target:addStatusEffectEx(xi.effect.MOUNTED, xi.effect.MOUNTED, xi.mount.CHOCOBO, 0, duration, 0, 64, true) + target:addStatusEffect(xi.effect.MOUNTED, { power = xi.mount.CHOCOBO, duration = duration, origin = user, subPower = 64, silent = true }) end return itemObject diff --git a/scripts/items/chocolate_cake.lua b/scripts/items/chocolate_cake.lua index 02ca4b07aef..9b9870fa3aa 100644 --- a/scripts/items/chocolate_cake.lua +++ b/scripts/items/chocolate_cake.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/chocolate_crepe.lua b/scripts/items/chocolate_crepe.lua index 6ddcd7367c2..42746857446 100644 --- a/scripts/items/chocolate_crepe.lua +++ b/scripts/items/chocolate_crepe.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/chocolate_rarab_tail.lua b/scripts/items/chocolate_rarab_tail.lua index b6f6655dca4..409f839ea33 100644 --- a/scripts/items/chocolate_rarab_tail.lua +++ b/scripts/items/chocolate_rarab_tail.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 180, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 180, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/chocolate_rusk.lua b/scripts/items/chocolate_rusk.lua index f584b78b2d4..9f474f0451b 100644 --- a/scripts/items/chocolate_rusk.lua +++ b/scripts/items/chocolate_rusk.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/chunk_of_goblin_chocolate.lua b/scripts/items/chunk_of_goblin_chocolate.lua index 2022baabf2a..47e84e8c87c 100644 --- a/scripts/items/chunk_of_goblin_chocolate.lua +++ b/scripts/items/chunk_of_goblin_chocolate.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 180, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 180, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/chunk_of_hobgoblin_chocolate.lua b/scripts/items/chunk_of_hobgoblin_chocolate.lua index 341a7153bce..eadaa61fd66 100644 --- a/scripts/items/chunk_of_hobgoblin_chocolate.lua +++ b/scripts/items/chunk_of_hobgoblin_chocolate.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/chunk_of_homemade_cheese.lua b/scripts/items/chunk_of_homemade_cheese.lua index 32cbd8655c3..5bd4ad7a96f 100644 --- a/scripts/items/chunk_of_homemade_cheese.lua +++ b/scripts/items/chunk_of_homemade_cheese.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/chunk_of_hydra_meat.lua b/scripts/items/chunk_of_hydra_meat.lua index 762e9ec3aa1..e392b840604 100644 --- a/scripts/items/chunk_of_hydra_meat.lua +++ b/scripts/items/chunk_of_hydra_meat.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/chunk_of_orobon_meat.lua b/scripts/items/chunk_of_orobon_meat.lua index c93450f02c2..37fdfa30d35 100644 --- a/scripts/items/chunk_of_orobon_meat.lua +++ b/scripts/items/chunk_of_orobon_meat.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/chunk_of_smelling_salts.lua b/scripts/items/chunk_of_smelling_salts.lua index 471eb6165e5..73882e87677 100644 --- a/scripts/items/chunk_of_smelling_salts.lua +++ b/scripts/items/chunk_of_smelling_salts.lua @@ -19,8 +19,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - if target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 180, 5320) then +itemObject.onItemUse = function(target, user) + if target:addStatusEffect(xi.effect.MEDICINE, { duration = 180, origin = user, subType = 5320 }) then local pet = target:getPet() if not pet then return diff --git a/scripts/items/chunk_of_sweet_lizard.lua b/scripts/items/chunk_of_sweet_lizard.lua index 7cd470e472c..8afb9a51394 100644 --- a/scripts/items/chunk_of_sweet_lizard.lua +++ b/scripts/items/chunk_of_sweet_lizard.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/cinna-cookie.lua b/scripts/items/cinna-cookie.lua index 6b62275448a..b0101ed388f 100644 --- a/scripts/items/cinna-cookie.lua +++ b/scripts/items/cinna-cookie.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 180, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 180, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/cirrocumulus_cell.lua b/scripts/items/cirrocumulus_cell.lua index b3d9d85f581..f52a14520b0 100644 --- a/scripts/items/cirrocumulus_cell.lua +++ b/scripts/items/cirrocumulus_cell.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) return -1 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) local encumbrance = target:getStatusEffect(xi.effect.ENCUMBRANCE_I) if not encumbrance then return @@ -28,7 +28,7 @@ itemObject.onItemUse = function(target) local newpower = bit.band(power, bit.bnot(0x8400)) target:delStatusEffectSilent(xi.effect.ENCUMBRANCE_I) if newpower > 0 then - target:addStatusEffectEx(xi.effect.ENCUMBRANCE_I, xi.effect.ENCUMBRANCE_I, newpower, 0, 0) + target:addStatusEffect(xi.effect.ENCUMBRANCE_I, { power = newpower, origin = user }) end target:messageText(target, zones[target:getZoneID()].text.CELL_OFFSET + 5) diff --git a/scripts/items/clear_drop.lua b/scripts/items/clear_drop.lua index 58749b130ef..de81987952c 100644 --- a/scripts/items/clear_drop.lua +++ b/scripts/items/clear_drop.lua @@ -14,9 +14,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.INT_BOOST, 5, 0, 600) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.INT_BOOST, { power = 5, duration = 600, origin = user }) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/clump_of_batagreens.lua b/scripts/items/clump_of_batagreens.lua index 5452c57504f..ef665a54528 100644 --- a/scripts/items/clump_of_batagreens.lua +++ b/scripts/items/clump_of_batagreens.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/clump_of_beaugreens.lua b/scripts/items/clump_of_beaugreens.lua index 719c12cdb74..f624cdc779a 100644 --- a/scripts/items/clump_of_beaugreens.lua +++ b/scripts/items/clump_of_beaugreens.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/clump_of_shungiku.lua b/scripts/items/clump_of_shungiku.lua index c18d3950be5..8cc01aa1c3a 100644 --- a/scripts/items/clump_of_shungiku.lua +++ b/scripts/items/clump_of_shungiku.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/cluster_of_paprika.lua b/scripts/items/cluster_of_paprika.lua index 870bd948a65..f925c3a2558 100644 --- a/scripts/items/cluster_of_paprika.lua +++ b/scripts/items/cluster_of_paprika.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/coated_shield.lua b/scripts/items/coated_shield.lua index 17c39c33612..2b7a637253b 100644 --- a/scripts/items/coated_shield.lua +++ b/scripts/items/coated_shield.lua @@ -10,7 +10,7 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) local power = 1055 -- Shell I (27/256) local tier = 1 local bonus = 0 @@ -19,7 +19,7 @@ itemObject.onItemUse = function(target) end power = power + (bonus * tier) - if target:addStatusEffect(xi.effect.SHELL, power, 0, 1800, 0, 0, tier) then + if target:addStatusEffect(xi.effect.SHELL, { power = power, duration = 1800, origin = user, tier = tier }) then target:messageBasic(xi.msg.basic.GAINS_EFFECT_OF_STATUS, xi.effect.SHELL) else target:messageBasic(xi.msg.basic.NO_EFFECT) diff --git a/scripts/items/cobalt_jellyfish.lua b/scripts/items/cobalt_jellyfish.lua index 86b4b59d451..0736f6569a0 100644 --- a/scripts/items/cobalt_jellyfish.lua +++ b/scripts/items/cobalt_jellyfish.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/cobra_staff.lua b/scripts/items/cobra_staff.lua index 775bc8b8d22..d7516f8cfe9 100644 --- a/scripts/items/cobra_staff.lua +++ b/scripts/items/cobra_staff.lua @@ -10,8 +10,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.WINDURST_WATERS_S, 0, 3) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.WINDURST_WATERS_S, duration = 3, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/coconut_rusk.lua b/scripts/items/coconut_rusk.lua index 4b13fa71660..a21aab154b4 100644 --- a/scripts/items/coconut_rusk.lua +++ b/scripts/items/coconut_rusk.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/coeurl_sub.lua b/scripts/items/coeurl_sub.lua index b50ecec3bc4..8302a528b2f 100644 --- a/scripts/items/coeurl_sub.lua +++ b/scripts/items/coeurl_sub.lua @@ -22,7 +22,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/coeurl_sub_+1.lua b/scripts/items/coeurl_sub_+1.lua index 114e62d9af9..62e3e255bb6 100644 --- a/scripts/items/coeurl_sub_+1.lua +++ b/scripts/items/coeurl_sub_+1.lua @@ -23,7 +23,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/coffee_macaron.lua b/scripts/items/coffee_macaron.lua index ca7e526939d..04d48f5a727 100644 --- a/scripts/items/coffee_macaron.lua +++ b/scripts/items/coffee_macaron.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/coffeecake_muffin.lua b/scripts/items/coffeecake_muffin.lua index e27af00768a..dbf0b4a9f1a 100644 --- a/scripts/items/coffeecake_muffin.lua +++ b/scripts/items/coffeecake_muffin.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/coffeecake_muffin_+1.lua b/scripts/items/coffeecake_muffin_+1.lua index 197f925d32b..bd56a225cd3 100644 --- a/scripts/items/coffeecake_muffin_+1.lua +++ b/scripts/items/coffeecake_muffin_+1.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/coin_cookie.lua b/scripts/items/coin_cookie.lua index 0b2d984152e..19088a459bc 100644 --- a/scripts/items/coin_cookie.lua +++ b/scripts/items/coin_cookie.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/colored_egg.lua b/scripts/items/colored_egg.lua index fc7da37ac6e..334d638f106 100644 --- a/scripts/items/colored_egg.lua +++ b/scripts/items/colored_egg.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/cone_calamary.lua b/scripts/items/cone_calamary.lua index 785cf0d3f1b..6cd9a9afd78 100644 --- a/scripts/items/cone_calamary.lua +++ b/scripts/items/cone_calamary.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/cone_of_homemade_gelato.lua b/scripts/items/cone_of_homemade_gelato.lua index e3b8ffc2d82..e4a44ec69bb 100644 --- a/scripts/items/cone_of_homemade_gelato.lua +++ b/scripts/items/cone_of_homemade_gelato.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/cone_of_seraphs_kiss.lua b/scripts/items/cone_of_seraphs_kiss.lua index 07ff596d142..8ec1078772d 100644 --- a/scripts/items/cone_of_seraphs_kiss.lua +++ b/scripts/items/cone_of_seraphs_kiss.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/cone_of_snoll_gelato.lua b/scripts/items/cone_of_snoll_gelato.lua index 1faa84d022c..28bc7447a76 100644 --- a/scripts/items/cone_of_snoll_gelato.lua +++ b/scripts/items/cone_of_snoll_gelato.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/cone_of_sub-zero_gelato.lua b/scripts/items/cone_of_sub-zero_gelato.lua index 2af3515c591..693ef8c29d3 100644 --- a/scripts/items/cone_of_sub-zero_gelato.lua +++ b/scripts/items/cone_of_sub-zero_gelato.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/copper_frog.lua b/scripts/items/copper_frog.lua index c729961eb52..4110eef01b5 100644 --- a/scripts/items/copper_frog.lua +++ b/scripts/items/copper_frog.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/coral_butterfly.lua b/scripts/items/coral_butterfly.lua index 3fa0a12aad8..2b2a8121918 100644 --- a/scripts/items/coral_butterfly.lua +++ b/scripts/items/coral_butterfly.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/coral_fungus.lua b/scripts/items/coral_fungus.lua index 775db9ba093..40bec9b18c3 100644 --- a/scripts/items/coral_fungus.lua +++ b/scripts/items/coral_fungus.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/counter_earring.lua b/scripts/items/counter_earring.lua index 8f7edf4cf05..b9706fea654 100644 --- a/scripts/items/counter_earring.lua +++ b/scripts/items/counter_earring.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.COUNTER_EARRING) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.COUNTER_EARRING) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.COUNTER_EARRING }) end end diff --git a/scripts/items/crab_stewpot.lua b/scripts/items/crab_stewpot.lua index 7cf53e138f1..93f3750f122 100644 --- a/scripts/items/crab_stewpot.lua +++ b/scripts/items/crab_stewpot.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/crawler_egg.lua b/scripts/items/crawler_egg.lua index c3e00eba2dd..3f06c396038 100644 --- a/scripts/items/crawler_egg.lua +++ b/scripts/items/crawler_egg.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/crayfish.lua b/scripts/items/crayfish.lua index d9c7377da22..6a481306234 100644 --- a/scripts/items/crayfish.lua +++ b/scripts/items/crayfish.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/cream_puff.lua b/scripts/items/cream_puff.lua index a7106c6e217..f390f52ee11 100644 --- a/scripts/items/cream_puff.lua +++ b/scripts/items/cream_puff.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/crepe_belle_helene.lua b/scripts/items/crepe_belle_helene.lua index 0479e3eebbd..e393d0166c6 100644 --- a/scripts/items/crepe_belle_helene.lua +++ b/scripts/items/crepe_belle_helene.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/crepe_caprice.lua b/scripts/items/crepe_caprice.lua index a64be688599..2db16d56a3b 100644 --- a/scripts/items/crepe_caprice.lua +++ b/scripts/items/crepe_caprice.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/crepe_delice.lua b/scripts/items/crepe_delice.lua index 2ec9f1350d8..46dae9e81f2 100644 --- a/scripts/items/crepe_delice.lua +++ b/scripts/items/crepe_delice.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/crepe_des_rois.lua b/scripts/items/crepe_des_rois.lua index 58ce86da946..8fe14caf3df 100644 --- a/scripts/items/crepe_des_rois.lua +++ b/scripts/items/crepe_des_rois.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/crepe_forestiere.lua b/scripts/items/crepe_forestiere.lua index b98e5908850..686e94efd17 100644 --- a/scripts/items/crepe_forestiere.lua +++ b/scripts/items/crepe_forestiere.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/crepe_paysanne.lua b/scripts/items/crepe_paysanne.lua index 177256454f6..d54014084fc 100644 --- a/scripts/items/crepe_paysanne.lua +++ b/scripts/items/crepe_paysanne.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/crescent_fish.lua b/scripts/items/crescent_fish.lua index a767c4e6d58..bd99128b88a 100644 --- a/scripts/items/crescent_fish.lua +++ b/scripts/items/crescent_fish.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/cube_of_cotton_tofu.lua b/scripts/items/cube_of_cotton_tofu.lua index 1afb61c1ebb..218b859c2cd 100644 --- a/scripts/items/cube_of_cotton_tofu.lua +++ b/scripts/items/cube_of_cotton_tofu.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/culinarians_belt.lua b/scripts/items/culinarians_belt.lua index 824a3d358cc..68bad1e8938 100644 --- a/scripts/items/culinarians_belt.lua +++ b/scripts/items/culinarians_belt.lua @@ -16,8 +16,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COOKING_IMAGERY, 3, 0, 480) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COOKING_IMAGERY, { power = 3, duration = 480, origin = user }) end return itemObject diff --git a/scripts/items/cumulus_masque_+1.lua b/scripts/items/cumulus_masque_+1.lua index e31976a9d26..c7d3bd27fdd 100644 --- a/scripts/items/cumulus_masque_+1.lua +++ b/scripts/items/cumulus_masque_+1.lua @@ -15,8 +15,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return result end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.CUMULUS_MASQUE, 0, 8) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.CUMULUS_MASQUE, duration = 8, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/cup_of_caravan_tea.lua b/scripts/items/cup_of_caravan_tea.lua index 655edfce33c..94706e308d0 100644 --- a/scripts/items/cup_of_caravan_tea.lua +++ b/scripts/items/cup_of_caravan_tea.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/cup_of_chai.lua b/scripts/items/cup_of_chai.lua index e69004fb23d..3694183896b 100644 --- a/scripts/items/cup_of_chai.lua +++ b/scripts/items/cup_of_chai.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/cup_of_chai_+1.lua b/scripts/items/cup_of_chai_+1.lua index dbe923fbd13..4a40680fb52 100644 --- a/scripts/items/cup_of_chai_+1.lua +++ b/scripts/items/cup_of_chai_+1.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/cup_of_chamomile_tea.lua b/scripts/items/cup_of_chamomile_tea.lua index e3ff01631d4..6d8628b14d4 100644 --- a/scripts/items/cup_of_chamomile_tea.lua +++ b/scripts/items/cup_of_chamomile_tea.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/cup_of_choco-delight.lua b/scripts/items/cup_of_choco-delight.lua index 6d9dc07c9c7..b728f14f15b 100644 --- a/scripts/items/cup_of_choco-delight.lua +++ b/scripts/items/cup_of_choco-delight.lua @@ -13,7 +13,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/cup_of_chocomilk.lua b/scripts/items/cup_of_chocomilk.lua index 88194665a5c..df02e2873d5 100644 --- a/scripts/items/cup_of_chocomilk.lua +++ b/scripts/items/cup_of_chocomilk.lua @@ -13,7 +13,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/cup_of_date_tea.lua b/scripts/items/cup_of_date_tea.lua index 64362247dfc..b56d03d1ebf 100644 --- a/scripts/items/cup_of_date_tea.lua +++ b/scripts/items/cup_of_date_tea.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/cup_of_healing_tea.lua b/scripts/items/cup_of_healing_tea.lua index df8016433ca..ae8c8213535 100644 --- a/scripts/items/cup_of_healing_tea.lua +++ b/scripts/items/cup_of_healing_tea.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/cup_of_imperial_coffee.lua b/scripts/items/cup_of_imperial_coffee.lua index 3ad186a39b6..24e31e67d43 100644 --- a/scripts/items/cup_of_imperial_coffee.lua +++ b/scripts/items/cup_of_imperial_coffee.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/cup_of_imperial_coffee_+1.lua b/scripts/items/cup_of_imperial_coffee_+1.lua index 467baf5116d..91459ea8194 100644 --- a/scripts/items/cup_of_imperial_coffee_+1.lua +++ b/scripts/items/cup_of_imperial_coffee_+1.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/cup_of_windurstian_tea.lua b/scripts/items/cup_of_windurstian_tea.lua index 6929f014922..6fd6c2f5f1f 100644 --- a/scripts/items/cup_of_windurstian_tea.lua +++ b/scripts/items/cup_of_windurstian_tea.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/cupid_chocolate.lua b/scripts/items/cupid_chocolate.lua index 54fd9fb4cfc..19c47a3e073 100644 --- a/scripts/items/cupid_chocolate.lua +++ b/scripts/items/cupid_chocolate.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/custom_gilet_+1.lua b/scripts/items/custom_gilet_+1.lua index 6f2f447f1b6..0127d9bbcb2 100644 --- a/scripts/items/custom_gilet_+1.lua +++ b/scripts/items/custom_gilet_+1.lua @@ -15,8 +15,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return result end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.PURGONORGO, 0, 3) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.PURGONORGO, duration = 3, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/custom_top_+1.lua b/scripts/items/custom_top_+1.lua index 48f3a77a3ec..5ad75cd81f0 100644 --- a/scripts/items/custom_top_+1.lua +++ b/scripts/items/custom_top_+1.lua @@ -15,8 +15,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return result end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.PURGONORGO, 0, 3) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.PURGONORGO, duration = 3, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/cutlet_sandwich.lua b/scripts/items/cutlet_sandwich.lua index 256787a52df..7bdc1b13c7a 100644 --- a/scripts/items/cutlet_sandwich.lua +++ b/scripts/items/cutlet_sandwich.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/cutlet_sandwich_+1.lua b/scripts/items/cutlet_sandwich_+1.lua index 04de0665603..15497409ecb 100644 --- a/scripts/items/cutlet_sandwich_+1.lua +++ b/scripts/items/cutlet_sandwich_+1.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/cyclical_coalescence.lua b/scripts/items/cyclical_coalescence.lua index 85086d76f74..afda7417439 100644 --- a/scripts/items/cyclical_coalescence.lua +++ b/scripts/items/cyclical_coalescence.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/czars_belt.lua b/scripts/items/czars_belt.lua index 26af7680068..3a9aceb274d 100644 --- a/scripts/items/czars_belt.lua +++ b/scripts/items/czars_belt.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.CZARS_BELT) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 60, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.CZARS_BELT) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 60, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.CZARS_BELT }) end end diff --git a/scripts/items/danceshroom.lua b/scripts/items/danceshroom.lua index 943462bdbcc..530b0d1afe9 100644 --- a/scripts/items/danceshroom.lua +++ b/scripts/items/danceshroom.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dark_bass.lua b/scripts/items/dark_bass.lua index 04de4a5333f..bed39877222 100644 --- a/scripts/items/dark_bass.lua +++ b/scripts/items/dark_bass.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/date.lua b/scripts/items/date.lua index 65b4ac1d83e..02127fe9d9b 100644 --- a/scripts/items/date.lua +++ b/scripts/items/date.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/deadeye_earring.lua b/scripts/items/deadeye_earring.lua index 7ff42bea85d..a50016603b2 100644 --- a/scripts/items/deadeye_earring.lua +++ b/scripts/items/deadeye_earring.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.DEADEYE_EARRING) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.DEADEYE_EARRING) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.DEADEYE_EARRING }) end end diff --git a/scripts/items/death_chakram.lua b/scripts/items/death_chakram.lua index 2b2e32f08a7..e47855479b4 100644 --- a/scripts/items/death_chakram.lua +++ b/scripts/items/death_chakram.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.DEATH_CHAKRAM) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.DEATH_CHAKRAM) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.DEATH_CHAKRAM }) end end diff --git a/scripts/items/deathball.lua b/scripts/items/deathball.lua index c7e1374828c..1aa159ba90b 100644 --- a/scripts/items/deathball.lua +++ b/scripts/items/deathball.lua @@ -12,9 +12,9 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 180, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 180, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) if not target:hasStatusEffect(xi.effect.POISON) then - target:addStatusEffect(xi.effect.POISON, 2, 3, 180) + target:addStatusEffect(xi.effect.POISON, { power = 2, duration = 180, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/deductive_brocade_obi.lua b/scripts/items/deductive_brocade_obi.lua index 2a4e89b8bbe..75c24dc2806 100644 --- a/scripts/items/deductive_brocade_obi.lua +++ b/scripts/items/deductive_brocade_obi.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.DEDUCTIVE_BROCADE_OBI) then - target:addStatusEffect(xi.effect.MND_BOOST, 0, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.DEDUCTIVE_BROCADE_OBI) + target:addStatusEffect(xi.effect.MND_BOOST, { duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.DEDUCTIVE_BROCADE_OBI }) end end diff --git a/scripts/items/deep-fried_shrimp.lua b/scripts/items/deep-fried_shrimp.lua index e4148304dfe..fe09892fe05 100644 --- a/scripts/items/deep-fried_shrimp.lua +++ b/scripts/items/deep-fried_shrimp.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/deep-fried_shrimp_+1.lua b/scripts/items/deep-fried_shrimp_+1.lua index 25a512749c7..b2a89577490 100644 --- a/scripts/items/deep-fried_shrimp_+1.lua +++ b/scripts/items/deep-fried_shrimp_+1.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/denizanasi.lua b/scripts/items/denizanasi.lua index 2f93e45c5b0..1aa536a62ca 100644 --- a/scripts/items/denizanasi.lua +++ b/scripts/items/denizanasi.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/derfland_pear.lua b/scripts/items/derfland_pear.lua index 32d24026bf2..da01b1f28a3 100644 --- a/scripts/items/derfland_pear.lua +++ b/scripts/items/derfland_pear.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/detonator_belt.lua b/scripts/items/detonator_belt.lua index 1a32f097595..4d498c58006 100644 --- a/scripts/items/detonator_belt.lua +++ b/scripts/items/detonator_belt.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 290, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { power = 290, duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/dexterity_potion.lua b/scripts/items/dexterity_potion.lua index 19aca243a2c..88ee93b2fb6 100644 --- a/scripts/items/dexterity_potion.lua +++ b/scripts/items/dexterity_potion.lua @@ -14,9 +14,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.DEX_BOOST, 7, 0, 180) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 900) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.DEX_BOOST, { power = 7, duration = 180, origin = user }) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 900, origin = user }) end return itemObject diff --git a/scripts/items/dhalmel_pie.lua b/scripts/items/dhalmel_pie.lua index 6466ded04a8..12d36ffa6a7 100644 --- a/scripts/items/dhalmel_pie.lua +++ b/scripts/items/dhalmel_pie.lua @@ -22,7 +22,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dhalmel_pie_+1.lua b/scripts/items/dhalmel_pie_+1.lua index 88726c1751b..a2d1fa1bb7b 100644 --- a/scripts/items/dhalmel_pie_+1.lua +++ b/scripts/items/dhalmel_pie_+1.lua @@ -22,7 +22,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dhalmel_steak.lua b/scripts/items/dhalmel_steak.lua index ecc71473177..8f04932272b 100644 --- a/scripts/items/dhalmel_steak.lua +++ b/scripts/items/dhalmel_steak.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dhalmel_whistle.lua b/scripts/items/dhalmel_whistle.lua index 911df27826b..7d30f255d66 100644 --- a/scripts/items/dhalmel_whistle.lua +++ b/scripts/items/dhalmel_whistle.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.DHALMEL_WHISTLE) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.DHALMEL_WHISTLE) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.DHALMEL_WHISTLE }) end end diff --git a/scripts/items/dil.lua b/scripts/items/dil.lua index 2f1764a81e8..61f60b8e4fe 100644 --- a/scripts/items/dil.lua +++ b/scripts/items/dil.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dish_of_homemade_carbonara.lua b/scripts/items/dish_of_homemade_carbonara.lua index 08fe520939f..4f3d515f56f 100644 --- a/scripts/items/dish_of_homemade_carbonara.lua +++ b/scripts/items/dish_of_homemade_carbonara.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dish_of_hydra_kofte.lua b/scripts/items/dish_of_hydra_kofte.lua index 55b4a0a71dc..6273962f42a 100644 --- a/scripts/items/dish_of_hydra_kofte.lua +++ b/scripts/items/dish_of_hydra_kofte.lua @@ -21,7 +21,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dish_of_hydra_kofte_+1.lua b/scripts/items/dish_of_hydra_kofte_+1.lua index c155bea2419..685f3ef23ab 100644 --- a/scripts/items/dish_of_hydra_kofte_+1.lua +++ b/scripts/items/dish_of_hydra_kofte_+1.lua @@ -21,7 +21,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dish_of_salsa.lua b/scripts/items/dish_of_salsa.lua index e37f5b3cc3f..e43d55fa9f1 100644 --- a/scripts/items/dish_of_salsa.lua +++ b/scripts/items/dish_of_salsa.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 180, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 180, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dish_of_spaghetti_arrabbiata.lua b/scripts/items/dish_of_spaghetti_arrabbiata.lua index 3a146263fc5..d23bff812f3 100644 --- a/scripts/items/dish_of_spaghetti_arrabbiata.lua +++ b/scripts/items/dish_of_spaghetti_arrabbiata.lua @@ -20,7 +20,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dish_of_spaghetti_arrabbiata_+1.lua b/scripts/items/dish_of_spaghetti_arrabbiata_+1.lua index c4dcd647f34..325be3f2958 100644 --- a/scripts/items/dish_of_spaghetti_arrabbiata_+1.lua +++ b/scripts/items/dish_of_spaghetti_arrabbiata_+1.lua @@ -20,7 +20,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dish_of_spaghetti_boscaiola.lua b/scripts/items/dish_of_spaghetti_boscaiola.lua index 388c778656e..a5df4638cdf 100644 --- a/scripts/items/dish_of_spaghetti_boscaiola.lua +++ b/scripts/items/dish_of_spaghetti_boscaiola.lua @@ -21,7 +21,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dish_of_spaghetti_boscaiola_+1.lua b/scripts/items/dish_of_spaghetti_boscaiola_+1.lua index a82a42714d2..6a6478533d5 100644 --- a/scripts/items/dish_of_spaghetti_boscaiola_+1.lua +++ b/scripts/items/dish_of_spaghetti_boscaiola_+1.lua @@ -21,7 +21,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dish_of_spaghetti_carbonara.lua b/scripts/items/dish_of_spaghetti_carbonara.lua index ae55b24e09e..f9c5226f02d 100644 --- a/scripts/items/dish_of_spaghetti_carbonara.lua +++ b/scripts/items/dish_of_spaghetti_carbonara.lua @@ -21,7 +21,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dish_of_spaghetti_carbonara_+1.lua b/scripts/items/dish_of_spaghetti_carbonara_+1.lua index 090262287ac..7b6fda6cc07 100644 --- a/scripts/items/dish_of_spaghetti_carbonara_+1.lua +++ b/scripts/items/dish_of_spaghetti_carbonara_+1.lua @@ -21,7 +21,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dish_of_spaghetti_marinara.lua b/scripts/items/dish_of_spaghetti_marinara.lua index 18039132737..d966003b416 100644 --- a/scripts/items/dish_of_spaghetti_marinara.lua +++ b/scripts/items/dish_of_spaghetti_marinara.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dish_of_spaghetti_marinara_+1.lua b/scripts/items/dish_of_spaghetti_marinara_+1.lua index ee19739dbe5..7d1032d0edf 100644 --- a/scripts/items/dish_of_spaghetti_marinara_+1.lua +++ b/scripts/items/dish_of_spaghetti_marinara_+1.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dish_of_spaghetti_melanzane.lua b/scripts/items/dish_of_spaghetti_melanzane.lua index dcadb518278..61d38b884e5 100644 --- a/scripts/items/dish_of_spaghetti_melanzane.lua +++ b/scripts/items/dish_of_spaghetti_melanzane.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dish_of_spaghetti_melanzane_+1.lua b/scripts/items/dish_of_spaghetti_melanzane_+1.lua index b5a726cb54b..8fd07290414 100644 --- a/scripts/items/dish_of_spaghetti_melanzane_+1.lua +++ b/scripts/items/dish_of_spaghetti_melanzane_+1.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dish_of_spaghetti_nero_di_seppia.lua b/scripts/items/dish_of_spaghetti_nero_di_seppia.lua index 9a5e41b7386..a5d1a6d3d7b 100644 --- a/scripts/items/dish_of_spaghetti_nero_di_seppia.lua +++ b/scripts/items/dish_of_spaghetti_nero_di_seppia.lua @@ -20,7 +20,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dish_of_spaghetti_nero_di_seppia_+1.lua b/scripts/items/dish_of_spaghetti_nero_di_seppia_+1.lua index 6eb3595a110..a0d7d52389c 100644 --- a/scripts/items/dish_of_spaghetti_nero_di_seppia_+1.lua +++ b/scripts/items/dish_of_spaghetti_nero_di_seppia_+1.lua @@ -20,7 +20,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dish_of_spaghetti_ortolana.lua b/scripts/items/dish_of_spaghetti_ortolana.lua index 80f65967ec3..e527e6eb703 100644 --- a/scripts/items/dish_of_spaghetti_ortolana.lua +++ b/scripts/items/dish_of_spaghetti_ortolana.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dish_of_spaghetti_ortolana_+1.lua b/scripts/items/dish_of_spaghetti_ortolana_+1.lua index 7d27ae23388..f7c7c5c24d0 100644 --- a/scripts/items/dish_of_spaghetti_ortolana_+1.lua +++ b/scripts/items/dish_of_spaghetti_ortolana_+1.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dish_of_spaghetti_peperoncino.lua b/scripts/items/dish_of_spaghetti_peperoncino.lua index 978dcc03bb1..e5c36fa6aa3 100644 --- a/scripts/items/dish_of_spaghetti_peperoncino.lua +++ b/scripts/items/dish_of_spaghetti_peperoncino.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dish_of_spaghetti_peperoncino_+1.lua b/scripts/items/dish_of_spaghetti_peperoncino_+1.lua index 67f9dd42eec..9ea0d59c360 100644 --- a/scripts/items/dish_of_spaghetti_peperoncino_+1.lua +++ b/scripts/items/dish_of_spaghetti_peperoncino_+1.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dish_of_spaghetti_pescatora.lua b/scripts/items/dish_of_spaghetti_pescatora.lua index e0932a89ce5..031b9ab405f 100644 --- a/scripts/items/dish_of_spaghetti_pescatora.lua +++ b/scripts/items/dish_of_spaghetti_pescatora.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dish_of_spaghetti_pescatora_+1.lua b/scripts/items/dish_of_spaghetti_pescatora_+1.lua index 816002118d1..5e348d5a6c9 100644 --- a/scripts/items/dish_of_spaghetti_pescatora_+1.lua +++ b/scripts/items/dish_of_spaghetti_pescatora_+1.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dish_of_spaghetti_tonno_rosso.lua b/scripts/items/dish_of_spaghetti_tonno_rosso.lua index 129cae23ae2..e854f267ae2 100644 --- a/scripts/items/dish_of_spaghetti_tonno_rosso.lua +++ b/scripts/items/dish_of_spaghetti_tonno_rosso.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dish_of_spaghetti_tonno_rosso_+1.lua b/scripts/items/dish_of_spaghetti_tonno_rosso_+1.lua index d002ec9576a..5f773815f9b 100644 --- a/scripts/items/dish_of_spaghetti_tonno_rosso_+1.lua +++ b/scripts/items/dish_of_spaghetti_tonno_rosso_+1.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dish_of_spaghetti_vongole_rosso.lua b/scripts/items/dish_of_spaghetti_vongole_rosso.lua index dcae8ff0f1f..664f0ac15ee 100644 --- a/scripts/items/dish_of_spaghetti_vongole_rosso.lua +++ b/scripts/items/dish_of_spaghetti_vongole_rosso.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dish_of_spaghetti_vongole_rosso_+1.lua b/scripts/items/dish_of_spaghetti_vongole_rosso_+1.lua index 828adfdd6ba..f06032adfb2 100644 --- a/scripts/items/dish_of_spaghetti_vongole_rosso_+1.lua +++ b/scripts/items/dish_of_spaghetti_vongole_rosso_+1.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dragon_fruit.lua b/scripts/items/dragon_fruit.lua index 06341f9213a..fc5a042d1aa 100644 --- a/scripts/items/dragon_fruit.lua +++ b/scripts/items/dragon_fruit.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dragon_heart.lua b/scripts/items/dragon_heart.lua index fc7c974ed80..d00e949fbfd 100644 --- a/scripts/items/dragon_heart.lua +++ b/scripts/items/dragon_heart.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dragon_steak.lua b/scripts/items/dragon_steak.lua index 52a0ae6c38b..c4eec87bd10 100644 --- a/scripts/items/dragon_steak.lua +++ b/scripts/items/dragon_steak.lua @@ -22,7 +22,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dream_boots_+1.lua b/scripts/items/dream_boots_+1.lua index f8d0e0f3e07..11f23c9e324 100644 --- a/scripts/items/dream_boots_+1.lua +++ b/scripts/items/dream_boots_+1.lua @@ -12,9 +12,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.SNEAK) then - target:addStatusEffect(xi.effect.SNEAK, 1, 10, math.floor(200 * xi.settings.main.SNEAK_INVIS_DURATION_MULTIPLIER)) + target:addStatusEffect(xi.effect.SNEAK, { power = 1, duration = math.floor(200 * xi.settings.main.SNEAK_INVIS_DURATION_MULTIPLIER), origin = user, tick = 10 }) end end diff --git a/scripts/items/dream_mittens_+1.lua b/scripts/items/dream_mittens_+1.lua index 92f4de69539..d58f47cdc30 100644 --- a/scripts/items/dream_mittens_+1.lua +++ b/scripts/items/dream_mittens_+1.lua @@ -12,9 +12,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.INVISIBLE) then - target:addStatusEffect(xi.effect.INVISIBLE, 0, 10, math.floor(200 * xi.settings.main.SNEAK_INVIS_DURATION_MULTIPLIER)) + target:addStatusEffect(xi.effect.INVISIBLE, { duration = math.floor(200 * xi.settings.main.SNEAK_INVIS_DURATION_MULTIPLIER), origin = user, tick = 10 }) end end diff --git a/scripts/items/dried_berry.lua b/scripts/items/dried_berry.lua index 0909c0c590f..3849f82608e 100644 --- a/scripts/items/dried_berry.lua +++ b/scripts/items/dried_berry.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 180, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 180, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dried_date.lua b/scripts/items/dried_date.lua index 1788791828c..50e69084ea2 100644 --- a/scripts/items/dried_date.lua +++ b/scripts/items/dried_date.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/dried_date_+1.lua b/scripts/items/dried_date_+1.lua index 21abdcb9e60..fbbbf470e2c 100644 --- a/scripts/items/dried_date_+1.lua +++ b/scripts/items/dried_date_+1.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/drovers_belt.lua b/scripts/items/drovers_belt.lua index 92ecbe20916..7fc04d95668 100644 --- a/scripts/items/drovers_belt.lua +++ b/scripts/items/drovers_belt.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 1747, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { power = 1747, duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/ducal_guards_ring.lua b/scripts/items/ducal_guards_ring.lua index e6c49d1e5db..522187a2f4b 100644 --- a/scripts/items/ducal_guards_ring.lua +++ b/scripts/items/ducal_guards_ring.lua @@ -15,8 +15,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return result end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.DUCALGUARD, 0, 4) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.DUCALGUARD, duration = 4, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/duchy_earring.lua b/scripts/items/duchy_earring.lua index 96be149746c..a4c5bfdf692 100644 --- a/scripts/items/duchy_earring.lua +++ b/scripts/items/duchy_earring.lua @@ -10,8 +10,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.DUCHY_EARRING, 0, 4) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.DUCHY_EARRING, duration = 4, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/ear_of_grilled_corn.lua b/scripts/items/ear_of_grilled_corn.lua index 22c6cf3493a..c88c410c32f 100644 --- a/scripts/items/ear_of_grilled_corn.lua +++ b/scripts/items/ear_of_grilled_corn.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/ear_of_roasted_corn.lua b/scripts/items/ear_of_roasted_corn.lua index 1c7ea11d62c..2fd16d4d218 100644 --- a/scripts/items/ear_of_roasted_corn.lua +++ b/scripts/items/ear_of_roasted_corn.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/eastern_san_doria_gate_glyph.lua b/scripts/items/eastern_san_doria_gate_glyph.lua index 59868194200..15bff6c90bf 100644 --- a/scripts/items/eastern_san_doria_gate_glyph.lua +++ b/scripts/items/eastern_san_doria_gate_glyph.lua @@ -10,8 +10,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.EAST_SANDY_GLYPH, 0, 3) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.EAST_SANDY_GLYPH, duration = 3, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/eel_kabob.lua b/scripts/items/eel_kabob.lua index 13e1e6d6b81..273263a877d 100644 --- a/scripts/items/eel_kabob.lua +++ b/scripts/items/eel_kabob.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/egg_sandwich.lua b/scripts/items/egg_sandwich.lua index de94c07955d..4e3f2bf188c 100644 --- a/scripts/items/egg_sandwich.lua +++ b/scripts/items/egg_sandwich.lua @@ -21,7 +21,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/egg_sandwich_+1.lua b/scripts/items/egg_sandwich_+1.lua index 427b7e83492..0e974d98071 100644 --- a/scripts/items/egg_sandwich_+1.lua +++ b/scripts/items/egg_sandwich_+1.lua @@ -21,7 +21,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/eggplant.lua b/scripts/items/eggplant.lua index f407d304e86..680b3a71d4d 100644 --- a/scripts/items/eggplant.lua +++ b/scripts/items/eggplant.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/elder_gilet_+1.lua b/scripts/items/elder_gilet_+1.lua index 858066b97b7..bb7ed94ea5b 100644 --- a/scripts/items/elder_gilet_+1.lua +++ b/scripts/items/elder_gilet_+1.lua @@ -15,8 +15,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return result end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.PURGONORGO, 0, 3) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.PURGONORGO, duration = 3, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/eldritch_bone_hairpin.lua b/scripts/items/eldritch_bone_hairpin.lua index b172160fa0d..d4b4f84053a 100644 --- a/scripts/items/eldritch_bone_hairpin.lua +++ b/scripts/items/eldritch_bone_hairpin.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.ELDRITCH_BONE_HAIRPIN) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.ELDRITCH_BONE_HAIRPIN) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 1800, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.ELDRITCH_BONE_HAIRPIN }) end end diff --git a/scripts/items/eldritch_horn_hairpin.lua b/scripts/items/eldritch_horn_hairpin.lua index 661f8f3532b..6bb4c82aed3 100644 --- a/scripts/items/eldritch_horn_hairpin.lua +++ b/scripts/items/eldritch_horn_hairpin.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.ELDRITCH_HORN_HAIRPIN) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.ELDRITCH_HORN_HAIRPIN) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 1800, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.ELDRITCH_HORN_HAIRPIN }) end end diff --git a/scripts/items/elshena.lua b/scripts/items/elshena.lua index 8720f8e20cb..e8a04aeaa65 100644 --- a/scripts/items/elshena.lua +++ b/scripts/items/elshena.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/elshimo_coconut.lua b/scripts/items/elshimo_coconut.lua index be883db34fd..2bf34101b0f 100644 --- a/scripts/items/elshimo_coconut.lua +++ b/scripts/items/elshimo_coconut.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/elshimo_frog.lua b/scripts/items/elshimo_frog.lua index a08c96d781d..cc8a77b44f4 100644 --- a/scripts/items/elshimo_frog.lua +++ b/scripts/items/elshimo_frog.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/elshimo_pachira_fruit.lua b/scripts/items/elshimo_pachira_fruit.lua index 4898e592070..a3fdd31604c 100644 --- a/scripts/items/elshimo_pachira_fruit.lua +++ b/scripts/items/elshimo_pachira_fruit.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.POISON) then - target:addStatusEffect(xi.effect.POISON, 1, 3, 120) + target:addStatusEffect(xi.effect.POISON, { power = 1, duration = 120, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/elvaan_rice_cake.lua b/scripts/items/elvaan_rice_cake.lua index 00b57fe24df..2e726b3ae9d 100644 --- a/scripts/items/elvaan_rice_cake.lua +++ b/scripts/items/elvaan_rice_cake.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 158, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { power = 158, duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/emerald_quiche.lua b/scripts/items/emerald_quiche.lua index 4fa1c9759fa..bdb389eac1b 100644 --- a/scripts/items/emerald_quiche.lua +++ b/scripts/items/emerald_quiche.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/empire_earring.lua b/scripts/items/empire_earring.lua index 70ded78c759..c454a699cf6 100644 --- a/scripts/items/empire_earring.lua +++ b/scripts/items/empire_earring.lua @@ -10,8 +10,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.EMPIRE_EARRING, 0, 4) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.EMPIRE_EARRING, duration = 4, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/enthralling_brocade_obi.lua b/scripts/items/enthralling_brocade_obi.lua index 16918383029..cd85307c496 100644 --- a/scripts/items/enthralling_brocade_obi.lua +++ b/scripts/items/enthralling_brocade_obi.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.ENTHRALLING_BROCADE_OBI) then - target:addStatusEffect(xi.effect.CHR_BOOST, 10, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.ENTHRALLING_BROCADE_OBI) + target:addStatusEffect(xi.effect.CHR_BOOST, { power = 10, duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.ENTHRALLING_BROCADE_OBI }) end end diff --git a/scripts/items/faerie_apple.lua b/scripts/items/faerie_apple.lua index d951898b3b3..03f660dc214 100644 --- a/scripts/items/faerie_apple.lua +++ b/scripts/items/faerie_apple.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/federation_earring.lua b/scripts/items/federation_earring.lua index e500e12a23e..76ef8f40709 100644 --- a/scripts/items/federation_earring.lua +++ b/scripts/items/federation_earring.lua @@ -10,8 +10,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.FEDERATION_EARRING, 0, 4) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.FEDERATION_EARRING, duration = 4, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/federation_signet_staff.lua b/scripts/items/federation_signet_staff.lua index 4cc79316744..b9b7de7837c 100644 --- a/scripts/items/federation_signet_staff.lua +++ b/scripts/items/federation_signet_staff.lua @@ -29,9 +29,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) target:delStatusEffectsByFlag(xi.effectFlag.INFLUENCE, true) - target:addStatusEffect(xi.effect.SIGNET, 0, 0, 18000) + target:addStatusEffect(xi.effect.SIGNET, { duration = 18000, origin = user }) end return itemObject diff --git a/scripts/items/federation_stables_scarf.lua b/scripts/items/federation_stables_scarf.lua index 0196f7cff7c..cf1ce482b0c 100644 --- a/scripts/items/federation_stables_scarf.lua +++ b/scripts/items/federation_stables_scarf.lua @@ -15,8 +15,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return result end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.CHOCO_WINDURST, 0, 4) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.CHOCO_WINDURST, duration = 4, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/felicifruit.lua b/scripts/items/felicifruit.lua index 548bb2fa8e0..dc1974b3d3a 100644 --- a/scripts/items/felicifruit.lua +++ b/scripts/items/felicifruit.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/fire_feather.lua b/scripts/items/fire_feather.lua index 8be929c5fee..1a519466e64 100644 --- a/scripts/items/fire_feather.lua +++ b/scripts/items/fire_feather.lua @@ -10,8 +10,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.ENFIRE, 10, 0, 180) -- This is a guess, no potency or duration info is known +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.ENFIRE, { power = 10, duration = 180, origin = user }) -- This is a guess, no potency or duration info is known end return itemObject diff --git a/scripts/items/fish_chiefkabob.lua b/scripts/items/fish_chiefkabob.lua index 3981338de8b..3fadf0f851e 100644 --- a/scripts/items/fish_chiefkabob.lua +++ b/scripts/items/fish_chiefkabob.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/fish_mithkabob.lua b/scripts/items/fish_mithkabob.lua index fec3b3e81ae..df835c91210 100644 --- a/scripts/items/fish_mithkabob.lua +++ b/scripts/items/fish_mithkabob.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/fishermans_belt.lua b/scripts/items/fishermans_belt.lua index f86122e0fe8..70ec3092668 100644 --- a/scripts/items/fishermans_belt.lua +++ b/scripts/items/fishermans_belt.lua @@ -16,8 +16,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.FISHING_IMAGERY, 2, 0, 120 * 60) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.FISHING_IMAGERY, { power = 2, duration = 120 * 60, origin = user }) end return itemObject diff --git a/scripts/items/fishermans_feast.lua b/scripts/items/fishermans_feast.lua index 80eb6cd0f22..f0ae493df3f 100644 --- a/scripts/items/fishermans_feast.lua +++ b/scripts/items/fishermans_feast.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/flask_of_apple_au_lait.lua b/scripts/items/flask_of_apple_au_lait.lua index f50b8e12975..7b3e2bedf38 100644 --- a/scripts/items/flask_of_apple_au_lait.lua +++ b/scripts/items/flask_of_apple_au_lait.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.REGEN) then - target:addStatusEffect(xi.effect.REGEN, 2, 3, 180) + target:addStatusEffect(xi.effect.REGEN, { power = 2, duration = 180, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/flask_of_ayran.lua b/scripts/items/flask_of_ayran.lua index 5e7a3c0047c..7cd4227899c 100644 --- a/scripts/items/flask_of_ayran.lua +++ b/scripts/items/flask_of_ayran.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.REGEN) then - target:addStatusEffect(xi.effect.REGEN, 2, 3, 180) + target:addStatusEffect(xi.effect.REGEN, { power = 2, duration = 180, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/flask_of_blinding_potion.lua b/scripts/items/flask_of_blinding_potion.lua index f8b83ae6a86..3dd1e5114b5 100644 --- a/scripts/items/flask_of_blinding_potion.lua +++ b/scripts/items/flask_of_blinding_potion.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.BLINDNESS) then - target:addStatusEffect(xi.effect.BLINDNESS, 256, 0, 180) + target:addStatusEffect(xi.effect.BLINDNESS, { power = 256, duration = 180, origin = user }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/flask_of_deodorizer.lua b/scripts/items/flask_of_deodorizer.lua index e67b8d7376f..9361671651e 100644 --- a/scripts/items/flask_of_deodorizer.lua +++ b/scripts/items/flask_of_deodorizer.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.DEODORIZE) then - target:addStatusEffect(xi.effect.DEODORIZE, 1, 10, 600) + target:addStatusEffect(xi.effect.DEODORIZE, { power = 1, duration = 600, origin = user, tick = 10 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/flask_of_distilled_water.lua b/scripts/items/flask_of_distilled_water.lua index 76d24e3305f..ca067900f3d 100644 --- a/scripts/items/flask_of_distilled_water.lua +++ b/scripts/items/flask_of_distilled_water.lua @@ -11,12 +11,12 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:getMod(xi.mod.DRINK_DISTILLED) == 1 and not target:hasStatusEffect(xi.effect.REGEN) then - target:addStatusEffect(xi.effect.REGEN, 1, 3, 300) + target:addStatusEffect(xi.effect.REGEN, { power = 1, duration = 300, origin = user, tick = 3 }) else -- Retail will consume the item while doing nothing but telling you there was no effect. target:messageBasic(xi.msg.basic.NO_EFFECT) diff --git a/scripts/items/flask_of_dragon_fruit_au_lait.lua b/scripts/items/flask_of_dragon_fruit_au_lait.lua index 151189b05fa..c9674203a92 100644 --- a/scripts/items/flask_of_dragon_fruit_au_lait.lua +++ b/scripts/items/flask_of_dragon_fruit_au_lait.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.REGEN) then - target:addStatusEffect(xi.effect.REGEN, 6, 3, 300) + target:addStatusEffect(xi.effect.REGEN, { power = 6, duration = 300, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/flask_of_orange_au_lait.lua b/scripts/items/flask_of_orange_au_lait.lua index 911108d47c2..89f9bf8f075 100644 --- a/scripts/items/flask_of_orange_au_lait.lua +++ b/scripts/items/flask_of_orange_au_lait.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.REGEN) then - target:addStatusEffect(xi.effect.REGEN, 1, 3, 300) + target:addStatusEffect(xi.effect.REGEN, { power = 1, duration = 300, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/flask_of_pamama_au_lait.lua b/scripts/items/flask_of_pamama_au_lait.lua index f1b3fb96bfb..f8db67aff13 100644 --- a/scripts/items/flask_of_pamama_au_lait.lua +++ b/scripts/items/flask_of_pamama_au_lait.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.REGEN) then - target:addStatusEffect(xi.effect.REGEN, 2, 3, 600) + target:addStatusEffect(xi.effect.REGEN, { power = 2, duration = 600, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/flask_of_paralyze_potion.lua b/scripts/items/flask_of_paralyze_potion.lua index 3c3526a82ee..133045dbd88 100644 --- a/scripts/items/flask_of_paralyze_potion.lua +++ b/scripts/items/flask_of_paralyze_potion.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.PARALYSIS) then - target:addStatusEffect(xi.effect.PARALYSIS, 20, 0, 180) + target:addStatusEffect(xi.effect.PARALYSIS, { power = 20, duration = 180, origin = user }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/flask_of_pear_au_lait.lua b/scripts/items/flask_of_pear_au_lait.lua index 8ae1700ade4..ee433c7a485 100644 --- a/scripts/items/flask_of_pear_au_lait.lua +++ b/scripts/items/flask_of_pear_au_lait.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.REGEN) then - target:addStatusEffect(xi.effect.REGEN, 3, 3, 300) + target:addStatusEffect(xi.effect.REGEN, { power = 3, duration = 300, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/flask_of_persikos_au_lait.lua b/scripts/items/flask_of_persikos_au_lait.lua index f5dcbd06883..673180a059d 100644 --- a/scripts/items/flask_of_persikos_au_lait.lua +++ b/scripts/items/flask_of_persikos_au_lait.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.REGEN) then - target:addStatusEffect(xi.effect.REGEN, 4, 3, 600) + target:addStatusEffect(xi.effect.REGEN, { power = 4, duration = 600, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/flask_of_petrify_potion.lua b/scripts/items/flask_of_petrify_potion.lua index c115ade6920..d234540903a 100644 --- a/scripts/items/flask_of_petrify_potion.lua +++ b/scripts/items/flask_of_petrify_potion.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.PETRIFICATION) then - target:addStatusEffect(xi.effect.PETRIFICATION, 1, 3, 180) + target:addStatusEffect(xi.effect.PETRIFICATION, { power = 1, duration = 180, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/flask_of_poison_potion.lua b/scripts/items/flask_of_poison_potion.lua index 7e27cc6843c..c2049c965ba 100644 --- a/scripts/items/flask_of_poison_potion.lua +++ b/scripts/items/flask_of_poison_potion.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.POISON) then - target:addStatusEffect(xi.effect.POISON, 1, 3, 180) + target:addStatusEffect(xi.effect.POISON, { power = 1, duration = 180, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/flask_of_primeval_brew.lua b/scripts/items/flask_of_primeval_brew.lua index 83b0ee7ebc3..a03d3242140 100644 --- a/scripts/items/flask_of_primeval_brew.lua +++ b/scripts/items/flask_of_primeval_brew.lua @@ -34,8 +34,8 @@ itemObject.onItemCheck = function(target, item, param, caster) end end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.TRANSCENDENCY, 1, 0, 180) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TRANSCENDENCY, { power = 1, duration = 180, origin = user }) end return itemObject diff --git a/scripts/items/flask_of_silencing_potion.lua b/scripts/items/flask_of_silencing_potion.lua index 2362d905154..8ad4e78bf56 100644 --- a/scripts/items/flask_of_silencing_potion.lua +++ b/scripts/items/flask_of_silencing_potion.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.SILENCE) then - target:addStatusEffect(xi.effect.SILENCE, 1, 3, 180) + target:addStatusEffect(xi.effect.SILENCE, { power = 1, duration = 180, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/flask_of_sleeping_potion.lua b/scripts/items/flask_of_sleeping_potion.lua index ffa688fd48c..d1d6d9e33c7 100644 --- a/scripts/items/flask_of_sleeping_potion.lua +++ b/scripts/items/flask_of_sleeping_potion.lua @@ -10,8 +10,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.SLEEP_I, 1, 0, 30) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.SLEEP_I, { power = 1, duration = 30, origin = user }) end return itemObject diff --git a/scripts/items/flask_of_strange_milk.lua b/scripts/items/flask_of_strange_milk.lua index ea19ac872fe..9dee3b1671b 100644 --- a/scripts/items/flask_of_strange_milk.lua +++ b/scripts/items/flask_of_strange_milk.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.REGEN) then - target:addStatusEffect(xi.effect.REGEN, 5, 3, 300) + target:addStatusEffect(xi.effect.REGEN, { power = 5, duration = 300, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/flask_of_venom_potion.lua b/scripts/items/flask_of_venom_potion.lua index e0edf12a467..5b3bab13dd6 100644 --- a/scripts/items/flask_of_venom_potion.lua +++ b/scripts/items/flask_of_venom_potion.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.POISON) then - target:addStatusEffect(xi.effect.POISON, 5, 3, 180) + target:addStatusEffect(xi.effect.POISON, { power = 5, duration = 180, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/flexible_pole.lua b/scripts/items/flexible_pole.lua index 86e2090223e..4248272e302 100644 --- a/scripts/items/flexible_pole.lua +++ b/scripts/items/flexible_pole.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.FLEXIBLE_POLE) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.FLEXIBLE_POLE) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 1800, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.FLEXIBLE_POLE }) end end diff --git a/scripts/items/forest_carp.lua b/scripts/items/forest_carp.lua index db32c913513..205f6b95967 100644 --- a/scripts/items/forest_carp.lua +++ b/scripts/items/forest_carp.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/four-leaf_mandragora_bud.lua b/scripts/items/four-leaf_mandragora_bud.lua index 7d1398d788e..bd69eda00ab 100644 --- a/scripts/items/four-leaf_mandragora_bud.lua +++ b/scripts/items/four-leaf_mandragora_bud.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/fourth_staff.lua b/scripts/items/fourth_staff.lua index a22d2753419..9b426798f2f 100644 --- a/scripts/items/fourth_staff.lua +++ b/scripts/items/fourth_staff.lua @@ -10,8 +10,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.BASTOK_MARKETS_S, 0, 3) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.BASTOK_MARKETS_S, duration = 3, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/fried_popoto.lua b/scripts/items/fried_popoto.lua index 72555d9d177..8f977067cfb 100644 --- a/scripts/items/fried_popoto.lua +++ b/scripts/items/fried_popoto.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/fried_popoto_+1.lua b/scripts/items/fried_popoto_+1.lua index 59f270917f3..e852cc9bb51 100644 --- a/scripts/items/fried_popoto_+1.lua +++ b/scripts/items/fried_popoto_+1.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/frost_turnip.lua b/scripts/items/frost_turnip.lua index d5e1792179a..3d615a7d60f 100644 --- a/scripts/items/frost_turnip.lua +++ b/scripts/items/frost_turnip.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/fruit_parfait.lua b/scripts/items/fruit_parfait.lua index 494c1f254a0..a38ef4087e5 100644 --- a/scripts/items/fruit_parfait.lua +++ b/scripts/items/fruit_parfait.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/fudgy-wudge.lua b/scripts/items/fudgy-wudge.lua index 3d250555f5c..ea7da1563cf 100644 --- a/scripts/items/fudgy-wudge.lua +++ b/scripts/items/fudgy-wudge.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 180, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 180, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/fulm-long_salmon_sub.lua b/scripts/items/fulm-long_salmon_sub.lua index 80c7ee3298d..eec43e88860 100644 --- a/scripts/items/fulm-long_salmon_sub.lua +++ b/scripts/items/fulm-long_salmon_sub.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/galette_des_rois.lua b/scripts/items/galette_des_rois.lua index be16229a945..d5f633196e4 100644 --- a/scripts/items/galette_des_rois.lua +++ b/scripts/items/galette_des_rois.lua @@ -25,7 +25,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) local rand = math.random(784, 815) npcUtil.giveItem(target, { { rand, 1 } }) end diff --git a/scripts/items/galkan_sausage.lua b/scripts/items/galkan_sausage.lua index d42258e217b..aa56079b21a 100644 --- a/scripts/items/galkan_sausage.lua +++ b/scripts/items/galkan_sausage.lua @@ -26,7 +26,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/galkan_sausage_+1.lua b/scripts/items/galkan_sausage_+1.lua index a1cc7913202..d3f48046a2e 100644 --- a/scripts/items/galkan_sausage_+1.lua +++ b/scripts/items/galkan_sausage_+1.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/galkan_sausage_+2.lua b/scripts/items/galkan_sausage_+2.lua index 4472ff6da9d..4967a204115 100644 --- a/scripts/items/galkan_sausage_+2.lua +++ b/scripts/items/galkan_sausage_+2.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/galkan_sausage_+3.lua b/scripts/items/galkan_sausage_+3.lua index 3151d1f0ece..971345f6d36 100644 --- a/scripts/items/galkan_sausage_+3.lua +++ b/scripts/items/galkan_sausage_+3.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/galkan_sausage_-1.lua b/scripts/items/galkan_sausage_-1.lua index 38ce8fdf4e4..0d7a1619538 100644 --- a/scripts/items/galkan_sausage_-1.lua +++ b/scripts/items/galkan_sausage_-1.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/gamushara_earring.lua b/scripts/items/gamushara_earring.lua index ab977cffd8b..1ff597eba2c 100644 --- a/scripts/items/gamushara_earring.lua +++ b/scripts/items/gamushara_earring.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.GAMUSHARA_EARRING) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.GAMUSHARA_EARRING) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.GAMUSHARA_EARRING }) end end diff --git a/scripts/items/gargoyle_boots.lua b/scripts/items/gargoyle_boots.lua index e21606718f8..07c85c08a25 100644 --- a/scripts/items/gargoyle_boots.lua +++ b/scripts/items/gargoyle_boots.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - if target:addStatusEffect(xi.effect.STONESKIN, 200, 0, 60) then + if target:addStatusEffect(xi.effect.STONESKIN, { power = 200, duration = 60, origin = user }) then action:messageID(target:getID(), xi.msg.basic.ITEM_RECEIVES_EFFECT) return xi.effect.STONESKIN diff --git a/scripts/items/garlic_cracker.lua b/scripts/items/garlic_cracker.lua index 06763a38b92..276c8ca5285 100644 --- a/scripts/items/garlic_cracker.lua +++ b/scripts/items/garlic_cracker.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 180, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 180, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/garlic_cracker_+1.lua b/scripts/items/garlic_cracker_+1.lua index 687ed5b5ec2..388723757de 100644 --- a/scripts/items/garlic_cracker_+1.lua +++ b/scripts/items/garlic_cracker_+1.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/garpike.lua b/scripts/items/garpike.lua index ebfc89c806c..f9988bb7aba 100644 --- a/scripts/items/garpike.lua +++ b/scripts/items/garpike.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/gateau_aux_fraises.lua b/scripts/items/gateau_aux_fraises.lua index 98ce30ff0e8..9d9f4699e4a 100644 --- a/scripts/items/gateau_aux_fraises.lua +++ b/scripts/items/gateau_aux_fraises.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/getsul_ring.lua b/scripts/items/getsul_ring.lua index 6e114a6625c..dd6eaedddce 100644 --- a/scripts/items/getsul_ring.lua +++ b/scripts/items/getsul_ring.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.GETSUL_RING) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.GETSUL_RING) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.GETSUL_RING }) end end diff --git a/scripts/items/ghost_cape.lua b/scripts/items/ghost_cape.lua index 1575b30996c..b6198160d86 100644 --- a/scripts/items/ghost_cape.lua +++ b/scripts/items/ghost_cape.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 368, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { power = 368, duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/gimlet_spear.lua b/scripts/items/gimlet_spear.lua index 36d4c7a632d..ebb2b38faae 100644 --- a/scripts/items/gimlet_spear.lua +++ b/scripts/items/gimlet_spear.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.GIMLET_SPEAR) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.GIMLET_SPEAR) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 1800, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.GIMLET_SPEAR }) end end diff --git a/scripts/items/ginger_cookie.lua b/scripts/items/ginger_cookie.lua index e8eed9d4652..04740eff249 100644 --- a/scripts/items/ginger_cookie.lua +++ b/scripts/items/ginger_cookie.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 180, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 180, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/goblin_belt.lua b/scripts/items/goblin_belt.lua index d9d3b46f6f9..bcd463e6045 100644 --- a/scripts/items/goblin_belt.lua +++ b/scripts/items/goblin_belt.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 673, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { power = 673, duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/goblin_mushpot.lua b/scripts/items/goblin_mushpot.lua index b5938b3bd45..f646e87242a 100644 --- a/scripts/items/goblin_mushpot.lua +++ b/scripts/items/goblin_mushpot.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/goblin_pie.lua b/scripts/items/goblin_pie.lua index ee11d11e95f..80c03531b15 100644 --- a/scripts/items/goblin_pie.lua +++ b/scripts/items/goblin_pie.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/gold_carp.lua b/scripts/items/gold_carp.lua index bcde1891baa..035ffdfd1d6 100644 --- a/scripts/items/gold_carp.lua +++ b/scripts/items/gold_carp.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/gold_lobster.lua b/scripts/items/gold_lobster.lua index 56afc964045..a4c21c18a35 100644 --- a/scripts/items/gold_lobster.lua +++ b/scripts/items/gold_lobster.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/goldsmiths_belt.lua b/scripts/items/goldsmiths_belt.lua index 0eebcd49e1f..7248e0d5a95 100644 --- a/scripts/items/goldsmiths_belt.lua +++ b/scripts/items/goldsmiths_belt.lua @@ -16,8 +16,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.GOLDSMITHING_IMAGERY, 3, 0, 480) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.GOLDSMITHING_IMAGERY, { power = 3, duration = 480, origin = user }) end return itemObject diff --git a/scripts/items/grape_daifuku.lua b/scripts/items/grape_daifuku.lua index 43f157b665b..6f96c000a97 100644 --- a/scripts/items/grape_daifuku.lua +++ b/scripts/items/grape_daifuku.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/grape_daifuku_+1.lua b/scripts/items/grape_daifuku_+1.lua index 20c239ca7f7..82524494f2d 100644 --- a/scripts/items/grape_daifuku_+1.lua +++ b/scripts/items/grape_daifuku_+1.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/greedie.lua b/scripts/items/greedie.lua index f2e14201654..55077c00b2a 100644 --- a/scripts/items/greedie.lua +++ b/scripts/items/greedie.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/green_curry_bun.lua b/scripts/items/green_curry_bun.lua index c2facc2dfe0..3549dc47501 100644 --- a/scripts/items/green_curry_bun.lua +++ b/scripts/items/green_curry_bun.lua @@ -20,7 +20,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end local dataTable = diff --git a/scripts/items/green_curry_bun_+1.lua b/scripts/items/green_curry_bun_+1.lua index 80ad597cab6..5c5585cbc37 100644 --- a/scripts/items/green_curry_bun_+1.lua +++ b/scripts/items/green_curry_bun_+1.lua @@ -20,7 +20,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/green_drop.lua b/scripts/items/green_drop.lua index 2ce467bd748..1eb72adf3c8 100644 --- a/scripts/items/green_drop.lua +++ b/scripts/items/green_drop.lua @@ -14,9 +14,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.AGI_BOOST, 5, 0, 900) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.AGI_BOOST, { power = 5, duration = 900, origin = user }) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/green_quiche.lua b/scripts/items/green_quiche.lua index a9af7725992..99b0743efd9 100644 --- a/scripts/items/green_quiche.lua +++ b/scripts/items/green_quiche.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/grilled_lik.lua b/scripts/items/grilled_lik.lua index 866495a591f..46b69e6dd8b 100644 --- a/scripts/items/grilled_lik.lua +++ b/scripts/items/grilled_lik.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/gurnard.lua b/scripts/items/gurnard.lua index bcf95220026..fb117e7488e 100644 --- a/scripts/items/gurnard.lua +++ b/scripts/items/gurnard.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/gyokuto_obi.lua b/scripts/items/gyokuto_obi.lua index 729972d7f95..3f346bdf5bd 100644 --- a/scripts/items/gyokuto_obi.lua +++ b/scripts/items/gyokuto_obi.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 335, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { power = 335, duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/gyudon.lua b/scripts/items/gyudon.lua index a2a839ff1cd..acb70a3989f 100644 --- a/scripts/items/gyudon.lua +++ b/scripts/items/gyudon.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/gyudon_+1.lua b/scripts/items/gyudon_+1.lua index 83b10af993e..9b25e49843f 100644 --- a/scripts/items/gyudon_+1.lua +++ b/scripts/items/gyudon_+1.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/hallowed_sword.lua b/scripts/items/hallowed_sword.lua index 90f4e38ef60..c71a1d691e7 100644 --- a/scripts/items/hallowed_sword.lua +++ b/scripts/items/hallowed_sword.lua @@ -7,7 +7,7 @@ local itemObject = {} -itemObject.onItemCheck = function(target) +itemObject.onItemCheck = function(target, user) if target:getStatusEffectBySource(xi.effect.ENLIGHT, xi.effectSourceType.EQUIPPED_ITEM, xi.item.HALLOWED_SWORD) ~= nil then target:delStatusEffect(xi.effect.ENLIGHT, nil, xi.effectSourceType.EQUIPPED_ITEM, xi.item.HALLOWED_SWORD) end @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.HALLOWED_SWORD) then - target:addStatusEffect(xi.effect.ENLIGHT, 0, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.HALLOWED_SWORD) + target:addStatusEffect(xi.effect.ENLIGHT, { duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.HALLOWED_SWORD }) end end diff --git a/scripts/items/ham_and_cheese_crepe.lua b/scripts/items/ham_and_cheese_crepe.lua index 3c3b543c93d..0215ef59b4e 100644 --- a/scripts/items/ham_and_cheese_crepe.lua +++ b/scripts/items/ham_and_cheese_crepe.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/hamsi.lua b/scripts/items/hamsi.lua index 0562718301f..4ad200aeed6 100644 --- a/scripts/items/hamsi.lua +++ b/scripts/items/hamsi.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/handful_of_bloody_chocolate.lua b/scripts/items/handful_of_bloody_chocolate.lua index b7ccd8aa2da..eafbbc45cbd 100644 --- a/scripts/items/handful_of_bloody_chocolate.lua +++ b/scripts/items/handful_of_bloody_chocolate.lua @@ -13,7 +13,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/handful_of_roasted_almonds.lua b/scripts/items/handful_of_roasted_almonds.lua index d1c782c0864..eadb19f5568 100644 --- a/scripts/items/handful_of_roasted_almonds.lua +++ b/scripts/items/handful_of_roasted_almonds.lua @@ -13,7 +13,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/handful_of_sunflower_seeds.lua b/scripts/items/handful_of_sunflower_seeds.lua index e8dd3d1e673..c5a49155eaf 100644 --- a/scripts/items/handful_of_sunflower_seeds.lua +++ b/scripts/items/handful_of_sunflower_seeds.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/hard-boiled_egg.lua b/scripts/items/hard-boiled_egg.lua index 77d196b4528..da013281741 100644 --- a/scripts/items/hard-boiled_egg.lua +++ b/scripts/items/hard-boiled_egg.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/haste_belt.lua b/scripts/items/haste_belt.lua index 89464ce2f52..11889609e4e 100644 --- a/scripts/items/haste_belt.lua +++ b/scripts/items/haste_belt.lua @@ -14,10 +14,10 @@ itemObject.onItemUnequip = function(target, item) target:delStatusEffect(xi.effect.HASTE, nil, xi.effectSourceType.EQUIPPED_ITEM, xi.item.HASTE_BELT) end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.HASTE_BELT) then -- TODO: Haste applied by the belt should a separate buff from Spell Haste and stacks. Currently overwrites. - target:addStatusEffect(xi.effect.HASTE, 0, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.HASTE_BELT) + target:addStatusEffect(xi.effect.HASTE, { duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.HASTE_BELT }) end end diff --git a/scripts/items/head_of_grauberg_lettuce.lua b/scripts/items/head_of_grauberg_lettuce.lua index a19584bdf30..3c0ceb4ae4e 100644 --- a/scripts/items/head_of_grauberg_lettuce.lua +++ b/scripts/items/head_of_grauberg_lettuce.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/head_of_isleracea.lua b/scripts/items/head_of_isleracea.lua index 40e0bada2d5..e45c9188258 100644 --- a/scripts/items/head_of_isleracea.lua +++ b/scripts/items/head_of_isleracea.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/head_of_napa.lua b/scripts/items/head_of_napa.lua index f43483eed6f..a2c7facf77c 100644 --- a/scripts/items/head_of_napa.lua +++ b/scripts/items/head_of_napa.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/healing_feather.lua b/scripts/items/healing_feather.lua index ead071593ce..64b10a0c88b 100644 --- a/scripts/items/healing_feather.lua +++ b/scripts/items/healing_feather.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.HEALING_FEATHER) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.HEALING_FEATHER) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.HEALING_FEATHER }) end end diff --git a/scripts/items/heart_chocolate.lua b/scripts/items/heart_chocolate.lua index 9abd5e3c793..880d6592c21 100644 --- a/scripts/items/heart_chocolate.lua +++ b/scripts/items/heart_chocolate.lua @@ -12,7 +12,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/hedgehog_pie.lua b/scripts/items/hedgehog_pie.lua index 874968d39cf..adadbae5ab9 100644 --- a/scripts/items/hedgehog_pie.lua +++ b/scripts/items/hedgehog_pie.lua @@ -24,7 +24,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/hellsteak.lua b/scripts/items/hellsteak.lua index 2142527c788..455b1e55bf3 100644 --- a/scripts/items/hellsteak.lua +++ b/scripts/items/hellsteak.lua @@ -20,7 +20,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/hellsteak_+1.lua b/scripts/items/hellsteak_+1.lua index 78eddfe6a39..c7c95e2c96f 100644 --- a/scripts/items/hellsteak_+1.lua +++ b/scripts/items/hellsteak_+1.lua @@ -20,7 +20,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/hermes_quencher.lua b/scripts/items/hermes_quencher.lua index ad6079f3070..1462dbea1a7 100644 --- a/scripts/items/hermes_quencher.lua +++ b/scripts/items/hermes_quencher.lua @@ -14,11 +14,11 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) target:delStatusEffect(xi.effect.FLEE) - target:addStatusEffect(xi.effect.FLEE, 8750, 0, 30) + target:addStatusEffect(xi.effect.FLEE, { power = 8750, duration = 30, origin = user }) target:messageBasic(xi.msg.basic.GAINS_EFFECT_OF_STATUS, xi.effect.FLEE) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 900) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 900, origin = user }) end return itemObject diff --git a/scripts/items/hi-reraiser.lua b/scripts/items/hi-reraiser.lua index 634495cdc52..b331ea68508 100644 --- a/scripts/items/hi-reraiser.lua +++ b/scripts/items/hi-reraiser.lua @@ -10,10 +10,10 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) local duration = 5400 target:delStatusEffect(xi.effect.RERAISE) - target:addStatusEffect(xi.effect.RERAISE, 2, 0, duration) + target:addStatusEffect(xi.effect.RERAISE, { power = 2, duration = duration, origin = user }) end return itemObject diff --git a/scripts/items/high_breath_mantle.lua b/scripts/items/high_breath_mantle.lua index 707051a1a99..21d5405c645 100644 --- a/scripts/items/high_breath_mantle.lua +++ b/scripts/items/high_breath_mantle.lua @@ -14,9 +14,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.HIGH_BREATH_MANTLE) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.HIGH_BREATH_MANTLE) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 1800, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.HIGH_BREATH_MANTLE }) end end diff --git a/scripts/items/high_mana_wand.lua b/scripts/items/high_mana_wand.lua index 798ad400000..20b7bbe4237 100644 --- a/scripts/items/high_mana_wand.lua +++ b/scripts/items/high_mana_wand.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.HIGH_MANA_WAND) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.HIGH_MANA_WAND) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 1800, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.HIGH_MANA_WAND }) end end diff --git a/scripts/items/himesama_rice_ball.lua b/scripts/items/himesama_rice_ball.lua index 4751125bec7..0fc4cfd6c9e 100644 --- a/scripts/items/himesama_rice_ball.lua +++ b/scripts/items/himesama_rice_ball.lua @@ -20,7 +20,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/hobgoblin_pie.lua b/scripts/items/hobgoblin_pie.lua index 73dfcc8edea..82fb57ae387 100644 --- a/scripts/items/hobgoblin_pie.lua +++ b/scripts/items/hobgoblin_pie.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/homemade_omelette.lua b/scripts/items/homemade_omelette.lua index d26268b0162..fa1f1fee46b 100644 --- a/scripts/items/homemade_omelette.lua +++ b/scripts/items/homemade_omelette.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/homemade_rice_ball.lua b/scripts/items/homemade_rice_ball.lua index 22035760fc6..f913b400e5c 100644 --- a/scripts/items/homemade_rice_ball.lua +++ b/scripts/items/homemade_rice_ball.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/homemade_salisbury_steak.lua b/scripts/items/homemade_salisbury_steak.lua index 108fb5e631d..c8d3c1538bb 100644 --- a/scripts/items/homemade_salisbury_steak.lua +++ b/scripts/items/homemade_salisbury_steak.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) return xi.effect.FOOD end diff --git a/scripts/items/homemade_steak.lua b/scripts/items/homemade_steak.lua index 65ad1077e50..7ab2a6e450b 100644 --- a/scripts/items/homemade_steak.lua +++ b/scripts/items/homemade_steak.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/homing_ring.lua b/scripts/items/homing_ring.lua index 536339f1eec..b5bbaf8f412 100644 --- a/scripts/items/homing_ring.lua +++ b/scripts/items/homing_ring.lua @@ -20,9 +20,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return result end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) local region = target:getCurrentRegion() - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.OUTPOST, 0, 4, 0, region) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.OUTPOST, duration = 4, origin = user, icon = 0, subPower = region }) end return itemObject diff --git a/scripts/items/hume_rice_cake.lua b/scripts/items/hume_rice_cake.lua index 9de65126d95..363afb017af 100644 --- a/scripts/items/hume_rice_cake.lua +++ b/scripts/items/hume_rice_cake.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 118, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { power = 118, duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/humpty_dumpty_effigy.lua b/scripts/items/humpty_dumpty_effigy.lua index a262091333a..3336dbe2387 100644 --- a/scripts/items/humpty_dumpty_effigy.lua +++ b/scripts/items/humpty_dumpty_effigy.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/hydra_doublet.lua b/scripts/items/hydra_doublet.lua index 30981fcffde..45bf1809a4e 100644 --- a/scripts/items/hydra_doublet.lua +++ b/scripts/items/hydra_doublet.lua @@ -14,9 +14,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.HYDRA_DOUBLET) then - target:addStatusEffect(xi.effect.REFRESH, 0, 0, 60, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.HYDRA_DOUBLET) + target:addStatusEffect(xi.effect.REFRESH, { duration = 60, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.HYDRA_DOUBLET }) end end diff --git a/scripts/items/hydra_harness.lua b/scripts/items/hydra_harness.lua index d00c626269f..885c352dec9 100644 --- a/scripts/items/hydra_harness.lua +++ b/scripts/items/hydra_harness.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.HYDRA_HARNESS) then - target:addStatusEffect(xi.effect.ATTACK_BOOST, 0, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.HYDRA_HARNESS) + target:addStatusEffect(xi.effect.ATTACK_BOOST, { duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.HYDRA_HARNESS }) end end diff --git a/scripts/items/hydra_haubert.lua b/scripts/items/hydra_haubert.lua index 168982eb4fb..2ece58f7f35 100644 --- a/scripts/items/hydra_haubert.lua +++ b/scripts/items/hydra_haubert.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) if target:hasEquipped(xi.item.HYDRA_HAUBERT) then - target:addStatusEffect(xi.effect.REFRESH, 0, 0, 60, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.HYDRA_HAUBERT) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.HYDRA_HAUBERT) then + target:addStatusEffect(xi.effect.REFRESH, { duration = 60, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.HYDRA_HAUBERT }) end end diff --git a/scripts/items/hydra_mittens.lua b/scripts/items/hydra_mittens.lua index 38d325bf228..fa379589adc 100644 --- a/scripts/items/hydra_mittens.lua +++ b/scripts/items/hydra_mittens.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.HYDRA_MITTENS) then - target:addStatusEffect(xi.effect.ACCURACY_BOOST, 0, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.HYDRA_MITTENS) + target:addStatusEffect(xi.effect.ACCURACY_BOOST, { duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.HYDRA_MITTENS }) end end diff --git a/scripts/items/hydra_spats.lua b/scripts/items/hydra_spats.lua index 4794d06769a..a20cdb6a8a6 100644 --- a/scripts/items/hydra_spats.lua +++ b/scripts/items/hydra_spats.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.HYDRA_SPATS) then - target:addStatusEffect(xi.effect.EVASION_BOOST, 0, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.HYDRA_SPATS) + target:addStatusEffect(xi.effect.EVASION_BOOST, { duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.HYDRA_SPATS }) end end diff --git a/scripts/items/hydra_tiara.lua b/scripts/items/hydra_tiara.lua index 9302a51c7e1..29c15048a82 100644 --- a/scripts/items/hydra_tiara.lua +++ b/scripts/items/hydra_tiara.lua @@ -7,7 +7,7 @@ ---@type TItem local itemObject = {} -itemObject.onItemCheck = function(target) +itemObject.onItemCheck = function(target, user) if target:getStatusEffectBySource(xi.effect.POTENCY, xi.effectSourceType.EQUIPPED_ITEM, xi.item.HYDRA_TIARA) ~= nil then target:delStatusEffect(xi.effect.POTENCY, nil, xi.effectSourceType.EQUIPPED_ITEM, xi.item.HYDRA_TIARA) end @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.HYDRA_TIARA) then - target:addStatusEffect(xi.effect.POTENCY, 0, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.HYDRA_TIARA) + target:addStatusEffect(xi.effect.POTENCY, { duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.HYDRA_TIARA }) end end diff --git a/scripts/items/hydra_tights.lua b/scripts/items/hydra_tights.lua index 83c0b6d2234..412855319cd 100644 --- a/scripts/items/hydra_tights.lua +++ b/scripts/items/hydra_tights.lua @@ -7,7 +7,7 @@ ---@type TItem local itemObject = {} -itemObject.onItemCheck = function(target) +itemObject.onItemCheck = function(target, user) if target:getStatusEffectBySource(xi.effect.HASTE, xi.effectSourceType.EQUIPPED_ITEM, xi.item.HYDRA_TIGHTS) ~= nil then target:delStatusEffect(xi.effect.HASTE, nil, xi.effectSourceType.EQUIPPED_ITEM, xi.item.HYDRA_TIGHTS) end @@ -15,10 +15,10 @@ itemObject.onItemCheck = function(target) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.HYDRA_TIGHTS) then if not target:hasStatusEffect(xi.effect.HASTE) then - target:addStatusEffect(xi.effect.HASTE, 0, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.HYDRA_TIGHTS) + target:addStatusEffect(xi.effect.HASTE, { duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.HYDRA_TIGHTS }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/hyper_ether.lua b/scripts/items/hyper_ether.lua index 08b7dc3d5b2..f113d14ab98 100644 --- a/scripts/items/hyper_ether.lua +++ b/scripts/items/hyper_ether.lua @@ -16,9 +16,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) target:messageBasic(xi.msg.basic.RECOVERS_MP, 0, target:addMP(125 * xi.settings.main.ITEM_POWER)) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 300) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 300, origin = user }) end return itemObject diff --git a/scripts/items/hyper_potion.lua b/scripts/items/hyper_potion.lua index c6c166c6a8a..fe47d048c3f 100644 --- a/scripts/items/hyper_potion.lua +++ b/scripts/items/hyper_potion.lua @@ -16,9 +16,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) target:messageBasic(xi.msg.basic.RECOVERS_HP, 0, target:addHP(250 * xi.settings.main.ITEM_POWER)) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 300) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 300, origin = user }) end return itemObject diff --git a/scripts/items/icarus_wing.lua b/scripts/items/icarus_wing.lua index 3e84aadf330..85f2d1c244d 100644 --- a/scripts/items/icarus_wing.lua +++ b/scripts/items/icarus_wing.lua @@ -14,9 +14,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) target:addTP(1000) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 7200) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 7200, origin = user }) end return itemObject diff --git a/scripts/items/ice_trousers.lua b/scripts/items/ice_trousers.lua index 14eb59e4291..f0aee49b4bf 100644 --- a/scripts/items/ice_trousers.lua +++ b/scripts/items/ice_trousers.lua @@ -10,8 +10,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.ICE_SPIKES, 7, 0, 180) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.ICE_SPIKES, { power = 7, duration = 180, origin = user }) end return itemObject diff --git a/scripts/items/icefish.lua b/scripts/items/icefish.lua index 5dc48dc4353..e656859a5f4 100644 --- a/scripts/items/icefish.lua +++ b/scripts/items/icefish.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/imperial_omelette.lua b/scripts/items/imperial_omelette.lua index 3c8e2526c9d..7efde1bcda5 100644 --- a/scripts/items/imperial_omelette.lua +++ b/scripts/items/imperial_omelette.lua @@ -31,7 +31,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/intelligence_potion.lua b/scripts/items/intelligence_potion.lua index 5fdb81d00c9..f3e1852c842 100644 --- a/scripts/items/intelligence_potion.lua +++ b/scripts/items/intelligence_potion.lua @@ -14,9 +14,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.INT_BOOST, 7, 0, 180) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 900) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.INT_BOOST, { power = 7, duration = 180, origin = user }) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 900, origin = user }) end return itemObject diff --git a/scripts/items/invisible_mantle.lua b/scripts/items/invisible_mantle.lua index ee15b7ea21c..c59df963d10 100644 --- a/scripts/items/invisible_mantle.lua +++ b/scripts/items/invisible_mantle.lua @@ -10,12 +10,12 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.INVISIBLE_MANTLE) then if target:hasStatusEffect(xi.effect.INVISIBLE) then target:messageBasic(xi.msg.basic.NO_EFFECT) else - target:addStatusEffect(xi.effect.INVISIBLE, 0, 10, math.floor(180 * xi.settings.main.SNEAK_INVIS_DURATION_MULTIPLIER), 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.INVISIBLE_MANTLE) + target:addStatusEffect(xi.effect.INVISIBLE, { duration = math.floor(180 * xi.settings.main.SNEAK_INVIS_DURATION_MULTIPLIER), origin = user, tick = 10, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.INVISIBLE_MANTLE }) end end end diff --git a/scripts/items/irmik_helvasi.lua b/scripts/items/irmik_helvasi.lua index 70e177649dc..818b8a8c3fb 100644 --- a/scripts/items/irmik_helvasi.lua +++ b/scripts/items/irmik_helvasi.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/irmik_helvasi_+1.lua b/scripts/items/irmik_helvasi_+1.lua index e3206f29e6a..4d7cf9a57e3 100644 --- a/scripts/items/irmik_helvasi_+1.lua +++ b/scripts/items/irmik_helvasi_+1.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/istakoz.lua b/scripts/items/istakoz.lua index 1afba48577d..470a9a56d70 100644 --- a/scripts/items/istakoz.lua +++ b/scripts/items/istakoz.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/istiridye.lua b/scripts/items/istiridye.lua index 1ca94b96826..daab86bc577 100644 --- a/scripts/items/istiridye.lua +++ b/scripts/items/istiridye.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/jack-o-lantern.lua b/scripts/items/jack-o-lantern.lua index 0041ddc0cd0..b9f933ade02 100644 --- a/scripts/items/jack-o-lantern.lua +++ b/scripts/items/jack-o-lantern.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/jack-o-pie.lua b/scripts/items/jack-o-pie.lua index 161387e4fc7..8409f9a3ca5 100644 --- a/scripts/items/jack-o-pie.lua +++ b/scripts/items/jack-o-pie.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/jacknife.lua b/scripts/items/jacknife.lua index 750d7744141..97bea9b95b6 100644 --- a/scripts/items/jacknife.lua +++ b/scripts/items/jacknife.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/janizary_earring.lua b/scripts/items/janizary_earring.lua index e311ffdea5a..e5500a1ffaf 100644 --- a/scripts/items/janizary_earring.lua +++ b/scripts/items/janizary_earring.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.JANIZARY_EARRING) then - target:addStatusEffect(xi.effect.DEFENSE_BOOST, 0, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.JANIZARY_EARRING) + target:addStatusEffect(xi.effect.DEFENSE_BOOST, { duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.JANIZARY_EARRING }) end end diff --git a/scripts/items/jar_of_ground_wasabi.lua b/scripts/items/jar_of_ground_wasabi.lua index d7ff9574055..d1df43c6976 100644 --- a/scripts/items/jar_of_ground_wasabi.lua +++ b/scripts/items/jar_of_ground_wasabi.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/jar_of_marinara_sauce.lua b/scripts/items/jar_of_marinara_sauce.lua index eaa21dfb514..eb349bd052b 100644 --- a/scripts/items/jar_of_marinara_sauce.lua +++ b/scripts/items/jar_of_marinara_sauce.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/jolt_axe.lua b/scripts/items/jolt_axe.lua index da5849b3778..6b5dbff512a 100644 --- a/scripts/items/jolt_axe.lua +++ b/scripts/items/jolt_axe.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.JOLT_AXE) then - target:addStatusEffect(xi.effect.ATTACK_BOOST, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.JOLT_AXE) + target:addStatusEffect(xi.effect.ATTACK_BOOST, { duration = 1800, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.JOLT_AXE }) end end diff --git a/scripts/items/jug_of_marys_milk.lua b/scripts/items/jug_of_marys_milk.lua index 20e88abb03d..35149f50ab7 100644 --- a/scripts/items/jug_of_marys_milk.lua +++ b/scripts/items/jug_of_marys_milk.lua @@ -10,13 +10,13 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.SLEEP_I) and not target:hasStatusEffect(xi.effect.SLEEP_II) and not target:hasStatusEffect(xi.effect.LULLABY) then - target:addStatusEffect(xi.effect.SLEEP_I, 1, 0, 60) + target:addStatusEffect(xi.effect.SLEEP_I, { power = 1, duration = 60, origin = user }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/jug_of_miracle_milk.lua b/scripts/items/jug_of_miracle_milk.lua index c17853b3fbe..d5a1bcc16ef 100644 --- a/scripts/items/jug_of_miracle_milk.lua +++ b/scripts/items/jug_of_miracle_milk.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 1747, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { power = 1747, duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/jug_of_selbina_milk.lua b/scripts/items/jug_of_selbina_milk.lua index da2e57699c3..277e898f212 100644 --- a/scripts/items/jug_of_selbina_milk.lua +++ b/scripts/items/jug_of_selbina_milk.lua @@ -10,12 +10,12 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.REGEN) then if target:getEquipID(xi.slot.BODY) == 14520 then -- Dream Robe +1 - target:addStatusEffect(xi.effect.REGEN, 1, 3, 150) + target:addStatusEffect(xi.effect.REGEN, { power = 1, duration = 150, origin = user, tick = 3 }) else - target:addStatusEffect(xi.effect.REGEN, 1, 3, 120) + target:addStatusEffect(xi.effect.REGEN, { power = 1, duration = 120, origin = user, tick = 3 }) end else target:messageBasic(xi.msg.basic.NO_EFFECT) diff --git a/scripts/items/jug_of_soy_milk.lua b/scripts/items/jug_of_soy_milk.lua index 44a7b740adb..4e483ec836b 100644 --- a/scripts/items/jug_of_soy_milk.lua +++ b/scripts/items/jug_of_soy_milk.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.REGEN) then - target:addStatusEffect(xi.effect.REGEN, 1, 3, 120) + target:addStatusEffect(xi.effect.REGEN, { power = 1, duration = 120, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/jug_of_uleguerand_milk.lua b/scripts/items/jug_of_uleguerand_milk.lua index 46f02c7ce45..420ce34ccd5 100644 --- a/scripts/items/jug_of_uleguerand_milk.lua +++ b/scripts/items/jug_of_uleguerand_milk.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.REGEN) then - target:addStatusEffect(xi.effect.REGEN, 2, 3, 120) + target:addStatusEffect(xi.effect.REGEN, { power = 2, duration = 120, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/juglan_jumble.lua b/scripts/items/juglan_jumble.lua index 06900f90740..b00045f08a6 100644 --- a/scripts/items/juglan_jumble.lua +++ b/scripts/items/juglan_jumble.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/kalamar.lua b/scripts/items/kalamar.lua index 7887fe8f871..3ac9ab08e5b 100644 --- a/scripts/items/kalamar.lua +++ b/scripts/items/kalamar.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/kaplumbaga.lua b/scripts/items/kaplumbaga.lua index b0393be41f9..5c33cc9d680 100644 --- a/scripts/items/kaplumbaga.lua +++ b/scripts/items/kaplumbaga.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/kawahori_kabuto.lua b/scripts/items/kawahori_kabuto.lua index 3cc70c84d13..2f3bc2ddd7d 100644 --- a/scripts/items/kawahori_kabuto.lua +++ b/scripts/items/kawahori_kabuto.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.BLINDNESS) then - target:addStatusEffect(xi.effect.BLINDNESS, 25, 0, 180) + target:addStatusEffect(xi.effect.BLINDNESS, { power = 25, duration = 180, origin = user }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/kayabaligi.lua b/scripts/items/kayabaligi.lua index 140acc30650..39936de59e5 100644 --- a/scripts/items/kayabaligi.lua +++ b/scripts/items/kayabaligi.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/kazham_earring.lua b/scripts/items/kazham_earring.lua index ace051c4174..373c1b0d7a5 100644 --- a/scripts/items/kazham_earring.lua +++ b/scripts/items/kazham_earring.lua @@ -10,8 +10,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.KAZHAM_EARRING, 0, 4) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.KAZHAM_EARRING, duration = 4, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/kazham_pineapple.lua b/scripts/items/kazham_pineapple.lua index 29cff1bb129..28c0698250b 100644 --- a/scripts/items/kazham_pineapple.lua +++ b/scripts/items/kazham_pineapple.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/keen_zaghnal.lua b/scripts/items/keen_zaghnal.lua index bd9b9d97dc4..2912b3a0248 100644 --- a/scripts/items/keen_zaghnal.lua +++ b/scripts/items/keen_zaghnal.lua @@ -16,9 +16,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.KEEN_ZAGHNAL) then - target:addStatusEffect(xi.effect.ACCURACY_BOOST, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.KEEN_ZAGHNAL) + target:addStatusEffect(xi.effect.ACCURACY_BOOST, { duration = 1800, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.KEEN_ZAGHNAL }) end end diff --git a/scripts/items/king_truffle.lua b/scripts/items/king_truffle.lua index d2bb80875ba..af764d9e19f 100644 --- a/scripts/items/king_truffle.lua +++ b/scripts/items/king_truffle.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/kingdom_earring.lua b/scripts/items/kingdom_earring.lua index 75bbd033b03..ca0d875d91f 100644 --- a/scripts/items/kingdom_earring.lua +++ b/scripts/items/kingdom_earring.lua @@ -10,8 +10,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.KINGDOM_EARRING, 0, 4) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.KINGDOM_EARRING, duration = 4, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/kingdom_signet_staff.lua b/scripts/items/kingdom_signet_staff.lua index 1b6da3abbb4..eeed8945dd5 100644 --- a/scripts/items/kingdom_signet_staff.lua +++ b/scripts/items/kingdom_signet_staff.lua @@ -29,9 +29,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) target:delStatusEffectsByFlag(xi.effectFlag.INFLUENCE, true) - target:addStatusEffect(xi.effect.SIGNET, 0, 0, 18000) + target:addStatusEffect(xi.effect.SIGNET, { duration = 18000, origin = user }) end return itemObject diff --git a/scripts/items/kingdom_stables_collar.lua b/scripts/items/kingdom_stables_collar.lua index 70172e0fa63..26b2b3804d7 100644 --- a/scripts/items/kingdom_stables_collar.lua +++ b/scripts/items/kingdom_stables_collar.lua @@ -15,8 +15,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return result end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.CHOCO_SANDORIA, 0, 4) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.CHOCO_SANDORIA, duration = 4, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/kinkobo.lua b/scripts/items/kinkobo.lua index 4b03f361fab..619571ec7ae 100644 --- a/scripts/items/kinkobo.lua +++ b/scripts/items/kinkobo.lua @@ -11,9 +11,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.ENCHANTMENT) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 3600, 17592) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 3600, origin = user, subType = 17592 }) end end diff --git a/scripts/items/kitron.lua b/scripts/items/kitron.lua index fae70b6821d..c93e1e4296d 100644 --- a/scripts/items/kitron.lua +++ b/scripts/items/kitron.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/kitron_macaron.lua b/scripts/items/kitron_macaron.lua index 1c0da7b9bad..465a910df55 100644 --- a/scripts/items/kitron_macaron.lua +++ b/scripts/items/kitron_macaron.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/kitron_snow_cone.lua b/scripts/items/kitron_snow_cone.lua index 9db0d614357..4978b00d21b 100644 --- a/scripts/items/kitron_snow_cone.lua +++ b/scripts/items/kitron_snow_cone.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/kitty_rod.lua b/scripts/items/kitty_rod.lua index 0351081f00d..ac76246cc8e 100644 --- a/scripts/items/kitty_rod.lua +++ b/scripts/items/kitty_rod.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 183, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { power = 183, duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/koccos_earring.lua b/scripts/items/koccos_earring.lua index 3cf6e8e8a0a..bb22bca9947 100644 --- a/scripts/items/koccos_earring.lua +++ b/scripts/items/koccos_earring.lua @@ -10,10 +10,10 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) local duration = 7200 target:delStatusEffect(xi.effect.RERAISE) - target:addStatusEffect(xi.effect.RERAISE, 2, 0, duration) + target:addStatusEffect(xi.effect.RERAISE, { power = 2, duration = duration, origin = user }) target:messageBasic(xi.msg.basic.GAINS_EFFECT_OF_STATUS, xi.effect.RERAISE) end diff --git a/scripts/items/koen.lua b/scripts/items/koen.lua index 51cb56b17a6..76cb63ed0f3 100644 --- a/scripts/items/koen.lua +++ b/scripts/items/koen.lua @@ -7,7 +7,7 @@ ---@type TItem local itemObject = {} -itemObject.onItemCheck = function(target) +itemObject.onItemCheck = function(target, user) if target:getStatusEffectBySource(xi.effect.ENFIRE, xi.effectSourceType.EQUIPPED_ITEM, xi.item.KOEN) ~= nil then target:delStatusEffect(xi.effect.ENFIRE, nil, xi.effectSourceType.EQUIPPED_ITEM, xi.item.KOEN) end @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.KOEN) then - target:addStatusEffect(xi.effect.ENFIRE, 0, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.KOEN) + target:addStatusEffect(xi.effect.ENFIRE, { duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.KOEN }) end end diff --git a/scripts/items/kohlrouladen.lua b/scripts/items/kohlrouladen.lua index 70145502227..29df86eaf99 100644 --- a/scripts/items/kohlrouladen.lua +++ b/scripts/items/kohlrouladen.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/kohlrouladen_+1.lua b/scripts/items/kohlrouladen_+1.lua index 9e349e32c9b..5c356c9fb17 100644 --- a/scripts/items/kohlrouladen_+1.lua +++ b/scripts/items/kohlrouladen_+1.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/konigskuchen.lua b/scripts/items/konigskuchen.lua index b5bebd918ce..c8ad7af0cfb 100644 --- a/scripts/items/konigskuchen.lua +++ b/scripts/items/konigskuchen.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/la_theine_cabbage.lua b/scripts/items/la_theine_cabbage.lua index f9a34d8ec60..156ab4fa8b5 100644 --- a/scripts/items/la_theine_cabbage.lua +++ b/scripts/items/la_theine_cabbage.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/lebkuchen_house.lua b/scripts/items/lebkuchen_house.lua index e7f09747fa8..10613209f2d 100644 --- a/scripts/items/lebkuchen_house.lua +++ b/scripts/items/lebkuchen_house.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/lebkuchen_manse.lua b/scripts/items/lebkuchen_manse.lua index af23ecc40d2..f5361f775cb 100644 --- a/scripts/items/lebkuchen_manse.lua +++ b/scripts/items/lebkuchen_manse.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/leremieu_salad.lua b/scripts/items/leremieu_salad.lua index b864c7179f6..de0bfa9cb3a 100644 --- a/scripts/items/leremieu_salad.lua +++ b/scripts/items/leremieu_salad.lua @@ -20,7 +20,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/leremieu_taco.lua b/scripts/items/leremieu_taco.lua index 888da53a33a..2e6d748420e 100644 --- a/scripts/items/leremieu_taco.lua +++ b/scripts/items/leremieu_taco.lua @@ -22,7 +22,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/lik_kabob.lua b/scripts/items/lik_kabob.lua index b19a7c35590..d3e805b02fc 100644 --- a/scripts/items/lik_kabob.lua +++ b/scripts/items/lik_kabob.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/lionhead.lua b/scripts/items/lionhead.lua index 79cffd62d1d..0ff25abddd5 100644 --- a/scripts/items/lionhead.lua +++ b/scripts/items/lionhead.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/lizard_egg.lua b/scripts/items/lizard_egg.lua index 89c4b4ba61c..e17647123f4 100644 --- a/scripts/items/lizard_egg.lua +++ b/scripts/items/lizard_egg.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/loaf_of_black_bread.lua b/scripts/items/loaf_of_black_bread.lua index d7983ffb011..61bf95880a2 100644 --- a/scripts/items/loaf_of_black_bread.lua +++ b/scripts/items/loaf_of_black_bread.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/loaf_of_goblin_bread.lua b/scripts/items/loaf_of_goblin_bread.lua index 231ec143851..d9c404dda7a 100644 --- a/scripts/items/loaf_of_goblin_bread.lua +++ b/scripts/items/loaf_of_goblin_bread.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/loaf_of_hobgoblin_bread.lua b/scripts/items/loaf_of_hobgoblin_bread.lua index 93502717e51..fcac612b7a4 100644 --- a/scripts/items/loaf_of_hobgoblin_bread.lua +++ b/scripts/items/loaf_of_hobgoblin_bread.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/loaf_of_homemade_bread.lua b/scripts/items/loaf_of_homemade_bread.lua index e3f8b1580f7..75dc79e4182 100644 --- a/scripts/items/loaf_of_homemade_bread.lua +++ b/scripts/items/loaf_of_homemade_bread.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/loaf_of_iron_bread.lua b/scripts/items/loaf_of_iron_bread.lua index e6875e88350..0b23c49ddc4 100644 --- a/scripts/items/loaf_of_iron_bread.lua +++ b/scripts/items/loaf_of_iron_bread.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/loaf_of_pain_de_neige.lua b/scripts/items/loaf_of_pain_de_neige.lua index c1f5a7a0350..c62a04da6e6 100644 --- a/scripts/items/loaf_of_pain_de_neige.lua +++ b/scripts/items/loaf_of_pain_de_neige.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/loaf_of_pumpernickel.lua b/scripts/items/loaf_of_pumpernickel.lua index 0bf48429b7e..334d50c781d 100644 --- a/scripts/items/loaf_of_pumpernickel.lua +++ b/scripts/items/loaf_of_pumpernickel.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/loaf_of_steel_bread.lua b/scripts/items/loaf_of_steel_bread.lua index c05eb5be1f9..6fda9a1c4f0 100644 --- a/scripts/items/loaf_of_steel_bread.lua +++ b/scripts/items/loaf_of_steel_bread.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/loaf_of_white_bread.lua b/scripts/items/loaf_of_white_bread.lua index a0123647785..33ca73dbce2 100644 --- a/scripts/items/loaf_of_white_bread.lua +++ b/scripts/items/loaf_of_white_bread.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/love_chocolate.lua b/scripts/items/love_chocolate.lua index ffca6aff3e4..3760b2cc232 100644 --- a/scripts/items/love_chocolate.lua +++ b/scripts/items/love_chocolate.lua @@ -13,7 +13,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/lucky_egg.lua b/scripts/items/lucky_egg.lua index d2ac290d68e..83cd0a67bd3 100644 --- a/scripts/items/lucky_egg.lua +++ b/scripts/items/lucky_egg.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/lungfish.lua b/scripts/items/lungfish.lua index 7f297193be0..dfafed25f19 100644 --- a/scripts/items/lungfish.lua +++ b/scripts/items/lungfish.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/m&p_cracker.lua b/scripts/items/m&p_cracker.lua index b68d22a7572..17d6eeb4db1 100644 --- a/scripts/items/m&p_cracker.lua +++ b/scripts/items/m&p_cracker.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 180, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 180, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/m&p_doner_kebab.lua b/scripts/items/m&p_doner_kebab.lua index f6f346624bb..0501c327d3a 100644 --- a/scripts/items/m&p_doner_kebab.lua +++ b/scripts/items/m&p_doner_kebab.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/m&p_dumpling.lua b/scripts/items/m&p_dumpling.lua index 9222490693b..c7959645676 100644 --- a/scripts/items/m&p_dumpling.lua +++ b/scripts/items/m&p_dumpling.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 180, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 180, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/maats_cap.lua b/scripts/items/maats_cap.lua index c09662a83b1..59ad204d541 100644 --- a/scripts/items/maats_cap.lua +++ b/scripts/items/maats_cap.lua @@ -10,8 +10,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.MAAT, 0, 4) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.MAAT, duration = 4, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/magma_steak.lua b/scripts/items/magma_steak.lua index fd24ada804a..2ad7432054a 100644 --- a/scripts/items/magma_steak.lua +++ b/scripts/items/magma_steak.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/magma_steak_+1.lua b/scripts/items/magma_steak_+1.lua index 0c2e8deabe1..37f89263eaa 100644 --- a/scripts/items/magma_steak_+1.lua +++ b/scripts/items/magma_steak_+1.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/magna_gilet_+1.lua b/scripts/items/magna_gilet_+1.lua index f789a9a0704..355fcea3333 100644 --- a/scripts/items/magna_gilet_+1.lua +++ b/scripts/items/magna_gilet_+1.lua @@ -15,8 +15,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return result end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.PURGONORGO, 0, 3) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.PURGONORGO, duration = 3, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/magna_top_+1.lua b/scripts/items/magna_top_+1.lua index 0fc06fcc2ba..d0580543214 100644 --- a/scripts/items/magna_top_+1.lua +++ b/scripts/items/magna_top_+1.lua @@ -15,8 +15,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return result end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.PURGONORGO, 0, 3) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.PURGONORGO, duration = 3, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/maharajas_belt.lua b/scripts/items/maharajas_belt.lua index b03ea0af494..312045231de 100644 --- a/scripts/items/maharajas_belt.lua +++ b/scripts/items/maharajas_belt.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.MAHARAJAS_BELT) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 60, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.MAHARAJAS_BELT) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 60, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.MAHARAJAS_BELT }) end end diff --git a/scripts/items/mamool_ja_earring.lua b/scripts/items/mamool_ja_earring.lua index 02e55a9b3be..6ff08e69432 100644 --- a/scripts/items/mamool_ja_earring.lua +++ b/scripts/items/mamool_ja_earring.lua @@ -10,10 +10,10 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) local duration = 3600 target:delStatusEffect(xi.effect.RERAISE) - target:addStatusEffect(xi.effect.RERAISE, 3, 0, duration) + target:addStatusEffect(xi.effect.RERAISE, { power = 3, duration = duration, origin = user }) end return itemObject diff --git a/scripts/items/mana_wand.lua b/scripts/items/mana_wand.lua index d77f989cd29..d0b32101798 100644 --- a/scripts/items/mana_wand.lua +++ b/scripts/items/mana_wand.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.MANA_WAND) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.MANA_WAND) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 1800, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.MANA_WAND }) end end diff --git a/scripts/items/manashell_ring.lua b/scripts/items/manashell_ring.lua index a232f9596c1..e37c33dbda2 100644 --- a/scripts/items/manashell_ring.lua +++ b/scripts/items/manashell_ring.lua @@ -7,7 +7,7 @@ ---@type TItem local itemObject = {} -itemObject.onItemCheck = function(target) +itemObject.onItemCheck = function(target, user) if target:getStatusEffectBySource(xi.effect.MAX_MP_BOOST, xi.effectSourceType.EQUIPPED_ITEM, xi.item.MANASHELL_RING) ~= nil then target:delStatusEffect(xi.effect.MAX_MP_BOOST, nil, xi.effectSourceType.EQUIPPED_ITEM, xi.item.MANASHELL_RING) end @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.MANASHELL_RING) then - target:addStatusEffect(xi.effect.MAX_MP_BOOST, 0, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.MANASHELL_RING) + target:addStatusEffect(xi.effect.MAX_MP_BOOST, { duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.MANASHELL_RING }) end end diff --git a/scripts/items/mandragora_belt.lua b/scripts/items/mandragora_belt.lua index 676f76c0a07..321ecc6df8c 100644 --- a/scripts/items/mandragora_belt.lua +++ b/scripts/items/mandragora_belt.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 31, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { power = 31, duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/mandragora_beret.lua b/scripts/items/mandragora_beret.lua index 3b95aae6515..9f041c39d0f 100644 --- a/scripts/items/mandragora_beret.lua +++ b/scripts/items/mandragora_beret.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 31, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { power = 31, duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/maple_cake.lua b/scripts/items/maple_cake.lua index 799c734d13a..003669d430e 100644 --- a/scripts/items/maple_cake.lua +++ b/scripts/items/maple_cake.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/margherita_pizza.lua b/scripts/items/margherita_pizza.lua index 955afd5a0fd..1ae01c29658 100644 --- a/scripts/items/margherita_pizza.lua +++ b/scripts/items/margherita_pizza.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/margherita_pizza_+1.lua b/scripts/items/margherita_pizza_+1.lua index 1fcd4d00cfe..4fb2f960eda 100644 --- a/scripts/items/margherita_pizza_+1.lua +++ b/scripts/items/margherita_pizza_+1.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/marinara_pizza.lua b/scripts/items/marinara_pizza.lua index a183bba62f0..2000d6a0f17 100644 --- a/scripts/items/marinara_pizza.lua +++ b/scripts/items/marinara_pizza.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/marinara_pizza_+1.lua b/scripts/items/marinara_pizza_+1.lua index d35470885cc..977395bdece 100644 --- a/scripts/items/marinara_pizza_+1.lua +++ b/scripts/items/marinara_pizza_+1.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/maringna.lua b/scripts/items/maringna.lua index 8544aa2a03a..64af1fba4a1 100644 --- a/scripts/items/maringna.lua +++ b/scripts/items/maringna.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/marron_glace.lua b/scripts/items/marron_glace.lua index 03f0bf549d8..3d6cc38db38 100644 --- a/scripts/items/marron_glace.lua +++ b/scripts/items/marron_glace.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/max-potion.lua b/scripts/items/max-potion.lua index 3cf94436d18..a704a06f749 100644 --- a/scripts/items/max-potion.lua +++ b/scripts/items/max-potion.lua @@ -16,9 +16,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) target:messageBasic(xi.msg.basic.RECOVERS_HP, 0, target:addHP(500 * xi.settings.main.ITEM_POWER)) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 900) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 900, origin = user }) end return itemObject diff --git a/scripts/items/max-potion_+1.lua b/scripts/items/max-potion_+1.lua index d7d0ca43c5f..6ae6f31b4e5 100644 --- a/scripts/items/max-potion_+1.lua +++ b/scripts/items/max-potion_+1.lua @@ -16,9 +16,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) target:messageBasic(xi.msg.basic.RECOVERS_HP, 0, target:addHP(550 * xi.settings.main.ITEM_POWER)) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 900) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 900, origin = user }) end return itemObject diff --git a/scripts/items/max-potion_+2.lua b/scripts/items/max-potion_+2.lua index 3ae02520b52..68723b1297b 100644 --- a/scripts/items/max-potion_+2.lua +++ b/scripts/items/max-potion_+2.lua @@ -16,9 +16,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) target:messageBasic(xi.msg.basic.RECOVERS_HP, 0, target:addHP(650 * xi.settings.main.ITEM_POWER)) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 900) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 900, origin = user }) end return itemObject diff --git a/scripts/items/max-potion_+3.lua b/scripts/items/max-potion_+3.lua index 8891b02a712..f2b611d6e78 100644 --- a/scripts/items/max-potion_+3.lua +++ b/scripts/items/max-potion_+3.lua @@ -16,9 +16,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) target:messageBasic(xi.msg.basic.RECOVERS_HP, 0, target:addHP(700 * xi.settings.main.ITEM_POWER)) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 900) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 900, origin = user }) end return itemObject diff --git a/scripts/items/meat_chiefkabob.lua b/scripts/items/meat_chiefkabob.lua index 64e1d91195d..54ce66e7674 100644 --- a/scripts/items/meat_chiefkabob.lua +++ b/scripts/items/meat_chiefkabob.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/meat_mithkabob.lua b/scripts/items/meat_mithkabob.lua index 5835e982f7f..52d46c51b62 100644 --- a/scripts/items/meat_mithkabob.lua +++ b/scripts/items/meat_mithkabob.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/meatloaf.lua b/scripts/items/meatloaf.lua index bc120f4bfbf..3ff85da871f 100644 --- a/scripts/items/meatloaf.lua +++ b/scripts/items/meatloaf.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/meatloaf_+1.lua b/scripts/items/meatloaf_+1.lua index ae262a5859c..57c941425f1 100644 --- a/scripts/items/meatloaf_+1.lua +++ b/scripts/items/meatloaf_+1.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/melomane_mallet.lua b/scripts/items/melomane_mallet.lua index 7f23c4c7126..3ab34a99f7b 100644 --- a/scripts/items/melomane_mallet.lua +++ b/scripts/items/melomane_mallet.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 31, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { power = 31, duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/melon_pie.lua b/scripts/items/melon_pie.lua index 862f97b973f..cec148f7ede 100644 --- a/scripts/items/melon_pie.lua +++ b/scripts/items/melon_pie.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/melon_pie_+1.lua b/scripts/items/melon_pie_+1.lua index acf1520e0fd..4d4b0905558 100644 --- a/scripts/items/melon_pie_+1.lua +++ b/scripts/items/melon_pie_+1.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/melon_snow_cone.lua b/scripts/items/melon_snow_cone.lua index 648c0df4bcc..d7cab216b3f 100644 --- a/scripts/items/melon_snow_cone.lua +++ b/scripts/items/melon_snow_cone.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/memento_muffler.lua b/scripts/items/memento_muffler.lua index 172c2e18449..83d8b452a52 100644 --- a/scripts/items/memento_muffler.lua +++ b/scripts/items/memento_muffler.lua @@ -7,7 +7,7 @@ ---@type TItem local itemObject = {} -itemObject.onItemCheck = function(target) +itemObject.onItemCheck = function(target, user) if target:getStatusEffectBySource(xi.effect.VIT_BOOST, xi.effectSourceType.EQUIPPED_ITEM, xi.item.MEMENTO_MUFFLER) ~= nil then target:delStatusEffect(xi.effect.VIT_BOOST, nil, xi.effectSourceType.EQUIPPED_ITEM, xi.item.MEMENTO_MUFFLER) end @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.MEMENTO_MUFFLER) then - target:addStatusEffect(xi.effect.VIT_BOOST, 0, 0, 300, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.MEMENTO_MUFFLER) + target:addStatusEffect(xi.effect.VIT_BOOST, { duration = 300, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.MEMENTO_MUFFLER }) end end diff --git a/scripts/items/mercanbaligi.lua b/scripts/items/mercanbaligi.lua index 0fb5d80be6c..ac790919665 100644 --- a/scripts/items/mercanbaligi.lua +++ b/scripts/items/mercanbaligi.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/messhikimaru.lua b/scripts/items/messhikimaru.lua index 78667d72f5b..311a4c010c9 100644 --- a/scripts/items/messhikimaru.lua +++ b/scripts/items/messhikimaru.lua @@ -11,9 +11,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.MESSHIKIMARU) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 600, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.MESSHIKIMARU) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 600, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.MESSHIKIMARU }) end end diff --git a/scripts/items/mhaura_earring.lua b/scripts/items/mhaura_earring.lua index d6808618fb9..62fdf2193e7 100644 --- a/scripts/items/mhaura_earring.lua +++ b/scripts/items/mhaura_earring.lua @@ -10,8 +10,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.MHAURA_EARRING, 0, 4) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.MHAURA_EARRING, duration = 4, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/midwinter_dream.lua b/scripts/items/midwinter_dream.lua index 5e618986d13..58b064bcde4 100644 --- a/scripts/items/midwinter_dream.lua +++ b/scripts/items/midwinter_dream.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/mighty_ring.lua b/scripts/items/mighty_ring.lua index c183c837549..0b750b3dece 100644 --- a/scripts/items/mighty_ring.lua +++ b/scripts/items/mighty_ring.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.MIGHTY_RING) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.MIGHTY_RING) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 1800, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.MIGHTY_RING }) end end diff --git a/scripts/items/mihgo_mithkabob.lua b/scripts/items/mihgo_mithkabob.lua index c95ceb3876d..2046dbb60aa 100644 --- a/scripts/items/mihgo_mithkabob.lua +++ b/scripts/items/mihgo_mithkabob.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/mind_potion.lua b/scripts/items/mind_potion.lua index 3eca5575e8f..e75e24d4e3b 100644 --- a/scripts/items/mind_potion.lua +++ b/scripts/items/mind_potion.lua @@ -14,9 +14,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.MND_BOOST, 7, 0, 180) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 900) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.MND_BOOST, { power = 7, duration = 180, origin = user }) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 900, origin = user }) end return itemObject diff --git a/scripts/items/mist_crown.lua b/scripts/items/mist_crown.lua index ac1341a83b1..b7ac17fbd0a 100644 --- a/scripts/items/mist_crown.lua +++ b/scripts/items/mist_crown.lua @@ -14,10 +14,10 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.MIST_CROWN) then if not target:hasStatusEffect(xi.effect.EVASION_BOOST) then - target:addStatusEffect(xi.effect.EVASION_BOOST, 0, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.MIST_CROWN) + target:addStatusEffect(xi.effect.EVASION_BOOST, { duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.MIST_CROWN }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/mist_mitts.lua b/scripts/items/mist_mitts.lua index ad3ee6f15e2..3ee68c2d89b 100644 --- a/scripts/items/mist_mitts.lua +++ b/scripts/items/mist_mitts.lua @@ -14,10 +14,10 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.MIST_MITTS) then if not target:hasStatusEffect(xi.effect.EVASION_BOOST) then - target:addStatusEffect(xi.effect.EVASION_BOOST, 0, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.MIST_MITTS) + target:addStatusEffect(xi.effect.EVASION_BOOST, { duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.MIST_MITTS }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/mist_pumps.lua b/scripts/items/mist_pumps.lua index 6ae9a54cb1c..481a51f0ec1 100644 --- a/scripts/items/mist_pumps.lua +++ b/scripts/items/mist_pumps.lua @@ -14,10 +14,10 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.MIST_PUMPS) then if not target:hasStatusEffect(xi.effect.EVASION_BOOST) then - target:addStatusEffect(xi.effect.EVASION_BOOST, 0, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.MIST_PUMPS) + target:addStatusEffect(xi.effect.EVASION_BOOST, { duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.MIST_PUMPS }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/mist_slacks.lua b/scripts/items/mist_slacks.lua index 80074df77dd..52a993e11ec 100644 --- a/scripts/items/mist_slacks.lua +++ b/scripts/items/mist_slacks.lua @@ -14,10 +14,10 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.MIST_SLACKS) then if not target:hasStatusEffect(xi.effect.EVASION_BOOST) then - target:addStatusEffect(xi.effect.EVASION_BOOST, 0, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.MIST_SLACKS) + target:addStatusEffect(xi.effect.EVASION_BOOST, { duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.MIST_SLACKS }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/mist_tunic.lua b/scripts/items/mist_tunic.lua index 29ecabe8899..2dac2689b0a 100644 --- a/scripts/items/mist_tunic.lua +++ b/scripts/items/mist_tunic.lua @@ -14,10 +14,10 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.MIST_TUNIC) then if not target:hasStatusEffect(xi.effect.EVASION_BOOST) then - target:addStatusEffect(xi.effect.EVASION_BOOST, 0, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.MIST_TUNIC) + target:addStatusEffect(xi.effect.EVASION_BOOST, { duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.MIST_TUNIC }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/mithran_rice_cake.lua b/scripts/items/mithran_rice_cake.lua index ecb0bef78ed..905c4e7996f 100644 --- a/scripts/items/mithran_rice_cake.lua +++ b/scripts/items/mithran_rice_cake.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 182, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { power = 182, duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/mithran_tomato.lua b/scripts/items/mithran_tomato.lua index 4032da11885..88617f94598 100644 --- a/scripts/items/mithran_tomato.lua +++ b/scripts/items/mithran_tomato.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/moat_carp.lua b/scripts/items/moat_carp.lua index 932d99b0c26..68edcd0b433 100644 --- a/scripts/items/moat_carp.lua +++ b/scripts/items/moat_carp.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/montagna.lua b/scripts/items/montagna.lua index cf6982209db..61c1d96dabd 100644 --- a/scripts/items/montagna.lua +++ b/scripts/items/montagna.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/moogle_cap.lua b/scripts/items/moogle_cap.lua index 2ca95486b39..e5ab4e1e8ee 100644 --- a/scripts/items/moogle_cap.lua +++ b/scripts/items/moogle_cap.lua @@ -12,8 +12,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.HOME_NATION, 0, 4) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.HOME_NATION, duration = 4, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/moogle_pie.lua b/scripts/items/moogle_pie.lua index bae0b65c005..d75b34b1788 100644 --- a/scripts/items/moogle_pie.lua +++ b/scripts/items/moogle_pie.lua @@ -21,7 +21,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/moon_ball.lua b/scripts/items/moon_ball.lua index 92643d6cf60..9f26ace3d2b 100644 --- a/scripts/items/moon_ball.lua +++ b/scripts/items/moon_ball.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/moon_carrot.lua b/scripts/items/moon_carrot.lua index 27923e8a419..37c0ecd926c 100644 --- a/scripts/items/moon_carrot.lua +++ b/scripts/items/moon_carrot.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/moorish_idol.lua b/scripts/items/moorish_idol.lua index 97b91e0d3bb..eb4995eed67 100644 --- a/scripts/items/moorish_idol.lua +++ b/scripts/items/moorish_idol.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/mug_of_honeyed_egg.lua b/scripts/items/mug_of_honeyed_egg.lua index 4dffb8ccfcd..b0ab5cf20ee 100644 --- a/scripts/items/mug_of_honeyed_egg.lua +++ b/scripts/items/mug_of_honeyed_egg.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/mushroom_crepe.lua b/scripts/items/mushroom_crepe.lua index 97b847e8012..cd321bb43b1 100644 --- a/scripts/items/mushroom_crepe.lua +++ b/scripts/items/mushroom_crepe.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/mushroom_salad.lua b/scripts/items/mushroom_salad.lua index ba6426a2f2e..1ec44221ccc 100644 --- a/scripts/items/mushroom_salad.lua +++ b/scripts/items/mushroom_salad.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/mutton_enchilada.lua b/scripts/items/mutton_enchilada.lua index 7e49a7fc0f1..d71711659f8 100644 --- a/scripts/items/mutton_enchilada.lua +++ b/scripts/items/mutton_enchilada.lua @@ -20,7 +20,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/mutton_tortilla.lua b/scripts/items/mutton_tortilla.lua index ce24fad2a0c..66c83dbab22 100644 --- a/scripts/items/mutton_tortilla.lua +++ b/scripts/items/mutton_tortilla.lua @@ -20,7 +20,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/naruko_earring.lua b/scripts/items/naruko_earring.lua index b273f4d6b74..dc796b76358 100644 --- a/scripts/items/naruko_earring.lua +++ b/scripts/items/naruko_earring.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.NARUKO_EARRING) then - target:addStatusEffect(xi.effect.ENMITY_BOOST, 10, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.NARUKO_EARRING) + target:addStatusEffect(xi.effect.ENMITY_BOOST, { power = 10, duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.NARUKO_EARRING }) end end diff --git a/scripts/items/nashmau_earring.lua b/scripts/items/nashmau_earring.lua index da7e0dd3207..ebdfb305673 100644 --- a/scripts/items/nashmau_earring.lua +++ b/scripts/items/nashmau_earring.lua @@ -10,8 +10,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.NASHMAU_EARRING, 0, 4) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.NASHMAU_EARRING, duration = 4, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/naval_rice_ball.lua b/scripts/items/naval_rice_ball.lua index 5726ef539cc..58e4deeb475 100644 --- a/scripts/items/naval_rice_ball.lua +++ b/scripts/items/naval_rice_ball.lua @@ -20,7 +20,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/nebimonite.lua b/scripts/items/nebimonite.lua index c90d96e6b0e..f5a65007542 100644 --- a/scripts/items/nebimonite.lua +++ b/scripts/items/nebimonite.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/nebimonite_bake.lua b/scripts/items/nebimonite_bake.lua index d841278cf92..b3c7a7c1770 100644 --- a/scripts/items/nebimonite_bake.lua +++ b/scripts/items/nebimonite_bake.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/nexus_cape.lua b/scripts/items/nexus_cape.lua index 18bf5f0543c..52d3f62e5b7 100644 --- a/scripts/items/nexus_cape.lua +++ b/scripts/items/nexus_cape.lua @@ -134,8 +134,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return result end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.LEADER, 0, 4) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.LEADER, duration = 4, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/noble_lady.lua b/scripts/items/noble_lady.lua index 6d025e8ef3e..0497d7e864f 100644 --- a/scripts/items/noble_lady.lua +++ b/scripts/items/noble_lady.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/nomad_cap.lua b/scripts/items/nomad_cap.lua index f5f9e1fc381..ddbad3ce2a7 100644 --- a/scripts/items/nomad_cap.lua +++ b/scripts/items/nomad_cap.lua @@ -13,8 +13,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.HOME_NATION, 0, 4) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.HOME_NATION, duration = 4, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/nomad_moogle_shield.lua b/scripts/items/nomad_moogle_shield.lua index 7912b5a03c8..6150060eeec 100644 --- a/scripts/items/nomad_moogle_shield.lua +++ b/scripts/items/nomad_moogle_shield.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 2308, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { power = 2308, duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/nopales_salad.lua b/scripts/items/nopales_salad.lua index f24bd020b5d..4048a8ef54e 100644 --- a/scripts/items/nopales_salad.lua +++ b/scripts/items/nopales_salad.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/nopales_salad_+1.lua b/scripts/items/nopales_salad_+1.lua index c772c346ded..c431e69dfa4 100644 --- a/scripts/items/nopales_salad_+1.lua +++ b/scripts/items/nopales_salad_+1.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/norg_earring.lua b/scripts/items/norg_earring.lua index 05ad91c5214..1974d0a2050 100644 --- a/scripts/items/norg_earring.lua +++ b/scripts/items/norg_earring.lua @@ -10,8 +10,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.NORG_EARRING, 0, 4) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.NORG_EARRING, duration = 4, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/nosteau_herring.lua b/scripts/items/nosteau_herring.lua index cfe06d9d796..d2802768a89 100644 --- a/scripts/items/nosteau_herring.lua +++ b/scripts/items/nosteau_herring.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/ogre_eel.lua b/scripts/items/ogre_eel.lua index 79d5d3442b3..b0f5134d8ce 100644 --- a/scripts/items/ogre_eel.lua +++ b/scripts/items/ogre_eel.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/ojo_rice_ball.lua b/scripts/items/ojo_rice_ball.lua index 21471af3e41..059e97399c1 100644 --- a/scripts/items/ojo_rice_ball.lua +++ b/scripts/items/ojo_rice_ball.lua @@ -20,7 +20,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/olde_rarab_tail.lua b/scripts/items/olde_rarab_tail.lua index 53bfd53b85c..760be01e2f5 100644 --- a/scripts/items/olde_rarab_tail.lua +++ b/scripts/items/olde_rarab_tail.lua @@ -10,7 +10,7 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) local ID = zones[target:getZoneID()] if @@ -19,7 +19,7 @@ itemObject.onItemUse = function(target) target:getID() == ID.mob.ATORI_TUTORI + 1 or target:getID() == ID.mob.ATORI_TUTORI + 2) then - target:addStatusEffect(xi.effect.TERROR, 1, 3, 90) + target:addStatusEffect(xi.effect.TERROR, { power = 1, duration = 90, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/olduum_ring.lua b/scripts/items/olduum_ring.lua index cb8b3d224fa..81816b8578e 100644 --- a/scripts/items/olduum_ring.lua +++ b/scripts/items/olduum_ring.lua @@ -10,8 +10,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.WAJAOM_LEYPOINT, 0, 3) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.WAJAOM_LEYPOINT, duration = 3, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/omelette_sandwich.lua b/scripts/items/omelette_sandwich.lua index 1527f8b253c..f05ea4ce1e3 100644 --- a/scripts/items/omelette_sandwich.lua +++ b/scripts/items/omelette_sandwich.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/omelette_sandwich_+1.lua b/scripts/items/omelette_sandwich_+1.lua index 27dd7237475..5a21aa62be3 100644 --- a/scripts/items/omelette_sandwich_+1.lua +++ b/scripts/items/omelette_sandwich_+1.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/opo-opo_tart.lua b/scripts/items/opo-opo_tart.lua index d94e900f60f..435b7d96da5 100644 --- a/scripts/items/opo-opo_tart.lua +++ b/scripts/items/opo-opo_tart.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/orange_cake.lua b/scripts/items/orange_cake.lua index e8606d5883e..89c2b5f964a 100644 --- a/scripts/items/orange_cake.lua +++ b/scripts/items/orange_cake.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/orange_kuchen.lua b/scripts/items/orange_kuchen.lua index 9aac3ad2f07..da6687fa05f 100644 --- a/scripts/items/orange_kuchen.lua +++ b/scripts/items/orange_kuchen.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/orange_kuchen_+1.lua b/scripts/items/orange_kuchen_+1.lua index 963d0be1cbb..db598c45a15 100644 --- a/scripts/items/orange_kuchen_+1.lua +++ b/scripts/items/orange_kuchen_+1.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/orange_snow_cone.lua b/scripts/items/orange_snow_cone.lua index ecb71e1dfa7..f3a75ab6986 100644 --- a/scripts/items/orange_snow_cone.lua +++ b/scripts/items/orange_snow_cone.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/pacifist_ring.lua b/scripts/items/pacifist_ring.lua index ace0fdf9657..e53603a11bf 100644 --- a/scripts/items/pacifist_ring.lua +++ b/scripts/items/pacifist_ring.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.PACIFIST_RING) then - target:addStatusEffect(xi.effect.ENMITY_DOWN, 12, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.PACIFIST_RING) + target:addStatusEffect(xi.effect.ENMITY_DOWN, { power = 12, duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.PACIFIST_RING }) end end diff --git a/scripts/items/pair_of_nopales.lua b/scripts/items/pair_of_nopales.lua index b97672d868e..ad62be54de4 100644 --- a/scripts/items/pair_of_nopales.lua +++ b/scripts/items/pair_of_nopales.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/palmers_bangles.lua b/scripts/items/palmers_bangles.lua index e92c8951295..6ab4f785680 100644 --- a/scripts/items/palmers_bangles.lua +++ b/scripts/items/palmers_bangles.lua @@ -7,7 +7,7 @@ ---@type TItem local itemObject = {} -itemObject.onItemCheck = function(target) +itemObject.onItemCheck = function(target, user) if target:getStatusEffectBySource(xi.effect.ENCHANTMENT, xi.effectSourceType.EQUIPPED_ITEM, xi.item.PALMERS_BANGLES) ~= nil then target:delStatusEffect(xi.effect.ENCHANTMENT, nil, xi.effectSourceType.EQUIPPED_ITEM, xi.item.PALMERS_BANGLES) end @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.PALMERS_BANGLES) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.PALMERS_BANGLES) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.PALMERS_BANGLES }) end end diff --git a/scripts/items/pamama_tart.lua b/scripts/items/pamama_tart.lua index 35e03c09b1f..ff610e13192 100644 --- a/scripts/items/pamama_tart.lua +++ b/scripts/items/pamama_tart.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/party_egg.lua b/scripts/items/party_egg.lua index 44f049b5725..463b4eac894 100644 --- a/scripts/items/party_egg.lua +++ b/scripts/items/party_egg.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/pear_crepe.lua b/scripts/items/pear_crepe.lua index e406d0d0a90..bdc7a1058fe 100644 --- a/scripts/items/pear_crepe.lua +++ b/scripts/items/pear_crepe.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/pearlscale.lua b/scripts/items/pearlscale.lua index 142b4b21027..36674d5b970 100644 --- a/scripts/items/pearlscale.lua +++ b/scripts/items/pearlscale.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/pelican_ring.lua b/scripts/items/pelican_ring.lua index 0055e7eea92..cdcbac17a5a 100644 --- a/scripts/items/pelican_ring.lua +++ b/scripts/items/pelican_ring.lua @@ -7,7 +7,7 @@ ----------------------------------- local itemObject = {} -itemObject.onItemCheck = function(target) +itemObject.onItemCheck = function(target, user) local pelicanStacks = target:countEffect(xi.effect.ENCHANTMENT, xi.item.PELICAN_RING) if pelicanStacks >= 2 then @@ -29,7 +29,7 @@ itemObject.onItemUse = function(target, user, item, action) -- Allow for duplicate effects, max 2 if target:countEffect(effect, subType) < 2 then - target:addStatusEffectEx(effect, effect, power, tick, duration, subType, subPower, tier, flag) + target:addStatusEffect(effect, { power = power, duration = duration, origin = user, tick = tick, subType = subType, subPower = subPower, tier = tier, flag = flag }) end end diff --git a/scripts/items/pendragons_belt.lua b/scripts/items/pendragons_belt.lua index 5fd4c93df45..97449b088b8 100644 --- a/scripts/items/pendragons_belt.lua +++ b/scripts/items/pendragons_belt.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.PENDRAGONS_BELT) then - target:addStatusEffect(xi.effect.DEX_BOOST, 10, 0, 60, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.PENDRAGONS_BELT) + target:addStatusEffect(xi.effect.DEX_BOOST, { power = 10, duration = 60, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.PENDRAGONS_BELT }) end end diff --git a/scripts/items/pepperoni_pizza.lua b/scripts/items/pepperoni_pizza.lua index 4b3b7db6853..7542524a948 100644 --- a/scripts/items/pepperoni_pizza.lua +++ b/scripts/items/pepperoni_pizza.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/pepperoni_pizza_+1.lua b/scripts/items/pepperoni_pizza_+1.lua index 710691aa61a..a64274b3603 100644 --- a/scripts/items/pepperoni_pizza_+1.lua +++ b/scripts/items/pepperoni_pizza_+1.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/persikos.lua b/scripts/items/persikos.lua index f765dcc1b2d..25f854cc17d 100644 --- a/scripts/items/persikos.lua +++ b/scripts/items/persikos.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/persikos_snow_cone.lua b/scripts/items/persikos_snow_cone.lua index 2f8c23f7624..e54ab797bbc 100644 --- a/scripts/items/persikos_snow_cone.lua +++ b/scripts/items/persikos_snow_cone.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/phial_of_amnesia_screen.lua b/scripts/items/phial_of_amnesia_screen.lua index 99f8cc998dc..1ccfd0f9a6f 100644 --- a/scripts/items/phial_of_amnesia_screen.lua +++ b/scripts/items/phial_of_amnesia_screen.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.NEGATE_AMNESIA, 1, 0, 120) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.NEGATE_AMNESIA, { power = 1, duration = 120, origin = user }) end return itemObject diff --git a/scripts/items/phial_of_doom_screen.lua b/scripts/items/phial_of_doom_screen.lua index d2f52ce8271..8d970ff8431 100644 --- a/scripts/items/phial_of_doom_screen.lua +++ b/scripts/items/phial_of_doom_screen.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.NEGATE_DOOM, 1, 0, 120) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.NEGATE_DOOM, { power = 1, duration = 120, origin = user }) end return itemObject diff --git a/scripts/items/phial_of_petrify_screen.lua b/scripts/items/phial_of_petrify_screen.lua index 18927bcf28a..fb591aa66be 100644 --- a/scripts/items/phial_of_petrify_screen.lua +++ b/scripts/items/phial_of_petrify_screen.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.NEGATE_PETRIFY, 1, 0, 120) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.NEGATE_PETRIFY, { power = 1, duration = 120, origin = user }) end return itemObject diff --git a/scripts/items/phial_of_poison_screen.lua b/scripts/items/phial_of_poison_screen.lua index 16cdd09dcea..913b050fd73 100644 --- a/scripts/items/phial_of_poison_screen.lua +++ b/scripts/items/phial_of_poison_screen.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.NEGATE_POISON, 1, 0, 120) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.NEGATE_POISON, { power = 1, duration = 120, origin = user }) end return itemObject diff --git a/scripts/items/phial_of_spectral_serum.lua b/scripts/items/phial_of_spectral_serum.lua index 227778a7a4d..820fb4d5ad3 100644 --- a/scripts/items/phial_of_spectral_serum.lua +++ b/scripts/items/phial_of_spectral_serum.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 368, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { power = 368, duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/phial_of_terror_screen.lua b/scripts/items/phial_of_terror_screen.lua index 17b4d5c4f2c..0e22e4ba26f 100644 --- a/scripts/items/phial_of_terror_screen.lua +++ b/scripts/items/phial_of_terror_screen.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.NEGATE_TERROR, 1, 0, 120) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.NEGATE_TERROR, { power = 1, duration = 120, origin = user }) end return itemObject diff --git a/scripts/items/phial_of_volant_serum.lua b/scripts/items/phial_of_volant_serum.lua index 8127b956d62..ba9d4890e11 100644 --- a/scripts/items/phial_of_volant_serum.lua +++ b/scripts/items/phial_of_volant_serum.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 256, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { power = 256, duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/pickled_herring.lua b/scripts/items/pickled_herring.lua index 1f81ebf0b5d..b1defc9e0d5 100644 --- a/scripts/items/pickled_herring.lua +++ b/scripts/items/pickled_herring.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/piece_of_akamochi.lua b/scripts/items/piece_of_akamochi.lua index 6d2235269b3..09b437a6a25 100644 --- a/scripts/items/piece_of_akamochi.lua +++ b/scripts/items/piece_of_akamochi.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/piece_of_akamochi_+1.lua b/scripts/items/piece_of_akamochi_+1.lua index d729d6fcc5d..aa0276caaef 100644 --- a/scripts/items/piece_of_akamochi_+1.lua +++ b/scripts/items/piece_of_akamochi_+1.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/piece_of_bubble_chocolate.lua b/scripts/items/piece_of_bubble_chocolate.lua index 6b871e84d16..f882a5e4ac6 100644 --- a/scripts/items/piece_of_bubble_chocolate.lua +++ b/scripts/items/piece_of_bubble_chocolate.lua @@ -13,7 +13,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/piece_of_cascade_candy.lua b/scripts/items/piece_of_cascade_candy.lua index 019b9bfbee9..8f6ac60a3f0 100644 --- a/scripts/items/piece_of_cascade_candy.lua +++ b/scripts/items/piece_of_cascade_candy.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/piece_of_copse_candy.lua b/scripts/items/piece_of_copse_candy.lua index f0ce8881840..9912f873706 100644 --- a/scripts/items/piece_of_copse_candy.lua +++ b/scripts/items/piece_of_copse_candy.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 2706, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { power = 2706, duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/piece_of_elvaan_mochi.lua b/scripts/items/piece_of_elvaan_mochi.lua index af884ea394c..7171ed332dd 100644 --- a/scripts/items/piece_of_elvaan_mochi.lua +++ b/scripts/items/piece_of_elvaan_mochi.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 154, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { power = 154, duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/piece_of_galka_mochi.lua b/scripts/items/piece_of_galka_mochi.lua index 2faf6c38268..c8f889f35ca 100644 --- a/scripts/items/piece_of_galka_mochi.lua +++ b/scripts/items/piece_of_galka_mochi.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 178, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { power = 178, duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/piece_of_hume_mochi.lua b/scripts/items/piece_of_hume_mochi.lua index 6130be8e799..31584fa79c5 100644 --- a/scripts/items/piece_of_hume_mochi.lua +++ b/scripts/items/piece_of_hume_mochi.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 114, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { power = 114, duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/piece_of_kusamochi.lua b/scripts/items/piece_of_kusamochi.lua index f7e789672c9..41f1c41673f 100644 --- a/scripts/items/piece_of_kusamochi.lua +++ b/scripts/items/piece_of_kusamochi.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/piece_of_kusamochi_+1.lua b/scripts/items/piece_of_kusamochi_+1.lua index 81135a6392a..29a83cef5ae 100644 --- a/scripts/items/piece_of_kusamochi_+1.lua +++ b/scripts/items/piece_of_kusamochi_+1.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/piece_of_metal_slime_candy.lua b/scripts/items/piece_of_metal_slime_candy.lua index d87f92a80b3..8a29eef2c6b 100644 --- a/scripts/items/piece_of_metal_slime_candy.lua +++ b/scripts/items/piece_of_metal_slime_candy.lua @@ -5,12 +5,12 @@ ----------------------------------- local itemObject = {} -itemObject.onItemCheck = function(target) +itemObject.onItemCheck = function(target, user) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 0, 0, 10000, 6189) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { duration = 10000, origin = user, subType = 6189 }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/piece_of_raisin_bread.lua b/scripts/items/piece_of_raisin_bread.lua index 93275d2c355..6d4b612b918 100644 --- a/scripts/items/piece_of_raisin_bread.lua +++ b/scripts/items/piece_of_raisin_bread.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/piece_of_she-slime_candy.lua b/scripts/items/piece_of_she-slime_candy.lua index 955774c7713..f8c4a50a18e 100644 --- a/scripts/items/piece_of_she-slime_candy.lua +++ b/scripts/items/piece_of_she-slime_candy.lua @@ -5,12 +5,12 @@ ----------------------------------- local itemObject = {} -itemObject.onItemCheck = function(target) +itemObject.onItemCheck = function(target, user) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 0, 0, 10000, 6188) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { duration = 10000, origin = user, subType = 6188 }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/piece_of_shiromochi.lua b/scripts/items/piece_of_shiromochi.lua index 90ab6be7109..554ded26f2d 100644 --- a/scripts/items/piece_of_shiromochi.lua +++ b/scripts/items/piece_of_shiromochi.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/piece_of_shiromochi_+1.lua b/scripts/items/piece_of_shiromochi_+1.lua index 2535048d697..ab20beaaecc 100644 --- a/scripts/items/piece_of_shiromochi_+1.lua +++ b/scripts/items/piece_of_shiromochi_+1.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/piece_of_slimeulation_candy.lua b/scripts/items/piece_of_slimeulation_candy.lua index 87fea7da2c4..52e6e2be7b4 100644 --- a/scripts/items/piece_of_slimeulation_candy.lua +++ b/scripts/items/piece_of_slimeulation_candy.lua @@ -5,12 +5,12 @@ ----------------------------------- local itemObject = {} -itemObject.onItemCheck = function(target) +itemObject.onItemCheck = function(target, user) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 0, 0, 10000, 6187) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { duration = 10000, origin = user, subType = 6187 }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/piece_of_tarutaru_mochi.lua b/scripts/items/piece_of_tarutaru_mochi.lua index f76cc8c612e..fc3915c9df6 100644 --- a/scripts/items/piece_of_tarutaru_mochi.lua +++ b/scripts/items/piece_of_tarutaru_mochi.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 822, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { power = 822, duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/piece_of_witch_nougat.lua b/scripts/items/piece_of_witch_nougat.lua index e51fd8d8549..86bfa562fc6 100644 --- a/scripts/items/piece_of_witch_nougat.lua +++ b/scripts/items/piece_of_witch_nougat.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/piercing_dagger.lua b/scripts/items/piercing_dagger.lua index ea0c62e2f05..7cf43ca673b 100644 --- a/scripts/items/piercing_dagger.lua +++ b/scripts/items/piercing_dagger.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.PIERCING_DAGGER) then - target:addStatusEffect(xi.effect.ATTACK_BOOST, 3, 0, 1800, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.PIERCING_DAGGER) + target:addStatusEffect(xi.effect.ATTACK_BOOST, { power = 3, duration = 1800, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.PIERCING_DAGGER }) end end diff --git a/scripts/items/pinch_of_prism_powder.lua b/scripts/items/pinch_of_prism_powder.lua index 39a74eabf2f..4adbb96ba79 100644 --- a/scripts/items/pinch_of_prism_powder.lua +++ b/scripts/items/pinch_of_prism_powder.lua @@ -10,12 +10,12 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasStatusEffect(xi.effect.INVISIBLE) then target:delStatusEffect(xi.effect.INVISIBLE) end - target:addStatusEffect(xi.effect.INVISIBLE, 1, 10, math.floor(600 * xi.settings.main.SNEAK_INVIS_DURATION_MULTIPLIER)) + target:addStatusEffect(xi.effect.INVISIBLE, { power = 1, duration = math.floor(600 * xi.settings.main.SNEAK_INVIS_DURATION_MULTIPLIER), origin = user, tick = 10 }) end return itemObject diff --git a/scripts/items/pinch_of_rainbow_powder.lua b/scripts/items/pinch_of_rainbow_powder.lua index bef20c0bf36..d0a03c78068 100644 --- a/scripts/items/pinch_of_rainbow_powder.lua +++ b/scripts/items/pinch_of_rainbow_powder.lua @@ -11,12 +11,12 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasStatusEffect(xi.effect.INVISIBLE) then target:delStatusEffect(xi.effect.INVISIBLE) end - target:addStatusEffect(xi.effect.INVISIBLE, 1, 10, math.floor(600 * xi.settings.main.SNEAK_INVIS_DURATION_MULTIPLIER)) + target:addStatusEffect(xi.effect.INVISIBLE, { power = 1, duration = math.floor(600 * xi.settings.main.SNEAK_INVIS_DURATION_MULTIPLIER), origin = user, tick = 10 }) end return itemObject diff --git a/scripts/items/pipin_hot_popoto.lua b/scripts/items/pipin_hot_popoto.lua index 03c81a06927..1c2d4443397 100644 --- a/scripts/items/pipin_hot_popoto.lua +++ b/scripts/items/pipin_hot_popoto.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/pipira.lua b/scripts/items/pipira.lua index 2560fee8d8b..7f654e25108 100644 --- a/scripts/items/pipira.lua +++ b/scripts/items/pipira.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/piscators_skewer.lua b/scripts/items/piscators_skewer.lua index cf8eeea4a77..ab22c2d8416 100644 --- a/scripts/items/piscators_skewer.lua +++ b/scripts/items/piscators_skewer.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/pitcher_of_homemade_herbal_tea.lua b/scripts/items/pitcher_of_homemade_herbal_tea.lua index 234fecc5d3a..e588acbea0b 100644 --- a/scripts/items/pitcher_of_homemade_herbal_tea.lua +++ b/scripts/items/pitcher_of_homemade_herbal_tea.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_anchovies.lua b/scripts/items/plate_of_anchovies.lua index bb938fa84dc..53bdc307a0a 100644 --- a/scripts/items/plate_of_anchovies.lua +++ b/scripts/items/plate_of_anchovies.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 180, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 180, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_barnacle_paella.lua b/scripts/items/plate_of_barnacle_paella.lua index 3b4457641f0..0e633586a85 100644 --- a/scripts/items/plate_of_barnacle_paella.lua +++ b/scripts/items/plate_of_barnacle_paella.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_beef_paella.lua b/scripts/items/plate_of_beef_paella.lua index 10b79f25649..916ea8972db 100644 --- a/scripts/items/plate_of_beef_paella.lua +++ b/scripts/items/plate_of_beef_paella.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_beef_paella_+1.lua b/scripts/items/plate_of_beef_paella_+1.lua index c08d51835d5..ea6be923610 100644 --- a/scripts/items/plate_of_beef_paella_+1.lua +++ b/scripts/items/plate_of_beef_paella_+1.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_boiled_barnacles.lua b/scripts/items/plate_of_boiled_barnacles.lua index ce544ba081b..bb60b5e5190 100644 --- a/scripts/items/plate_of_boiled_barnacles.lua +++ b/scripts/items/plate_of_boiled_barnacles.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_boiled_barnacles_+1.lua b/scripts/items/plate_of_boiled_barnacles_+1.lua index 592fc19b77b..fe8ed2f42fb 100644 --- a/scripts/items/plate_of_boiled_barnacles_+1.lua +++ b/scripts/items/plate_of_boiled_barnacles_+1.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_bream_risotto.lua b/scripts/items/plate_of_bream_risotto.lua index b9200eeb04a..cdd98d46bdb 100644 --- a/scripts/items/plate_of_bream_risotto.lua +++ b/scripts/items/plate_of_bream_risotto.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_bream_sushi.lua b/scripts/items/plate_of_bream_sushi.lua index b0bd607eecb..e7cb5890a11 100644 --- a/scripts/items/plate_of_bream_sushi.lua +++ b/scripts/items/plate_of_bream_sushi.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_bream_sushi_+1.lua b/scripts/items/plate_of_bream_sushi_+1.lua index 581cdd616a2..9e27186b454 100644 --- a/scripts/items/plate_of_bream_sushi_+1.lua +++ b/scripts/items/plate_of_bream_sushi_+1.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_coeurl_saute.lua b/scripts/items/plate_of_coeurl_saute.lua index df80bd866cf..aaa41dcd09d 100644 --- a/scripts/items/plate_of_coeurl_saute.lua +++ b/scripts/items/plate_of_coeurl_saute.lua @@ -21,7 +21,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_crab_sushi.lua b/scripts/items/plate_of_crab_sushi.lua index d935cf1e92f..c41e4c46cd1 100644 --- a/scripts/items/plate_of_crab_sushi.lua +++ b/scripts/items/plate_of_crab_sushi.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_crab_sushi_+1.lua b/scripts/items/plate_of_crab_sushi_+1.lua index 737db29c4e6..c58aae64ece 100644 --- a/scripts/items/plate_of_crab_sushi_+1.lua +++ b/scripts/items/plate_of_crab_sushi_+1.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_dorado_sushi.lua b/scripts/items/plate_of_dorado_sushi.lua index cb09295f90a..f14dc33df7b 100644 --- a/scripts/items/plate_of_dorado_sushi.lua +++ b/scripts/items/plate_of_dorado_sushi.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_dorado_sushi_+1.lua b/scripts/items/plate_of_dorado_sushi_+1.lua index 9718ffee4fb..9c7737b0a6f 100644 --- a/scripts/items/plate_of_dorado_sushi_+1.lua +++ b/scripts/items/plate_of_dorado_sushi_+1.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_dulcet_panettones.lua b/scripts/items/plate_of_dulcet_panettones.lua index 54c2e045743..f75c284e5a0 100644 --- a/scripts/items/plate_of_dulcet_panettones.lua +++ b/scripts/items/plate_of_dulcet_panettones.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_fatty_tuna_sushi.lua b/scripts/items/plate_of_fatty_tuna_sushi.lua index cb48ac27b40..7347aaadd16 100644 --- a/scripts/items/plate_of_fatty_tuna_sushi.lua +++ b/scripts/items/plate_of_fatty_tuna_sushi.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_felicifruit_gelatin.lua b/scripts/items/plate_of_felicifruit_gelatin.lua index b6b2334d760..366e1c39ff5 100644 --- a/scripts/items/plate_of_felicifruit_gelatin.lua +++ b/scripts/items/plate_of_felicifruit_gelatin.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_fin_sushi.lua b/scripts/items/plate_of_fin_sushi.lua index 1848308ade1..985ca0e5366 100644 --- a/scripts/items/plate_of_fin_sushi.lua +++ b/scripts/items/plate_of_fin_sushi.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_fin_sushi_+1.lua b/scripts/items/plate_of_fin_sushi_+1.lua index 876fdf0dd11..bd3f59cc11f 100644 --- a/scripts/items/plate_of_fin_sushi_+1.lua +++ b/scripts/items/plate_of_fin_sushi_+1.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_fish_and_chips.lua b/scripts/items/plate_of_fish_and_chips.lua index f0d0d17097d..48018ad2792 100644 --- a/scripts/items/plate_of_fish_and_chips.lua +++ b/scripts/items/plate_of_fish_and_chips.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_flapanos_paella.lua b/scripts/items/plate_of_flapanos_paella.lua index 4ed6d9b1b1d..3467864f8a5 100644 --- a/scripts/items/plate_of_flapanos_paella.lua +++ b/scripts/items/plate_of_flapanos_paella.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_friture_de_la_misareaux.lua b/scripts/items/plate_of_friture_de_la_misareaux.lua index c8163c57e34..79cb9a01390 100644 --- a/scripts/items/plate_of_friture_de_la_misareaux.lua +++ b/scripts/items/plate_of_friture_de_la_misareaux.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_homemade_risotto.lua b/scripts/items/plate_of_homemade_risotto.lua index 313bdeae116..ceeb0ad0ff7 100644 --- a/scripts/items/plate_of_homemade_risotto.lua +++ b/scripts/items/plate_of_homemade_risotto.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_homemade_salad.lua b/scripts/items/plate_of_homemade_salad.lua index 2aa3ecf2789..b02fb26aeb6 100644 --- a/scripts/items/plate_of_homemade_salad.lua +++ b/scripts/items/plate_of_homemade_salad.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_ic_pilav.lua b/scripts/items/plate_of_ic_pilav.lua index 3eb2ad8d6cc..efa0fe036ac 100644 --- a/scripts/items/plate_of_ic_pilav.lua +++ b/scripts/items/plate_of_ic_pilav.lua @@ -22,7 +22,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_ic_pilav_+1.lua b/scripts/items/plate_of_ic_pilav_+1.lua index 052ff2ac34a..7e7be716cd9 100644 --- a/scripts/items/plate_of_ic_pilav_+1.lua +++ b/scripts/items/plate_of_ic_pilav_+1.lua @@ -22,7 +22,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_ikra_gunkan.lua b/scripts/items/plate_of_ikra_gunkan.lua index 81fd77e9ad9..9a054b0e891 100644 --- a/scripts/items/plate_of_ikra_gunkan.lua +++ b/scripts/items/plate_of_ikra_gunkan.lua @@ -20,7 +20,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_ikra_gunkan_+1.lua b/scripts/items/plate_of_ikra_gunkan_+1.lua index e8e21836085..1d454e06713 100644 --- a/scripts/items/plate_of_ikra_gunkan_+1.lua +++ b/scripts/items/plate_of_ikra_gunkan_+1.lua @@ -20,7 +20,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_mushroom_paella.lua b/scripts/items/plate_of_mushroom_paella.lua index efa6c941f34..fa1c67738a4 100644 --- a/scripts/items/plate_of_mushroom_paella.lua +++ b/scripts/items/plate_of_mushroom_paella.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_mushroom_paella_+1.lua b/scripts/items/plate_of_mushroom_paella_+1.lua index 99c3ed01b7e..d34f40ff333 100644 --- a/scripts/items/plate_of_mushroom_paella_+1.lua +++ b/scripts/items/plate_of_mushroom_paella_+1.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_mushroom_risotto.lua b/scripts/items/plate_of_mushroom_risotto.lua index f58fe7febcb..7911ded49f9 100644 --- a/scripts/items/plate_of_mushroom_risotto.lua +++ b/scripts/items/plate_of_mushroom_risotto.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_octopus_sushi.lua b/scripts/items/plate_of_octopus_sushi.lua index b9881dcd7c4..ce64a354f7f 100644 --- a/scripts/items/plate_of_octopus_sushi.lua +++ b/scripts/items/plate_of_octopus_sushi.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_octopus_sushi_+1.lua b/scripts/items/plate_of_octopus_sushi_+1.lua index 71f94a58003..1a11f17c46e 100644 --- a/scripts/items/plate_of_octopus_sushi_+1.lua +++ b/scripts/items/plate_of_octopus_sushi_+1.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_patlican_salata.lua b/scripts/items/plate_of_patlican_salata.lua index 7f7c336dd40..17b18278556 100644 --- a/scripts/items/plate_of_patlican_salata.lua +++ b/scripts/items/plate_of_patlican_salata.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_patlican_salata_+1.lua b/scripts/items/plate_of_patlican_salata_+1.lua index d461df71715..ce059ed23f6 100644 --- a/scripts/items/plate_of_patlican_salata_+1.lua +++ b/scripts/items/plate_of_patlican_salata_+1.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_piscators_paella.lua b/scripts/items/plate_of_piscators_paella.lua index a5c0d8db201..45ee5d7d934 100644 --- a/scripts/items/plate_of_piscators_paella.lua +++ b/scripts/items/plate_of_piscators_paella.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_ratatouille.lua b/scripts/items/plate_of_ratatouille.lua index 0369790a072..0b3de3f71e3 100644 --- a/scripts/items/plate_of_ratatouille.lua +++ b/scripts/items/plate_of_ratatouille.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_ratatouille_+1.lua b/scripts/items/plate_of_ratatouille_+1.lua index 372d4348c85..a427fd6135f 100644 --- a/scripts/items/plate_of_ratatouille_+1.lua +++ b/scripts/items/plate_of_ratatouille_+1.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_royal_saute.lua b/scripts/items/plate_of_royal_saute.lua index a0ddf66a3de..83a024a7bef 100644 --- a/scripts/items/plate_of_royal_saute.lua +++ b/scripts/items/plate_of_royal_saute.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_salmon_sushi.lua b/scripts/items/plate_of_salmon_sushi.lua index 0907a582ad8..8ad024a4ce5 100644 --- a/scripts/items/plate_of_salmon_sushi.lua +++ b/scripts/items/plate_of_salmon_sushi.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_salmon_sushi_+1.lua b/scripts/items/plate_of_salmon_sushi_+1.lua index 5e237b7dbbb..a818d0ac8b6 100644 --- a/scripts/items/plate_of_salmon_sushi_+1.lua +++ b/scripts/items/plate_of_salmon_sushi_+1.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_sea_spray_risotto.lua b/scripts/items/plate_of_sea_spray_risotto.lua index 057b68f8762..bc7bffb8f01 100644 --- a/scripts/items/plate_of_sea_spray_risotto.lua +++ b/scripts/items/plate_of_sea_spray_risotto.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_seafood_paella.lua b/scripts/items/plate_of_seafood_paella.lua index 1340c463604..5e38d84cd43 100644 --- a/scripts/items/plate_of_seafood_paella.lua +++ b/scripts/items/plate_of_seafood_paella.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_shrimp_sushi.lua b/scripts/items/plate_of_shrimp_sushi.lua index 4145ffbfa01..6fe5a47948b 100644 --- a/scripts/items/plate_of_shrimp_sushi.lua +++ b/scripts/items/plate_of_shrimp_sushi.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_shrimp_sushi_+1.lua b/scripts/items/plate_of_shrimp_sushi_+1.lua index 1a3078c63ee..27e2a076363 100644 --- a/scripts/items/plate_of_shrimp_sushi_+1.lua +++ b/scripts/items/plate_of_shrimp_sushi_+1.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_sole_sushi.lua b/scripts/items/plate_of_sole_sushi.lua index 8889a4fee85..a8ba2d729c7 100644 --- a/scripts/items/plate_of_sole_sushi.lua +++ b/scripts/items/plate_of_sole_sushi.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_sole_sushi_+1.lua b/scripts/items/plate_of_sole_sushi_+1.lua index 817e039a0b4..8c9b74e3894 100644 --- a/scripts/items/plate_of_sole_sushi_+1.lua +++ b/scripts/items/plate_of_sole_sushi_+1.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_squid_sushi.lua b/scripts/items/plate_of_squid_sushi.lua index 29ac2496acd..68683db8374 100644 --- a/scripts/items/plate_of_squid_sushi.lua +++ b/scripts/items/plate_of_squid_sushi.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_squid_sushi_+1.lua b/scripts/items/plate_of_squid_sushi_+1.lua index a3a6dda21b3..8f750fd8088 100644 --- a/scripts/items/plate_of_squid_sushi_+1.lua +++ b/scripts/items/plate_of_squid_sushi_+1.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_sublime_sushi.lua b/scripts/items/plate_of_sublime_sushi.lua index 6ee44ac3199..e0409a189d5 100644 --- a/scripts/items/plate_of_sublime_sushi.lua +++ b/scripts/items/plate_of_sublime_sushi.lua @@ -21,7 +21,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_sublime_sushi_+1.lua b/scripts/items/plate_of_sublime_sushi_+1.lua index 4873cfdb065..509ea543481 100644 --- a/scripts/items/plate_of_sublime_sushi_+1.lua +++ b/scripts/items/plate_of_sublime_sushi_+1.lua @@ -21,7 +21,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_tentacle_sushi.lua b/scripts/items/plate_of_tentacle_sushi.lua index 8fea6c4c5cc..ac018606b4c 100644 --- a/scripts/items/plate_of_tentacle_sushi.lua +++ b/scripts/items/plate_of_tentacle_sushi.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_tentacle_sushi_+1.lua b/scripts/items/plate_of_tentacle_sushi_+1.lua index a7739ee699c..eecd086392b 100644 --- a/scripts/items/plate_of_tentacle_sushi_+1.lua +++ b/scripts/items/plate_of_tentacle_sushi_+1.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_tuna_sushi.lua b/scripts/items/plate_of_tuna_sushi.lua index 5029736ce35..b1f8980ea7c 100644 --- a/scripts/items/plate_of_tuna_sushi.lua +++ b/scripts/items/plate_of_tuna_sushi.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_urchin_sushi.lua b/scripts/items/plate_of_urchin_sushi.lua index 0aeca0117d8..980a497da9e 100644 --- a/scripts/items/plate_of_urchin_sushi.lua +++ b/scripts/items/plate_of_urchin_sushi.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_urchin_sushi_+1.lua b/scripts/items/plate_of_urchin_sushi_+1.lua index 990323f50cf..d1d4692e7eb 100644 --- a/scripts/items/plate_of_urchin_sushi_+1.lua +++ b/scripts/items/plate_of_urchin_sushi_+1.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_vegan_saute.lua b/scripts/items/plate_of_vegan_saute.lua index 80d6e65fee2..e7e12b9aae3 100644 --- a/scripts/items/plate_of_vegan_saute.lua +++ b/scripts/items/plate_of_vegan_saute.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_witch_risotto.lua b/scripts/items/plate_of_witch_risotto.lua index 8a20321d5c9..48e9a00c833 100644 --- a/scripts/items/plate_of_witch_risotto.lua +++ b/scripts/items/plate_of_witch_risotto.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/plate_of_yahata-style_carp_sushi.lua b/scripts/items/plate_of_yahata-style_carp_sushi.lua index deca61ec894..1a5cc45e4c8 100644 --- a/scripts/items/plate_of_yahata-style_carp_sushi.lua +++ b/scripts/items/plate_of_yahata-style_carp_sushi.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/pogaca.lua b/scripts/items/pogaca.lua index 5c9f52a398a..139f09ab282 100644 --- a/scripts/items/pogaca.lua +++ b/scripts/items/pogaca.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 180, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 180, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/pogaca_+1.lua b/scripts/items/pogaca_+1.lua index d63a91a7ba3..e9613aaf4e5 100644 --- a/scripts/items/pogaca_+1.lua +++ b/scripts/items/pogaca_+1.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/porcupine_pie.lua b/scripts/items/porcupine_pie.lua index 4ef3ed6b3a3..d3236b5f479 100644 --- a/scripts/items/porcupine_pie.lua +++ b/scripts/items/porcupine_pie.lua @@ -22,7 +22,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/pork_cutlet.lua b/scripts/items/pork_cutlet.lua index 11b507587c0..984f39415c7 100644 --- a/scripts/items/pork_cutlet.lua +++ b/scripts/items/pork_cutlet.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/pork_cutlet_+1.lua b/scripts/items/pork_cutlet_+1.lua index 57a3f0c2585..368e2227643 100644 --- a/scripts/items/pork_cutlet_+1.lua +++ b/scripts/items/pork_cutlet_+1.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/pork_cutlet_rice_bowl.lua b/scripts/items/pork_cutlet_rice_bowl.lua index 2d3e15dbd02..6003f279881 100644 --- a/scripts/items/pork_cutlet_rice_bowl.lua +++ b/scripts/items/pork_cutlet_rice_bowl.lua @@ -22,7 +22,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/pork_cutlet_rice_bowl_+1.lua b/scripts/items/pork_cutlet_rice_bowl_+1.lua index c6c9bf67b68..eb3a48543c5 100644 --- a/scripts/items/pork_cutlet_rice_bowl_+1.lua +++ b/scripts/items/pork_cutlet_rice_bowl_+1.lua @@ -22,7 +22,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/pot-au-feu.lua b/scripts/items/pot-au-feu.lua index f9489c0dd93..1af7ac3af6e 100644 --- a/scripts/items/pot-au-feu.lua +++ b/scripts/items/pot-au-feu.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/pot-au-feu_+1.lua b/scripts/items/pot-au-feu_+1.lua index 38edda7673d..a41711b4fbc 100644 --- a/scripts/items/pot-au-feu_+1.lua +++ b/scripts/items/pot-au-feu_+1.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/pot_of_honey.lua b/scripts/items/pot_of_honey.lua index 5e20363d512..a768b22f0b6 100644 --- a/scripts/items/pot_of_honey.lua +++ b/scripts/items/pot_of_honey.lua @@ -13,7 +13,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/pot_of_royal_tea.lua b/scripts/items/pot_of_royal_tea.lua index d5a1062da09..54946503433 100644 --- a/scripts/items/pot_of_royal_tea.lua +++ b/scripts/items/pot_of_royal_tea.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/pot_of_san_dorian_tea.lua b/scripts/items/pot_of_san_dorian_tea.lua index 6c08f0dea74..22cb9b2bd51 100644 --- a/scripts/items/pot_of_san_dorian_tea.lua +++ b/scripts/items/pot_of_san_dorian_tea.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/pot_of_silent_oil.lua b/scripts/items/pot_of_silent_oil.lua index 0cf1265a346..1f383d7f027 100644 --- a/scripts/items/pot_of_silent_oil.lua +++ b/scripts/items/pot_of_silent_oil.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.SNEAK) then - target:addStatusEffect(xi.effect.SNEAK, 1, 10, math.floor(600 * xi.settings.main.SNEAK_INVIS_DURATION_MULTIPLIER)) + target:addStatusEffect(xi.effect.SNEAK, { power = 1, duration = math.floor(600 * xi.settings.main.SNEAK_INVIS_DURATION_MULTIPLIER), origin = user, tick = 10 }) end end diff --git a/scripts/items/pot_of_white_honey.lua b/scripts/items/pot_of_white_honey.lua index 4aeba0a77ba..b6ca7887e6f 100644 --- a/scripts/items/pot_of_white_honey.lua +++ b/scripts/items/pot_of_white_honey.lua @@ -13,7 +13,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/poultry_pitaru.lua b/scripts/items/poultry_pitaru.lua index 940932bea75..f8116292919 100644 --- a/scripts/items/poultry_pitaru.lua +++ b/scripts/items/poultry_pitaru.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/powder_boots.lua b/scripts/items/powder_boots.lua index 2288bb2a50b..eacc6daec48 100644 --- a/scripts/items/powder_boots.lua +++ b/scripts/items/powder_boots.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) target:delStatusEffect(xi.effect.FLEE) - target:addStatusEffect(xi.effect.FLEE, 10000, 0, 30) + target:addStatusEffect(xi.effect.FLEE, { power = 10000, duration = 30, origin = user }) end return itemObject diff --git a/scripts/items/prime_angler_stewpot.lua b/scripts/items/prime_angler_stewpot.lua index b1bba6e4998..ce6caeda98e 100644 --- a/scripts/items/prime_angler_stewpot.lua +++ b/scripts/items/prime_angler_stewpot.lua @@ -22,7 +22,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/prime_beef_stewpot.lua b/scripts/items/prime_beef_stewpot.lua index 5379eaa3380..c678711c0b9 100644 --- a/scripts/items/prime_beef_stewpot.lua +++ b/scripts/items/prime_beef_stewpot.lua @@ -22,7 +22,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/prime_crab_stewpot.lua b/scripts/items/prime_crab_stewpot.lua index 540e816fbec..e84a221d49f 100644 --- a/scripts/items/prime_crab_stewpot.lua +++ b/scripts/items/prime_crab_stewpot.lua @@ -22,7 +22,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/prime_seafood_stewpot.lua b/scripts/items/prime_seafood_stewpot.lua index 356b65af05b..c2cc5eb2345 100644 --- a/scripts/items/prime_seafood_stewpot.lua +++ b/scripts/items/prime_seafood_stewpot.lua @@ -24,7 +24,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/prize_angler_stewpot.lua b/scripts/items/prize_angler_stewpot.lua index fbc84a59f8c..42b71ce74cf 100644 --- a/scripts/items/prize_angler_stewpot.lua +++ b/scripts/items/prize_angler_stewpot.lua @@ -22,7 +22,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/prized_beef_stewpot.lua b/scripts/items/prized_beef_stewpot.lua index 1e1451dfb5d..96caca7cd05 100644 --- a/scripts/items/prized_beef_stewpot.lua +++ b/scripts/items/prized_beef_stewpot.lua @@ -22,7 +22,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/prized_crab_stewpot.lua b/scripts/items/prized_crab_stewpot.lua index ff2189a709f..dba3541f527 100644 --- a/scripts/items/prized_crab_stewpot.lua +++ b/scripts/items/prized_crab_stewpot.lua @@ -22,7 +22,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/prized_seafood_stewpot.lua b/scripts/items/prized_seafood_stewpot.lua index f257f71c23d..3026be7c4f3 100644 --- a/scripts/items/prized_seafood_stewpot.lua +++ b/scripts/items/prized_seafood_stewpot.lua @@ -24,7 +24,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/pro-ether.lua b/scripts/items/pro-ether.lua index 6387dde4f5f..e79b8f9be04 100644 --- a/scripts/items/pro-ether.lua +++ b/scripts/items/pro-ether.lua @@ -16,9 +16,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) target:messageBasic(xi.msg.basic.RECOVERS_MP, 0, target:addMP(250 * xi.settings.main.ITEM_POWER)) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 900) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 900, origin = user }) end return itemObject diff --git a/scripts/items/pro-ether_+1.lua b/scripts/items/pro-ether_+1.lua index d07e5f44e8b..bd1119e57e1 100644 --- a/scripts/items/pro-ether_+1.lua +++ b/scripts/items/pro-ether_+1.lua @@ -16,9 +16,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) target:messageBasic(xi.msg.basic.RECOVERS_MP, 0, target:addMP(280 * xi.settings.main.ITEM_POWER)) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 900) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 900, origin = user }) end return itemObject diff --git a/scripts/items/pro-ether_+2.lua b/scripts/items/pro-ether_+2.lua index 47f9fdc1ad8..edb8b0dfb72 100644 --- a/scripts/items/pro-ether_+2.lua +++ b/scripts/items/pro-ether_+2.lua @@ -16,9 +16,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) target:messageBasic(xi.msg.basic.RECOVERS_MP, 0, target:addMP(310 * xi.settings.main.ITEM_POWER)) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 900) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 900, origin = user }) end return itemObject diff --git a/scripts/items/pro-ether_+3.lua b/scripts/items/pro-ether_+3.lua index f7691ca89e2..3f3e2e5f7f3 100644 --- a/scripts/items/pro-ether_+3.lua +++ b/scripts/items/pro-ether_+3.lua @@ -16,9 +16,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) target:messageBasic(xi.msg.basic.RECOVERS_MP, 0, target:addMP(350 * xi.settings.main.ITEM_POWER)) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 900) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 900, origin = user }) end return itemObject diff --git a/scripts/items/prominence_axe.lua b/scripts/items/prominence_axe.lua index 5c35f9f69c4..0e7b67ad4d2 100644 --- a/scripts/items/prominence_axe.lua +++ b/scripts/items/prominence_axe.lua @@ -7,7 +7,7 @@ ---@type TItem local itemObject = {} -itemObject.onItemCheck = function(target) +itemObject.onItemCheck = function(target, user) if target:getStatusEffectBySource(xi.effect.ENFIRE, xi.effectSourceType.EQUIPPED_ITEM, xi.item.PROMINENCE_AXE) ~= nil then target:delStatusEffect(xi.effect.ENFIRE, nil, xi.effectSourceType.EQUIPPED_ITEM, xi.item.PROMINENCE_AXE) end @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.PROMINENCE_AXE) then local effect = xi.effect.ENFIRE local magicskill = target:getSkillLevel(xi.skill.ENHANCING_MAGIC) @@ -29,7 +29,7 @@ itemObject.onItemUse = function(target) potency = utils.clamp(potency, 3, 25) - target:addStatusEffect(effect, potency, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.PROMINENCE_AXE) + target:addStatusEffect(effect, { power = potency, duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.PROMINENCE_AXE }) end end diff --git a/scripts/items/prominense_sword.lua b/scripts/items/prominense_sword.lua index ce3376f1a13..375027897ca 100644 --- a/scripts/items/prominense_sword.lua +++ b/scripts/items/prominense_sword.lua @@ -7,7 +7,7 @@ ---@type TItem local itemObject = {} -itemObject.onItemCheck = function(target) +itemObject.onItemCheck = function(target, user) if target:getStatusEffectBySource(xi.effect.ENFIRE, xi.effectSourceType.EQUIPPED_ITEM, xi.item.PROMINENCE_SWORD) ~= nil then target:delStatusEffect(xi.effect.ENFIRE, nil, xi.effectSourceType.EQUIPPED_ITEM, xi.item.PROMINENCE_SWORD) end @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.PROMINENCE_SWORD) then local effect = xi.effect.ENFIRE local magicskill = target:getSkillLevel(xi.skill.ENHANCING_MAGIC) @@ -29,7 +29,7 @@ itemObject.onItemUse = function(target) potency = utils.clamp(potency, 3, 25) - target:addStatusEffect(effect, potency, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.PROMINENCE_SWORD) + target:addStatusEffect(effect, { power = potency, duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.PROMINENCE_SWORD }) end end diff --git a/scripts/items/protect_earring.lua b/scripts/items/protect_earring.lua index 81593f5c958..fb8bf51aee8 100644 --- a/scripts/items/protect_earring.lua +++ b/scripts/items/protect_earring.lua @@ -10,7 +10,7 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) local power = 20 local tier = 1 local bonus = 0 @@ -20,7 +20,7 @@ itemObject.onItemUse = function(target) power = power + (bonus * tier) - if target:addStatusEffect(xi.effect.PROTECT, power, 0, 1800, 0, 0, tier) then + if target:addStatusEffect(xi.effect.PROTECT, { power = power, duration = 1800, origin = user, tier = tier }) then target:messageBasic(xi.msg.basic.GAINS_EFFECT_OF_STATUS, xi.effect.PROTECT) else target:messageBasic(xi.msg.basic.NO_EFFECT) diff --git a/scripts/items/protect_ring.lua b/scripts/items/protect_ring.lua index 14b0d331a9b..750fe973fe8 100644 --- a/scripts/items/protect_ring.lua +++ b/scripts/items/protect_ring.lua @@ -10,7 +10,7 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) local power = 50 local tier = 2 local bonus = 0 @@ -20,7 +20,7 @@ itemObject.onItemUse = function(target) power = power + (bonus * tier) - if target:addStatusEffect(xi.effect.PROTECT, power, 0, 1800, 0, 0, tier) then + if target:addStatusEffect(xi.effect.PROTECT, { power = power, duration = 1800, origin = user, tier = tier }) then target:messageBasic(xi.msg.basic.GAINS_EFFECT_OF_STATUS, xi.effect.PROTECT) else target:messageBasic(xi.msg.basic.NO_EFFECT) diff --git a/scripts/items/puffball.lua b/scripts/items/puffball.lua index 480b77c7674..122c58bae74 100644 --- a/scripts/items/puffball.lua +++ b/scripts/items/puffball.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/puk_egg.lua b/scripts/items/puk_egg.lua index dc67b22f047..71a433fccaa 100644 --- a/scripts/items/puk_egg.lua +++ b/scripts/items/puk_egg.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/pukatrice_egg.lua b/scripts/items/pukatrice_egg.lua index d54cc5f985d..1c5ba211e08 100644 --- a/scripts/items/pukatrice_egg.lua +++ b/scripts/items/pukatrice_egg.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/pukatrice_egg_+1.lua b/scripts/items/pukatrice_egg_+1.lua index 1d89a3864f7..d9116ee6698 100644 --- a/scripts/items/pukatrice_egg_+1.lua +++ b/scripts/items/pukatrice_egg_+1.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/pumpkin_cake.lua b/scripts/items/pumpkin_cake.lua index 48fce620d3b..e0ba66ab38a 100644 --- a/scripts/items/pumpkin_cake.lua +++ b/scripts/items/pumpkin_cake.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/pumpkin_pie.lua b/scripts/items/pumpkin_pie.lua index 1ea869b51cd..092e23071a6 100644 --- a/scripts/items/pumpkin_pie.lua +++ b/scripts/items/pumpkin_pie.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/pumpkin_pie_+1.lua b/scripts/items/pumpkin_pie_+1.lua index b9b2588d17a..ca4efde8172 100644 --- a/scripts/items/pumpkin_pie_+1.lua +++ b/scripts/items/pumpkin_pie_+1.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/purgatory_collar.lua b/scripts/items/purgatory_collar.lua index 28724dfec59..81ce8edeac9 100644 --- a/scripts/items/purgatory_collar.lua +++ b/scripts/items/purgatory_collar.lua @@ -7,7 +7,7 @@ ---@type TItem local itemObject = {} -itemObject.onItemCheck = function(target) +itemObject.onItemCheck = function(target, user) if target:getStatusEffectBySource(xi.effect.ENCHANTMENT, xi.effectSourceType.EQUIPPED_ITEM, xi.item.PURGATORY_COLLAR) ~= nil then target:delStatusEffect(xi.effect.ENCHANTMENT, nil, xi.effectSourceType.EQUIPPED_ITEM, xi.item.PURGATORY_COLLAR) end @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.PURGATORY_COLLAR) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 45, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.PURGATORY_COLLAR) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 45, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.PURGATORY_COLLAR }) end end diff --git a/scripts/items/purple_drop.lua b/scripts/items/purple_drop.lua index ff9f32067c5..798d7072617 100644 --- a/scripts/items/purple_drop.lua +++ b/scripts/items/purple_drop.lua @@ -14,9 +14,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.DEX_BOOST, 5, 0, 900) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.DEX_BOOST, { power = 5, duration = 900, origin = user }) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/purple_polypore.lua b/scripts/items/purple_polypore.lua index 9b690b1c052..29f5abe0a98 100644 --- a/scripts/items/purple_polypore.lua +++ b/scripts/items/purple_polypore.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/quadav_belt.lua b/scripts/items/quadav_belt.lua index 9017c4e19a8..7256fc5f14d 100644 --- a/scripts/items/quadav_belt.lua +++ b/scripts/items/quadav_belt.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 644, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { power = 644, duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/queens_crown.lua b/scripts/items/queens_crown.lua index dd76ebbee89..5377229460c 100644 --- a/scripts/items/queens_crown.lua +++ b/scripts/items/queens_crown.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/quus.lua b/scripts/items/quus.lua index 322a5b55a00..2123f12b3ac 100644 --- a/scripts/items/quus.lua +++ b/scripts/items/quus.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/rabao_earring.lua b/scripts/items/rabao_earring.lua index 2f15f5368bd..e97b859b702 100644 --- a/scripts/items/rabao_earring.lua +++ b/scripts/items/rabao_earring.lua @@ -10,8 +10,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.RABAO_EARRING, 0, 4) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.RABAO_EARRING, duration = 4, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/rabbit_belt.lua b/scripts/items/rabbit_belt.lua index dfd40b81866..8f646fadcc3 100644 --- a/scripts/items/rabbit_belt.lua +++ b/scripts/items/rabbit_belt.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 268, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { power = 268, duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/rabbit_pie.lua b/scripts/items/rabbit_pie.lua index b7394f1f770..cc8be87d567 100644 --- a/scripts/items/rabbit_pie.lua +++ b/scripts/items/rabbit_pie.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/raising_earring.lua b/scripts/items/raising_earring.lua index 88627611830..ccb1d4c1646 100644 --- a/scripts/items/raising_earring.lua +++ b/scripts/items/raising_earring.lua @@ -10,10 +10,10 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) local duration = 2100 target:delStatusEffect(xi.effect.RERAISE) - target:addStatusEffect(xi.effect.RERAISE, 1, 0, duration) + target:addStatusEffect(xi.effect.RERAISE, { power = 1, duration = duration, origin = user }) end return itemObject diff --git a/scripts/items/ram_staff.lua b/scripts/items/ram_staff.lua index d5973c6d7f4..9c3c8cad356 100644 --- a/scripts/items/ram_staff.lua +++ b/scripts/items/ram_staff.lua @@ -10,8 +10,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.SOUTHERN_SAN_DORIA_S, 0, 3) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.SOUTHERN_SAN_DORIA_S, duration = 3, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/random_ring.lua b/scripts/items/random_ring.lua index 05470dda2be..b21afbfa1c2 100644 --- a/scripts/items/random_ring.lua +++ b/scripts/items/random_ring.lua @@ -15,11 +15,11 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.RANDOM_RING) then local power = math.random(1, 8) - target:addStatusEffect(xi.effect.ENCHANTMENT, power, 0, 3600, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.RANDOM_RING) + target:addStatusEffect(xi.effect.ENCHANTMENT, { power = power, duration = 3600, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.RANDOM_RING }) end end diff --git a/scripts/items/raphaels_rod.lua b/scripts/items/raphaels_rod.lua index dcda5749c20..023a5d2d952 100644 --- a/scripts/items/raphaels_rod.lua +++ b/scripts/items/raphaels_rod.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) target:delStatusEffect(xi.effect.RERAISE) - target:addStatusEffect(xi.effect.RERAISE, 3, 0, 7200) + target:addStatusEffect(xi.effect.RERAISE, { power = 3, duration = 7200, origin = user }) target:messageBasic(xi.msg.basic.GAINS_EFFECT_OF_STATUS, xi.effect.RERAISE) end diff --git a/scripts/items/rarab_meatball.lua b/scripts/items/rarab_meatball.lua index 61c8b79fb69..8d416b36e19 100644 --- a/scripts/items/rarab_meatball.lua +++ b/scripts/items/rarab_meatball.lua @@ -20,7 +20,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/rarab_tail.lua b/scripts/items/rarab_tail.lua index ffea4a271a1..f62729cb8f3 100644 --- a/scripts/items/rarab_tail.lua +++ b/scripts/items/rarab_tail.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/rebirth_feather.lua b/scripts/items/rebirth_feather.lua index e04bb08b7e1..ab8532546a3 100644 --- a/scripts/items/rebirth_feather.lua +++ b/scripts/items/rebirth_feather.lua @@ -10,10 +10,10 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) local duration = 7200 target:delStatusEffect(xi.effect.RERAISE) - target:addStatusEffect(xi.effect.RERAISE, 3, 0, duration) + target:addStatusEffect(xi.effect.RERAISE, { power = 3, duration = duration, origin = user }) target:messageBasic(xi.msg.basic.GAINS_EFFECT_OF_STATUS, xi.effect.RERAISE) end diff --git a/scripts/items/recall_ring_jugner.lua b/scripts/items/recall_ring_jugner.lua index d52b1ac1238..40762fdc7c5 100644 --- a/scripts/items/recall_ring_jugner.lua +++ b/scripts/items/recall_ring_jugner.lua @@ -15,8 +15,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return result end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.JUGNER, 0, 4) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.JUGNER, duration = 4, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/recall_ring_meriphataud.lua b/scripts/items/recall_ring_meriphataud.lua index 562155c4e35..69edd04b94a 100644 --- a/scripts/items/recall_ring_meriphataud.lua +++ b/scripts/items/recall_ring_meriphataud.lua @@ -15,8 +15,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return result end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.MERIPH, 0, 4) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.MERIPH, duration = 4, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/recall_ring_pashhow.lua b/scripts/items/recall_ring_pashhow.lua index f77b4bf52c5..82a23d95c8c 100644 --- a/scripts/items/recall_ring_pashhow.lua +++ b/scripts/items/recall_ring_pashhow.lua @@ -15,8 +15,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return result end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.PASHH, 0, 4) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.PASHH, duration = 4, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/red_bubble-eye.lua b/scripts/items/red_bubble-eye.lua index 706cbf4bb17..f7889025792 100644 --- a/scripts/items/red_bubble-eye.lua +++ b/scripts/items/red_bubble-eye.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/red_curry_bun.lua b/scripts/items/red_curry_bun.lua index d4b9a9eede0..da43e518dc3 100644 --- a/scripts/items/red_curry_bun.lua +++ b/scripts/items/red_curry_bun.lua @@ -23,7 +23,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end local dataTable = diff --git a/scripts/items/red_curry_bun_+1.lua b/scripts/items/red_curry_bun_+1.lua index 40638aa2c83..2f0424c684d 100644 --- a/scripts/items/red_curry_bun_+1.lua +++ b/scripts/items/red_curry_bun_+1.lua @@ -22,7 +22,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/red_drop.lua b/scripts/items/red_drop.lua index 5dc8d0ff81b..e144f7af41c 100644 --- a/scripts/items/red_drop.lua +++ b/scripts/items/red_drop.lua @@ -14,9 +14,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.STR_BOOST, 5, 0, 900) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.STR_BOOST, { power = 5, duration = 900, origin = user }) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/red_hot_cracker.lua b/scripts/items/red_hot_cracker.lua index ae8b8feb33f..0e2339685c0 100644 --- a/scripts/items/red_hot_cracker.lua +++ b/scripts/items/red_hot_cracker.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 180, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 180, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/red_terrapin.lua b/scripts/items/red_terrapin.lua index 5b31037b55f..7cab925d387 100644 --- a/scripts/items/red_terrapin.lua +++ b/scripts/items/red_terrapin.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/regain_feather.lua b/scripts/items/regain_feather.lua index cd4b544b0fc..3c9675dc0dc 100644 --- a/scripts/items/regain_feather.lua +++ b/scripts/items/regain_feather.lua @@ -15,11 +15,11 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) target:setHP(target:getMaxHP()) target:setMP(target:getMaxMP()) target:setTP(3000) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 7200) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 7200, origin = user }) end return itemObject diff --git a/scripts/items/regen_collar.lua b/scripts/items/regen_collar.lua index 5c6e34602e4..6b89c7ea32b 100644 --- a/scripts/items/regen_collar.lua +++ b/scripts/items/regen_collar.lua @@ -14,9 +14,9 @@ itemObject.onItemUnequip = function(target, item) target:delStatusEffect(xi.effect.ENCHANTMENT, nil, xi.effectSourceType.EQUIPPED_ITEM, xi.item.REGEN_COLLAR) end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.REGEN_COLLAR) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 120, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.REGEN_COLLAR) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 120, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.REGEN_COLLAR }) end end diff --git a/scripts/items/regen_cuirass.lua b/scripts/items/regen_cuirass.lua index 658e0b72d9e..932d2dafd99 100644 --- a/scripts/items/regen_cuirass.lua +++ b/scripts/items/regen_cuirass.lua @@ -10,12 +10,12 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.REGEN_CUIRASS) then if target:hasStatusEffect(xi.effect.REGEN) then target:messageBasic(xi.msg.basic.NO_EFFECT) else - target:addStatusEffect(xi.effect.REGEN, 15, 3, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.REGEN_CUIRASS) + target:addStatusEffect(xi.effect.REGEN, { power = 15, duration = 180, origin = user, tick = 3, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.REGEN_CUIRASS }) end end end diff --git a/scripts/items/reishi_mushroom.lua b/scripts/items/reishi_mushroom.lua index ff84aa7c44d..5148a33f328 100644 --- a/scripts/items/reishi_mushroom.lua +++ b/scripts/items/reishi_mushroom.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/republic_earring.lua b/scripts/items/republic_earring.lua index 1e799334b9e..fae6307353a 100644 --- a/scripts/items/republic_earring.lua +++ b/scripts/items/republic_earring.lua @@ -10,8 +10,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.REPUBLIC_EARRING, 0, 4) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.REPUBLIC_EARRING, duration = 4, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/republic_signet_staff.lua b/scripts/items/republic_signet_staff.lua index 8a3faf54bfd..df9e3e3b266 100644 --- a/scripts/items/republic_signet_staff.lua +++ b/scripts/items/republic_signet_staff.lua @@ -29,9 +29,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) target:delStatusEffectsByFlag(xi.effectFlag.INFLUENCE, true) - target:addStatusEffect(xi.effect.SIGNET, 0, 0, 18000) + target:addStatusEffect(xi.effect.SIGNET, { duration = 18000, origin = user }) end return itemObject diff --git a/scripts/items/republic_stables_medal.lua b/scripts/items/republic_stables_medal.lua index 5274ca8f61a..b05b56de8e7 100644 --- a/scripts/items/republic_stables_medal.lua +++ b/scripts/items/republic_stables_medal.lua @@ -15,8 +15,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return result end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.CHOCO_BASTOK, 0, 4) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.CHOCO_BASTOK, duration = 4, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/reraise_earring.lua b/scripts/items/reraise_earring.lua index d35ae387724..6c9263005f3 100644 --- a/scripts/items/reraise_earring.lua +++ b/scripts/items/reraise_earring.lua @@ -10,10 +10,10 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) local duration = 7200 target:delStatusEffect(xi.effect.RERAISE) - target:addStatusEffect(xi.effect.RERAISE, 1, 0, duration) + target:addStatusEffect(xi.effect.RERAISE, { power = 1, duration = duration, origin = user }) target:messageBasic(xi.msg.basic.GAINS_EFFECT_OF_STATUS, xi.effect.RERAISE) end diff --git a/scripts/items/reraise_gorget.lua b/scripts/items/reraise_gorget.lua index b4270858d47..2d4db4701bf 100644 --- a/scripts/items/reraise_gorget.lua +++ b/scripts/items/reraise_gorget.lua @@ -10,10 +10,10 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) local duration = 7200 target:delStatusEffect(xi.effect.RERAISE) - target:addStatusEffect(xi.effect.RERAISE, 2, 0, duration) + target:addStatusEffect(xi.effect.RERAISE, { power = 2, duration = duration, origin = user }) target:messageBasic(xi.msg.basic.GAINS_EFFECT_OF_STATUS, xi.effect.RERAISE) end diff --git a/scripts/items/reraise_hairpin.lua b/scripts/items/reraise_hairpin.lua index 27d932a8909..30b936f953a 100644 --- a/scripts/items/reraise_hairpin.lua +++ b/scripts/items/reraise_hairpin.lua @@ -10,10 +10,10 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) local duration = 7200 target:delStatusEffect(xi.effect.RERAISE) - target:addStatusEffect(xi.effect.RERAISE, 2, 0, duration) + target:addStatusEffect(xi.effect.RERAISE, { power = 2, duration = duration, origin = user }) target:messageBasic(xi.msg.basic.GAINS_EFFECT_OF_STATUS, xi.effect.RERAISE) end diff --git a/scripts/items/reraiser.lua b/scripts/items/reraiser.lua index 7e90595243a..501a8a9e3cb 100644 --- a/scripts/items/reraiser.lua +++ b/scripts/items/reraiser.lua @@ -10,10 +10,10 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) local duration = 3600 target:delStatusEffect(xi.effect.RERAISE) - target:addStatusEffect(xi.effect.RERAISE, 1, 0, duration) + target:addStatusEffect(xi.effect.RERAISE, { power = 1, duration = duration, origin = user }) target:messageBasic(xi.msg.basic.GAINS_EFFECT_OF_STATUS, xi.effect.RERAISE) end diff --git a/scripts/items/return_ring.lua b/scripts/items/return_ring.lua index f9201ca0a0e..d35ec84f449 100644 --- a/scripts/items/return_ring.lua +++ b/scripts/items/return_ring.lua @@ -20,9 +20,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return result end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) local region = target:getCurrentRegion() - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.OUTPOST, 0, 4, 0, region) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.OUTPOST, duration = 4, origin = user, icon = 0, subPower = region }) end return itemObject diff --git a/scripts/items/revive_feather.lua b/scripts/items/revive_feather.lua index 91bd06c3911..8b47a09531d 100644 --- a/scripts/items/revive_feather.lua +++ b/scripts/items/revive_feather.lua @@ -10,10 +10,10 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) local duration = 7200 target:delStatusEffect(xi.effect.RERAISE) - target:addStatusEffect(xi.effect.RERAISE, 1, 0, duration) + target:addStatusEffect(xi.effect.RERAISE, { power = 1, duration = duration, origin = user }) target:messageBasic(xi.msg.basic.GAINS_EFFECT_OF_STATUS, xi.effect.RERAISE) end diff --git a/scripts/items/rice_ball.lua b/scripts/items/rice_ball.lua index d89bc6de3f0..0646b56f38a 100644 --- a/scripts/items/rice_ball.lua +++ b/scripts/items/rice_ball.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/rice_dumpling.lua b/scripts/items/rice_dumpling.lua index 6cb78f9f759..6a17e0e46e3 100644 --- a/scripts/items/rice_dumpling.lua +++ b/scripts/items/rice_dumpling.lua @@ -22,7 +22,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/ritterhentzes.lua b/scripts/items/ritterhentzes.lua index a1679081a9a..34595f24aa2 100644 --- a/scripts/items/ritterhentzes.lua +++ b/scripts/items/ritterhentzes.lua @@ -10,8 +10,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.BLAZE_SPIKES, 20, 0, 210) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.BLAZE_SPIKES, { power = 20, duration = 210, origin = user }) end return itemObject diff --git a/scripts/items/roast_carp.lua b/scripts/items/roast_carp.lua index ba8ac18ff2f..6cffac81cc8 100644 --- a/scripts/items/roast_carp.lua +++ b/scripts/items/roast_carp.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/roast_mushroom.lua b/scripts/items/roast_mushroom.lua index 22e7c89e91e..dcaae6e805e 100644 --- a/scripts/items/roast_mushroom.lua +++ b/scripts/items/roast_mushroom.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/roast_pipira.lua b/scripts/items/roast_pipira.lua index 7edae282366..91de6df934e 100644 --- a/scripts/items/roast_pipira.lua +++ b/scripts/items/roast_pipira.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/roast_trout.lua b/scripts/items/roast_trout.lua index edd25f89eda..9f0bc677053 100644 --- a/scripts/items/roast_trout.lua +++ b/scripts/items/roast_trout.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/roast_turkey.lua b/scripts/items/roast_turkey.lua index c23c09eca10..db11d2bf95c 100644 --- a/scripts/items/roast_turkey.lua +++ b/scripts/items/roast_turkey.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/rogue_rice_ball.lua b/scripts/items/rogue_rice_ball.lua index 56e9f5c9dcb..27c5896625c 100644 --- a/scripts/items/rogue_rice_ball.lua +++ b/scripts/items/rogue_rice_ball.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/rolanberry.lua b/scripts/items/rolanberry.lua index d2f5f4977cf..323bb369bfb 100644 --- a/scripts/items/rolanberry.lua +++ b/scripts/items/rolanberry.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/rolanberry_864_ce.lua b/scripts/items/rolanberry_864_ce.lua index 8a2dac4b412..1b11a7cb4c8 100644 --- a/scripts/items/rolanberry_864_ce.lua +++ b/scripts/items/rolanberry_864_ce.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/rolanberry_874_ce.lua b/scripts/items/rolanberry_874_ce.lua index c253d9bf24a..ae1b1e0fa3d 100644 --- a/scripts/items/rolanberry_874_ce.lua +++ b/scripts/items/rolanberry_874_ce.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/rolanberry_881_ce.lua b/scripts/items/rolanberry_881_ce.lua index 4c7e9c8817b..d36c991f485 100644 --- a/scripts/items/rolanberry_881_ce.lua +++ b/scripts/items/rolanberry_881_ce.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/rolanberry_daifuku.lua b/scripts/items/rolanberry_daifuku.lua index d5f007abe63..7f81f54084f 100644 --- a/scripts/items/rolanberry_daifuku.lua +++ b/scripts/items/rolanberry_daifuku.lua @@ -26,7 +26,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/rolanberry_daifuku_+1.lua b/scripts/items/rolanberry_daifuku_+1.lua index f5b64a4233c..f9d4d35bb83 100644 --- a/scripts/items/rolanberry_daifuku_+1.lua +++ b/scripts/items/rolanberry_daifuku_+1.lua @@ -26,7 +26,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/rolanberry_pie.lua b/scripts/items/rolanberry_pie.lua index b6202c696a1..dd969df183c 100644 --- a/scripts/items/rolanberry_pie.lua +++ b/scripts/items/rolanberry_pie.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/rolanberry_pie_+1.lua b/scripts/items/rolanberry_pie_+1.lua index 3f236660860..70e2e5d1865 100644 --- a/scripts/items/rolanberry_pie_+1.lua +++ b/scripts/items/rolanberry_pie_+1.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/roll_of_buche_au_chocolat.lua b/scripts/items/roll_of_buche_au_chocolat.lua index 04a248d1f3f..671a64d92c5 100644 --- a/scripts/items/roll_of_buche_au_chocolat.lua +++ b/scripts/items/roll_of_buche_au_chocolat.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/roll_of_sylvan_excursion.lua b/scripts/items/roll_of_sylvan_excursion.lua index 7a96ce56780..a17dd45e297 100644 --- a/scripts/items/roll_of_sylvan_excursion.lua +++ b/scripts/items/roll_of_sylvan_excursion.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/rolsin.lua b/scripts/items/rolsin.lua index 09a954d857c..f9556dfb187 100644 --- a/scripts/items/rolsin.lua +++ b/scripts/items/rolsin.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/royal_omelette.lua b/scripts/items/royal_omelette.lua index 97bfb712791..f305be0b3ea 100644 --- a/scripts/items/royal_omelette.lua +++ b/scripts/items/royal_omelette.lua @@ -31,7 +31,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/runners_belt.lua b/scripts/items/runners_belt.lua index b8878bc3a75..d127414ab41 100644 --- a/scripts/items/runners_belt.lua +++ b/scripts/items/runners_belt.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.RUNNERS_BELT) then - target:addStatusEffect(xi.effect.DEX_BOOST, 3, 0, 60, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.RUNNERS_BELT) + target:addStatusEffect(xi.effect.DEX_BOOST, { power = 3, duration = 60, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.RUNNERS_BELT }) end end diff --git a/scripts/items/sacred_degen.lua b/scripts/items/sacred_degen.lua index 48bdddc3cec..c85d2f12c56 100644 --- a/scripts/items/sacred_degen.lua +++ b/scripts/items/sacred_degen.lua @@ -7,7 +7,7 @@ ---@type TItem local itemObject = {} -itemObject.onItemCheck = function(target) +itemObject.onItemCheck = function(target, user) if target:getStatusEffectBySource(xi.effect.ENLIGHT, xi.effectSourceType.EQUIPPED_ITEM, xi.item.SACRED_DEGEN) ~= nil then target:delStatusEffect(xi.effect.ENLIGHT, nil, xi.effectSourceType.EQUIPPED_ITEM, xi.item.SACRED_DEGEN) end @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.SACRED_DEGEN) then local effect = xi.effect.ENLIGHT local magicskill = target:getSkillLevel(xi.skill.ENHANCING_MAGIC) @@ -29,7 +29,7 @@ itemObject.onItemUse = function(target) potency = utils.clamp(potency, 3, 25) - target:addStatusEffect(effect, potency, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.SACRED_DEGEN) + target:addStatusEffect(effect, { power = potency, duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.SACRED_DEGEN }) end end diff --git a/scripts/items/sacred_lance.lua b/scripts/items/sacred_lance.lua index c1a1248cb83..9d5a7a61cf8 100644 --- a/scripts/items/sacred_lance.lua +++ b/scripts/items/sacred_lance.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.SACRED_LANCE) then local effect = xi.effect.ENLIGHT local magicskill = target:getSkillLevel(xi.skill.ENHANCING_MAGIC) @@ -29,7 +29,7 @@ itemObject.onItemUse = function(target) potency = utils.clamp(potency, 3, 25) - target:addStatusEffect(effect, potency, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.SACRED_LANCE) + target:addStatusEffect(effect, { power = potency, duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.SACRED_LANCE }) end end diff --git a/scripts/items/sacred_mace.lua b/scripts/items/sacred_mace.lua index c34f3fd55f0..956e5e1f348 100644 --- a/scripts/items/sacred_mace.lua +++ b/scripts/items/sacred_mace.lua @@ -5,7 +5,7 @@ -- Duration: 3 minutes ----------------------------------- local itemObject = {} -itemObject.onItemCheck = function(target) +itemObject.onItemCheck = function(target, user) if target:getStatusEffectBySource(xi.effect.ENLIGHT, xi.effectSourceType.EQUIPPED_ITEM, xi.item.SACRED_MACE) ~= nil then target:delStatusEffect(xi.effect.ENLIGHT, nil, xi.effectSourceType.EQUIPPED_ITEM, xi.item.SACRED_MACE) end @@ -13,7 +13,7 @@ itemObject.onItemCheck = function(target) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.SACRED_MACE) then local effect = xi.effect.ENLIGHT local magicskill = target:getSkillLevel(xi.skill.ENHANCING_MAGIC) @@ -27,7 +27,7 @@ itemObject.onItemUse = function(target) potency = utils.clamp(potency, 3, 25) - target:addStatusEffect(effect, potency, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.SACRED_MACE) + target:addStatusEffect(effect, { power = potency, duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.SACRED_MACE }) end end diff --git a/scripts/items/sacred_maul.lua b/scripts/items/sacred_maul.lua index 93966c1cefc..17f216c835a 100644 --- a/scripts/items/sacred_maul.lua +++ b/scripts/items/sacred_maul.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.SACRED_MAUL) then local effect = xi.effect.ENLIGHT local magicskill = target:getSkillLevel(xi.skill.ENHANCING_MAGIC) @@ -29,7 +29,7 @@ itemObject.onItemUse = function(target) potency = utils.clamp(potency, 3, 25) - target:addStatusEffect(effect, potency, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.SACRED_MAUL) + target:addStatusEffect(effect, { power = potency, duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.SACRED_MAUL }) end end diff --git a/scripts/items/sacred_sword.lua b/scripts/items/sacred_sword.lua index 31bfa458d88..9920e764eaf 100644 --- a/scripts/items/sacred_sword.lua +++ b/scripts/items/sacred_sword.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.SACRED_SWORD) then local effect = xi.effect.ENLIGHT local magicskill = target:getSkillLevel(xi.skill.ENHANCING_MAGIC) @@ -29,7 +29,7 @@ itemObject.onItemUse = function(target) potency = utils.clamp(potency, 3, 25) - target:addStatusEffect(effect, potency, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.SACRED_SWORD) + target:addStatusEffect(effect, { power = potency, duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.SACRED_SWORD }) end end diff --git a/scripts/items/sacred_wand.lua b/scripts/items/sacred_wand.lua index 514fa069acc..270add757d1 100644 --- a/scripts/items/sacred_wand.lua +++ b/scripts/items/sacred_wand.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.SACRED_WAND) then local effect = xi.effect.ENLIGHT local magicskill = target:getSkillLevel(xi.skill.ENHANCING_MAGIC) @@ -29,7 +29,7 @@ itemObject.onItemUse = function(target) potency = utils.clamp(potency, 3, 25) - target:addStatusEffect(effect, potency, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.SACRED_WAND) + target:addStatusEffect(effect, { power = potency, duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.SACRED_WAND }) end end diff --git a/scripts/items/safehold_earring.lua b/scripts/items/safehold_earring.lua index 0dbeb7541d2..f5b85b2eb46 100644 --- a/scripts/items/safehold_earring.lua +++ b/scripts/items/safehold_earring.lua @@ -10,8 +10,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.SAFEHOLD_EARRING, 0, 4) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.SAFEHOLD_EARRING, duration = 4, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/sakura_biscuit.lua b/scripts/items/sakura_biscuit.lua index 9ae4569f95b..a4e1fc92ffe 100644 --- a/scripts/items/sakura_biscuit.lua +++ b/scripts/items/sakura_biscuit.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/salmon_croute.lua b/scripts/items/salmon_croute.lua index f88ccb798f6..f3c4c35325f 100644 --- a/scripts/items/salmon_croute.lua +++ b/scripts/items/salmon_croute.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/salmon_rice_ball.lua b/scripts/items/salmon_rice_ball.lua index 202bd383ff0..a6d47783d6e 100644 --- a/scripts/items/salmon_rice_ball.lua +++ b/scripts/items/salmon_rice_ball.lua @@ -20,7 +20,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/salmon_sub_sandwich.lua b/scripts/items/salmon_sub_sandwich.lua index 93edddee334..7a672aefe0f 100644 --- a/scripts/items/salmon_sub_sandwich.lua +++ b/scripts/items/salmon_sub_sandwich.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/saltena.lua b/scripts/items/saltena.lua index c01683a0dc7..68ddc810e26 100644 --- a/scripts/items/saltena.lua +++ b/scripts/items/saltena.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/salty_bretzel.lua b/scripts/items/salty_bretzel.lua index 42ac3e644b7..d7690620806 100644 --- a/scripts/items/salty_bretzel.lua +++ b/scripts/items/salty_bretzel.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/samsonian_belt.lua b/scripts/items/samsonian_belt.lua index 94f4a0892ac..46527d14a38 100644 --- a/scripts/items/samsonian_belt.lua +++ b/scripts/items/samsonian_belt.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.SAMSONIAN_BELT) then - target:addStatusEffect(xi.effect.STR_BOOST, 3, 0, 60, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.SAMSONIAN_BELT) + target:addStatusEffect(xi.effect.STR_BOOST, { power = 3, duration = 60, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.SAMSONIAN_BELT }) end end diff --git a/scripts/items/san_dorian_carrot.lua b/scripts/items/san_dorian_carrot.lua index 9fa4f09f36d..a13592791ed 100644 --- a/scripts/items/san_dorian_carrot.lua +++ b/scripts/items/san_dorian_carrot.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/sanation_ring.lua b/scripts/items/sanation_ring.lua index 09d4b8bee9a..b1c51150f47 100644 --- a/scripts/items/sanation_ring.lua +++ b/scripts/items/sanation_ring.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.SANATION_RING) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.SANATION_RING) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.SANATION_RING }) end end diff --git a/scripts/items/sandfish.lua b/scripts/items/sandfish.lua index 95b2d8c8c06..175b0cca995 100644 --- a/scripts/items/sandfish.lua +++ b/scripts/items/sandfish.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/saruta_orange.lua b/scripts/items/saruta_orange.lua index 2df0dd7245f..b9bbb097197 100644 --- a/scripts/items/saruta_orange.lua +++ b/scripts/items/saruta_orange.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/sausage.lua b/scripts/items/sausage.lua index ee416eb4cac..68e3da93ab3 100644 --- a/scripts/items/sausage.lua +++ b/scripts/items/sausage.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/sausage_roll.lua b/scripts/items/sausage_roll.lua index 2617e848dd5..7ffd8697472 100644 --- a/scripts/items/sausage_roll.lua +++ b/scripts/items/sausage_roll.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/savage_top_+1.lua b/scripts/items/savage_top_+1.lua index 321811a43e3..461fb1435bd 100644 --- a/scripts/items/savage_top_+1.lua +++ b/scripts/items/savage_top_+1.lua @@ -15,8 +15,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return result end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.PURGONORGO, 0, 3) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.PURGONORGO, duration = 3, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/sazanbaligi.lua b/scripts/items/sazanbaligi.lua index 5fe359b4b33..2cc83ec091a 100644 --- a/scripts/items/sazanbaligi.lua +++ b/scripts/items/sazanbaligi.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/scapegoat.lua b/scripts/items/scapegoat.lua index 178ce4f18fa..3875a3dc2d9 100644 --- a/scripts/items/scapegoat.lua +++ b/scripts/items/scapegoat.lua @@ -9,7 +9,7 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) local power = 1 local duration = 1800 @@ -25,10 +25,10 @@ itemObject.onItemUse = function(target) target:messageBasic(xi.msg.basic.NO_EFFECT) else target:delStatusEffect(xi.effect.RERAISE) - target:addStatusEffect(xi.effect.RERAISE, power, 0, duration) + target:addStatusEffect(xi.effect.RERAISE, { power = power, duration = duration, origin = user }) end else - target:addStatusEffect(xi.effect.RERAISE, power, 0, duration) + target:addStatusEffect(xi.effect.RERAISE, { power = power, duration = duration, origin = user }) end end diff --git a/scripts/items/scream_fungus.lua b/scripts/items/scream_fungus.lua index 7fd8bd04842..283aa716836 100644 --- a/scripts/items/scream_fungus.lua +++ b/scripts/items/scream_fungus.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/scroll_of_instant_protect.lua b/scripts/items/scroll_of_instant_protect.lua index fc1beadb2ee..561997f1871 100644 --- a/scripts/items/scroll_of_instant_protect.lua +++ b/scripts/items/scroll_of_instant_protect.lua @@ -10,11 +10,11 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) local power = 75 local duration = 1800 - target:addStatusEffect(xi.effect.PROTECT, power, 0, duration) + target:addStatusEffect(xi.effect.PROTECT, { power = power, duration = duration, origin = user }) end return itemObject diff --git a/scripts/items/scroll_of_instant_reraise.lua b/scripts/items/scroll_of_instant_reraise.lua index 579063beb6a..9e065a4a239 100644 --- a/scripts/items/scroll_of_instant_reraise.lua +++ b/scripts/items/scroll_of_instant_reraise.lua @@ -10,7 +10,7 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) local power = 1 local duration = 1800 if target:hasStatusEffect(xi.effect.RERAISE) then @@ -25,10 +25,10 @@ itemObject.onItemUse = function(target) target:messageBasic(xi.msg.basic.NO_EFFECT) else target:delStatusEffect(xi.effect.RERAISE) - target:addStatusEffect(xi.effect.RERAISE, power, 0, duration) + target:addStatusEffect(xi.effect.RERAISE, { power = power, duration = duration, origin = user }) end else - target:addStatusEffect(xi.effect.RERAISE, power, 0, duration) + target:addStatusEffect(xi.effect.RERAISE, { power = power, duration = duration, origin = user }) end end diff --git a/scripts/items/scroll_of_instant_retrace.lua b/scripts/items/scroll_of_instant_retrace.lua index 6bf27f8925d..4b82e73a74d 100644 --- a/scripts/items/scroll_of_instant_retrace.lua +++ b/scripts/items/scroll_of_instant_retrace.lua @@ -14,9 +14,9 @@ itemObject.onItemCheck = function(target, item, param, caster) end end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:getCampaignAllegiance() > 0 then - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.RETRACE, 0, 3) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.RETRACE, duration = 3, origin = user, icon = 0 }) end end diff --git a/scripts/items/scroll_of_instant_shell.lua b/scripts/items/scroll_of_instant_shell.lua index 66f3a56a6d1..427224a542a 100644 --- a/scripts/items/scroll_of_instant_shell.lua +++ b/scripts/items/scroll_of_instant_shell.lua @@ -10,11 +10,11 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) local power = 1900 -- shell_iii base power local duration = 1800 - target:addStatusEffect(xi.effect.SHELL, power, duration) + target:addStatusEffect(xi.effect.SHELL, { power = power, duration = duration, origin = user }) end return itemObject diff --git a/scripts/items/scroll_of_instant_stoneskin.lua b/scripts/items/scroll_of_instant_stoneskin.lua index 2ff455e69eb..6d364d786ce 100644 --- a/scripts/items/scroll_of_instant_stoneskin.lua +++ b/scripts/items/scroll_of_instant_stoneskin.lua @@ -10,8 +10,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - if target:addStatusEffect(xi.effect.STONESKIN, 200, 0, 300, 0, 0, 4) then +itemObject.onItemUse = function(target, user) + if target:addStatusEffect(xi.effect.STONESKIN, { power = 200, duration = 300, origin = user, tier = 4 }) then target:messageBasic(xi.msg.basic.GAINS_EFFECT_OF_STATUS, xi.effect.STONESKIN) else target:messageBasic(xi.msg.basic.NO_EFFECT) diff --git a/scripts/items/scroll_of_instant_warp.lua b/scripts/items/scroll_of_instant_warp.lua index f093f0cadce..693991062ff 100644 --- a/scripts/items/scroll_of_instant_warp.lua +++ b/scripts/items/scroll_of_instant_warp.lua @@ -10,8 +10,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.WARP, 0, 3) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.WARP, duration = 3, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/sea_bass_croute.lua b/scripts/items/sea_bass_croute.lua index e712e327029..38d62b95a3d 100644 --- a/scripts/items/sea_bass_croute.lua +++ b/scripts/items/sea_bass_croute.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/seafood_pitaru.lua b/scripts/items/seafood_pitaru.lua index 6e72da8f183..0da52f689db 100644 --- a/scripts/items/seafood_pitaru.lua +++ b/scripts/items/seafood_pitaru.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/seafood_stewpot.lua b/scripts/items/seafood_stewpot.lua index adb867502dd..c0aca940bc2 100644 --- a/scripts/items/seafood_stewpot.lua +++ b/scripts/items/seafood_stewpot.lua @@ -20,7 +20,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/selbina_earring.lua b/scripts/items/selbina_earring.lua index c9009bd9ee5..fef7d72bbcf 100644 --- a/scripts/items/selbina_earring.lua +++ b/scripts/items/selbina_earring.lua @@ -10,8 +10,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.SELBINA_EARRING, 0, 4) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.SELBINA_EARRING, duration = 4, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/senroh_skewer.lua b/scripts/items/senroh_skewer.lua index 0e10bd96a90..c13f11e8cc1 100644 --- a/scripts/items/senroh_skewer.lua +++ b/scripts/items/senroh_skewer.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_bass_meuniere.lua b/scripts/items/serving_of_bass_meuniere.lua index f890a27e4f2..af5150bf7d3 100644 --- a/scripts/items/serving_of_bass_meuniere.lua +++ b/scripts/items/serving_of_bass_meuniere.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_bass_meuniere_+1.lua b/scripts/items/serving_of_bass_meuniere_+1.lua index 45a5fe5f451..f16ccf7da2e 100644 --- a/scripts/items/serving_of_bass_meuniere_+1.lua +++ b/scripts/items/serving_of_bass_meuniere_+1.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_batagreen_saute.lua b/scripts/items/serving_of_batagreen_saute.lua index 716929cd3ce..62f606dcc14 100644 --- a/scripts/items/serving_of_batagreen_saute.lua +++ b/scripts/items/serving_of_batagreen_saute.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_bavarois.lua b/scripts/items/serving_of_bavarois.lua index 4abd9397bc4..948090ccf5e 100644 --- a/scripts/items/serving_of_bavarois.lua +++ b/scripts/items/serving_of_bavarois.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_bavarois_+1.lua b/scripts/items/serving_of_bavarois_+1.lua index 4be884dd5f2..cd6c3bddee1 100644 --- a/scripts/items/serving_of_bavarois_+1.lua +++ b/scripts/items/serving_of_bavarois_+1.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_beaugreen_saute.lua b/scripts/items/serving_of_beaugreen_saute.lua index ec1746f010f..58eea164f4b 100644 --- a/scripts/items/serving_of_beaugreen_saute.lua +++ b/scripts/items/serving_of_beaugreen_saute.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_bison_steak.lua b/scripts/items/serving_of_bison_steak.lua index 7155a33a459..5e8e30d01b2 100644 --- a/scripts/items/serving_of_bison_steak.lua +++ b/scripts/items/serving_of_bison_steak.lua @@ -20,7 +20,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_black_curry.lua b/scripts/items/serving_of_black_curry.lua index e5841bc6db0..2553d82a173 100644 --- a/scripts/items/serving_of_black_curry.lua +++ b/scripts/items/serving_of_black_curry.lua @@ -23,7 +23,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end local dataTable = diff --git a/scripts/items/serving_of_black_pudding.lua b/scripts/items/serving_of_black_pudding.lua index 47865221c59..978fe5b44a4 100644 --- a/scripts/items/serving_of_black_pudding.lua +++ b/scripts/items/serving_of_black_pudding.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_cherry_bavarois.lua b/scripts/items/serving_of_cherry_bavarois.lua index 960a97edb84..43054962c0f 100644 --- a/scripts/items/serving_of_cherry_bavarois.lua +++ b/scripts/items/serving_of_cherry_bavarois.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_cherry_bavarois_+1.lua b/scripts/items/serving_of_cherry_bavarois_+1.lua index b953f3f8abd..cc02226ec4b 100644 --- a/scripts/items/serving_of_cherry_bavarois_+1.lua +++ b/scripts/items/serving_of_cherry_bavarois_+1.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_cibarious_cilbir.lua b/scripts/items/serving_of_cibarious_cilbir.lua index 7a8c2fb36d2..3a127c6547f 100644 --- a/scripts/items/serving_of_cibarious_cilbir.lua +++ b/scripts/items/serving_of_cibarious_cilbir.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_cilbir.lua b/scripts/items/serving_of_cilbir.lua index 7a5a8fca6c7..d3af0576924 100644 --- a/scripts/items/serving_of_cilbir.lua +++ b/scripts/items/serving_of_cilbir.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_crimson_jelly.lua b/scripts/items/serving_of_crimson_jelly.lua index 8c4c3beb09d..e822bbefe46 100644 --- a/scripts/items/serving_of_crimson_jelly.lua +++ b/scripts/items/serving_of_crimson_jelly.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_dusky_indulgence.lua b/scripts/items/serving_of_dusky_indulgence.lua index 5a5311b4c19..b0db7388a48 100644 --- a/scripts/items/serving_of_dusky_indulgence.lua +++ b/scripts/items/serving_of_dusky_indulgence.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_elysian_eclair.lua b/scripts/items/serving_of_elysian_eclair.lua index 9fc41067706..afe801f6e45 100644 --- a/scripts/items/serving_of_elysian_eclair.lua +++ b/scripts/items/serving_of_elysian_eclair.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_emperor_roe.lua b/scripts/items/serving_of_emperor_roe.lua index 67dd632a2ed..b4fccd03238 100644 --- a/scripts/items/serving_of_emperor_roe.lua +++ b/scripts/items/serving_of_emperor_roe.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_flint_caviar.lua b/scripts/items/serving_of_flint_caviar.lua index 748762258a3..3929b273bf7 100644 --- a/scripts/items/serving_of_flint_caviar.lua +++ b/scripts/items/serving_of_flint_caviar.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_flounder_meuniere.lua b/scripts/items/serving_of_flounder_meuniere.lua index dba48c2ee08..708090cd586 100644 --- a/scripts/items/serving_of_flounder_meuniere.lua +++ b/scripts/items/serving_of_flounder_meuniere.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_flounder_meuniere_+1.lua b/scripts/items/serving_of_flounder_meuniere_+1.lua index c99bed9b67e..1d587651cdb 100644 --- a/scripts/items/serving_of_flounder_meuniere_+1.lua +++ b/scripts/items/serving_of_flounder_meuniere_+1.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_flurry_courante.lua b/scripts/items/serving_of_flurry_courante.lua index 38919ce9c6b..eb48984b45b 100644 --- a/scripts/items/serving_of_flurry_courante.lua +++ b/scripts/items/serving_of_flurry_courante.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_frog_flambe.lua b/scripts/items/serving_of_frog_flambe.lua index 5a369fedb95..6b9eafea03c 100644 --- a/scripts/items/serving_of_frog_flambe.lua +++ b/scripts/items/serving_of_frog_flambe.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_goblin_stir-fry.lua b/scripts/items/serving_of_goblin_stir-fry.lua index c670e4c106f..e9e392d0489 100644 --- a/scripts/items/serving_of_goblin_stir-fry.lua +++ b/scripts/items/serving_of_goblin_stir-fry.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_golden_royale.lua b/scripts/items/serving_of_golden_royale.lua index 32c57d1b718..33889fcad52 100644 --- a/scripts/items/serving_of_golden_royale.lua +++ b/scripts/items/serving_of_golden_royale.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_green_curry.lua b/scripts/items/serving_of_green_curry.lua index 46628c9c69c..1896d256d4a 100644 --- a/scripts/items/serving_of_green_curry.lua +++ b/scripts/items/serving_of_green_curry.lua @@ -20,7 +20,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end local dataTable = diff --git a/scripts/items/serving_of_herb_crawler_eggs.lua b/scripts/items/serving_of_herb_crawler_eggs.lua index 1b31d44e588..5b139d677ba 100644 --- a/scripts/items/serving_of_herb_crawler_eggs.lua +++ b/scripts/items/serving_of_herb_crawler_eggs.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_herb_quus.lua b/scripts/items/serving_of_herb_quus.lua index 4c52204d17f..60acbdc2314 100644 --- a/scripts/items/serving_of_herb_quus.lua +++ b/scripts/items/serving_of_herb_quus.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_icecap_rolanberry.lua b/scripts/items/serving_of_icecap_rolanberry.lua index 5b34897fd03..3aa2b4df4f0 100644 --- a/scripts/items/serving_of_icecap_rolanberry.lua +++ b/scripts/items/serving_of_icecap_rolanberry.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_karni_yarik.lua b/scripts/items/serving_of_karni_yarik.lua index ae0355226d2..cb09ad9d81f 100644 --- a/scripts/items/serving_of_karni_yarik.lua +++ b/scripts/items/serving_of_karni_yarik.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_karni_yarik_+1.lua b/scripts/items/serving_of_karni_yarik_+1.lua index e118d2ead7d..ccc6699bbb9 100644 --- a/scripts/items/serving_of_karni_yarik_+1.lua +++ b/scripts/items/serving_of_karni_yarik_+1.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_leadafry.lua b/scripts/items/serving_of_leadafry.lua index 34d648e0148..ff43d7a8f57 100644 --- a/scripts/items/serving_of_leadafry.lua +++ b/scripts/items/serving_of_leadafry.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_marbled_steak.lua b/scripts/items/serving_of_marbled_steak.lua index 52d357ce8f3..f6eddf5137b 100644 --- a/scripts/items/serving_of_marbled_steak.lua +++ b/scripts/items/serving_of_marbled_steak.lua @@ -20,7 +20,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_medicinal_quus.lua b/scripts/items/serving_of_medicinal_quus.lua index 542c6449862..37196b1ac87 100644 --- a/scripts/items/serving_of_medicinal_quus.lua +++ b/scripts/items/serving_of_medicinal_quus.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_menemen.lua b/scripts/items/serving_of_menemen.lua index 94d8f5fd84c..c3669e1f956 100644 --- a/scripts/items/serving_of_menemen.lua +++ b/scripts/items/serving_of_menemen.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_menemen_+1.lua b/scripts/items/serving_of_menemen_+1.lua index 0e76c030ee3..8c75c1505c9 100644 --- a/scripts/items/serving_of_menemen_+1.lua +++ b/scripts/items/serving_of_menemen_+1.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_mille-feuille.lua b/scripts/items/serving_of_mille-feuille.lua index 28aa2eadf89..6cf822a078f 100644 --- a/scripts/items/serving_of_mille-feuille.lua +++ b/scripts/items/serving_of_mille-feuille.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_monastic_saute.lua b/scripts/items/serving_of_monastic_saute.lua index 30f86cef5df..84a8a9ce419 100644 --- a/scripts/items/serving_of_monastic_saute.lua +++ b/scripts/items/serving_of_monastic_saute.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_mont_blanc.lua b/scripts/items/serving_of_mont_blanc.lua index 2d5c9250683..36fa2cf8800 100644 --- a/scripts/items/serving_of_mont_blanc.lua +++ b/scripts/items/serving_of_mont_blanc.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_mushroom_saute.lua b/scripts/items/serving_of_mushroom_saute.lua index de99e238954..1edc4eeeaa6 100644 --- a/scripts/items/serving_of_mushroom_saute.lua +++ b/scripts/items/serving_of_mushroom_saute.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_newt_flambe.lua b/scripts/items/serving_of_newt_flambe.lua index 3248afdb660..f4a8c81ba95 100644 --- a/scripts/items/serving_of_newt_flambe.lua +++ b/scripts/items/serving_of_newt_flambe.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_patriarch_saute.lua b/scripts/items/serving_of_patriarch_saute.lua index 97e1549dbdf..43be1340659 100644 --- a/scripts/items/serving_of_patriarch_saute.lua +++ b/scripts/items/serving_of_patriarch_saute.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_popotoes_con_queso.lua b/scripts/items/serving_of_popotoes_con_queso.lua index 62b5fddaa22..bb5197ef8d6 100644 --- a/scripts/items/serving_of_popotoes_con_queso.lua +++ b/scripts/items/serving_of_popotoes_con_queso.lua @@ -22,7 +22,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_popotoes_con_queso_+1.lua b/scripts/items/serving_of_popotoes_con_queso_+1.lua index a3c11edc6eb..84504b74788 100644 --- a/scripts/items/serving_of_popotoes_con_queso_+1.lua +++ b/scripts/items/serving_of_popotoes_con_queso_+1.lua @@ -22,7 +22,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_red_curry.lua b/scripts/items/serving_of_red_curry.lua index 15ca3930635..6059f374eba 100644 --- a/scripts/items/serving_of_red_curry.lua +++ b/scripts/items/serving_of_red_curry.lua @@ -23,7 +23,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end local dataTable = diff --git a/scripts/items/serving_of_royal_jelly.lua b/scripts/items/serving_of_royal_jelly.lua index 201ff248460..306c09e14e6 100644 --- a/scripts/items/serving_of_royal_jelly.lua +++ b/scripts/items/serving_of_royal_jelly.lua @@ -13,7 +13,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_salmon_eggs.lua b/scripts/items/serving_of_salmon_eggs.lua index e00ace23d1b..3b59acb8d0d 100644 --- a/scripts/items/serving_of_salmon_eggs.lua +++ b/scripts/items/serving_of_salmon_eggs.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_salmon_meuniere.lua b/scripts/items/serving_of_salmon_meuniere.lua index 26c0198cbad..1451079fad9 100644 --- a/scripts/items/serving_of_salmon_meuniere.lua +++ b/scripts/items/serving_of_salmon_meuniere.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_salmon_meuniere_+1.lua b/scripts/items/serving_of_salmon_meuniere_+1.lua index 94f2a66e0b7..fab326722f3 100644 --- a/scripts/items/serving_of_salmon_meuniere_+1.lua +++ b/scripts/items/serving_of_salmon_meuniere_+1.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_salmon_roe.lua b/scripts/items/serving_of_salmon_roe.lua index d526d9ae8ab..cd260dbfd9d 100644 --- a/scripts/items/serving_of_salmon_roe.lua +++ b/scripts/items/serving_of_salmon_roe.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_seafood_gratin.lua b/scripts/items/serving_of_seafood_gratin.lua index d1e374cd215..e466646cc7f 100644 --- a/scripts/items/serving_of_seafood_gratin.lua +++ b/scripts/items/serving_of_seafood_gratin.lua @@ -22,7 +22,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_seafood_gratin_+1.lua b/scripts/items/serving_of_seafood_gratin_+1.lua index 3ed5f8e218f..13bf07cce0d 100644 --- a/scripts/items/serving_of_seafood_gratin_+1.lua +++ b/scripts/items/serving_of_seafood_gratin_+1.lua @@ -22,7 +22,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_shallops_tropicale.lua b/scripts/items/serving_of_shallops_tropicale.lua index 240c58bd93e..0aebcf0592e 100644 --- a/scripts/items/serving_of_shallops_tropicale.lua +++ b/scripts/items/serving_of_shallops_tropicale.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_snowy_rolanberry.lua b/scripts/items/serving_of_snowy_rolanberry.lua index e10e632491c..31ba283e8b6 100644 --- a/scripts/items/serving_of_snowy_rolanberry.lua +++ b/scripts/items/serving_of_snowy_rolanberry.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_squirrels_delight.lua b/scripts/items/serving_of_squirrels_delight.lua index 1250407746d..fb51968e541 100644 --- a/scripts/items/serving_of_squirrels_delight.lua +++ b/scripts/items/serving_of_squirrels_delight.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_vermillion_jelly.lua b/scripts/items/serving_of_vermillion_jelly.lua index bfc15d3cf32..f7c06f2bd8a 100644 --- a/scripts/items/serving_of_vermillion_jelly.lua +++ b/scripts/items/serving_of_vermillion_jelly.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_yellow_curry.lua b/scripts/items/serving_of_yellow_curry.lua index c4f23586e4e..9b2699f627b 100644 --- a/scripts/items/serving_of_yellow_curry.lua +++ b/scripts/items/serving_of_yellow_curry.lua @@ -23,7 +23,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end local dataTable = diff --git a/scripts/items/serving_of_zaru_soba.lua b/scripts/items/serving_of_zaru_soba.lua index cc9e47cde5d..047cc255432 100644 --- a/scripts/items/serving_of_zaru_soba.lua +++ b/scripts/items/serving_of_zaru_soba.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/serving_of_zaru_soba_+1.lua b/scripts/items/serving_of_zaru_soba_+1.lua index 3bc4bf71c88..fd7facfd211 100644 --- a/scripts/items/serving_of_zaru_soba_+1.lua +++ b/scripts/items/serving_of_zaru_soba_+1.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/shadow_lord_shirt.lua b/scripts/items/shadow_lord_shirt.lua index 137cef16b6d..60668cd4efa 100644 --- a/scripts/items/shadow_lord_shirt.lua +++ b/scripts/items/shadow_lord_shirt.lua @@ -16,10 +16,10 @@ itemObject.onItemCheck = function(target, item, param, caster) return result end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) -- May need a retail capture to verify actual position -- https://ffxiclopedia.fandom.com/wiki/Shadow_Lord_Shirt states teleports next to HP#1 - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.ZVAHL_KEEP, 0, 4) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.ZVAHL_KEEP, duration = 4, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/shall_shell.lua b/scripts/items/shall_shell.lua index 53ce62cb3f1..f80154fd80a 100644 --- a/scripts/items/shall_shell.lua +++ b/scripts/items/shall_shell.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/shining_trout.lua b/scripts/items/shining_trout.lua index d571f9c2c38..653219a593d 100644 --- a/scripts/items/shining_trout.lua +++ b/scripts/items/shining_trout.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/shock_subligar.lua b/scripts/items/shock_subligar.lua index 3ed8fc7c38c..82573f2a27d 100644 --- a/scripts/items/shock_subligar.lua +++ b/scripts/items/shock_subligar.lua @@ -10,8 +10,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.SHOCK_SPIKES, 7, 0, 180) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.SHOCK_SPIKES, { power = 7, duration = 180, origin = user }) end return itemObject diff --git a/scripts/items/shogun_rice_ball.lua b/scripts/items/shogun_rice_ball.lua index c2ada9631ac..c633e8f5884 100644 --- a/scripts/items/shogun_rice_ball.lua +++ b/scripts/items/shogun_rice_ball.lua @@ -20,7 +20,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/shrimp_cracker.lua b/scripts/items/shrimp_cracker.lua index f92d7146d27..2a4352028e7 100644 --- a/scripts/items/shrimp_cracker.lua +++ b/scripts/items/shrimp_cracker.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 180, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 180, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/shrimp_cracker_+1.lua b/scripts/items/shrimp_cracker_+1.lua index b8c456215f7..e47b6993337 100644 --- a/scripts/items/shrimp_cracker_+1.lua +++ b/scripts/items/shrimp_cracker_+1.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/silken_sash.lua b/scripts/items/silken_sash.lua index f6873ceb320..ca8fbae256a 100644 --- a/scripts/items/silken_sash.lua +++ b/scripts/items/silken_sash.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/silken_siesta.lua b/scripts/items/silken_siesta.lua index 079ae376883..fcf04f24a4f 100644 --- a/scripts/items/silken_siesta.lua +++ b/scripts/items/silken_siesta.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/silken_smile.lua b/scripts/items/silken_smile.lua index 6bc60a5aa1a..90da743b7bc 100644 --- a/scripts/items/silken_smile.lua +++ b/scripts/items/silken_smile.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/silken_spirit.lua b/scripts/items/silken_spirit.lua index 37d625d4950..71fa288fca0 100644 --- a/scripts/items/silken_spirit.lua +++ b/scripts/items/silken_spirit.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/silken_squeeze.lua b/scripts/items/silken_squeeze.lua index c3427c9ac80..036b7191e5d 100644 --- a/scripts/items/silken_squeeze.lua +++ b/scripts/items/silken_squeeze.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/silkworm_egg.lua b/scripts/items/silkworm_egg.lua index 6156a2e719d..c3ad840f80a 100644 --- a/scripts/items/silkworm_egg.lua +++ b/scripts/items/silkworm_egg.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/silver_shark.lua b/scripts/items/silver_shark.lua index 40fae71df17..0b9cad956f1 100644 --- a/scripts/items/silver_shark.lua +++ b/scripts/items/silver_shark.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/simit.lua b/scripts/items/simit.lua index 121f66710a7..58fe6d20645 100644 --- a/scripts/items/simit.lua +++ b/scripts/items/simit.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/simit_+1.lua b/scripts/items/simit_+1.lua index 54041afc0e9..51d0bc32882 100644 --- a/scripts/items/simit_+1.lua +++ b/scripts/items/simit_+1.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/sis_kebabi.lua b/scripts/items/sis_kebabi.lua index ab797146d87..4a5dcf26a42 100644 --- a/scripts/items/sis_kebabi.lua +++ b/scripts/items/sis_kebabi.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/sis_kebabi_+1.lua b/scripts/items/sis_kebabi_+1.lua index af8da3d6bbe..343324300a1 100644 --- a/scripts/items/sis_kebabi_+1.lua +++ b/scripts/items/sis_kebabi_+1.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/skeleton_robe.lua b/scripts/items/skeleton_robe.lua index 424d8978525..2cc5f47fd95 100644 --- a/scripts/items/skeleton_robe.lua +++ b/scripts/items/skeleton_robe.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 564, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { power = 564, duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/skewer_of_m&p_chicken.lua b/scripts/items/skewer_of_m&p_chicken.lua index 881a77fb757..d8b9eba530e 100644 --- a/scripts/items/skewer_of_m&p_chicken.lua +++ b/scripts/items/skewer_of_m&p_chicken.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 180, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 180, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/slab_of_ruszor_meat.lua b/scripts/items/slab_of_ruszor_meat.lua index 9f333a13d06..ca1f2252386 100644 --- a/scripts/items/slab_of_ruszor_meat.lua +++ b/scripts/items/slab_of_ruszor_meat.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/sleepshroom.lua b/scripts/items/sleepshroom.lua index 2bff7948736..67df122f406 100644 --- a/scripts/items/sleepshroom.lua +++ b/scripts/items/sleepshroom.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/slice_of_anchovy_pizza.lua b/scripts/items/slice_of_anchovy_pizza.lua index c5cb1327315..7837d162a61 100644 --- a/scripts/items/slice_of_anchovy_pizza.lua +++ b/scripts/items/slice_of_anchovy_pizza.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/slice_of_anchovy_pizza_+1.lua b/scripts/items/slice_of_anchovy_pizza_+1.lua index e71c4908b83..f3ede43c66c 100644 --- a/scripts/items/slice_of_anchovy_pizza_+1.lua +++ b/scripts/items/slice_of_anchovy_pizza_+1.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/slice_of_buffalo_meat.lua b/scripts/items/slice_of_buffalo_meat.lua index 7e0c99f977a..720d06274f0 100644 --- a/scripts/items/slice_of_buffalo_meat.lua +++ b/scripts/items/slice_of_buffalo_meat.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/slice_of_cerberus_meat.lua b/scripts/items/slice_of_cerberus_meat.lua index 9768421e3bd..3accf56da83 100644 --- a/scripts/items/slice_of_cerberus_meat.lua +++ b/scripts/items/slice_of_cerberus_meat.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/slice_of_cockatrice_meat.lua b/scripts/items/slice_of_cockatrice_meat.lua index 209fb6081f5..d99657c1948 100644 --- a/scripts/items/slice_of_cockatrice_meat.lua +++ b/scripts/items/slice_of_cockatrice_meat.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/slice_of_coeurl_meat.lua b/scripts/items/slice_of_coeurl_meat.lua index aa4d4372500..7991884e252 100644 --- a/scripts/items/slice_of_coeurl_meat.lua +++ b/scripts/items/slice_of_coeurl_meat.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/slice_of_dhalmel_meat.lua b/scripts/items/slice_of_dhalmel_meat.lua index 09eab7f9482..43f03983298 100644 --- a/scripts/items/slice_of_dhalmel_meat.lua +++ b/scripts/items/slice_of_dhalmel_meat.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/slice_of_diatryma_meat.lua b/scripts/items/slice_of_diatryma_meat.lua index 5bbb8a8f9f1..e31df707673 100644 --- a/scripts/items/slice_of_diatryma_meat.lua +++ b/scripts/items/slice_of_diatryma_meat.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/slice_of_dragon_meat.lua b/scripts/items/slice_of_dragon_meat.lua index 11e97cfc8b5..7aa0aac3189 100644 --- a/scripts/items/slice_of_dragon_meat.lua +++ b/scripts/items/slice_of_dragon_meat.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/slice_of_giant_sheep_meat.lua b/scripts/items/slice_of_giant_sheep_meat.lua index 744e5e5495c..f633494d782 100644 --- a/scripts/items/slice_of_giant_sheep_meat.lua +++ b/scripts/items/slice_of_giant_sheep_meat.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/slice_of_grilled_black_hare.lua b/scripts/items/slice_of_grilled_black_hare.lua index 61922a28175..70e67d17503 100644 --- a/scripts/items/slice_of_grilled_black_hare.lua +++ b/scripts/items/slice_of_grilled_black_hare.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/slice_of_grilled_hare.lua b/scripts/items/slice_of_grilled_hare.lua index 14dd097af3b..62a85d1ab00 100644 --- a/scripts/items/slice_of_grilled_hare.lua +++ b/scripts/items/slice_of_grilled_hare.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/slice_of_hare_meat.lua b/scripts/items/slice_of_hare_meat.lua index 1c8dd53f689..8c16c9661e1 100644 --- a/scripts/items/slice_of_hare_meat.lua +++ b/scripts/items/slice_of_hare_meat.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/slice_of_juicy_mutton.lua b/scripts/items/slice_of_juicy_mutton.lua index cf66a7d472f..26567f0c8fa 100644 --- a/scripts/items/slice_of_juicy_mutton.lua +++ b/scripts/items/slice_of_juicy_mutton.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/slice_of_karakul_meat.lua b/scripts/items/slice_of_karakul_meat.lua index 09f39179df5..ea71fb8ad9e 100644 --- a/scripts/items/slice_of_karakul_meat.lua +++ b/scripts/items/slice_of_karakul_meat.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/slice_of_land_crab_meat.lua b/scripts/items/slice_of_land_crab_meat.lua index bdce1a9bed0..3723842b677 100644 --- a/scripts/items/slice_of_land_crab_meat.lua +++ b/scripts/items/slice_of_land_crab_meat.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/slice_of_lynx_meat.lua b/scripts/items/slice_of_lynx_meat.lua index 672dafaeff0..a99bcbc274d 100644 --- a/scripts/items/slice_of_lynx_meat.lua +++ b/scripts/items/slice_of_lynx_meat.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/slice_of_margherita_pizza.lua b/scripts/items/slice_of_margherita_pizza.lua index c8d2b30b43c..37a0a2837b3 100644 --- a/scripts/items/slice_of_margherita_pizza.lua +++ b/scripts/items/slice_of_margherita_pizza.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/slice_of_margherita_pizza_+1.lua b/scripts/items/slice_of_margherita_pizza_+1.lua index 1a16d590f46..583c68d638a 100644 --- a/scripts/items/slice_of_margherita_pizza_+1.lua +++ b/scripts/items/slice_of_margherita_pizza_+1.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/slice_of_marinara_pizza.lua b/scripts/items/slice_of_marinara_pizza.lua index 0466a02ca66..bdd1f77a6ee 100644 --- a/scripts/items/slice_of_marinara_pizza.lua +++ b/scripts/items/slice_of_marinara_pizza.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/slice_of_marinara_pizza_+1.lua b/scripts/items/slice_of_marinara_pizza_+1.lua index f0ed2bf1839..0d5b79baba8 100644 --- a/scripts/items/slice_of_marinara_pizza_+1.lua +++ b/scripts/items/slice_of_marinara_pizza_+1.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/slice_of_pepperoni_pizza.lua b/scripts/items/slice_of_pepperoni_pizza.lua index e0007b2bb99..4e625f21033 100644 --- a/scripts/items/slice_of_pepperoni_pizza.lua +++ b/scripts/items/slice_of_pepperoni_pizza.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/slice_of_pepperoni_pizza_+1.lua b/scripts/items/slice_of_pepperoni_pizza_+1.lua index af030abeea0..b01d54d623f 100644 --- a/scripts/items/slice_of_pepperoni_pizza_+1.lua +++ b/scripts/items/slice_of_pepperoni_pizza_+1.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/slice_of_roast_mutton.lua b/scripts/items/slice_of_roast_mutton.lua index fbb33a9ac4a..4d04e0fae1a 100644 --- a/scripts/items/slice_of_roast_mutton.lua +++ b/scripts/items/slice_of_roast_mutton.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/slice_of_salted_hare.lua b/scripts/items/slice_of_salted_hare.lua index c3f30a5a006..44c59441fae 100644 --- a/scripts/items/slice_of_salted_hare.lua +++ b/scripts/items/slice_of_salted_hare.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/slice_of_tavnazian_ram_meat.lua b/scripts/items/slice_of_tavnazian_ram_meat.lua index 759d065098d..86310839230 100644 --- a/scripts/items/slice_of_tavnazian_ram_meat.lua +++ b/scripts/items/slice_of_tavnazian_ram_meat.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/slice_of_ziz_meat.lua b/scripts/items/slice_of_ziz_meat.lua index c9d676e6c12..2273cb2631d 100644 --- a/scripts/items/slice_of_ziz_meat.lua +++ b/scripts/items/slice_of_ziz_meat.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/smash_cesti.lua b/scripts/items/smash_cesti.lua index a22bc868e59..b003b429706 100644 --- a/scripts/items/smash_cesti.lua +++ b/scripts/items/smash_cesti.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.SMASH_CESTI) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.SMASH_CESTI) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 1800, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.SMASH_CESTI }) end end diff --git a/scripts/items/smilodon_liver.lua b/scripts/items/smilodon_liver.lua index efc5c76840e..bf6bdbd1bb2 100644 --- a/scripts/items/smilodon_liver.lua +++ b/scripts/items/smilodon_liver.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/smoked_salmon.lua b/scripts/items/smoked_salmon.lua index 1a17ce70b3e..7e0adc5bbed 100644 --- a/scripts/items/smoked_salmon.lua +++ b/scripts/items/smoked_salmon.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/smoldering_salisbury_steak.lua b/scripts/items/smoldering_salisbury_steak.lua index 72cc889e9c3..a42b6ce0181 100644 --- a/scripts/items/smoldering_salisbury_steak.lua +++ b/scripts/items/smoldering_salisbury_steak.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/sneaking_boots.lua b/scripts/items/sneaking_boots.lua index f0ac38d0d7d..ea7960cc3e1 100644 --- a/scripts/items/sneaking_boots.lua +++ b/scripts/items/sneaking_boots.lua @@ -9,9 +9,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) target:delStatusEffect(xi.effect.SNEAK) - target:addStatusEffect(xi.effect.SNEAK, 1, 0, math.floor(180 * xi.settings.main.SNEAK_INVIS_DURATION_MULTIPLIER)) + target:addStatusEffect(xi.effect.SNEAK, { power = 1, duration = math.floor(180 * xi.settings.main.SNEAK_INVIS_DURATION_MULTIPLIER), origin = user }) end return itemObject diff --git a/scripts/items/snow_bunny_hat_+1.lua b/scripts/items/snow_bunny_hat_+1.lua index a671b7df4b8..f397c48378b 100644 --- a/scripts/items/snow_bunny_hat_+1.lua +++ b/scripts/items/snow_bunny_hat_+1.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 270, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { power = 270, duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/snowman_cap.lua b/scripts/items/snowman_cap.lua index 685b958c976..e87a24bdeba 100644 --- a/scripts/items/snowman_cap.lua +++ b/scripts/items/snowman_cap.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 279, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { power = 279, duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/sobbing_fungus.lua b/scripts/items/sobbing_fungus.lua index 9fa975bfea0..0e144c2adb7 100644 --- a/scripts/items/sobbing_fungus.lua +++ b/scripts/items/sobbing_fungus.lua @@ -12,9 +12,9 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 180, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 180, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) if not target:hasStatusEffect(xi.effect.SILENCE) then - target:addStatusEffect(xi.effect.SILENCE, 1, 3, 180) + target:addStatusEffect(xi.effect.SILENCE, { power = 1, duration = 180, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/soft-boiled_egg.lua b/scripts/items/soft-boiled_egg.lua index bad50e78fad..36c6e1f2aba 100644 --- a/scripts/items/soft-boiled_egg.lua +++ b/scripts/items/soft-boiled_egg.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/spartan_hoplon.lua b/scripts/items/spartan_hoplon.lua index ee4f512164c..8c46ed12444 100644 --- a/scripts/items/spartan_hoplon.lua +++ b/scripts/items/spartan_hoplon.lua @@ -10,8 +10,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - if target:addStatusEffect(xi.effect.PHALANX, 10, 0, 180) then -- Retail potency unknown, 10 is a guess. (someone 1000 needles test this thing!) +itemObject.onItemUse = function(target, user) + if target:addStatusEffect(xi.effect.PHALANX, { power = 10, duration = 180, origin = user }) then -- Retail potency unknown, 10 is a guess. (someone 1000 needles test this thing!) target:messageBasic(xi.msg.basic.GAINS_EFFECT_OF_STATUS, xi.effect.PHALANX) else target:messageBasic(xi.msg.basic.NO_EFFECT) diff --git a/scripts/items/spicy_cracker.lua b/scripts/items/spicy_cracker.lua index 96add0a622b..4137c6042d1 100644 --- a/scripts/items/spicy_cracker.lua +++ b/scripts/items/spicy_cracker.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 180, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 180, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/spirit_lantern.lua b/scripts/items/spirit_lantern.lua index d20fa86fd15..84db011b350 100644 --- a/scripts/items/spirit_lantern.lua +++ b/scripts/items/spirit_lantern.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.SPIRIT_LANTERN) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.SPIRIT_LANTERN) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.SPIRIT_LANTERN }) end end diff --git a/scripts/items/sprig_of_cibol.lua b/scripts/items/sprig_of_cibol.lua index 2b8cb58a1d7..f39783e0a68 100644 --- a/scripts/items/sprig_of_cibol.lua +++ b/scripts/items/sprig_of_cibol.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/sprig_of_hemlock.lua b/scripts/items/sprig_of_hemlock.lua index 45752276c99..a259f1458c1 100644 --- a/scripts/items/sprig_of_hemlock.lua +++ b/scripts/items/sprig_of_hemlock.lua @@ -11,9 +11,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.PARALYSIS) then - target:addStatusEffect(xi.effect.PARALYSIS, 20, 0, 600) + target:addStatusEffect(xi.effect.PARALYSIS, { power = 20, duration = 600, origin = user }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/sprinters_shoes.lua b/scripts/items/sprinters_shoes.lua index e73a844c23d..5d503c55fbd 100644 --- a/scripts/items/sprinters_shoes.lua +++ b/scripts/items/sprinters_shoes.lua @@ -11,8 +11,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.QUICKENING, 5, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.QUICKENING, { power = 5, duration = 3600, origin = user }) target:messageBasic(xi.msg.basic.GAINS_EFFECT_OF_STATUS, xi.effect.QUICKENING) end diff --git a/scripts/items/steamed_catfish.lua b/scripts/items/steamed_catfish.lua index a7b2c6252f5..c86cdcd87fa 100644 --- a/scripts/items/steamed_catfish.lua +++ b/scripts/items/steamed_catfish.lua @@ -19,7 +19,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/steamed_crab.lua b/scripts/items/steamed_crab.lua index 2f8df67d941..3fd01b29590 100644 --- a/scripts/items/steamed_crab.lua +++ b/scripts/items/steamed_crab.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/steamed_crayfish.lua b/scripts/items/steamed_crayfish.lua index 57961758e01..9b6a6ff77d3 100644 --- a/scripts/items/steamed_crayfish.lua +++ b/scripts/items/steamed_crayfish.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/stick_of_cotton_candy.lua b/scripts/items/stick_of_cotton_candy.lua index f1a08f9ca32..5862eabcbca 100644 --- a/scripts/items/stick_of_cotton_candy.lua +++ b/scripts/items/stick_of_cotton_candy.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/stick_of_pepperoni.lua b/scripts/items/stick_of_pepperoni.lua index 35a2582479b..302c142d3e7 100644 --- a/scripts/items/stick_of_pepperoni.lua +++ b/scripts/items/stick_of_pepperoni.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/stirge_belt.lua b/scripts/items/stirge_belt.lua index 52fc03b0b52..3fff450bb1e 100644 --- a/scripts/items/stirge_belt.lua +++ b/scripts/items/stirge_belt.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 256, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { power = 256, duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/stoneskin_torque.lua b/scripts/items/stoneskin_torque.lua index 44e268a548b..21008bf51d8 100644 --- a/scripts/items/stoneskin_torque.lua +++ b/scripts/items/stoneskin_torque.lua @@ -10,9 +10,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.STONESKIN_TORQUE) then - if target:addStatusEffect(xi.effect.STONESKIN, 104, 0, 300, 0, 0, 4, xi.effectSourceType.EQUIPPED_ITEM, xi.item.STONESKIN_TORQUE) then + if target:addStatusEffect(xi.effect.STONESKIN, { power = 104, duration = 300, origin = user, tier = 4, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.STONESKIN_TORQUE }) then target:messageBasic(xi.msg.basic.GAINS_EFFECT_OF_STATUS, xi.effect.STONESKIN) else target:messageBasic(xi.msg.basic.NO_EFFECT) diff --git a/scripts/items/strength_potion.lua b/scripts/items/strength_potion.lua index 96f006afa6f..081d9ac7ef8 100644 --- a/scripts/items/strength_potion.lua +++ b/scripts/items/strength_potion.lua @@ -14,9 +14,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.STR_BOOST, 7, 0, 180) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 900) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.STR_BOOST, { power = 7, duration = 180, origin = user }) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 900, origin = user }) end return itemObject diff --git a/scripts/items/strip_of_bison_jerky.lua b/scripts/items/strip_of_bison_jerky.lua index 6db2e266395..79800ea1c36 100644 --- a/scripts/items/strip_of_bison_jerky.lua +++ b/scripts/items/strip_of_bison_jerky.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/strip_of_buffalo_jerky.lua b/scripts/items/strip_of_buffalo_jerky.lua index 6af442f00e8..b7765f68977 100644 --- a/scripts/items/strip_of_buffalo_jerky.lua +++ b/scripts/items/strip_of_buffalo_jerky.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/strip_of_meat_jerky.lua b/scripts/items/strip_of_meat_jerky.lua index a48eb104992..f933ad15b0e 100644 --- a/scripts/items/strip_of_meat_jerky.lua +++ b/scripts/items/strip_of_meat_jerky.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/strip_of_sheep_jerky.lua b/scripts/items/strip_of_sheep_jerky.lua index 125cbc4938e..8551423d386 100644 --- a/scripts/items/strip_of_sheep_jerky.lua +++ b/scripts/items/strip_of_sheep_jerky.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/strip_of_smoked_mackerel.lua b/scripts/items/strip_of_smoked_mackerel.lua index f011ef8d246..a4598d85573 100644 --- a/scripts/items/strip_of_smoked_mackerel.lua +++ b/scripts/items/strip_of_smoked_mackerel.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/stuffed_pitaru.lua b/scripts/items/stuffed_pitaru.lua index a4e3af535fe..0aecc55382d 100644 --- a/scripts/items/stuffed_pitaru.lua +++ b/scripts/items/stuffed_pitaru.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/sturdy_slacks.lua b/scripts/items/sturdy_slacks.lua index a642f23bc49..2f31adb5164 100644 --- a/scripts/items/sturdy_slacks.lua +++ b/scripts/items/sturdy_slacks.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.STURDY_SLACKS) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.STURDY_SLACKS) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 1800, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.STURDY_SLACKS }) end end diff --git a/scripts/items/sturdy_trousers.lua b/scripts/items/sturdy_trousers.lua index 1e685d15579..7dbd1b43994 100644 --- a/scripts/items/sturdy_trousers.lua +++ b/scripts/items/sturdy_trousers.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.STURDY_TROUSERS) then - target:addStatusEffect(xi.effect.MAX_HP_BOOST, 10, 0, 1800, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.STURDY_TROUSERS) + target:addStatusEffect(xi.effect.MAX_HP_BOOST, { power = 10, duration = 1800, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.STURDY_TROUSERS }) end end diff --git a/scripts/items/sugar_rusk.lua b/scripts/items/sugar_rusk.lua index 567a70e44c6..11bc17a3ef7 100644 --- a/scripts/items/sugar_rusk.lua +++ b/scripts/items/sugar_rusk.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/sultans_belt.lua b/scripts/items/sultans_belt.lua index b4d4ce8da35..9ce36bf0010 100644 --- a/scripts/items/sultans_belt.lua +++ b/scripts/items/sultans_belt.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.SULTANS_BELT) then - target:addStatusEffect(xi.effect.STR_BOOST, 10, 0, 60, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.SULTANS_BELT) + target:addStatusEffect(xi.effect.STR_BOOST, { power = 10, duration = 60, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.SULTANS_BELT }) end end diff --git a/scripts/items/super_reraiser.lua b/scripts/items/super_reraiser.lua index 09945cfb415..7a8f95355da 100644 --- a/scripts/items/super_reraiser.lua +++ b/scripts/items/super_reraiser.lua @@ -10,10 +10,10 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) local duration = 3600 target:delStatusEffect(xi.effect.RERAISE) - target:addStatusEffect(xi.effect.RERAISE, 3, 0, duration) + target:addStatusEffect(xi.effect.RERAISE, { power = 3, duration = duration, origin = user }) end return itemObject diff --git a/scripts/items/sweet_baked_apple.lua b/scripts/items/sweet_baked_apple.lua index e404a66e8a3..bbc7969302b 100644 --- a/scripts/items/sweet_baked_apple.lua +++ b/scripts/items/sweet_baked_apple.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/sweet_rice_cake.lua b/scripts/items/sweet_rice_cake.lua index 608130fbc46..fcdc0b7f99b 100644 --- a/scripts/items/sweet_rice_cake.lua +++ b/scripts/items/sweet_rice_cake.lua @@ -20,7 +20,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/tactical_ring.lua b/scripts/items/tactical_ring.lua index e986d546777..9212a8378c9 100644 --- a/scripts/items/tactical_ring.lua +++ b/scripts/items/tactical_ring.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.TACTICAL_RING) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 120, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.TACTICAL_RING) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 120, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.TACTICAL_RING }) end end diff --git a/scripts/items/taikyoku_kenpogi.lua b/scripts/items/taikyoku_kenpogi.lua index 950e9aa3db5..a8efe3bbb31 100644 --- a/scripts/items/taikyoku_kenpogi.lua +++ b/scripts/items/taikyoku_kenpogi.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.TAIKYOKU_KENPOGI) then - target:addStatusEffect(xi.effect.EVASION_BOOST, 3, 0, 1800, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.TAIKYOKU_KENPOGI) + target:addStatusEffect(xi.effect.EVASION_BOOST, { power = 3, duration = 1800, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.TAIKYOKU_KENPOGI }) end end diff --git a/scripts/items/talaria.lua b/scripts/items/talaria.lua index fe4ce4f219a..dcdd9348b3b 100644 --- a/scripts/items/talaria.lua +++ b/scripts/items/talaria.lua @@ -12,9 +12,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if not target:hasStatusEffect(xi.effect.ENCHANTMENT) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 3600, 11403) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 3600, origin = user, subType = 11403 }) end end diff --git a/scripts/items/talisman_obi.lua b/scripts/items/talisman_obi.lua index 2668626ec7f..5c198cf650a 100644 --- a/scripts/items/talisman_obi.lua +++ b/scripts/items/talisman_obi.lua @@ -6,7 +6,7 @@ ---@type TItem local itemObject = {} -itemObject.onItemCheck = function(target) +itemObject.onItemCheck = function(target, user) if target:getStatusEffectBySource(xi.effect.ENCHANTMENT, xi.effectSourceType.EQUIPPED_ITEM, xi.item.TALISMAN_OBI) ~= nil then target:delStatusEffect(xi.effect.ENCHANTMENT, nil, xi.effectSourceType.EQUIPPED_ITEM, xi.item.TALISMAN_OBI) end @@ -14,9 +14,9 @@ itemObject.onItemCheck = function(target) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.TALISMAN_OBI) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.TALISMAN_OBI) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 1800, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.TALISMAN_OBI }) end end diff --git a/scripts/items/tanners_belt.lua b/scripts/items/tanners_belt.lua index 951848b378c..e5a0cb369a4 100644 --- a/scripts/items/tanners_belt.lua +++ b/scripts/items/tanners_belt.lua @@ -16,8 +16,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.LEATHERCRAFT_IMAGERY, 3, 0, 480) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.LEATHERCRAFT_IMAGERY, { power = 3, duration = 480, origin = user }) end return itemObject diff --git a/scripts/items/tarutaru_rice_cake.lua b/scripts/items/tarutaru_rice_cake.lua index 7cace6eb7c1..4c66353ec68 100644 --- a/scripts/items/tarutaru_rice_cake.lua +++ b/scripts/items/tarutaru_rice_cake.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 823, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { power = 823, duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/tavnazian_goby.lua b/scripts/items/tavnazian_goby.lua index bb20499f2eb..e56763e8c79 100644 --- a/scripts/items/tavnazian_goby.lua +++ b/scripts/items/tavnazian_goby.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/tavnazian_salad.lua b/scripts/items/tavnazian_salad.lua index dec4e48609b..34cba0cdfa6 100644 --- a/scripts/items/tavnazian_salad.lua +++ b/scripts/items/tavnazian_salad.lua @@ -20,7 +20,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/tavnazian_sheep_liver.lua b/scripts/items/tavnazian_sheep_liver.lua index a74d0e64f3b..abec6fe2da0 100644 --- a/scripts/items/tavnazian_sheep_liver.lua +++ b/scripts/items/tavnazian_sheep_liver.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/tavnazian_taco.lua b/scripts/items/tavnazian_taco.lua index 5bed98c17c3..e235ebc11ba 100644 --- a/scripts/items/tavnazian_taco.lua +++ b/scripts/items/tavnazian_taco.lua @@ -22,7 +22,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/teleport_ring_altep.lua b/scripts/items/teleport_ring_altep.lua index 0c6bf7fdca5..5e6c97adedc 100644 --- a/scripts/items/teleport_ring_altep.lua +++ b/scripts/items/teleport_ring_altep.lua @@ -15,8 +15,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return result end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.ALTEP, 0, 4) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.ALTEP, duration = 4, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/teleport_ring_dem.lua b/scripts/items/teleport_ring_dem.lua index 57b4fb09491..721f26a6429 100644 --- a/scripts/items/teleport_ring_dem.lua +++ b/scripts/items/teleport_ring_dem.lua @@ -15,8 +15,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return result end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.DEM, 0, 4) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.DEM, duration = 4, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/teleport_ring_holla.lua b/scripts/items/teleport_ring_holla.lua index 834aeafb5b1..69cb534f76b 100644 --- a/scripts/items/teleport_ring_holla.lua +++ b/scripts/items/teleport_ring_holla.lua @@ -15,8 +15,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return result end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.HOLLA, 0, 4) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.HOLLA, duration = 4, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/teleport_ring_mea.lua b/scripts/items/teleport_ring_mea.lua index 5bd12485e23..e5430d9b5cd 100644 --- a/scripts/items/teleport_ring_mea.lua +++ b/scripts/items/teleport_ring_mea.lua @@ -15,8 +15,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return result end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.MEA, 0, 4) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.MEA, duration = 4, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/teleport_ring_vahzl.lua b/scripts/items/teleport_ring_vahzl.lua index 1e0f53ad2c4..723dfc2c434 100644 --- a/scripts/items/teleport_ring_vahzl.lua +++ b/scripts/items/teleport_ring_vahzl.lua @@ -15,8 +15,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return result end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.VAHZL, 0, 4) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.VAHZL, duration = 4, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/teleport_ring_yhoat.lua b/scripts/items/teleport_ring_yhoat.lua index 46f6555e655..bbc8d60dbbd 100644 --- a/scripts/items/teleport_ring_yhoat.lua +++ b/scripts/items/teleport_ring_yhoat.lua @@ -15,8 +15,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return result end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.YHOAT, 0, 4) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.YHOAT, duration = 4, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/temple_truffle.lua b/scripts/items/temple_truffle.lua index 013175667ac..4e0e064a7bb 100644 --- a/scripts/items/temple_truffle.lua +++ b/scripts/items/temple_truffle.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 180, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 180, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/thundermelon.lua b/scripts/items/thundermelon.lua index 08e0b568191..eec7ade22fc 100644 --- a/scripts/items/thundermelon.lua +++ b/scripts/items/thundermelon.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/tidal_talisman.lua b/scripts/items/tidal_talisman.lua index 68ace8ce7fa..33eed2ca565 100644 --- a/scripts/items/tidal_talisman.lua +++ b/scripts/items/tidal_talisman.lua @@ -21,8 +21,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 56 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.TIDAL_TALISMAN, 0, 4) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.TIDAL_TALISMAN, duration = 4, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/tiger_cod.lua b/scripts/items/tiger_cod.lua index 63adacbbebd..36dbed1f29f 100644 --- a/scripts/items/tiger_cod.lua +++ b/scripts/items/tiger_cod.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/timbre_timbers_salad.lua b/scripts/items/timbre_timbers_salad.lua index 970756901e1..aa8ae450651 100644 --- a/scripts/items/timbre_timbers_salad.lua +++ b/scripts/items/timbre_timbers_salad.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/timbre_timbers_taco.lua b/scripts/items/timbre_timbers_taco.lua index 92651b61b3e..702fdb1ef69 100644 --- a/scripts/items/timbre_timbers_taco.lua +++ b/scripts/items/timbre_timbers_taco.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/tiny_goldfish.lua b/scripts/items/tiny_goldfish.lua index f5e4004fabc..d8e3c650a14 100644 --- a/scripts/items/tiny_goldfish.lua +++ b/scripts/items/tiny_goldfish.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/tonosama_rice_ball.lua b/scripts/items/tonosama_rice_ball.lua index 80fc5b5bad6..ad57b8f0dba 100644 --- a/scripts/items/tonosama_rice_ball.lua +++ b/scripts/items/tonosama_rice_ball.lua @@ -20,7 +20,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/tortilla.lua b/scripts/items/tortilla.lua index caecaeda35c..3de4ff695b9 100644 --- a/scripts/items/tortilla.lua +++ b/scripts/items/tortilla.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/tortilla_buena.lua b/scripts/items/tortilla_buena.lua index cad30223354..9afbd8a13e6 100644 --- a/scripts/items/tortilla_buena.lua +++ b/scripts/items/tortilla_buena.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/tough_belt.lua b/scripts/items/tough_belt.lua index 0b04006ebf0..eeb771a45f6 100644 --- a/scripts/items/tough_belt.lua +++ b/scripts/items/tough_belt.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.TOUGH_BELT) then - target:addStatusEffect(xi.effect.VIT_BOOST, 3, 0, 60, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.TOUGH_BELT) + target:addStatusEffect(xi.effect.VIT_BOOST, { power = 3, duration = 60, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.TOUGH_BELT }) end end diff --git a/scripts/items/town_moogle_shield.lua b/scripts/items/town_moogle_shield.lua index d00255429a0..2f796f9c40e 100644 --- a/scripts/items/town_moogle_shield.lua +++ b/scripts/items/town_moogle_shield.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 2308, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { power = 2308, duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/trail_cookie.lua b/scripts/items/trail_cookie.lua index 2940f33f7fa..60b46031f38 100644 --- a/scripts/items/trail_cookie.lua +++ b/scripts/items/trail_cookie.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/tricolored_carp.lua b/scripts/items/tricolored_carp.lua index 0d1a892c1ef..bc097e294a8 100644 --- a/scripts/items/tricolored_carp.lua +++ b/scripts/items/tricolored_carp.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/trilobite.lua b/scripts/items/trilobite.lua index ecaf3e04eea..09ec3b88b6f 100644 --- a/scripts/items/trilobite.lua +++ b/scripts/items/trilobite.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/tropical_clam.lua b/scripts/items/tropical_clam.lua index c05200bdf23..c4a98f8b940 100644 --- a/scripts/items/tropical_clam.lua +++ b/scripts/items/tropical_clam.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/tropical_crepe.lua b/scripts/items/tropical_crepe.lua index efb53c426cf..49ecec3e456 100644 --- a/scripts/items/tropical_crepe.lua +++ b/scripts/items/tropical_crepe.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/truelove_chocolate.lua b/scripts/items/truelove_chocolate.lua index e232c21ea22..852db464f16 100644 --- a/scripts/items/truelove_chocolate.lua +++ b/scripts/items/truelove_chocolate.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/trumpet_shell.lua b/scripts/items/trumpet_shell.lua index 4d0c805ad98..11c9701caf6 100644 --- a/scripts/items/trumpet_shell.lua +++ b/scripts/items/trumpet_shell.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/turkey_with_rolanberry_sauce.lua b/scripts/items/turkey_with_rolanberry_sauce.lua index 0a704054204..435ddac411c 100644 --- a/scripts/items/turkey_with_rolanberry_sauce.lua +++ b/scripts/items/turkey_with_rolanberry_sauce.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/twicer.lua b/scripts/items/twicer.lua index ff884b6c01d..50d6a6f2f75 100644 --- a/scripts/items/twicer.lua +++ b/scripts/items/twicer.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.TWICER) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 30, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.TWICER) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 30, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.TWICER }) end end diff --git a/scripts/items/two-leaf_mandragora_bud.lua b/scripts/items/two-leaf_mandragora_bud.lua index 30fcf80c172..d71ca751961 100644 --- a/scripts/items/two-leaf_mandragora_bud.lua +++ b/scripts/items/two-leaf_mandragora_bud.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/uberkuchen.lua b/scripts/items/uberkuchen.lua index c45aba3e0b0..ccc8fc97462 100644 --- a/scripts/items/uberkuchen.lua +++ b/scripts/items/uberkuchen.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/ulbuconut.lua b/scripts/items/ulbuconut.lua index 8f098e7ddcb..008c5d601db 100644 --- a/scripts/items/ulbuconut.lua +++ b/scripts/items/ulbuconut.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/ulbukan_lobster.lua b/scripts/items/ulbukan_lobster.lua index 97684b92fbb..8e1d22bd980 100644 --- a/scripts/items/ulbukan_lobster.lua +++ b/scripts/items/ulbukan_lobster.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/uskumru.lua b/scripts/items/uskumru.lua index 059abeb3b89..5288f471e8d 100644 --- a/scripts/items/uskumru.lua +++ b/scripts/items/uskumru.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/verboshroom.lua b/scripts/items/verboshroom.lua index 7d8cb408192..cac4956b46f 100644 --- a/scripts/items/verboshroom.lua +++ b/scripts/items/verboshroom.lua @@ -12,9 +12,9 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 180, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 180, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) if not target:hasStatusEffect(xi.effect.POISON) then - target:addStatusEffect(xi.effect.POISON, 2, 3, 180) + target:addStatusEffect(xi.effect.POISON, { power = 2, duration = 180, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/vial_of_refresh_musk.lua b/scripts/items/vial_of_refresh_musk.lua index af15a540f21..2c2d401f663 100644 --- a/scripts/items/vial_of_refresh_musk.lua +++ b/scripts/items/vial_of_refresh_musk.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.VIAL_OF_REFRESH_MUSK) then - target:addStatusEffect(xi.effect.REFRESH, 3, 3, 30, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.VIAL_OF_REFRESH_MUSK) + target:addStatusEffect(xi.effect.REFRESH, { power = 3, duration = 30, origin = user, tick = 3, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.VIAL_OF_REFRESH_MUSK }) end end diff --git a/scripts/items/viking_herring.lua b/scripts/items/viking_herring.lua index 5e6a926357d..6c97d92a72d 100644 --- a/scripts/items/viking_herring.lua +++ b/scripts/items/viking_herring.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/vision_ring.lua b/scripts/items/vision_ring.lua index ca17df3d9bd..031b294335a 100644 --- a/scripts/items/vision_ring.lua +++ b/scripts/items/vision_ring.lua @@ -15,9 +15,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.VISION_RING) then - target:addStatusEffect(xi.effect.ENCHANTMENT, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.VISION_RING) + target:addStatusEffect(xi.effect.ENCHANTMENT, { duration = 1800, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.VISION_RING }) end end diff --git a/scripts/items/vitality_potion.lua b/scripts/items/vitality_potion.lua index 020c39550e8..bffbe03589e 100644 --- a/scripts/items/vitality_potion.lua +++ b/scripts/items/vitality_potion.lua @@ -13,9 +13,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.VIT_BOOST, 7, 0, 180) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 900) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.VIT_BOOST, { power = 7, duration = 180, origin = user }) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 900, origin = user }) end return itemObject diff --git a/scripts/items/vomp_carrot.lua b/scripts/items/vomp_carrot.lua index d5ecbff3834..c975697274e 100644 --- a/scripts/items/vomp_carrot.lua +++ b/scripts/items/vomp_carrot.lua @@ -10,7 +10,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/vongola_clam.lua b/scripts/items/vongola_clam.lua index 6d376880aa4..50ce85d07ba 100644 --- a/scripts/items/vongola_clam.lua +++ b/scripts/items/vongola_clam.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/vulcan_blade.lua b/scripts/items/vulcan_blade.lua index b6f83acaaa7..d658ae798a0 100644 --- a/scripts/items/vulcan_blade.lua +++ b/scripts/items/vulcan_blade.lua @@ -7,7 +7,7 @@ ---@type TItem local itemObject = {} -itemObject.onItemCheck = function(target) +itemObject.onItemCheck = function(target, user) if target:getStatusEffectBySource(xi.effect.ENFIRE, xi.effectSourceType.EQUIPPED_ITEM, xi.item.VULCAN_BLADE) ~= nil then target:delStatusEffect(xi.effect.ENFIRE, nil, xi.effectSourceType.EQUIPPED_ITEM, xi.item.VULCAN_BLADE) end @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.VULCAN_BLADE) then local effect = xi.effect.ENFIRE local magicskill = target:getSkillLevel(xi.skill.ENHANCING_MAGIC) @@ -29,7 +29,7 @@ itemObject.onItemUse = function(target) potency = utils.clamp(potency, 3, 25) - target:addStatusEffect(effect, potency, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.VULCAN_BLADE) + target:addStatusEffect(effect, { power = potency, duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.VULCAN_BLADE }) end end diff --git a/scripts/items/vulcan_claymore.lua b/scripts/items/vulcan_claymore.lua index 9d775cc5653..c41a9fc8412 100644 --- a/scripts/items/vulcan_claymore.lua +++ b/scripts/items/vulcan_claymore.lua @@ -7,7 +7,7 @@ ---@type TItem local itemObject = {} -itemObject.onItemCheck = function(target) +itemObject.onItemCheck = function(target, user) if target:getStatusEffectBySource(xi.effect.ENFIRE, xi.effectSourceType.EQUIPPED_ITEM, xi.item.VULCAN_CLAYMORE) ~= nil then target:delStatusEffect(xi.effect.ENFIRE, nil, xi.effectSourceType.EQUIPPED_ITEM, xi.item.VULCAN_CLAYMORE) end @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.VULCAN_CLAYMORE) then local effect = xi.effect.ENFIRE local magicskill = target:getSkillLevel(xi.skill.ENHANCING_MAGIC) @@ -29,7 +29,7 @@ itemObject.onItemUse = function(target) potency = utils.clamp(potency, 3, 25) - target:addStatusEffect(effect, potency, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.VULCAN_CLAYMORE) + target:addStatusEffect(effect, { power = potency, duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.VULCAN_CLAYMORE }) end end diff --git a/scripts/items/vulcan_degen.lua b/scripts/items/vulcan_degen.lua index 2deb46937ab..a593bef75ca 100644 --- a/scripts/items/vulcan_degen.lua +++ b/scripts/items/vulcan_degen.lua @@ -7,7 +7,7 @@ ---@type TItem local itemObject = {} -itemObject.onItemCheck = function(target) +itemObject.onItemCheck = function(target, user) if target:getStatusEffectBySource(xi.effect.ENFIRE, xi.effectSourceType.EQUIPPED_ITEM, xi.item.VULCAN_DEGEN) ~= nil then target:delStatusEffect(xi.effect.ENFIRE, nil, xi.effectSourceType.EQUIPPED_ITEM, xi.item.VULCAN_DEGEN) end @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.VULCAN_DEGEN) then local effect = xi.effect.ENFIRE local magicskill = target:getSkillLevel(xi.skill.ENHANCING_MAGIC) @@ -29,7 +29,7 @@ itemObject.onItemUse = function(target) potency = utils.clamp(potency, 3, 25) - target:addStatusEffect(effect, potency, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.VULCAN_DEGEN) + target:addStatusEffect(effect, { power = potency, duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.VULCAN_DEGEN }) end end diff --git a/scripts/items/vulcan_sword.lua b/scripts/items/vulcan_sword.lua index 555cb335023..04805b5dc40 100644 --- a/scripts/items/vulcan_sword.lua +++ b/scripts/items/vulcan_sword.lua @@ -7,7 +7,7 @@ ---@type TItem local itemObject = {} -itemObject.onItemCheck = function(target) +itemObject.onItemCheck = function(target, user) if target:getStatusEffectBySource(xi.effect.ENFIRE, xi.effectSourceType.EQUIPPED_ITEM, xi.item.VULCAN_SWORD) ~= nil then target:delStatusEffect(xi.effect.ENFIRE, nil, xi.effectSourceType.EQUIPPED_ITEM, xi.item.VULCAN_SWORD) end @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.VULCAN_SWORD) then local effect = xi.effect.ENFIRE local magicskill = target:getSkillLevel(xi.skill.ENHANCING_MAGIC) @@ -29,7 +29,7 @@ itemObject.onItemUse = function(target) potency = utils.clamp(potency, 3, 25) - target:addStatusEffect(effect, potency, 0, 180, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.VULCAN_SWORD) + target:addStatusEffect(effect, { power = potency, duration = 180, origin = user, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.VULCAN_SWORD }) end end diff --git a/scripts/items/walnut.lua b/scripts/items/walnut.lua index e53143f0b70..0635c7300ac 100644 --- a/scripts/items/walnut.lua +++ b/scripts/items/walnut.lua @@ -13,7 +13,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/walnut_cookie.lua b/scripts/items/walnut_cookie.lua index ce710d1811b..31e9344646a 100644 --- a/scripts/items/walnut_cookie.lua +++ b/scripts/items/walnut_cookie.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 180, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 180, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/warm_egg.lua b/scripts/items/warm_egg.lua index 9c18ed6b2ce..f9e0654dfc1 100644 --- a/scripts/items/warm_egg.lua +++ b/scripts/items/warm_egg.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/warp_cudgel.lua b/scripts/items/warp_cudgel.lua index 81747a0da4c..b1b7bf2f739 100644 --- a/scripts/items/warp_cudgel.lua +++ b/scripts/items/warp_cudgel.lua @@ -10,8 +10,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.WARP, 0, 3) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.WARP, duration = 3, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/warp_ring.lua b/scripts/items/warp_ring.lua index d99a9ade645..2b2f9fc48cd 100644 --- a/scripts/items/warp_ring.lua +++ b/scripts/items/warp_ring.lua @@ -10,8 +10,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.WARP, 0, 3) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.WARP, duration = 3, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/watermelon.lua b/scripts/items/watermelon.lua index 3685889b1ed..649e5e7400b 100644 --- a/scripts/items/watermelon.lua +++ b/scripts/items/watermelon.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/weavers_belt.lua b/scripts/items/weavers_belt.lua index 8c487de3854..8d3914e3062 100644 --- a/scripts/items/weavers_belt.lua +++ b/scripts/items/weavers_belt.lua @@ -16,8 +16,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.CLOTHCRAFT_IMAGERY, 3, 0, 480) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.CLOTHCRAFT_IMAGERY, { power = 3, duration = 480, origin = user }) end return itemObject diff --git a/scripts/items/wedge_of_chalaimbille.lua b/scripts/items/wedge_of_chalaimbille.lua index 124d5a27c09..cfcdd36b90e 100644 --- a/scripts/items/wedge_of_chalaimbille.lua +++ b/scripts/items/wedge_of_chalaimbille.lua @@ -13,7 +13,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/white_drop.lua b/scripts/items/white_drop.lua index fe7b67270ba..6f063c15512 100644 --- a/scripts/items/white_drop.lua +++ b/scripts/items/white_drop.lua @@ -14,9 +14,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.CHR_BOOST, 5, 0, 900) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.CHR_BOOST, { power = 5, duration = 900, origin = user }) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/white_rarab_cap_+1.lua b/scripts/items/white_rarab_cap_+1.lua index fc8cb3c7d87..8c39df60ec4 100644 --- a/scripts/items/white_rarab_cap_+1.lua +++ b/scripts/items/white_rarab_cap_+1.lua @@ -10,10 +10,10 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) local duration = 7200 target:delStatusEffect(xi.effect.RERAISE) - target:addStatusEffect(xi.effect.RERAISE, 1, 0, duration) + target:addStatusEffect(xi.effect.RERAISE, { power = 1, duration = duration, origin = user }) target:messageBasic(xi.msg.basic.GAINS_EFFECT_OF_STATUS, xi.effect.RERAISE) end diff --git a/scripts/items/wild_cookie.lua b/scripts/items/wild_cookie.lua index e0fb98f1794..9d765f384fe 100644 --- a/scripts/items/wild_cookie.lua +++ b/scripts/items/wild_cookie.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/wild_melon.lua b/scripts/items/wild_melon.lua index 156b1f71f36..b8b1c37eaa5 100644 --- a/scripts/items/wild_melon.lua +++ b/scripts/items/wild_melon.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/wild_onion.lua b/scripts/items/wild_onion.lua index 8f563425acf..ff81957856d 100644 --- a/scripts/items/wild_onion.lua +++ b/scripts/items/wild_onion.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/wild_pineapple.lua b/scripts/items/wild_pineapple.lua index 1c29d57b5b3..7709da07c4a 100644 --- a/scripts/items/wild_pineapple.lua +++ b/scripts/items/wild_pineapple.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/wild_steak.lua b/scripts/items/wild_steak.lua index 87bf0b1f3c0..64eebba57bc 100644 --- a/scripts/items/wild_steak.lua +++ b/scripts/items/wild_steak.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 14400, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 14400, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/windurst_salad.lua b/scripts/items/windurst_salad.lua index f516def7710..d048767a1cf 100644 --- a/scripts/items/windurst_salad.lua +++ b/scripts/items/windurst_salad.lua @@ -17,7 +17,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/windurst_taco.lua b/scripts/items/windurst_taco.lua index 1bd1abf1d2f..23a8a32af1b 100644 --- a/scripts/items/windurst_taco.lua +++ b/scripts/items/windurst_taco.lua @@ -18,7 +18,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/windurst_woods_gate_glyph.lua b/scripts/items/windurst_woods_gate_glyph.lua index efd87e7f611..0be63852cf9 100644 --- a/scripts/items/windurst_woods_gate_glyph.lua +++ b/scripts/items/windurst_woods_gate_glyph.lua @@ -11,8 +11,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.WINDY_WOODS_GLYPH, 0, 3) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.WINDY_WOODS_GLYPH, duration = 3, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/wing_gorget.lua b/scripts/items/wing_gorget.lua index efb2a3f36b1..1e4800a911e 100644 --- a/scripts/items/wing_gorget.lua +++ b/scripts/items/wing_gorget.lua @@ -10,12 +10,12 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) if target:hasEquipped(xi.item.WING_GORGET) then if target:hasStatusEffect(xi.effect.REGAIN) then target:messageBasic(xi.msg.basic.NO_EFFECT) else - target:addStatusEffect(xi.effect.REGAIN, 5, 3, 30, 0, 0, 0, xi.effectSourceType.EQUIPPED_ITEM, xi.item.WING_GORGET) + target:addStatusEffect(xi.effect.REGAIN, { power = 5, duration = 30, origin = user, tick = 3, sourceType = xi.effectSourceType.EQUIPPED_ITEM, sourceTypeParam = xi.item.WING_GORGET }) end end end diff --git a/scripts/items/winterflower.lua b/scripts/items/winterflower.lua index 60ac42f774c..52672edc904 100644 --- a/scripts/items/winterflower.lua +++ b/scripts/items/winterflower.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/witch_kabob.lua b/scripts/items/witch_kabob.lua index 22bb03175b4..9b5aba87fe2 100644 --- a/scripts/items/witch_kabob.lua +++ b/scripts/items/witch_kabob.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/withered_rolanberry.lua b/scripts/items/withered_rolanberry.lua index 423772a0e69..79f0fed92e1 100644 --- a/scripts/items/withered_rolanberry.lua +++ b/scripts/items/withered_rolanberry.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/wizard_cookie.lua b/scripts/items/wizard_cookie.lua index 30d43c7b15e..69af6b18e8c 100644 --- a/scripts/items/wizard_cookie.lua +++ b/scripts/items/wizard_cookie.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/wonder_maillot_+1.lua b/scripts/items/wonder_maillot_+1.lua index e5739916d41..efe1ce5c28b 100644 --- a/scripts/items/wonder_maillot_+1.lua +++ b/scripts/items/wonder_maillot_+1.lua @@ -15,8 +15,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return result end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.PURGONORGO, 0, 3) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.PURGONORGO, duration = 3, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/wonder_top_+1.lua b/scripts/items/wonder_top_+1.lua index 6a525dab68f..67835a18a35 100644 --- a/scripts/items/wonder_top_+1.lua +++ b/scripts/items/wonder_top_+1.lua @@ -15,8 +15,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return result end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.PURGONORGO, 0, 3) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.PURGONORGO, duration = 3, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/woozyshroom.lua b/scripts/items/woozyshroom.lua index e94ead58802..5c8ea4ffbe1 100644 --- a/scripts/items/woozyshroom.lua +++ b/scripts/items/woozyshroom.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/worm_belt.lua b/scripts/items/worm_belt.lua index 98092b9f5b1..8eadb50372f 100644 --- a/scripts/items/worm_belt.lua +++ b/scripts/items/worm_belt.lua @@ -14,8 +14,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.COSTUME, 424, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.COSTUME, { power = 424, duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/wyrmking_suit_+1.lua b/scripts/items/wyrmking_suit_+1.lua index d9f28185097..c3d47177f2d 100644 --- a/scripts/items/wyrmking_suit_+1.lua +++ b/scripts/items/wyrmking_suit_+1.lua @@ -15,8 +15,8 @@ itemObject.onItemCheck = function(target, item, param, caster) return result end -itemObject.onItemUse = function(target) - target:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.WYRMKING_SUIT, 0, 3) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.WYRMKING_SUIT, duration = 3, origin = user, icon = 0 }) end return itemObject diff --git a/scripts/items/x-potion.lua b/scripts/items/x-potion.lua index 782906209a1..84b7b27005f 100644 --- a/scripts/items/x-potion.lua +++ b/scripts/items/x-potion.lua @@ -16,9 +16,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) target:messageBasic(xi.msg.basic.RECOVERS_HP, 0, target:addHP(150 * xi.settings.main.ITEM_POWER)) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 5) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 5, origin = user }) end return itemObject diff --git a/scripts/items/x-potion_+1.lua b/scripts/items/x-potion_+1.lua index 50267d470d7..dda0fee8b5f 100644 --- a/scripts/items/x-potion_+1.lua +++ b/scripts/items/x-potion_+1.lua @@ -16,9 +16,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) target:messageBasic(xi.msg.basic.RECOVERS_HP, 0, target:addHP(160 * xi.settings.main.ITEM_POWER)) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 5) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 5, origin = user }) end return itemObject diff --git a/scripts/items/x-potion_+2.lua b/scripts/items/x-potion_+2.lua index 40406b6eb9d..c4297a086a9 100644 --- a/scripts/items/x-potion_+2.lua +++ b/scripts/items/x-potion_+2.lua @@ -16,9 +16,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) target:messageBasic(xi.msg.basic.RECOVERS_HP, 0, target:addHP(170 * xi.settings.main.ITEM_POWER)) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 5) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 5, origin = user }) end return itemObject diff --git a/scripts/items/x-potion_+3.lua b/scripts/items/x-potion_+3.lua index 28fb45933a8..bfcea5871fc 100644 --- a/scripts/items/x-potion_+3.lua +++ b/scripts/items/x-potion_+3.lua @@ -16,9 +16,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) target:messageBasic(xi.msg.basic.RECOVERS_HP, 0, target:addHP(180 * xi.settings.main.ITEM_POWER)) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 5) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 5, origin = user }) end return itemObject diff --git a/scripts/items/yagudo_cherry.lua b/scripts/items/yagudo_cherry.lua index a76fc9df9dc..98c8eed984d 100644 --- a/scripts/items/yagudo_cherry.lua +++ b/scripts/items/yagudo_cherry.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/yellow_curry_bun.lua b/scripts/items/yellow_curry_bun.lua index b7ee2c9e77d..07e1e73e2c0 100644 --- a/scripts/items/yellow_curry_bun.lua +++ b/scripts/items/yellow_curry_bun.lua @@ -23,7 +23,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 1800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 1800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end local dataTable = diff --git a/scripts/items/yellow_curry_bun_+1.lua b/scripts/items/yellow_curry_bun_+1.lua index 4a49368d2df..de3ab6c5fa4 100644 --- a/scripts/items/yellow_curry_bun_+1.lua +++ b/scripts/items/yellow_curry_bun_+1.lua @@ -24,7 +24,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 3600, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 3600, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/yellow_drop.lua b/scripts/items/yellow_drop.lua index 33ddc1f2f26..e78a87c8dba 100644 --- a/scripts/items/yellow_drop.lua +++ b/scripts/items/yellow_drop.lua @@ -14,9 +14,9 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) - target:addStatusEffect(xi.effect.VIT_BOOST, 5, 0, 900) - target:addStatusEffect(xi.effect.MEDICINE, 0, 0, 3600) +itemObject.onItemUse = function(target, user) + target:addStatusEffect(xi.effect.VIT_BOOST, { power = 5, duration = 900, origin = user }) + target:addStatusEffect(xi.effect.MEDICINE, { duration = 3600, origin = user }) end return itemObject diff --git a/scripts/items/yellow_globe.lua b/scripts/items/yellow_globe.lua index 72264318af7..8e0bb0f76f5 100644 --- a/scripts/items/yellow_globe.lua +++ b/scripts/items/yellow_globe.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/yilanbaligi.lua b/scripts/items/yilanbaligi.lua index 94f1bf988f6..f3a903f0263 100644 --- a/scripts/items/yilanbaligi.lua +++ b/scripts/items/yilanbaligi.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/yogurt_cake.lua b/scripts/items/yogurt_cake.lua index d7dd130a460..6870708560d 100644 --- a/scripts/items/yogurt_cake.lua +++ b/scripts/items/yogurt_cake.lua @@ -16,7 +16,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 10800, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 10800, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/zafmlug_bass.lua b/scripts/items/zafmlug_bass.lua index 9505dda7e13..03962c96fed 100644 --- a/scripts/items/zafmlug_bass.lua +++ b/scripts/items/zafmlug_bass.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/zebra_eel.lua b/scripts/items/zebra_eel.lua index 28d093e7558..bc26d632649 100644 --- a/scripts/items/zebra_eel.lua +++ b/scripts/items/zebra_eel.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/zegham_carrot.lua b/scripts/items/zegham_carrot.lua index 74b52f6e749..be5004994b5 100644 --- a/scripts/items/zegham_carrot.lua +++ b/scripts/items/zegham_carrot.lua @@ -14,7 +14,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/items/zoolater_hat.lua b/scripts/items/zoolater_hat.lua index 396bb558594..9071dec64d3 100644 --- a/scripts/items/zoolater_hat.lua +++ b/scripts/items/zoolater_hat.lua @@ -10,10 +10,10 @@ itemObject.onItemCheck = function(target, item, param, caster) return 0 end -itemObject.onItemUse = function(target) +itemObject.onItemUse = function(target, user) local pet = target:getPet() if pet then - pet:addStatusEffect(xi.effect.REGAIN, 15, 3, 15) + pet:addStatusEffect(xi.effect.REGAIN, { power = 15, duration = 15, origin = user, tick = 3 }) else target:messageBasic(xi.msg.basic.NO_EFFECT) end diff --git a/scripts/items/zucchini.lua b/scripts/items/zucchini.lua index bc271cc934d..34dd8e70fb5 100644 --- a/scripts/items/zucchini.lua +++ b/scripts/items/zucchini.lua @@ -15,7 +15,7 @@ itemObject.onItemCheck = function(target, item, param, caster) end itemObject.onItemUse = function(target, user, item, action) - target:addStatusEffect(xi.effect.FOOD, 0, 0, 300, 0, 0, 0, xi.effectSourceType.FOOD, item:getID(), user:getID()) + target:addStatusEffect(xi.effect.FOOD, { duration = 300, origin = user, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = item:getID() }) end itemObject.onEffectGain = function(target, effect) diff --git a/scripts/missions/amk/13_A_Challenge_You_Could_Be_a_Winner.lua b/scripts/missions/amk/13_A_Challenge_You_Could_Be_a_Winner.lua index 5dc6cea1e5f..830a2bb7939 100644 --- a/scripts/missions/amk/13_A_Challenge_You_Could_Be_a_Winner.lua +++ b/scripts/missions/amk/13_A_Challenge_You_Could_Be_a_Winner.lua @@ -231,7 +231,7 @@ mission.sections = } if option == 5 or option == 6 then - player:addStatusEffect(xi.effect.FLEE, 10000, 0, fleeDuration[option]) + player:addStatusEffect(xi.effect.FLEE, { power = 10000, duration = fleeDuration[option], origin = player }) end end end, @@ -405,19 +405,19 @@ mission.sections = -- Start run player:needToZone(true) mission:setLocalVar(player, '[p3]timeLimit', GetSystemTime() + utils.minutes(8)) - player:addStatusEffect(xi.effect.LEVEL_RESTRICTION, 1, 0, 0) + player:addStatusEffect(xi.effect.LEVEL_RESTRICTION, { power = 1, origin = player }) -- https://www.bg-wiki.com/ffxi/Kupo_Mission_13 : "The effect durations are random. They can be 3-7 minutes long. " local buffDuration = math.floor(utils.minutes(math.random(3, 7)) * xi.settings.main.SNEAK_INVIS_DURATION_MULTIPLIER) - player:addStatusEffect(xi.effect.INVISIBLE, 1, 10, buffDuration) - player:addStatusEffect(xi.effect.DEODORIZE, 1, 10, buffDuration) - player:addStatusEffect(xi.effect.SNEAK, 1, 10, buffDuration) + player:addStatusEffect(xi.effect.INVISIBLE, { power = 1, duration = buffDuration, origin = player, tick = 10 }) + player:addStatusEffect(xi.effect.DEODORIZE, { power = 1, duration = buffDuration, origin = player, tick = 10 }) + player:addStatusEffect(xi.effect.SNEAK, { power = 1, duration = buffDuration, origin = player, tick = 10 }) elseif option == 2 then -- Player came back to refresh buffs local buffDuration = math.floor(utils.minutes(math.random(3, 7)) * xi.settings.main.SNEAK_INVIS_DURATION_MULTIPLIER) - player:addStatusEffect(xi.effect.INVISIBLE, 1, 10, buffDuration) - player:addStatusEffect(xi.effect.DEODORIZE, 1, 10, buffDuration) - player:addStatusEffect(xi.effect.SNEAK, 1, 10, buffDuration) + player:addStatusEffect(xi.effect.INVISIBLE, { power = 1, duration = buffDuration, origin = player, tick = 10 }) + player:addStatusEffect(xi.effect.DEODORIZE, { power = 1, duration = buffDuration, origin = player, tick = 10 }) + player:addStatusEffect(xi.effect.SNEAK, { power = 1, duration = buffDuration, origin = player, tick = 10 }) end end, diff --git a/scripts/quests/full_speed_ahead.lua b/scripts/quests/full_speed_ahead.lua index d360cbc62df..850a2b4a43d 100644 --- a/scripts/quests/full_speed_ahead.lua +++ b/scripts/quests/full_speed_ahead.lua @@ -37,7 +37,7 @@ xi.full_speed_ahead.onEffectGain = function(player, effect) player:setLocalVar('FSA_Food', 0xFF) player:setLocalVar('FSA_FoodCount', 0) -- NOTE: This used to be mount id 1: QUEST_RAPTOR, but it appears to have changed - player:addStatusEffect(xi.effect.MOUNTED, xi.mount.RAPTOR, 3, 0) + player:addStatusEffect(xi.effect.MOUNTED, { power = xi.mount.RAPTOR, origin = player, tick = 3 }) player:setCharVar('[QUEST]FullSpeedAhead', 3) end diff --git a/scripts/quests/hiddenQuests/Crimson_Orb.lua b/scripts/quests/hiddenQuests/Crimson_Orb.lua index f5889351008..46d21cd7ad2 100644 --- a/scripts/quests/hiddenQuests/Crimson_Orb.lua +++ b/scripts/quests/hiddenQuests/Crimson_Orb.lua @@ -65,7 +65,7 @@ local pondEventFinish = function(player, csid, option, npc) player:addKeyItem(xi.ki.WHITE_ORB + numPonds + 1) if numPonds == 3 then - player:addStatusEffect(xi.effect.CURSE_I, 50, 0, 900) + player:addStatusEffect(xi.effect.CURSE_I, { power = 50, duration = 900, origin = player }) player:messageSpecial(davoiID.text.ORB_QUEST_OFFSET + 5) quest:setVar(player, 'Prog', 3) end diff --git a/scripts/specs/core/CBaseEntity.lua b/scripts/specs/core/CBaseEntity.lua index 7f1ae9e8089..3a31f330f6d 100644 --- a/scripts/specs/core/CBaseEntity.lua +++ b/scripts/specs/core/CBaseEntity.lua @@ -2853,13 +2853,13 @@ function CBaseEntity:clearEnmityForEntity(PEntity) end ---@class StatusEffectParams ----@field power integer ----@field duration number ---@field origin CBaseEntity ----@field tick integer? ----@field icon xi.effect? +---@field power number? +---@field duration number? +---@field tick number? +---@field icon xi.effect? Defaults to effectId if not set ---@field subType integer? ----@field subPower integer? +---@field subPower number? ---@field tier integer? ---@field flag xi.effectFlag? ---@field sourceType xi.effectSourceType? diff --git a/scripts/tests/packets/s2c/0x028_battle2/dancer.lua b/scripts/tests/packets/s2c/0x028_battle2/dancer.lua index 349bdc17cd6..807f5594f5c 100644 --- a/scripts/tests/packets/s2c/0x028_battle2/dancer.lua +++ b/scripts/tests/packets/s2c/0x028_battle2/dancer.lua @@ -177,7 +177,7 @@ local packets = test = function(player, mob) player:changeJob(xi.job.DNC) player:setLevel(99) - player:addStatusEffectEx(xi.effect.FINISHING_MOVE_1, xi.effect.FINISHING_MOVE_6, 6, 0, 7200) + player:addStatusEffect(xi.effect.FINISHING_MOVE_1, { power = 6, duration = 7200, origin = player, icon = xi.effect.FINISHING_MOVE_6 }) player.actions:useAbility(mob, xi.jobAbility.ANIMATED_FLOURISH) xi.test.world:tickEntity(player) end, @@ -219,7 +219,7 @@ local packets = test = function(player, mob) player:changeJob(xi.job.DNC) player:setLevel(99) - player:addStatusEffectEx(xi.effect.FINISHING_MOVE_1, xi.effect.FINISHING_MOVE_6, 6, 0, 7200) + player:addStatusEffect(xi.effect.FINISHING_MOVE_1, { power = 6, duration = 7200, origin = player, icon = xi.effect.FINISHING_MOVE_6 }) player.actions:useAbility(player, xi.jobAbility.REVERSE_FLOURISH) end, @@ -328,7 +328,7 @@ local packets = player:setLevel(99) player:addItem(xi.item.TERPSICHORE_99) player:equipItem(xi.item.TERPSICHORE_99, nil, xi.slot.MAIN) - player:addStatusEffectEx(xi.effect.FINISHING_MOVE_1, xi.effect.FINISHING_MOVE_6, 6, 0, 7200) + player:addStatusEffect(xi.effect.FINISHING_MOVE_1, { power = 6, duration = 7200, origin = player, icon = xi.effect.FINISHING_MOVE_6 }) player.actions:engage(mob) player.actions:useAbility(mob, xi.jobAbility.VIOLENT_FLOURISH) xi.test.world:skipTime(1) diff --git a/scripts/tests/packets/s2c/0x028_battle2/runefencer.lua b/scripts/tests/packets/s2c/0x028_battle2/runefencer.lua index 9bb0018b096..de57ad0f899 100644 --- a/scripts/tests/packets/s2c/0x028_battle2/runefencer.lua +++ b/scripts/tests/packets/s2c/0x028_battle2/runefencer.lua @@ -48,7 +48,7 @@ local packets = test = function(player, mob) player:changeJob(xi.job.RUN) player:setLevel(99) - player:addStatusEffect(xi.effect.IGNIS, 1, 0, 300) + player:addStatusEffect(xi.effect.IGNIS, { power = 1, duration = 300, origin = player }) player.actions:useAbility(player, xi.jobAbility.VALLATION) end, @@ -89,7 +89,7 @@ local packets = test = function(player, mob) player:changeJob(xi.job.RUN) player:setLevel(99) - player:addStatusEffect(xi.effect.IGNIS, 1, 0, 300) + player:addStatusEffect(xi.effect.IGNIS, { power = 1, duration = 300, origin = player }) player.actions:useAbility(player, xi.jobAbility.LIEMENT) end, @@ -133,7 +133,7 @@ local packets = player:addItem(xi.item.CHAOSBRINGER) player:equipItem(xi.item.CHAOSBRINGER) player.actions:engage(mob) - player:addStatusEffect(xi.effect.SULPOR, 1, 0, 300) + player:addStatusEffect(xi.effect.SULPOR, { power = 1, duration = 300, origin = player }) player.actions:useAbility(mob, xi.jobAbility.SWIPE) end, @@ -177,7 +177,7 @@ local packets = player:addItem(xi.item.CHAOSBRINGER) player:equipItem(xi.item.CHAOSBRINGER) player.actions:engage(mob) - player:addStatusEffect(xi.effect.SULPOR, 1, 0, 300) + player:addStatusEffect(xi.effect.SULPOR, { power = 1, duration = 300, origin = player }) player.actions:useAbility(mob, xi.jobAbility.LUNGE) end, @@ -221,7 +221,7 @@ local packets = player:addItem(xi.item.CHAOSBRINGER) player:equipItem(xi.item.CHAOSBRINGER) player.actions:engage(mob) - player:addStatusEffect(xi.effect.SULPOR, 1, 0, 300) + player:addStatusEffect(xi.effect.SULPOR, { power = 1, duration = 300, origin = player }) player.actions:useAbility(mob, xi.jobAbility.GAMBIT) end, diff --git a/scripts/tests/systems/elements.lua b/scripts/tests/systems/elements.lua index add38a551c2..c8647886f90 100644 --- a/scripts/tests/systems/elements.lua +++ b/scripts/tests/systems/elements.lua @@ -15,7 +15,7 @@ describe('Crystals', function() before_each(function() player = xi.test.world:spawnPlayer({ zone = xi.zone.EAST_SARUTABARUTA }) - player:addStatusEffect(xi.effect.SIGNET, 0, 0, 0) + player:addStatusEffect(xi.effect.SIGNET, { origin = player }) end) it('of matching element drop when monster killed', function() diff --git a/scripts/tests/systems/invisible.lua b/scripts/tests/systems/invisible.lua index d8d9b5a30ca..21f248eb58f 100644 --- a/scripts/tests/systems/invisible.lua +++ b/scripts/tests/systems/invisible.lua @@ -15,7 +15,7 @@ describe('Invisible', function() for sName, sId in pairs(invisibleStatus) do it(string.format('breaks on item use (%s)', sName), function() - player:addStatusEffect(sId, 0, 10, 60) + player:addStatusEffect(sId, { duration = 60, origin = player, tick = 10 }) player:addItem(xi.item.MEAT_MITHKABOB) local kabob = player:findItem(xi.item.MEAT_MITHKABOB) assert(kabob) diff --git a/scripts/tests/systems/spells/aoe.lua b/scripts/tests/systems/spells/aoe.lua index b2e0f1f6ef4..1b11c1d2b9c 100644 --- a/scripts/tests/systems/spells/aoe.lua +++ b/scripts/tests/systems/spells/aoe.lua @@ -110,7 +110,7 @@ describe('AoE', function() end) it('converts -na spells to 10y AoE with Divine Seal', function() - p2:addStatusEffect(xi.effect.PARALYSIS, 1, 0, 60) + p2:addStatusEffect(xi.effect.PARALYSIS, { power = 1, duration = 60, origin = p2 }) p2.assert:hasEffect(xi.effect.PARALYSIS) p1.actions:useAbility(p1, xi.jobAbility.DIVINE_SEAL) xi.test.world:tickEntity(p1) @@ -121,7 +121,7 @@ describe('AoE', function() end) it('converts -na spells to 10y AoE with AOE_NA mod chance', function() - p2:addStatusEffect(xi.effect.PARALYSIS, 1, 0, 60) + p2:addStatusEffect(xi.effect.PARALYSIS, { power = 1, duration = 60, origin = p2 }) p2.assert:hasEffect(xi.effect.PARALYSIS) p1:addItem(xi.item.YAGRUSH_75) p1:equipItem(xi.item.YAGRUSH_75, nil, xi.slot.MAIN) @@ -132,8 +132,8 @@ describe('AoE', function() end) it('converts Erase to 10y AoE with Divine Seal', function() - p1:addStatusEffect(xi.effect.SLOW, 1, 0, 60) - p2:addStatusEffect(xi.effect.SLOW, 1, 0, 60) + p1:addStatusEffect(xi.effect.SLOW, { power = 1, duration = 60, origin = p1 }) + p2:addStatusEffect(xi.effect.SLOW, { power = 1, duration = 60, origin = p2 }) p1.assert:hasEffect(xi.effect.SLOW) p2.assert:hasEffect(xi.effect.SLOW) p1.actions:useAbility(p1, xi.jobAbility.DIVINE_SEAL) @@ -147,7 +147,7 @@ describe('AoE', function() it('does not convert without Divine Veil trait', function() p1:setLevel(49) - p2:addStatusEffect(xi.effect.PARALYSIS, 1, 0, 60) + p2:addStatusEffect(xi.effect.PARALYSIS, { power = 1, duration = 60, origin = p2 }) p2.assert:hasEffect(xi.effect.PARALYSIS) p1.actions:useAbility(p1, xi.jobAbility.DIVINE_SEAL) xi.test.world:tickEntity(p1) @@ -158,7 +158,7 @@ describe('AoE', function() end) it('does not convert without Divine Seal or AOE_NA mod', function() - p2:addStatusEffect(xi.effect.PARALYSIS, 1, 0, 60) + p2:addStatusEffect(xi.effect.PARALYSIS, { power = 1, duration = 60, origin = p2 }) p2.assert:hasEffect(xi.effect.PARALYSIS) p1.actions:useSpell(p1, xi.magic.spell.PARALYNA) xi.test.world:tickEntity(p1) @@ -174,7 +174,7 @@ describe('AoE', function() end) it('converts RADIAL_MANI spells to 10y AoE', function() - p1:addStatusEffect(xi.effect.MANIFESTATION, 1, 0, 60) + p1:addStatusEffect(xi.effect.MANIFESTATION, { power = 1, duration = 60, origin = p1 }) local spell = GetSpell(xi.magic.spell.SLEEP) assert(spell, 'SLEEP spell not found') local result = xi.combat.magicAoE.calculateTypeAndRadius(p1, spell) @@ -183,7 +183,7 @@ describe('AoE', function() end) it('does not affect spells without RADIAL_MANI type', function() - p1:addStatusEffect(xi.effect.MANIFESTATION, 1, 0, 60) + p1:addStatusEffect(xi.effect.MANIFESTATION, { power = 1, duration = 60, origin = p1 }) local spell = GetSpell(xi.magic.spell.STONE) assert(spell, 'STONE spell not found') local result = xi.combat.magicAoE.calculateTypeAndRadius(p1, spell) @@ -199,7 +199,7 @@ describe('AoE', function() end) it('halves the radius of -ra spells (Fira to Watera)', function() - p1:addStatusEffect(xi.effect.THEURGIC_FOCUS, 1, 0, 60) + p1:addStatusEffect(xi.effect.THEURGIC_FOCUS, { power = 1, duration = 60, origin = p1 }) local spell = GetSpell(xi.magic.spell.FIRA) assert(spell, 'FIRA spell not found') local result = xi.combat.magicAoE.calculateTypeAndRadius(p1, spell) @@ -208,7 +208,7 @@ describe('AoE', function() end) it('does not affect non -ra spells', function() - p1:addStatusEffect(xi.effect.THEURGIC_FOCUS, 1, 0, 60) + p1:addStatusEffect(xi.effect.THEURGIC_FOCUS, { power = 1, duration = 60, origin = p1 }) local spell = GetSpell(xi.magic.spell.FIRE) assert(spell, 'FIRE spell not found') local baseRadius = spell:getRadius() @@ -224,7 +224,7 @@ describe('AoE', function() end) it('converts DIFFUSION type BLU spells to 10y AoE', function() - p1:addStatusEffect(xi.effect.DIFFUSION, 1, 0, 60) + p1:addStatusEffect(xi.effect.DIFFUSION, { power = 1, duration = 60, origin = p1 }) local spell = GetSpell(xi.magic.spell.METALLIC_BODY) assert(spell, 'METALLIC_BODY spell not found') local result = xi.combat.magicAoE.calculateTypeAndRadius(p1, spell) @@ -233,7 +233,7 @@ describe('AoE', function() end) it('does not affect spells without DIFFUSION type', function() - p1:addStatusEffect(xi.effect.DIFFUSION, 1, 0, 60) + p1:addStatusEffect(xi.effect.DIFFUSION, { power = 1, duration = 60, origin = p1 }) local spell = GetSpell(xi.magic.spell.POLLEN) assert(spell, 'POLLEN spell not found') local result = xi.combat.magicAoE.calculateTypeAndRadius(p1, spell) @@ -249,7 +249,7 @@ describe('AoE', function() end) it('forces offensive BLU magic spells to single target', function() - p1:addStatusEffect(xi.effect.CONVERGENCE, 1, 0, 60) + p1:addStatusEffect(xi.effect.CONVERGENCE, { power = 1, duration = 60, origin = p1 }) local spell = GetSpell(xi.magic.spell.MAELSTROM) assert(spell, 'MAELSTROM spell not found') local result = xi.combat.magicAoE.calculateTypeAndRadius(p1, spell) @@ -258,7 +258,7 @@ describe('AoE', function() end) it('does not affect physical BLU spells (ELEMENT_NONE)', function() - p1:addStatusEffect(xi.effect.CONVERGENCE, 1, 0, 60) + p1:addStatusEffect(xi.effect.CONVERGENCE, { power = 1, duration = 60, origin = p1 }) local spell = GetSpell(xi.magic.spell.WHIRL_OF_RAGE) assert(spell, 'WHIRL_OF_RAGE spell not found') local result = xi.combat.magicAoE.calculateTypeAndRadius(p1, spell) diff --git a/scripts/zones/Abyssea-Altepa/npcs/Cruor_Prospector.lua b/scripts/zones/Abyssea-Altepa/npcs/Cruor_Prospector.lua index 03502fd5b55..772538a4e63 100644 --- a/scripts/zones/Abyssea-Altepa/npcs/Cruor_Prospector.lua +++ b/scripts/zones/Abyssea-Altepa/npcs/Cruor_Prospector.lua @@ -175,7 +175,7 @@ entity.onEventFinish = function(player, csid, option, npc) if enhanceData[2] <= cruorTotal then for _, v in ipairs(enhanceData[1]) do - player:addStatusEffectEx(v[1], v[2], v[3] + xi.abyssea.getAbyssiteTotal(player, v[4]) * v[5], 0, 0) + player:addStatusEffect(v[1], { power = v[3] + xi.abyssea.getAbyssiteTotal(player, v[4]) * v[5], origin = player, icon = v[2] }) if v[1] == xi.effect.ABYSSEA_HP then player:addHP(v[3] + xi.abyssea.getAbyssiteTotal(player, v[4]) * v[5]) diff --git a/scripts/zones/Abyssea-Attohwa/npcs/Cruor_Prospector.lua b/scripts/zones/Abyssea-Attohwa/npcs/Cruor_Prospector.lua index ed43a916225..44c083723ef 100644 --- a/scripts/zones/Abyssea-Attohwa/npcs/Cruor_Prospector.lua +++ b/scripts/zones/Abyssea-Attohwa/npcs/Cruor_Prospector.lua @@ -173,7 +173,7 @@ entity.onEventFinish = function(player, csid, option, npc) if enhanceData[2] <= cruorTotal then for _, v in ipairs(enhanceData[1]) do - player:addStatusEffectEx(v[1], v[2], v[3] + xi.abyssea.getAbyssiteTotal(player, v[4]) * v[5], 0, 0) + player:addStatusEffect(v[1], { power = v[3] + xi.abyssea.getAbyssiteTotal(player, v[4]) * v[5], origin = player, icon = v[2] }) if v[1] == xi.effect.ABYSSEA_HP then player:addHP(v[3] + xi.abyssea.getAbyssiteTotal(player, v[4]) * v[5]) diff --git a/scripts/zones/Abyssea-Grauberg/npcs/Cruor_Prospector.lua b/scripts/zones/Abyssea-Grauberg/npcs/Cruor_Prospector.lua index f083add3a5b..129ff65651c 100644 --- a/scripts/zones/Abyssea-Grauberg/npcs/Cruor_Prospector.lua +++ b/scripts/zones/Abyssea-Grauberg/npcs/Cruor_Prospector.lua @@ -178,7 +178,7 @@ entity.onEventFinish = function(player, csid, option, npc) if enhanceData[2] <= cruorTotal then for _, v in ipairs(enhanceData[1]) do - player:addStatusEffectEx(v[1], v[2], v[3] + xi.abyssea.getAbyssiteTotal(player, v[4]) * v[5], 0, 0) + player:addStatusEffect(v[1], { power = v[3] + xi.abyssea.getAbyssiteTotal(player, v[4]) * v[5], origin = player, icon = v[2] }) if v[1] == xi.effect.ABYSSEA_HP then player:addHP(v[3] + xi.abyssea.getAbyssiteTotal(player, v[4]) * v[5]) diff --git a/scripts/zones/Abyssea-Misareaux/npcs/Cruor_Prospector.lua b/scripts/zones/Abyssea-Misareaux/npcs/Cruor_Prospector.lua index 17df2046f75..2976d635b35 100644 --- a/scripts/zones/Abyssea-Misareaux/npcs/Cruor_Prospector.lua +++ b/scripts/zones/Abyssea-Misareaux/npcs/Cruor_Prospector.lua @@ -172,7 +172,7 @@ entity.onEventFinish = function(player, csid, option, npc) if enhanceData[2] <= cruorTotal then for _, v in ipairs(enhanceData[1]) do - player:addStatusEffectEx(v[1], v[2], v[3] + xi.abyssea.getAbyssiteTotal(player, v[4]) * v[5], 0, 0) + player:addStatusEffect(v[1], { power = v[3] + xi.abyssea.getAbyssiteTotal(player, v[4]) * v[5], origin = player, icon = v[2] }) if v[1] == xi.effect.ABYSSEA_HP then player:addHP(v[3] + xi.abyssea.getAbyssiteTotal(player, v[4]) * v[5]) diff --git a/scripts/zones/Abyssea-Uleguerand/npcs/Cruor_Prospector.lua b/scripts/zones/Abyssea-Uleguerand/npcs/Cruor_Prospector.lua index 8f66180f3b2..ab8d36a9182 100644 --- a/scripts/zones/Abyssea-Uleguerand/npcs/Cruor_Prospector.lua +++ b/scripts/zones/Abyssea-Uleguerand/npcs/Cruor_Prospector.lua @@ -174,7 +174,7 @@ entity.onEventFinish = function(player, csid, option, npc) if enhanceData[2] <= cruorTotal then for _, v in ipairs(enhanceData[1]) do - player:addStatusEffectEx(v[1], v[2], v[3] + xi.abyssea.getAbyssiteTotal(player, v[4]) * v[5], 0, 0) + player:addStatusEffect(v[1], { power = v[3] + xi.abyssea.getAbyssiteTotal(player, v[4]) * v[5], origin = player, icon = v[2] }) if v[1] == xi.effect.ABYSSEA_HP then player:addHP(v[3] + xi.abyssea.getAbyssiteTotal(player, v[4]) * v[5]) diff --git a/scripts/zones/Abyssea-Vunkerl/npcs/Cruor_Prospector.lua b/scripts/zones/Abyssea-Vunkerl/npcs/Cruor_Prospector.lua index edd48db55ed..842f14097c1 100644 --- a/scripts/zones/Abyssea-Vunkerl/npcs/Cruor_Prospector.lua +++ b/scripts/zones/Abyssea-Vunkerl/npcs/Cruor_Prospector.lua @@ -184,7 +184,7 @@ entity.onEventFinish = function(player, csid, option, npc) if enhanceData[2] <= cruorTotal then for _, v in ipairs(enhanceData[1]) do - player:addStatusEffectEx(v[1], v[2], v[3] + xi.abyssea.getAbyssiteTotal(player, v[4]) * v[5], 0, 0) + player:addStatusEffect(v[1], { power = v[3] + xi.abyssea.getAbyssiteTotal(player, v[4]) * v[5], origin = player, icon = v[2] }) if v[1] == xi.effect.ABYSSEA_HP then player:addHP(v[3] + xi.abyssea.getAbyssiteTotal(player, v[4]) * v[5]) diff --git a/scripts/zones/Arrapago_Reef/mobs/Velionis.lua b/scripts/zones/Arrapago_Reef/mobs/Velionis.lua index 24bff06e46c..6c05f7c3ca2 100644 --- a/scripts/zones/Arrapago_Reef/mobs/Velionis.lua +++ b/scripts/zones/Arrapago_Reef/mobs/Velionis.lua @@ -9,7 +9,7 @@ local entity = {} entity.onMobInitialize = function(mob) mob:setMobMod(xi.mobMod.AUTO_SPIKES, 1) - mob:addStatusEffect(xi.effect.BLAZE_SPIKES, 200, 0, 0) -- Wiki says "180-230" and we have NO DATA! We don't know what the players conditions/gear was. + mob:addStatusEffect(xi.effect.BLAZE_SPIKES, { power = 200, origin = mob }) -- Wiki says "180-230" and we have NO DATA! We don't know what the players conditions/gear was. mob:getStatusEffect(xi.effect.BLAZE_SPIKES):setEffectFlags(xi.effectFlag.DEATH) mob:setMobMod(xi.mobMod.IDLE_DESPAWN, 300) end diff --git a/scripts/zones/Arrapago_Remnants/instances/arrapago_remnants.lua b/scripts/zones/Arrapago_Remnants/instances/arrapago_remnants.lua index 5cce578259d..9694c0d5064 100644 --- a/scripts/zones/Arrapago_Remnants/instances/arrapago_remnants.lua +++ b/scripts/zones/Arrapago_Remnants/instances/arrapago_remnants.lua @@ -9,11 +9,11 @@ instanceObject.afterInstanceRegister = function(player) local instance = player:getInstance() player:messageSpecial(ID.text.TIME_TO_COMPLETE, instance:getTimeLimit()) player:messageSpecial(ID.text.SALVAGE_START, 1) - player:addStatusEffectEx(xi.effect.ENCUMBRANCE_I, xi.effect.ENCUMBRANCE_I, 0xFFFF, 0, 6000) - player:addStatusEffectEx(xi.effect.OBLIVISCENCE, xi.effect.OBLIVISCENCE, 0, 0, 6000) - player:addStatusEffectEx(xi.effect.OMERTA, xi.effect.OMERTA, 0x3F, 0, 6000) - player:addStatusEffectEx(xi.effect.IMPAIRMENT, xi.effect.IMPAIRMENT, 3, 0, 6000) - player:addStatusEffectEx(xi.effect.DEBILITATION, xi.effect.DEBILITATION, 0x1FF, 0, 6000) + player:addStatusEffect(xi.effect.ENCUMBRANCE_I, { power = 0xFFFF, duration = 6000, origin = player }) + player:addStatusEffect(xi.effect.OBLIVISCENCE, { duration = 6000, origin = player }) + player:addStatusEffect(xi.effect.OMERTA, { power = 0x3F, duration = 6000, origin = player }) + player:addStatusEffect(xi.effect.IMPAIRMENT, { power = 3, duration = 6000, origin = player }) + player:addStatusEffect(xi.effect.DEBILITATION, { power = 0x1FF, duration = 6000, origin = player }) for i = 0, 15 do player:unequipItem(i) end diff --git a/scripts/zones/Attohwa_Chasm/Zone.lua b/scripts/zones/Attohwa_Chasm/Zone.lua index 76e2e526893..f0a3cec7b8d 100644 --- a/scripts/zones/Attohwa_Chasm/Zone.lua +++ b/scripts/zones/Attohwa_Chasm/Zone.lua @@ -71,7 +71,7 @@ zoneObject.onTriggerAreaEnter = function(player, triggerArea) gasponia:openDoor(3) if not player:hasStatusEffect(xi.effect.POISON) then - player:addStatusEffect(xi.effect.POISON, 15, 0, math.random(30, 60)) + player:addStatusEffect(xi.effect.POISON, { power = 15, duration = math.random(30, 60), origin = player }) player:messageSpecial(ID.text.GASPONIA_POISON) end end diff --git a/scripts/zones/Attohwa_Chasm/mobs/Sargas.lua b/scripts/zones/Attohwa_Chasm/mobs/Sargas.lua index 454bdfe411d..64dccc24579 100644 --- a/scripts/zones/Attohwa_Chasm/mobs/Sargas.lua +++ b/scripts/zones/Attohwa_Chasm/mobs/Sargas.lua @@ -8,7 +8,7 @@ local entity = {} entity.onMobInitialize = function(mob) mob:setMobMod(xi.mobMod.ADD_EFFECT, 1) mob:setMobMod(xi.mobMod.AUTO_SPIKES, 1) - mob:addStatusEffect(xi.effect.SHOCK_SPIKES, 50, 0, 0) + mob:addStatusEffect(xi.effect.SHOCK_SPIKES, { power = 50, origin = mob }) mob:getStatusEffect(xi.effect.SHOCK_SPIKES):setEffectFlags(xi.effectFlag.DEATH) end diff --git a/scripts/zones/Attohwa_Chasm/mobs/Tiamat.lua b/scripts/zones/Attohwa_Chasm/mobs/Tiamat.lua index d7b81a15933..d552d850fa3 100644 --- a/scripts/zones/Attohwa_Chasm/mobs/Tiamat.lua +++ b/scripts/zones/Attohwa_Chasm/mobs/Tiamat.lua @@ -61,7 +61,7 @@ entity.spawnPoints = local function enterFlight(mob) mob:setAnimationSub(1) -- Change to flight. - mob:addStatusEffectEx(xi.effect.ALL_MISS, 0, 1, 0, 0) + mob:addStatusEffect(xi.effect.ALL_MISS, { power = 1, origin = mob, icon = 0 }) mob:setMobSkillAttack(730) mob:setLocalVar('flightTime', GetSystemTime() + 120) mob:setLocalVar('changeHP', mob:getHP() - 10000) @@ -158,7 +158,7 @@ entity.onMobFight = function(mob, target) hpp <= 25 and not mob:hasStatusEffect(xi.effect.ATTACK_BOOST) then - mob:addStatusEffect(xi.effect.ATTACK_BOOST, 75, 0, 0) + mob:addStatusEffect(xi.effect.ATTACK_BOOST, { power = 75, origin = mob }) mob:getStatusEffect(xi.effect.ATTACK_BOOST):addEffectFlag(xi.effectFlag.DEATH) end diff --git a/scripts/zones/Balgas_Dais/mobs/Opo-opo_Heir.lua b/scripts/zones/Balgas_Dais/mobs/Opo-opo_Heir.lua index 74e061faf7a..3d95fcaa3b6 100644 --- a/scripts/zones/Balgas_Dais/mobs/Opo-opo_Heir.lua +++ b/scripts/zones/Balgas_Dais/mobs/Opo-opo_Heir.lua @@ -38,7 +38,7 @@ entity.onMobFight = function(mob, target) mob:setTP(3000) mob:setMobMod(xi.mobMod.BASE_DAMAGE_MULTIPLIER, 150) mob:setMod(xi.mod.REGAIN, 300) - mob:addStatusEffect(xi.effect.MAGIC_SHIELD, 1, 0, 900) + mob:addStatusEffect(xi.effect.MAGIC_SHIELD, { power = 1, duration = 900, origin = mob }) end end diff --git a/scripts/zones/Balgas_Dais/mobs/Wyrm.lua b/scripts/zones/Balgas_Dais/mobs/Wyrm.lua index 4c27f792c76..695fc9644a5 100644 --- a/scripts/zones/Balgas_Dais/mobs/Wyrm.lua +++ b/scripts/zones/Balgas_Dais/mobs/Wyrm.lua @@ -19,7 +19,7 @@ local entity = {} local function enterFlight(mob) mob:setMobSkillAttack(1146) mob:setMobMod(xi.mobMod.NO_MOVE, 1) - mob:addStatusEffectEx(xi.effect.ALL_MISS, 0, 1, 0, 0) + mob:addStatusEffect(xi.effect.ALL_MISS, { power = 1, origin = mob, icon = 0 }) mob:setBehavior(bit.band(mob:getBehavior(), bit.bnot(xi.behavior.NO_TURN))) mob:setAnimationSub(1) end diff --git a/scripts/zones/Batallia_Downs/Zone.lua b/scripts/zones/Batallia_Downs/Zone.lua index 1418baafe74..019f48a5b54 100644 --- a/scripts/zones/Batallia_Downs/Zone.lua +++ b/scripts/zones/Batallia_Downs/Zone.lua @@ -48,10 +48,10 @@ zoneObject.onZoneIn = function(player, prevZone) end if player:getCharVar('[QUEST]FullSpeedAhead') == 1 then -- Normal Mode - player:addStatusEffect(xi.effect.FULL_SPEED_AHEAD, 0, 3, xi.fsa.duration) + player:addStatusEffect(xi.effect.FULL_SPEED_AHEAD, { duration = xi.fsa.duration, origin = player, tick = 3 }) return -1 elseif player:getCharVar('[QUEST]FullSpeedAhead') == 2 then -- Easy Mode - player:addStatusEffect(xi.effect.FULL_SPEED_AHEAD, 1, 3, xi.fsa.duration) + player:addStatusEffect(xi.effect.FULL_SPEED_AHEAD, { power = 1, duration = xi.fsa.duration, origin = player, tick = 3 }) return -1 end diff --git a/scripts/zones/Beadeaux/Zone.lua b/scripts/zones/Beadeaux/Zone.lua index ad36a4afc1c..16118f0b0bb 100644 --- a/scripts/zones/Beadeaux/Zone.lua +++ b/scripts/zones/Beadeaux/Zone.lua @@ -64,7 +64,7 @@ zoneObject.onTriggerAreaEnter = function(player, triggerArea) if not player:hasStatusEffect(xi.effect.SILENCE) then GetNPCByID(ID.npc.AFFLICTOR_BASE + (triggerArea:getTriggerAreaID() -1)):entityAnimationPacket('main', player) player:setLocalVar('inRegion', time + 11) -- Start timer. We set it here to prevent double message. - player:addStatusEffect(xi.effect.CURSE_I, 75, 0, 120) + player:addStatusEffect(xi.effect.CURSE_I, { power = 75, duration = 120, origin = player }) player:messageSpecial(ID.text.FEEL_NUMB) elseif player:getLocalVar('inRegion1') <= time then player:messageSpecial(ID.text.LIGHT_HEADED) diff --git a/scripts/zones/Beadeaux/npcs/The_Mute.lua b/scripts/zones/Beadeaux/npcs/The_Mute.lua index 1500ec3a20a..556bc132087 100644 --- a/scripts/zones/Beadeaux/npcs/The_Mute.lua +++ b/scripts/zones/Beadeaux/npcs/The_Mute.lua @@ -10,7 +10,7 @@ entity.onTrigger = function(player, npc) local duration = math.random(600, 900) npc:entityAnimationPacket(xi.animationString.EFFECT_SILENCE, player) - player:addStatusEffect(xi.effect.SILENCE, 0, 0, duration) + player:addStatusEffect(xi.effect.SILENCE, { duration = duration, origin = player }) end return entity diff --git a/scripts/zones/Beaucedine_Glacier/mobs/Humbaba.lua b/scripts/zones/Beaucedine_Glacier/mobs/Humbaba.lua index a4fc232621c..16cfd72f27b 100644 --- a/scripts/zones/Beaucedine_Glacier/mobs/Humbaba.lua +++ b/scripts/zones/Beaucedine_Glacier/mobs/Humbaba.lua @@ -18,7 +18,7 @@ entity.onMobInitialize = function(mob) mob:setRespawnTime(math.random(3600, 4200)) -- When server restarts, reset timer mob:setMobMod(xi.mobMod.AUTO_SPIKES, 1) - mob:addStatusEffect(xi.effect.ICE_SPIKES, 50, 0, 0) + mob:addStatusEffect(xi.effect.ICE_SPIKES, { power = 50, origin = mob }) mob:getStatusEffect(xi.effect.ICE_SPIKES):setEffectFlags(xi.effectFlag.DEATH) end diff --git a/scripts/zones/Bhaflau_Remnants/instances/bhaflau_remnants.lua b/scripts/zones/Bhaflau_Remnants/instances/bhaflau_remnants.lua index aeaeba26c31..6c7e72bfbcc 100644 --- a/scripts/zones/Bhaflau_Remnants/instances/bhaflau_remnants.lua +++ b/scripts/zones/Bhaflau_Remnants/instances/bhaflau_remnants.lua @@ -118,11 +118,11 @@ instanceObject.afterInstanceRegister = function(player) player:unequipItem(i) end - player:addStatusEffectEx(xi.effect.ENCUMBRANCE_I, xi.effect.ENCUMBRANCE_I, 0xFFFF, 0, 6000) - player:addStatusEffectEx(xi.effect.OBLIVISCENCE, xi.effect.OBLIVISCENCE, 1, 0, 6000) - player:addStatusEffectEx(xi.effect.OMERTA, xi.effect.OMERTA, 0x3F, 0, 6000) - player:addStatusEffectEx(xi.effect.IMPAIRMENT, xi.effect.IMPAIRMENT, 3, 0, 6000) - player:addStatusEffectEx(xi.effect.DEBILITATION, xi.effect.DEBILITATION, 0x1FF, 0, 6000) + player:addStatusEffect(xi.effect.ENCUMBRANCE_I, { power = 0xFFFF, duration = 6000, origin = player }) + player:addStatusEffect(xi.effect.OBLIVISCENCE, { power = 1, duration = 6000, origin = player }) + player:addStatusEffect(xi.effect.OMERTA, { power = 0x3F, duration = 6000, origin = player }) + player:addStatusEffect(xi.effect.IMPAIRMENT, { power = 3, duration = 6000, origin = player }) + player:addStatusEffect(xi.effect.DEBILITATION, { power = 0x1FF, duration = 6000, origin = player }) player:addTempItem(xi.item.CAGE_OF_B_REMNANTS_FIREFLIES) player:delKeyItem(xi.ki.REMNANTS_PERMIT) end diff --git a/scripts/zones/Bhaflau_Remnants/mobs/Reactionary_Rampart.lua b/scripts/zones/Bhaflau_Remnants/mobs/Reactionary_Rampart.lua index ebd8fa64d9b..deba64059fb 100644 --- a/scripts/zones/Bhaflau_Remnants/mobs/Reactionary_Rampart.lua +++ b/scripts/zones/Bhaflau_Remnants/mobs/Reactionary_Rampart.lua @@ -32,7 +32,7 @@ entity.onMobSpawn = function(mob) mob:setMod(xi.mod.UDMGRANGE, 160) -- TODO: - -- mob:addStatusEffect(xi.effect.NO_REST, 1, 0, 0) + -- mob:addStatusEffect(xi.effect.NO_REST, { power = 1, origin = mob }) mob:setMobMod(xi.mobMod.DETECTION, xi.detects.SCENT) -- 70/30 split to be able to spawn a NM or not into rotation diff --git a/scripts/zones/Bibiki_Bay/mobs/Peerifool.lua b/scripts/zones/Bibiki_Bay/mobs/Peerifool.lua index d9f5546d99b..3e35afd4c32 100644 --- a/scripts/zones/Bibiki_Bay/mobs/Peerifool.lua +++ b/scripts/zones/Bibiki_Bay/mobs/Peerifool.lua @@ -12,7 +12,7 @@ end entity.onMobSpawn = function(mob) mob:setMobMod(xi.mobMod.IDLE_DESPAWN, 180) -- 3 minutes - mob:addStatusEffectEx(xi.effect.STUN, xi.effect.STUN, 0, 0, 3, 0, 0, 0, xi.effectFlag.NO_LOSS_MESSAGE, true) -- Holds the mobs for a few seconds until they move to attack the player + mob:addStatusEffect(xi.effect.STUN, { duration = 3, origin = mob, flag = xi.effectFlag.NO_LOSS_MESSAGE, silent = true }) -- Holds the mobs for a few seconds until they move to attack the player end entity.onAdditionalEffect = function(mob, target, damage) diff --git a/scripts/zones/Bibiki_Bay/mobs/Shen.lua b/scripts/zones/Bibiki_Bay/mobs/Shen.lua index 8784d1ae62c..8a093cf6c4d 100644 --- a/scripts/zones/Bibiki_Bay/mobs/Shen.lua +++ b/scripts/zones/Bibiki_Bay/mobs/Shen.lua @@ -90,7 +90,7 @@ entity.onMobFight = function(mob, target) not xi.combat.behavior.isEntityBusy(mob) then mob:setMagicCastingEnabled(false) - mob:addStatusEffectEx(xi.effect.CHAINSPELL, xi.effect.CHAINSPELL, 1, 0, 3, true) + mob:addStatusEffect(xi.effect.CHAINSPELL, { power = 1, duration = 3, origin = mob, silent = true }) mob:castSpell(xi.magic.spell.FLOOD, target) mob:setLocalVar('petCooldown', GetSystemTime() + 20) end diff --git a/scripts/zones/Caedarva_Mire/Zone.lua b/scripts/zones/Caedarva_Mire/Zone.lua index e82f0b6df2f..ca9678fe235 100644 --- a/scripts/zones/Caedarva_Mire/Zone.lua +++ b/scripts/zones/Caedarva_Mire/Zone.lua @@ -88,7 +88,7 @@ zoneObject.onTriggerAreaEnter = function(player, triggerArea) local random = math.random(1000) for i = 1, 6 do if random <= effectTable[i][1] then - player:addStatusEffect(effectTable[i][2], effectTable[i][3], 0, math.random(effectTable[i][4], effectTable[i][5])) + player:addStatusEffect(effectTable[i][2], { power = effectTable[i][3], duration = math.random(effectTable[i][4], effectTable[i][5]), origin = player }) player:messageSpecial(effectTable[i][6]) break end diff --git a/scripts/zones/Castle_Zvahl_Baileys/mobs/Demon_Banneret.lua b/scripts/zones/Castle_Zvahl_Baileys/mobs/Demon_Banneret.lua index b4195214e55..492cf395cb7 100644 --- a/scripts/zones/Castle_Zvahl_Baileys/mobs/Demon_Banneret.lua +++ b/scripts/zones/Castle_Zvahl_Baileys/mobs/Demon_Banneret.lua @@ -9,7 +9,7 @@ local entity = {} entity.onMobSpawn = function(mob) mob:addImmunity(xi.immunity.PETRIFY) mob:addImmunity(xi.immunity.SILENCE) - mob:addStatusEffectEx(xi.effect.STUN, xi.effect.STUN, 0, 0, 5, 0, 0, 0, xi.effectFlag.NO_LOSS_MESSAGE, true) -- Holds the mobs until the NM has "arrived" + mob:addStatusEffect(xi.effect.STUN, { duration = 5, origin = mob, flag = xi.effectFlag.NO_LOSS_MESSAGE, silent = true }) -- Holds the mobs until the NM has "arrived" end return entity diff --git a/scripts/zones/Castle_Zvahl_Baileys/mobs/Demon_Secretary.lua b/scripts/zones/Castle_Zvahl_Baileys/mobs/Demon_Secretary.lua index 5de190dcd6e..afb6f147874 100644 --- a/scripts/zones/Castle_Zvahl_Baileys/mobs/Demon_Secretary.lua +++ b/scripts/zones/Castle_Zvahl_Baileys/mobs/Demon_Secretary.lua @@ -9,7 +9,7 @@ local entity = {} entity.onMobSpawn = function(mob) mob:addImmunity(xi.immunity.PETRIFY) mob:addImmunity(xi.immunity.SILENCE) - mob:addStatusEffectEx(xi.effect.STUN, xi.effect.STUN, 0, 0, 5, 0, 0, 0, xi.effectFlag.NO_LOSS_MESSAGE, true) -- Holds the mobs until the NM has "arrived" + mob:addStatusEffect(xi.effect.STUN, { duration = 5, origin = mob, flag = xi.effectFlag.NO_LOSS_MESSAGE, silent = true }) -- Holds the mobs until the NM has "arrived" end return entity diff --git a/scripts/zones/Ceizak_Battlegrounds/mobs/Mastop.lua b/scripts/zones/Ceizak_Battlegrounds/mobs/Mastop.lua index f8e9ac7ff14..137322a174f 100644 --- a/scripts/zones/Ceizak_Battlegrounds/mobs/Mastop.lua +++ b/scripts/zones/Ceizak_Battlegrounds/mobs/Mastop.lua @@ -14,7 +14,7 @@ local damageStages = { 0, -2500, -5000, -7500, -9900 } -- Predefined resistance local function applyAura(mob) for _, effect in ipairs({ xi.effect.SILENCE, xi.effect.AMNESIA, xi.effect.POISON }) do - mob:addStatusEffectEx(effect, effect, 6, 3, auraDuration, effect, 50, xi.auraTarget.ENEMIES, xi.effectFlag.AURA) + mob:addStatusEffect(effect, { power = 6, duration = auraDuration, origin = mob, tick = 3, subType = effect, subPower = 50, tier = xi.auraTarget.ENEMIES, flag = xi.effectFlag.AURA }) end end diff --git a/scripts/zones/Crawlers_Nest/mobs/Aqrabuamelu.lua b/scripts/zones/Crawlers_Nest/mobs/Aqrabuamelu.lua index d254649f8cd..ee5c42c6a5b 100644 --- a/scripts/zones/Crawlers_Nest/mobs/Aqrabuamelu.lua +++ b/scripts/zones/Crawlers_Nest/mobs/Aqrabuamelu.lua @@ -61,7 +61,7 @@ entity.spawnPoints = entity.onMobInitialize = function(mob) mob:setMobMod(xi.mobMod.AUTO_SPIKES, 1) - mob:addStatusEffect(xi.effect.ICE_SPIKES, 50, 0, 0) + mob:addStatusEffect(xi.effect.ICE_SPIKES, { power = 50, origin = mob }) mob:getStatusEffect(xi.effect.ICE_SPIKES):setEffectFlags(xi.effectFlag.DEATH) end diff --git a/scripts/zones/Empyreal_Paradox/mobs/Prishe.lua b/scripts/zones/Empyreal_Paradox/mobs/Prishe.lua index 19d05c5b7b5..42188a365b7 100644 --- a/scripts/zones/Empyreal_Paradox/mobs/Prishe.lua +++ b/scripts/zones/Empyreal_Paradox/mobs/Prishe.lua @@ -53,7 +53,7 @@ local itemActions = end, action = function(mob) - mob:addStatusEffect(xi.effect.FOOD, 0, 0, 150, 0, 0, 0, xi.effectSourceType.FOOD, 4511, mob:getID()) + mob:addStatusEffect(xi.effect.FOOD, { duration = 150, origin = mob, sourceType = xi.effectSourceType.FOOD, sourceTypeParam = 4511 }) mob:messageText(mob, ID.text.PRISHE_TEXT + 8, false) mob:useMobAbility(xi.mobSkill.ITEM_1_PRISHE) end, @@ -66,7 +66,7 @@ local itemActions = end, action = function(mob) - mob:addStatusEffect(xi.effect.PHYSICAL_SHIELD, 1, 0, 30) + mob:addStatusEffect(xi.effect.PHYSICAL_SHIELD, { power = 1, duration = 30, origin = mob }) mob:messageText(mob, ID.text.PRISHE_TEXT + 10, false) mob:useMobAbility(xi.mobSkill.ITEM_2_PRISHE) end, @@ -79,7 +79,7 @@ local itemActions = end, action = function(mob) - mob:addStatusEffect(xi.effect.MAGIC_SHIELD, 1, 0, 30) + mob:addStatusEffect(xi.effect.MAGIC_SHIELD, { power = 1, duration = 30, origin = mob }) mob:messageText(mob, ID.text.PRISHE_TEXT + 11, false) mob:useMobAbility(xi.mobSkill.ITEM_2_PRISHE) end, diff --git a/scripts/zones/FeiYin/npcs/Seed_Afterglow.lua b/scripts/zones/FeiYin/npcs/Seed_Afterglow.lua index 058240c940d..711f867499b 100644 --- a/scripts/zones/FeiYin/npcs/Seed_Afterglow.lua +++ b/scripts/zones/FeiYin/npcs/Seed_Afterglow.lua @@ -47,7 +47,7 @@ entity.onTrigger = function(player, npc) elseif not needToZone and not player:hasStatusEffect(xi.effect.MARK_OF_SEED) then player:setCharVar('SEED_AFTERGLOW_INTENSITY', intensity) player:messageSpecial(ID.text.YOU_REACH_OUT_TO_THE_LIGHT, 0) - player:addStatusEffectEx(xi.effect.MARK_OF_SEED, 0, 0, 30, 1800) + player:addStatusEffect(xi.effect.MARK_OF_SEED, { duration = 1800, origin = player, tick = 30, icon = 0 }) player:needToZone(true) player:messageSpecial(ID.text.THE_LIGHT_DWINDLES, 0) else diff --git a/scripts/zones/Grand_Palace_of_HuXzoi/mobs/DE_Quasilumin.lua b/scripts/zones/Grand_Palace_of_HuXzoi/mobs/DE_Quasilumin.lua index b007cc34b46..a4a59086ca7 100644 --- a/scripts/zones/Grand_Palace_of_HuXzoi/mobs/DE_Quasilumin.lua +++ b/scripts/zones/Grand_Palace_of_HuXzoi/mobs/DE_Quasilumin.lua @@ -196,7 +196,7 @@ entity.closeDoor = function(mob) end entity.onMobInitialize = function(mob) - -- mob:addStatusEffect(xi.effect.NO_REST, 1, 0, 0) + -- mob:addStatusEffect(xi.effect.NO_REST, { power = 1, origin = mob }) mob:setMobMod(xi.mobMod.NO_MOVE, 1) mob:setMobMod(xi.mobMod.NO_DESPAWN, 1) mob:setAutoAttackEnabled(false) diff --git a/scripts/zones/Gusgen_Mines/npcs/Degga.lua b/scripts/zones/Gusgen_Mines/npcs/Degga.lua index 747c2074698..9a71fd311c7 100644 --- a/scripts/zones/Gusgen_Mines/npcs/Degga.lua +++ b/scripts/zones/Gusgen_Mines/npcs/Degga.lua @@ -22,7 +22,7 @@ end entity.onEventFinish = function(player, csid, option, npc) if csid == 13 and option == 1 then - player:addStatusEffect(xi.effect.LEVEL_RESTRICTION, 25, 0, 0) + player:addStatusEffect(xi.effect.LEVEL_RESTRICTION, { power = 25, origin = player }) elseif csid == 16 then player:delStatusEffect(xi.effect.LEVEL_RESTRICTION) player:setCharVar('EcoStatus', 103) diff --git a/scripts/zones/Halvung/mobs/Copper_Borer.lua b/scripts/zones/Halvung/mobs/Copper_Borer.lua index ad2718b9215..c007d501976 100644 --- a/scripts/zones/Halvung/mobs/Copper_Borer.lua +++ b/scripts/zones/Halvung/mobs/Copper_Borer.lua @@ -8,7 +8,7 @@ local entity = {} entity.onMobInitialize = function(mob) mob:setMobMod(xi.mobMod.ADD_EFFECT, 1) mob:setMobMod(xi.mobMod.AUTO_SPIKES, 1) - mob:addStatusEffect(xi.effect.BLAZE_SPIKES, 36, 0, 0) + mob:addStatusEffect(xi.effect.BLAZE_SPIKES, { power = 36, origin = mob }) mob:getStatusEffect(xi.effect.BLAZE_SPIKES):setEffectFlags(xi.effectFlag.DEATH) end diff --git a/scripts/zones/Horlais_Peak/mobs/Aries.lua b/scripts/zones/Horlais_Peak/mobs/Aries.lua index bc4daf21836..bf1787940f5 100644 --- a/scripts/zones/Horlais_Peak/mobs/Aries.lua +++ b/scripts/zones/Horlais_Peak/mobs/Aries.lua @@ -31,7 +31,7 @@ local applySelfSleep = function(mob) mob:setLocalVar('isSelfSleeping', 1) mob:setMod(xi.mod.REGEN, regenPower) - mob:addStatusEffect(xi.effect.SLEEP_I, 255, 3, 30 * 3600) + mob:addStatusEffect(xi.effect.SLEEP_I, { power = 255, duration = 30 * 3600, origin = mob, tick = 3 }) mob:messageText(mob, ID.text.FALLS_INTO_A_DEEP_SLEEP) end diff --git a/scripts/zones/Ifrits_Cauldron/mobs/Tarasque.lua b/scripts/zones/Ifrits_Cauldron/mobs/Tarasque.lua index 96d0276a1c4..f2a95da4c03 100644 --- a/scripts/zones/Ifrits_Cauldron/mobs/Tarasque.lua +++ b/scripts/zones/Ifrits_Cauldron/mobs/Tarasque.lua @@ -23,7 +23,7 @@ entity.onMobSpawn = function(mob) mob:addListener('MELEE_SWING_HIT', 'TARASQUE_BLAZE_SPIKES', function(mobArg, targetArg, attackArg) if not mobArg:hasStatusEffect(xi.effect.BLAZE_SPIKES) then - mobArg:addStatusEffectEx(xi.effect.BLAZE_SPIKES, xi.effect.BLAZE_SPIKES, 50, 0, 3600, true) + mobArg:addStatusEffect(xi.effect.BLAZE_SPIKES, { power = 50, duration = 3600, origin = mob, silent = true }) end end) end diff --git a/scripts/zones/Jade_Sepulcher/mobs/Phantom_Puk_Clone.lua b/scripts/zones/Jade_Sepulcher/mobs/Phantom_Puk_Clone.lua index a19443c44d0..9b1d25e1bae 100644 --- a/scripts/zones/Jade_Sepulcher/mobs/Phantom_Puk_Clone.lua +++ b/scripts/zones/Jade_Sepulcher/mobs/Phantom_Puk_Clone.lua @@ -13,7 +13,7 @@ entity.onMobInitialize = function(mob) end entity.onMobSpawn = function(mob) - mob:addStatusEffect(xi.effect.BLINK, 3, 0, 180) + mob:addStatusEffect(xi.effect.BLINK, { power = 3, duration = 180, origin = mob }) mob:setMod(xi.mod.ACC, 338) mob:setMod(xi.mod.DMG, 10000) mob:setMod(xi.mod.HP, 0) diff --git a/scripts/zones/Lufaise_Meadows/mobs/Kurrea.lua b/scripts/zones/Lufaise_Meadows/mobs/Kurrea.lua index e523f6fde00..f87de29a397 100644 --- a/scripts/zones/Lufaise_Meadows/mobs/Kurrea.lua +++ b/scripts/zones/Lufaise_Meadows/mobs/Kurrea.lua @@ -65,7 +65,7 @@ entity.onMobFight = function(mob, target) if buffList[buffChoice].effect == xi.effect.NONE then mob:addHP(mob:getMaxHP() * .25) else - mob:addStatusEffectEx(buffList[buffChoice].effect, buffList[buffChoice].effect, buffList[buffChoice].power, 0, timer, true) + mob:addStatusEffect(buffList[buffChoice].effect, { power = buffList[buffChoice].power, duration = timer, origin = mob, silent = true }) end mob:messageText(mob, ID.text.KURREA_SLURP, false) diff --git a/scripts/zones/Mamook/mobs/Mamool_Ja.lua b/scripts/zones/Mamook/mobs/Mamool_Ja.lua index aefab997427..222e0cfd5a5 100644 --- a/scripts/zones/Mamook/mobs/Mamool_Ja.lua +++ b/scripts/zones/Mamook/mobs/Mamool_Ja.lua @@ -100,12 +100,12 @@ end local doHealing = function(mob) mob:setLocalVar('isHealing', 1) mob:setAutoAttackEnabled(false) -- Stops the NM from attacking until it is fully re-engaged with the player - mob:addStatusEffectEx(xi.effect.BIND, xi.effect.BIND, 0, 0, 5, 0, 0, 0, xi.effectFlag.NO_LOSS_MESSAGE, true) -- Will bind the NM to stop it from moving for a set time. + mob:addStatusEffect(xi.effect.BIND, { duration = 5, origin = mob, flag = xi.effectFlag.NO_LOSS_MESSAGE, silent = true }) -- Will bind the NM to stop it from moving for a set time. if mob:getHPP() < 85 and not mob:hasStatusEffect(xi.effect.REGEN) then - mob:addStatusEffectEx(xi.effect.REGEN, xi.effect.REGEN, 264, 5, 100, 0, 0, xi.effectFlag.NO_LOSS_MESSAGE, true) + mob:addStatusEffect(xi.effect.REGEN, { power = 264, duration = 100, origin = mob, tick = 5, tier = xi.effectFlag.NO_LOSS_MESSAGE, silent = true }) end end @@ -114,7 +114,7 @@ local spawnDance = function(mob) mob:pathTo(pathNodes[paths.SPAWN][2].x, pathNodes[paths.SPAWN][2].y, pathNodes[paths.SPAWN][2].z, xi.path.flag.SCRIPT) if mob:checkDistance(pathNodes[paths.SPAWN][2].x, pathNodes[paths.SPAWN][2].y, pathNodes[paths.SPAWN][2].z) < 1 then - mob:addStatusEffectEx(xi.effect.BIND, xi.effect.BIND, 0, 0, 5, 0, 0, 0, xi.effectFlag.NO_LOSS_MESSAGE, true) + mob:addStatusEffect(xi.effect.BIND, { duration = 5, origin = mob, flag = xi.effectFlag.NO_LOSS_MESSAGE, silent = true }) mob:setLocalVar('justSpawned', 0) end end @@ -150,7 +150,7 @@ entity.onMobFight = function(mob, target) hpp <= 75 and not mob:hasStatusEffect(xi.effect.INTIMIDATE) then - mob:addStatusEffectEx(xi.effect.INTIMIDATE, xi.effect.NONE, 20, 0, 0xFFFF, 0, 0, 0, xi.effectFlag.NO_LOSS_MESSAGE, true) + mob:addStatusEffect(xi.effect.INTIMIDATE, { power = 20, duration = 0xFFFF, origin = mob, icon = xi.effect.NONE, flag = xi.effectFlag.NO_LOSS_MESSAGE, silent = true }) elseif hpp > 75 then mob:delStatusEffect(xi.effect.INTIMIDATE) end diff --git a/scripts/zones/Mamook/npcs/Viscous_Liquid.lua b/scripts/zones/Mamook/npcs/Viscous_Liquid.lua index 3b2b58b31e9..d9354bc16d5 100644 --- a/scripts/zones/Mamook/npcs/Viscous_Liquid.lua +++ b/scripts/zones/Mamook/npcs/Viscous_Liquid.lua @@ -20,7 +20,7 @@ entity.onEventFinish = function(player, csid, option, npc) -- some kind of strange timing/race condition with interactions -- TODO: fix in core? player:timer(100, function(playerArg) - playerArg:addStatusEffect(xi.effect.ILLUSION, 1600, 0, 900, 0, 28) + playerArg:addStatusEffect(xi.effect.ILLUSION, { power = 1600, duration = 900, origin = player, subPower = 28 }) end) player:messageText(player, ID.text.PECULIAR_SENSATION) diff --git a/scripts/zones/Maquette_Abdhaljs-Legion_B/mobs/Bozzetto_Breadwinner.lua b/scripts/zones/Maquette_Abdhaljs-Legion_B/mobs/Bozzetto_Breadwinner.lua index 1a873594d09..3f46eb81e88 100644 --- a/scripts/zones/Maquette_Abdhaljs-Legion_B/mobs/Bozzetto_Breadwinner.lua +++ b/scripts/zones/Maquette_Abdhaljs-Legion_B/mobs/Bozzetto_Breadwinner.lua @@ -39,7 +39,7 @@ entity.onMobInitialize = function(mob) -- The Slow effect is strong enough to overwite Haste II. mob:addListener('TAKE_DAMAGE', 'BREADWINNDER_TAKE_DAMAGE', function(mobArg, amount, attacker, attackType, damageType) if mobArg:hasStatusEffect(xi.effect.HUNDRED_FISTS) then - attacker:addStatusEffect(xi.effect.SLOW, 30 * 100, 0, 60) + attacker:addStatusEffect(xi.effect.SLOW, { power = 30 * 100, duration = 60, origin = mob }) end end) end diff --git a/scripts/zones/Maze_of_Shakhrami/npcs/Ahko_Mhalijikhari.lua b/scripts/zones/Maze_of_Shakhrami/npcs/Ahko_Mhalijikhari.lua index a69903b5c0d..c4cc38a5379 100644 --- a/scripts/zones/Maze_of_Shakhrami/npcs/Ahko_Mhalijikhari.lua +++ b/scripts/zones/Maze_of_Shakhrami/npcs/Ahko_Mhalijikhari.lua @@ -22,7 +22,7 @@ end entity.onEventFinish = function(player, csid, option, npc) if csid == 62 and option == 1 then - player:addStatusEffect(xi.effect.LEVEL_RESTRICTION, 25, 0, 0) + player:addStatusEffect(xi.effect.LEVEL_RESTRICTION, { power = 25, origin = player }) elseif csid == 65 then player:delStatusEffect(xi.effect.LEVEL_RESTRICTION) player:setCharVar('EcoStatus', 203) diff --git a/scripts/zones/Monarch_Linn/mobs/Ouryu.lua b/scripts/zones/Monarch_Linn/mobs/Ouryu.lua index 11dbe27ee21..05007cfce9f 100644 --- a/scripts/zones/Monarch_Linn/mobs/Ouryu.lua +++ b/scripts/zones/Monarch_Linn/mobs/Ouryu.lua @@ -26,7 +26,7 @@ end local function fly(mob) mob:setAnimationSub(allFlightPhaseAnimationSub) - mob:addStatusEffectEx(xi.effect.ALL_MISS, 0, 1, 0, 0) + mob:addStatusEffect(xi.effect.ALL_MISS, { power = 1, origin = mob, icon = 0 }) mob:setMobSkillAttack(731) setNextPhaseTriggers(mob, subsequentPhaseDuration) end diff --git a/scripts/zones/Mount_Zhayolm/mobs/Claret.lua b/scripts/zones/Mount_Zhayolm/mobs/Claret.lua index 071f04d49fe..59770614a32 100644 --- a/scripts/zones/Mount_Zhayolm/mobs/Claret.lua +++ b/scripts/zones/Mount_Zhayolm/mobs/Claret.lua @@ -26,11 +26,11 @@ end entity.onMobFight = function(mob, target) if mob:checkDistance(target) < 3 then if not target:hasStatusEffect(xi.effect.POISON) then - target:addStatusEffect(xi.effect.POISON, 100, 3, math.random(3, 6) * 3) -- Poison for 3-6 ticks. + target:addStatusEffect(xi.effect.POISON, { power = 100, duration = math.random(3, 6) * 3, origin = mob, tick = 3 }) -- Poison for 3-6 ticks. else if target:getStatusEffect(xi.effect.POISON):getPower() < 100 then target:delStatusEffect(xi.effect.POISON) - target:addStatusEffect(xi.effect.POISON, 100, 3, math.random(3, 6) * 3) -- Poison for 3-6 ticks. + target:addStatusEffect(xi.effect.POISON, { power = 100, duration = math.random(3, 6) * 3, origin = mob, tick = 3 }) -- Poison for 3-6 ticks. end end end diff --git a/scripts/zones/Navukgo_Execution_Chamber/mobs/Karababa.lua b/scripts/zones/Navukgo_Execution_Chamber/mobs/Karababa.lua index 44983f7ab85..48d9160f279 100644 --- a/scripts/zones/Navukgo_Execution_Chamber/mobs/Karababa.lua +++ b/scripts/zones/Navukgo_Execution_Chamber/mobs/Karababa.lua @@ -17,7 +17,7 @@ entity.onMobFight = function(mob, target) if mob:getHPP() <= 50 and mob:getLocalVar('powerup') == 0 then target:showText(mob, ID.text.KARABABA_ENOUGH) target:showText(mob, ID.text.KARABABA_ROUGH) - mob:addStatusEffect(xi.effect.MAGIC_ATK_BOOST, 15, 0, 1800) + mob:addStatusEffect(xi.effect.MAGIC_ATK_BOOST, { power = 15, duration = 1800, origin = mob }) mob:setLocalVar('powerup', 1) elseif mob:getHPP() <= 20 and warp == 0 then mob:setLocalVar('warp', 1) diff --git a/scripts/zones/Navukgo_Execution_Chamber/mobs/Watch_Wamoura.lua b/scripts/zones/Navukgo_Execution_Chamber/mobs/Watch_Wamoura.lua index f353b256353..15032abbcbc 100644 --- a/scripts/zones/Navukgo_Execution_Chamber/mobs/Watch_Wamoura.lua +++ b/scripts/zones/Navukgo_Execution_Chamber/mobs/Watch_Wamoura.lua @@ -8,7 +8,7 @@ local entity = {} local function curl(mob) mob:setBaseSpeed(20) mob:setMod(xi.mod.DMG, -9500) - mob:addStatusEffect(xi.effect.BLAZE_SPIKES, 100, 0, 0) + mob:addStatusEffect(xi.effect.BLAZE_SPIKES, { power = 100, origin = mob }) mob:setAnimationSub(5) mob:setLocalVar('stretchTime', GetSystemTime() + math.random(65, 80)) end diff --git a/scripts/zones/North_Gustaberg/mobs/Bedrock_Barry.lua b/scripts/zones/North_Gustaberg/mobs/Bedrock_Barry.lua index 240b06e809e..81e47c122d5 100644 --- a/scripts/zones/North_Gustaberg/mobs/Bedrock_Barry.lua +++ b/scripts/zones/North_Gustaberg/mobs/Bedrock_Barry.lua @@ -65,7 +65,7 @@ entity.onMobInitialize = function(mob) end entity.onMobSpawn = function(mob) - mob:addStatusEffect(xi.effect.STONESKIN, math.random(30, 40), 0, 300) + mob:addStatusEffect(xi.effect.STONESKIN, { power = math.random(30, 40), duration = 300, origin = mob }) end entity.onMobDeath = function(mob, player, optParams) diff --git a/scripts/zones/Ordelles_Caves/mobs/Bombast.lua b/scripts/zones/Ordelles_Caves/mobs/Bombast.lua index 430db5f996c..f44e15b6bd2 100644 --- a/scripts/zones/Ordelles_Caves/mobs/Bombast.lua +++ b/scripts/zones/Ordelles_Caves/mobs/Bombast.lua @@ -7,7 +7,7 @@ local entity = {} entity.onMobInitialize = function(mob) mob:setMobMod(xi.mobMod.AUTO_SPIKES, 1) - mob:addStatusEffect(xi.effect.BLAZE_SPIKES, 15, 0, 0) + mob:addStatusEffect(xi.effect.BLAZE_SPIKES, { power = 15, origin = mob }) mob:getStatusEffect(xi.effect.BLAZE_SPIKES):setEffectFlags(xi.effectFlag.DEATH) end diff --git a/scripts/zones/Ordelles_Caves/npcs/Rojaireaut.lua b/scripts/zones/Ordelles_Caves/npcs/Rojaireaut.lua index aeda03fc48c..d4b3f081538 100644 --- a/scripts/zones/Ordelles_Caves/npcs/Rojaireaut.lua +++ b/scripts/zones/Ordelles_Caves/npcs/Rojaireaut.lua @@ -22,7 +22,7 @@ end entity.onEventFinish = function(player, csid, option, npc) if csid == 51 and option == 1 then - player:addStatusEffect(xi.effect.LEVEL_RESTRICTION, 25, 0, 0) + player:addStatusEffect(xi.effect.LEVEL_RESTRICTION, { power = 25, origin = player }) elseif csid == 54 then player:delStatusEffect(xi.effect.LEVEL_RESTRICTION) player:setCharVar('EcoStatus', 3) diff --git a/scripts/zones/Outer_Horutoto_Ruins/mobs/Legalox_Heftyhind.lua b/scripts/zones/Outer_Horutoto_Ruins/mobs/Legalox_Heftyhind.lua index ed4e92f2f26..bb08ef27a7a 100644 --- a/scripts/zones/Outer_Horutoto_Ruins/mobs/Legalox_Heftyhind.lua +++ b/scripts/zones/Outer_Horutoto_Ruins/mobs/Legalox_Heftyhind.lua @@ -16,7 +16,7 @@ entity.onMobInitialize = function(mob) end entity.onMobSpawn = function(mob) - mob:addStatusEffect(xi.effect.STONESKIN, 100, 0, 300) -- "Spawns with the effect of Stoneskin." + mob:addStatusEffect(xi.effect.STONESKIN, { power = 100, duration = 300, origin = mob }) -- "Spawns with the effect of Stoneskin." end entity.onAdditionalEffect = function(mob, target, damage) diff --git a/scripts/zones/Palborough_Mines/mobs/BeHya_Hundredwall.lua b/scripts/zones/Palborough_Mines/mobs/BeHya_Hundredwall.lua index 3968feff63b..38e27c65878 100644 --- a/scripts/zones/Palborough_Mines/mobs/BeHya_Hundredwall.lua +++ b/scripts/zones/Palborough_Mines/mobs/BeHya_Hundredwall.lua @@ -24,7 +24,7 @@ entity.phList = } entity.onMobSpawn = function(mob) - mob:addStatusEffect(xi.effect.STONESKIN, math.random(60, 70), 0, 300) + mob:addStatusEffect(xi.effect.STONESKIN, { power = math.random(60, 70), duration = 300, origin = mob }) end entity.onMobDeath = function(mob, player, optParams) diff --git a/scripts/zones/Phomiuna_Aqueducts/Zone.lua b/scripts/zones/Phomiuna_Aqueducts/Zone.lua index 8d83942fcdd..53a065cb626 100644 --- a/scripts/zones/Phomiuna_Aqueducts/Zone.lua +++ b/scripts/zones/Phomiuna_Aqueducts/Zone.lua @@ -45,7 +45,7 @@ end zoneObject.afterZoneIn = function(player) -- ZONE WIDE LEVEL RESTRICTION if xi.settings.main.ENABLE_COP_ZONE_CAP == 1 then - player:addStatusEffect(xi.effect.LEVEL_RESTRICTION, 40, 0, 0) + player:addStatusEffect(xi.effect.LEVEL_RESTRICTION, { power = 40, origin = player }) end end diff --git a/scripts/zones/Promyvion-Dem/Zone.lua b/scripts/zones/Promyvion-Dem/Zone.lua index 2a4395445f5..43a6a1a0e3f 100644 --- a/scripts/zones/Promyvion-Dem/Zone.lua +++ b/scripts/zones/Promyvion-Dem/Zone.lua @@ -46,7 +46,7 @@ end zoneObject.afterZoneIn = function(player) -- ZONE WIDE LEVEL RESTRICTION if xi.settings.main.ENABLE_COP_ZONE_CAP == 1 then - player:addStatusEffect(xi.effect.LEVEL_RESTRICTION, 30, 0, 0) + player:addStatusEffect(xi.effect.LEVEL_RESTRICTION, { power = 30, origin = player }) end end diff --git a/scripts/zones/Promyvion-Holla/Zone.lua b/scripts/zones/Promyvion-Holla/Zone.lua index cdaa2beb213..8273842f2f8 100644 --- a/scripts/zones/Promyvion-Holla/Zone.lua +++ b/scripts/zones/Promyvion-Holla/Zone.lua @@ -46,7 +46,7 @@ end zoneObject.afterZoneIn = function(player) -- ZONE WIDE LEVEL RESTRICTION if xi.settings.main.ENABLE_COP_ZONE_CAP == 1 then - player:addStatusEffect(xi.effect.LEVEL_RESTRICTION, 30, 0, 0) + player:addStatusEffect(xi.effect.LEVEL_RESTRICTION, { power = 30, origin = player }) end end diff --git a/scripts/zones/Promyvion-Mea/Zone.lua b/scripts/zones/Promyvion-Mea/Zone.lua index ed894875fce..c3ee03a3d94 100644 --- a/scripts/zones/Promyvion-Mea/Zone.lua +++ b/scripts/zones/Promyvion-Mea/Zone.lua @@ -46,7 +46,7 @@ end zoneObject.afterZoneIn = function(player) -- ZONE WIDE LEVEL RESTRICTION if xi.settings.main.ENABLE_COP_ZONE_CAP == 1 then - player:addStatusEffect(xi.effect.LEVEL_RESTRICTION, 30, 0, 0) + player:addStatusEffect(xi.effect.LEVEL_RESTRICTION, { power = 30, origin = player }) end end diff --git a/scripts/zones/Promyvion-Vahzl/Zone.lua b/scripts/zones/Promyvion-Vahzl/Zone.lua index a209986d9f5..42a79ed0a73 100644 --- a/scripts/zones/Promyvion-Vahzl/Zone.lua +++ b/scripts/zones/Promyvion-Vahzl/Zone.lua @@ -46,7 +46,7 @@ end zoneObject.afterZoneIn = function(player) -- ZONE WIDE LEVEL RESTRICTION if xi.settings.main.ENABLE_COP_ZONE_CAP == 1 then - player:addStatusEffect(xi.effect.LEVEL_RESTRICTION, 50, 0, 0) + player:addStatusEffect(xi.effect.LEVEL_RESTRICTION, { power = 50, origin = player }) end end diff --git a/scripts/zones/PsoXja/Zone.lua b/scripts/zones/PsoXja/Zone.lua index f34575e9680..a07303ba81c 100644 --- a/scripts/zones/PsoXja/Zone.lua +++ b/scripts/zones/PsoXja/Zone.lua @@ -57,7 +57,7 @@ zoneObject.afterZoneIn = function(player) local lvlCap = player:getCharVar('PSOXJA_RESTRICTION_LVL') if lvlCap > 0 then -- LV cap depends on entrance - player:addStatusEffect(xi.effect.LEVEL_RESTRICTION, lvlCap, 0, 0) + player:addStatusEffect(xi.effect.LEVEL_RESTRICTION, { power = lvlCap, origin = player }) end end end diff --git a/scripts/zones/Qulun_Dome/npcs/The_Mute.lua b/scripts/zones/Qulun_Dome/npcs/The_Mute.lua index 2736fe0f7d3..4126106d830 100644 --- a/scripts/zones/Qulun_Dome/npcs/The_Mute.lua +++ b/scripts/zones/Qulun_Dome/npcs/The_Mute.lua @@ -10,7 +10,7 @@ entity.onTrigger = function(player, npc) local duration = math.random(600, 900) if not player:hasStatusEffect(xi.effect.SILENCE) then - player:addStatusEffect(xi.effect.SILENCE, 0, 0, duration) + player:addStatusEffect(xi.effect.SILENCE, { duration = duration, origin = player }) end end diff --git a/scripts/zones/Riverne-Site_A01/Zone.lua b/scripts/zones/Riverne-Site_A01/Zone.lua index 651c04707b1..61fce8ffc81 100644 --- a/scripts/zones/Riverne-Site_A01/Zone.lua +++ b/scripts/zones/Riverne-Site_A01/Zone.lua @@ -28,7 +28,7 @@ end zoneObject.afterZoneIn = function(player) -- ZONE WIDE LEVEL RESTRICTION if xi.settings.main.ENABLE_COP_ZONE_CAP == 1 then - player:addStatusEffect(xi.effect.LEVEL_RESTRICTION, 40, 0, 0) + player:addStatusEffect(xi.effect.LEVEL_RESTRICTION, { power = 40, origin = player }) end end diff --git a/scripts/zones/Riverne-Site_A01/mobs/Ouryu.lua b/scripts/zones/Riverne-Site_A01/mobs/Ouryu.lua index 2484e585c2e..8cafb04956c 100644 --- a/scripts/zones/Riverne-Site_A01/mobs/Ouryu.lua +++ b/scripts/zones/Riverne-Site_A01/mobs/Ouryu.lua @@ -31,7 +31,7 @@ end local function fly(mob) mob:setAnimationSub(allFlightPhaseAnimationSub) - mob:addStatusEffectEx(xi.effect.ALL_MISS, 0, 1, 0, 0) + mob:addStatusEffect(xi.effect.ALL_MISS, { power = 1, origin = mob, icon = 0 }) mob:setMobSkillAttack(731) setNextPhaseTriggers(mob, subsequentPhaseDuration) end diff --git a/scripts/zones/Riverne-Site_B01/Zone.lua b/scripts/zones/Riverne-Site_B01/Zone.lua index c12bef4b4a2..ae5a74967dc 100644 --- a/scripts/zones/Riverne-Site_B01/Zone.lua +++ b/scripts/zones/Riverne-Site_B01/Zone.lua @@ -28,7 +28,7 @@ end zoneObject.afterZoneIn = function(player) -- ZONE WIDE LEVEL RESTRICTION if xi.settings.main.ENABLE_COP_ZONE_CAP == 1 then - player:addStatusEffect(xi.effect.LEVEL_RESTRICTION, 50, 0, 0) + player:addStatusEffect(xi.effect.LEVEL_RESTRICTION, { power = 50, origin = player }) end end diff --git a/scripts/zones/Riverne-Site_B01/mobs/Bahamut.lua b/scripts/zones/Riverne-Site_B01/mobs/Bahamut.lua index fdb99dab9f1..729ddd91881 100644 --- a/scripts/zones/Riverne-Site_B01/mobs/Bahamut.lua +++ b/scripts/zones/Riverne-Site_B01/mobs/Bahamut.lua @@ -33,10 +33,10 @@ entity.onMobSpawn = function(mob) mob:addMod(xi.mod.REGEN, 50) -- MDEF bonus scaled down from Bahamut v2 (wyrmking decends) value based on level difference mob:setMod(xi.mod.MDEF, 55) - mob:addStatusEffect(xi.effect.PHALANX, 35, 0, 180) - mob:addStatusEffect(xi.effect.STONESKIN, 350, 0, 300) - mob:addStatusEffect(xi.effect.PROTECT, 175, 0, 1800) - mob:addStatusEffect(xi.effect.SHELL, 24, 0, 1800) + mob:addStatusEffect(xi.effect.PHALANX, { power = 35, duration = 180, origin = mob }) + mob:addStatusEffect(xi.effect.STONESKIN, { power = 350, duration = 300, origin = mob }) + mob:addStatusEffect(xi.effect.PROTECT, { power = 175, duration = 1800, origin = mob }) + mob:addStatusEffect(xi.effect.SHELL, { power = 24, duration = 1800, origin = mob }) -- set these here to make sure no issues if previously killed during a flare mobskill mob:setMobAbilityEnabled(true) mob:setMagicCastingEnabled(true) diff --git a/scripts/zones/Riverne-Site_B01/mobs/Book_Browser_Bokabraq.lua b/scripts/zones/Riverne-Site_B01/mobs/Book_Browser_Bokabraq.lua index 90aa0e3baab..e02821e0332 100644 --- a/scripts/zones/Riverne-Site_B01/mobs/Book_Browser_Bokabraq.lua +++ b/scripts/zones/Riverne-Site_B01/mobs/Book_Browser_Bokabraq.lua @@ -19,7 +19,7 @@ entity.onMobSpawn = function(mob) mob:setMobMod(xi.mobMod.SUPERLINK, ID.mob.SPELL_SPITTER_SPILUSPOK) mob:setMobMod(xi.mobMod.SUPERLINK, ID.mob.SPELL_SPITTER_SPILUSPOK + 1) mob:setMod(xi.mod.REFRESH, 5) - mob:addStatusEffectEx(xi.effect.STUN, xi.effect.STUN, 0, 0, 1, 0, 0, 0, xi.effectFlag.NO_LOSS_MESSAGE, true) -- Holds the mob so the player can zone in before they "ambush" the player + mob:addStatusEffect(xi.effect.STUN, { duration = 1, origin = mob, flag = xi.effectFlag.NO_LOSS_MESSAGE, silent = true }) -- Holds the mob so the player can zone in before they "ambush" the player end -- When the NM is back at spawn it will rotate to face the portal before standing there until agro/despawn diff --git a/scripts/zones/Riverne-Site_B01/mobs/Chemical_Cook_Chemachiq.lua b/scripts/zones/Riverne-Site_B01/mobs/Chemical_Cook_Chemachiq.lua index 7f771fe8b47..616192e11ef 100644 --- a/scripts/zones/Riverne-Site_B01/mobs/Chemical_Cook_Chemachiq.lua +++ b/scripts/zones/Riverne-Site_B01/mobs/Chemical_Cook_Chemachiq.lua @@ -20,7 +20,7 @@ entity.onMobSpawn = function(mob) mob:setMobMod(xi.mobMod.SUPERLINK, ID.mob.SPELL_SPITTER_SPILUSPOK) mob:setMobMod(xi.mobMod.SUPERLINK, ID.mob.SPELL_SPITTER_SPILUSPOK + 2) mob:setMod(xi.mod.REFRESH, 5) - mob:addStatusEffectEx(xi.effect.STUN, xi.effect.STUN, 0, 0, 1, 0, 0, 0, xi.effectFlag.NO_LOSS_MESSAGE, true) -- Holds the mob so the player can zone in before they "ambush" the player + mob:addStatusEffect(xi.effect.STUN, { duration = 1, origin = mob, flag = xi.effectFlag.NO_LOSS_MESSAGE, silent = true }) -- Holds the mob so the player can zone in before they "ambush" the player -- Adds a listener for when the WHM loses silence since WHM doesn't have built in standback mob:addListener('EFFECT_LOSE', 'CCC_SILENCE', function(mobArg, effect) diff --git a/scripts/zones/Riverne-Site_B01/mobs/Spell_Spitter_Spilospok.lua b/scripts/zones/Riverne-Site_B01/mobs/Spell_Spitter_Spilospok.lua index edbb321cc7f..4c3011f97c0 100644 --- a/scripts/zones/Riverne-Site_B01/mobs/Spell_Spitter_Spilospok.lua +++ b/scripts/zones/Riverne-Site_B01/mobs/Spell_Spitter_Spilospok.lua @@ -19,7 +19,7 @@ entity.onMobSpawn = function(mob) mob:setMobMod(xi.mobMod.SUPERLINK, ID.mob.SPELL_SPITTER_SPILUSPOK + 1) mob:setMobMod(xi.mobMod.SUPERLINK, ID.mob.SPELL_SPITTER_SPILUSPOK + 2) mob:setMod(xi.mod.REFRESH, 5) - mob:addStatusEffectEx(xi.effect.STUN, xi.effect.STUN, 0, 0, 1, 0, 0, 0, xi.effectFlag.NO_LOSS_MESSAGE, true) -- Holds the mob so the player can zone in before they "ambush" the player + mob:addStatusEffect(xi.effect.STUN, { duration = 1, origin = mob, flag = xi.effectFlag.NO_LOSS_MESSAGE, silent = true }) -- Holds the mob so the player can zone in before they "ambush" the player end -- When the NM is back at spawn it will rotate to face the portal before standing there until agro/despawn diff --git a/scripts/zones/RoMaeve/mobs/Martinet.lua b/scripts/zones/RoMaeve/mobs/Martinet.lua index 259154c58d1..c909ea4dc51 100644 --- a/scripts/zones/RoMaeve/mobs/Martinet.lua +++ b/scripts/zones/RoMaeve/mobs/Martinet.lua @@ -24,7 +24,7 @@ entity.onMobInitialize = function(mob) mob:addImmunity(xi.immunity.GRAVITY) mob:addImmunity(xi.immunity.PLAGUE) mob:addImmunity(xi.immunity.TERROR) - mob:addStatusEffect(xi.effect.SHOCK_SPIKES, 60, 0, 0) + mob:addStatusEffect(xi.effect.SHOCK_SPIKES, { power = 60, origin = mob }) mob:getStatusEffect(xi.effect.SHOCK_SPIKES):setEffectFlags(xi.effectFlag.DEATH) xi.mob.updateNMSpawnPoint(mob) diff --git a/scripts/zones/Rolanberry_Fields_[S]/mobs/Dyinyinga.lua b/scripts/zones/Rolanberry_Fields_[S]/mobs/Dyinyinga.lua index 485b73d5dc6..6740757b7ef 100644 --- a/scripts/zones/Rolanberry_Fields_[S]/mobs/Dyinyinga.lua +++ b/scripts/zones/Rolanberry_Fields_[S]/mobs/Dyinyinga.lua @@ -56,8 +56,8 @@ entity.onMobFight = function(mob, target) else -- Aura and closes the gap mob:setMobMod(xi.mobMod.TARGET_DISTANCE_OFFSET, 50) - mob:addStatusEffectEx(xi.effect.COLURE_ACTIVE, xi.effect.COLURE_ACTIVE, 6, 3, 0, xi.effect.AMNESIA, 50, xi.auraTarget.ENEMIES, xi.effectFlag.AURA) - mob:addStatusEffectEx(xi.effect.NONE, xi.effect.NONE, 6, 3, 0, xi.effect.SILENCE, 50, xi.auraTarget.ENEMIES, xi.effectFlag.AURA) + mob:addStatusEffect(xi.effect.COLURE_ACTIVE, { power = 6, origin = mob, tick = 3, subType = xi.effect.AMNESIA, subPower = 50, tier = xi.auraTarget.ENEMIES, flag = xi.effectFlag.AURA }) + mob:addStatusEffect(xi.effect.NONE, { power = 6, origin = mob, tick = 3, subType = xi.effect.SILENCE, subPower = 50, tier = xi.auraTarget.ENEMIES, flag = xi.effectFlag.AURA }) end end diff --git a/scripts/zones/Sacrarium/Zone.lua b/scripts/zones/Sacrarium/Zone.lua index 015f7f7131e..2d4cfedf813 100644 --- a/scripts/zones/Sacrarium/Zone.lua +++ b/scripts/zones/Sacrarium/Zone.lua @@ -53,7 +53,7 @@ end zoneObject.afterZoneIn = function(player) -- ZONE WIDE LEVEL RESTRICTION if xi.settings.main.ENABLE_COP_ZONE_CAP == 1 then - player:addStatusEffect(xi.effect.LEVEL_RESTRICTION, 50, 0, 0) + player:addStatusEffect(xi.effect.LEVEL_RESTRICTION, { power = 50, origin = player }) end end diff --git a/scripts/zones/Sauromugue_Champaign/mobs/Old_Sabertooth.lua b/scripts/zones/Sauromugue_Champaign/mobs/Old_Sabertooth.lua index 342e7993352..738b89e80ee 100644 --- a/scripts/zones/Sauromugue_Champaign/mobs/Old_Sabertooth.lua +++ b/scripts/zones/Sauromugue_Champaign/mobs/Old_Sabertooth.lua @@ -28,7 +28,7 @@ entity.onMobSpawn = function(mob) mob:setBehavior(bit.bor(mob:getBehavior(), xi.behavior.NO_TURN)) mob:setMobAbilityEnabled(false) mob:setAutoAttackEnabled(false) - mob:addStatusEffect(xi.effect.POISON, 7, 10, 240) + mob:addStatusEffect(xi.effect.POISON, { power = 7, duration = 240, origin = mob, tick = 10 }) mob:addListener('TAKE_DAMAGE', 'PRIME_TAKE_DAMAGE', function(tiger, amount, attacker) if attacker then tiger:setLocalVar('tookDamage', 1) diff --git a/scripts/zones/Silver_Sea_Remnants/instances/silver_sea_remnants.lua b/scripts/zones/Silver_Sea_Remnants/instances/silver_sea_remnants.lua index 84a989d7761..b89a8417906 100644 --- a/scripts/zones/Silver_Sea_Remnants/instances/silver_sea_remnants.lua +++ b/scripts/zones/Silver_Sea_Remnants/instances/silver_sea_remnants.lua @@ -33,11 +33,11 @@ instanceObject.afterInstanceRegister = function(player) player:unequipItem(i) end - player:addStatusEffectEx(xi.effect.ENCUMBRANCE_I, xi.effect.ENCUMBRANCE_I, 0xFFFF, 0, 6000) - player:addStatusEffectEx(xi.effect.OBLIVISCENCE, xi.effect.OBLIVISCENCE, 1, 0, 6000) - player:addStatusEffectEx(xi.effect.OMERTA, xi.effect.OMERTA, 0x3F, 0, 6000) - player:addStatusEffectEx(xi.effect.IMPAIRMENT, xi.effect.IMPAIRMENT, 3, 0, 6000) - player:addStatusEffectEx(xi.effect.DEBILITATION, xi.effect.DEBILITATION, 0x1FF, 0, 6000) + player:addStatusEffect(xi.effect.ENCUMBRANCE_I, { power = 0xFFFF, duration = 6000, origin = player }) + player:addStatusEffect(xi.effect.OBLIVISCENCE, { power = 1, duration = 6000, origin = player }) + player:addStatusEffect(xi.effect.OMERTA, { power = 0x3F, duration = 6000, origin = player }) + player:addStatusEffect(xi.effect.IMPAIRMENT, { power = 3, duration = 6000, origin = player }) + player:addStatusEffect(xi.effect.DEBILITATION, { power = 0x1FF, duration = 6000, origin = player }) player:addTempItem(xi.item.CAGE_OF_S_REMNANTS_FIREFLIES) player:delKeyItem(xi.ki.REMNANTS_PERMIT) end diff --git a/scripts/zones/Southern_San_dOria_[S]/npcs/Saphiriance_TK.lua b/scripts/zones/Southern_San_dOria_[S]/npcs/Saphiriance_TK.lua index 9905464c2f9..dd8b2f30d26 100644 --- a/scripts/zones/Southern_San_dOria_[S]/npcs/Saphiriance_TK.lua +++ b/scripts/zones/Southern_San_dOria_[S]/npcs/Saphiriance_TK.lua @@ -18,7 +18,7 @@ end entity.onEventFinish = function(player, csid, option, npc) if csid == 454 then - player:addStatusEffectEx(xi.effect.TELEPORT, 0, xi.teleport.id.RETRACE, 0, 3) + player:addStatusEffect(xi.effect.TELEPORT, { power = xi.teleport.id.RETRACE, duration = 3, origin = player, icon = 0 }) player:delCurrency('allied_notes', 30) end end diff --git a/scripts/zones/The_Celestial_Nexus/mobs/Ealdnarche.lua b/scripts/zones/The_Celestial_Nexus/mobs/Ealdnarche.lua index facc664f353..40b41cd50ac 100644 --- a/scripts/zones/The_Celestial_Nexus/mobs/Ealdnarche.lua +++ b/scripts/zones/The_Celestial_Nexus/mobs/Ealdnarche.lua @@ -22,9 +22,9 @@ entity.onMobSpawn = function(mob) mob:setMod(xi.mod.MDEF, 50) mob:setMobMod(xi.mobMod.SIGHT_RANGE, 30) mob:setMobMod(xi.mobMod.GA_CHANCE, 25) - mob:addStatusEffectEx(xi.effect.PHYSICAL_SHIELD, 0, 1, 0, 0) - mob:addStatusEffectEx(xi.effect.ARROW_SHIELD, 0, 1, 0, 0) - mob:addStatusEffectEx(xi.effect.MAGIC_SHIELD, 0, 1, 0, 0) + mob:addStatusEffect(xi.effect.PHYSICAL_SHIELD, { power = 1, origin = mob, icon = 0 }) + mob:addStatusEffect(xi.effect.ARROW_SHIELD, { power = 1, origin = mob, icon = 0 }) + mob:addStatusEffect(xi.effect.MAGIC_SHIELD, { power = 1, origin = mob, icon = 0 }) mob:setMagicCastingEnabled(false) end diff --git a/scripts/zones/The_Shrine_of_RuAvitau/mobs/Mother_Globe.lua b/scripts/zones/The_Shrine_of_RuAvitau/mobs/Mother_Globe.lua index c3383750751..518765d03d2 100644 --- a/scripts/zones/The_Shrine_of_RuAvitau/mobs/Mother_Globe.lua +++ b/scripts/zones/The_Shrine_of_RuAvitau/mobs/Mother_Globe.lua @@ -193,7 +193,7 @@ end entity.onMobSpawn = function(mob) mob:setLocalVar('nextSlaveSpawnTime', GetSystemTime() + 30) -- spawn first 30s from now - mob:addStatusEffectEx(xi.effect.SHOCK_SPIKES, xi.effect.SHOCK_SPIKES, 60, 0, 3600, true) + mob:addStatusEffect(xi.effect.SHOCK_SPIKES, { power = 60, duration = 3600, origin = mob, silent = true }) -- Silently reapply shock spikes immediately mob:addListener('EFFECT_LOSE', 'MG_SPIKES', function(mobArg, effect) @@ -201,7 +201,7 @@ entity.onMobSpawn = function(mob) mobArg:isAlive() and effect:getEffectType() == xi.effect.SHOCK_SPIKES then - mobArg:addStatusEffectEx(xi.effect.SHOCK_SPIKES, xi.effect.SHOCK_SPIKES, 60, 0, 3600, true) + mobArg:addStatusEffect(xi.effect.SHOCK_SPIKES, { power = 60, duration = 3600, origin = mob, silent = true }) end end) end diff --git a/scripts/zones/Throne_Room/mobs/Shadow_Lord_Phase_1.lua b/scripts/zones/Throne_Room/mobs/Shadow_Lord_Phase_1.lua index 11f3bc37df1..3ce915477e1 100644 --- a/scripts/zones/Throne_Room/mobs/Shadow_Lord_Phase_1.lua +++ b/scripts/zones/Throne_Room/mobs/Shadow_Lord_Phase_1.lua @@ -24,13 +24,13 @@ local function changeStance(mob, stance) local magicalShieldPower = stanceTable[stance][4] if physicalShieldPower > 0 then - mob:addStatusEffectEx(xi.effect.PHYSICAL_SHIELD, 0, physicalShieldPower, 0, 0) - mob:addStatusEffectEx(xi.effect.ARROW_SHIELD, 0, physicalShieldPower, 0, 0) + mob:addStatusEffect(xi.effect.PHYSICAL_SHIELD, { power = physicalShieldPower, origin = mob, icon = 0 }) + mob:addStatusEffect(xi.effect.ARROW_SHIELD, { power = physicalShieldPower, origin = mob, icon = 0 }) mob:delStatusEffectSilent(xi.effect.MAGIC_SHIELD) else mob:delStatusEffectSilent(xi.effect.PHYSICAL_SHIELD) mob:delStatusEffectSilent(xi.effect.ARROW_SHIELD) - mob:addStatusEffectEx(xi.effect.MAGIC_SHIELD, 0, magicalShieldPower, 0, 0) + mob:addStatusEffect(xi.effect.MAGIC_SHIELD, { power = magicalShieldPower, origin = mob, icon = 0 }) end -- Set special modifiers for action delays. diff --git a/scripts/zones/Toraimarai_Canal/mobs/Brazen_Bones.lua b/scripts/zones/Toraimarai_Canal/mobs/Brazen_Bones.lua index 50a895b2114..9510d437f9d 100644 --- a/scripts/zones/Toraimarai_Canal/mobs/Brazen_Bones.lua +++ b/scripts/zones/Toraimarai_Canal/mobs/Brazen_Bones.lua @@ -14,7 +14,7 @@ entity.spawnPoints = entity.onMobSpawn = function(mob) mob:setMobMod(xi.mobMod.AUTO_SPIKES, 1) - mob:addStatusEffect(xi.effect.ICE_SPIKES, 50, 0, 0) + mob:addStatusEffect(xi.effect.ICE_SPIKES, { power = 50, origin = mob }) mob:getStatusEffect(xi.effect.ICE_SPIKES):setEffectFlags(xi.effectFlag.DEATH) mob:setMobMod(xi.mobMod.ADD_EFFECT, 1) mob:setMod(xi.mod.ICE_MEVA, 100) diff --git a/scripts/zones/Uleguerand_Range/mobs/Jormungand.lua b/scripts/zones/Uleguerand_Range/mobs/Jormungand.lua index 3c4b53a13f8..9f528bf28b1 100644 --- a/scripts/zones/Uleguerand_Range/mobs/Jormungand.lua +++ b/scripts/zones/Uleguerand_Range/mobs/Jormungand.lua @@ -61,7 +61,7 @@ entity.spawnPoints = local function enterFlight(mob) mob:setAnimationSub(1) - mob:addStatusEffectEx(xi.effect.ALL_MISS, 0, 1, 0, 0) + mob:addStatusEffect(xi.effect.ALL_MISS, { power = 1, origin = mob, icon = 0 }) mob:setMobSkillAttack(732) mob:setLocalVar('flightTime', GetSystemTime() + 30) mob:setLocalVar('changeHP', mob:getHP() - 6000) diff --git a/scripts/zones/Upper_Delkfutts_Tower/mobs/Autarch.lua b/scripts/zones/Upper_Delkfutts_Tower/mobs/Autarch.lua index 7ce97a48496..cf69169e095 100644 --- a/scripts/zones/Upper_Delkfutts_Tower/mobs/Autarch.lua +++ b/scripts/zones/Upper_Delkfutts_Tower/mobs/Autarch.lua @@ -8,7 +8,7 @@ local entity = {} entity.onMobInitialize = function(mob) mob:setMobMod(xi.mobMod.AUTO_SPIKES, 1) mob:setMobMod(xi.mobMod.DETECTION, bit.bor(xi.detects.MAGIC, xi.detects.SCENT)) -- TODO: Verify scent tracking on retail. - mob:addStatusEffect(xi.effect.SHOCK_SPIKES, 40, 0, 0) + mob:addStatusEffect(xi.effect.SHOCK_SPIKES, { power = 40, origin = mob }) mob:getStatusEffect(xi.effect.SHOCK_SPIKES):setEffectFlags(xi.effectFlag.DEATH) end diff --git a/scripts/zones/West_Sarutabaruta_[S]/mobs/Ramponneau.lua b/scripts/zones/West_Sarutabaruta_[S]/mobs/Ramponneau.lua index 759fd982de5..8f3c0eeb2f4 100644 --- a/scripts/zones/West_Sarutabaruta_[S]/mobs/Ramponneau.lua +++ b/scripts/zones/West_Sarutabaruta_[S]/mobs/Ramponneau.lua @@ -19,7 +19,7 @@ entity.phList = entity.onMobInitialize = function(mob) mob:setMobMod(xi.mobMod.ADD_EFFECT, 1) - mob:addStatusEffect(xi.effect.SHOCK_SPIKES, 10, 0, 0) + mob:addStatusEffect(xi.effect.SHOCK_SPIKES, { power = 10, origin = mob }) mob:getStatusEffect(xi.effect.SHOCK_SPIKES):setEffectFlags(xi.effectFlag.DEATH) end diff --git a/scripts/zones/Western_Adoulin/npcs/Ruth.lua b/scripts/zones/Western_Adoulin/npcs/Ruth.lua index 366af181946..e867184e75c 100644 --- a/scripts/zones/Western_Adoulin/npcs/Ruth.lua +++ b/scripts/zones/Western_Adoulin/npcs/Ruth.lua @@ -23,7 +23,7 @@ entity.onEventFinish = function(player, csid, option, npc) if csid == 2523 then -- Progresses Quest: 'A Pioneers Best (Imaginary) Friend' player:delStatusEffectsByFlag(xi.effectFlag.INFLUENCE, true) - player:addStatusEffect(xi.effect.IONIS, 0, 0, 9000) + player:addStatusEffect(xi.effect.IONIS, { duration = 9000, origin = player }) end end diff --git a/scripts/zones/Xarcabard/mobs/Barbaric_Weapon.lua b/scripts/zones/Xarcabard/mobs/Barbaric_Weapon.lua index 74c9d638134..cea6db9365f 100644 --- a/scripts/zones/Xarcabard/mobs/Barbaric_Weapon.lua +++ b/scripts/zones/Xarcabard/mobs/Barbaric_Weapon.lua @@ -33,7 +33,7 @@ end entity.onMobWeaponSkill = function(target, mob, skill) -- Gains Dread Spikes effect when using Whirl of Rage TP move if skill:getID() == 514 then - mob:addStatusEffectEx(xi.effect.DREAD_SPIKES, 0, 10, 0, 180, 0, 310, 1, 0, true) + mob:addStatusEffect(xi.effect.DREAD_SPIKES, { power = 10, duration = 180, origin = mob, icon = 0, subPower = 310, tier = 1, silent = true }) end end diff --git a/src/map/lua/lua_baseentity.cpp b/src/map/lua/lua_baseentity.cpp index ab372e02af0..786aed90a52 100644 --- a/src/map/lua/lua_baseentity.cpp +++ b/src/map/lua/lua_baseentity.cpp @@ -13650,11 +13650,11 @@ auto CLuaBaseEntity::addStatusEffect(const EFFECT effectId, sol::table params) c } // Required parameters - auto originEntity = params["origin"].get(); - const auto power = static_cast(params["power"].get()); // Can come in as a lua_number, capture as double and truncate - const auto duration = params["duration"].get(); + auto originEntity = params["origin"].get(); // Optional parameters + const auto duration = params["duration"].get_or(0.0); + const auto power = static_cast(params["power"].get_or(0.0)); const auto tick = static_cast(params["tick"].get_or(0.0)); const auto icon = params["icon"].get_or(static_cast(effectId)); const auto subType = params["subType"].get_or(0u); @@ -13714,9 +13714,9 @@ auto CLuaBaseEntity::copyStatusEffect(const CLuaStatusEffect* PStatusEffect) con auto remainingDuration = 0s; if (POriginal->GetDuration() > 0s) { - auto duration = POriginal->GetStartTime() - timer::now() + POriginal->GetDuration(); - remainingDuration = std::chrono::duration_cast(duration); - remainingDuration = std::max(remainingDuration, 0s); + const auto duration = POriginal->GetStartTime() - timer::now() + POriginal->GetDuration(); + remainingDuration = std::chrono::duration_cast(duration); + remainingDuration = std::max(remainingDuration, 0s); } auto* PNewEffect = new CStatusEffect( @@ -13728,7 +13728,7 @@ auto CLuaBaseEntity::copyStatusEffect(const CLuaStatusEffect* PStatusEffect) con POriginal->GetSubID(), POriginal->GetSubPower(), POriginal->GetTier(), - POriginal->GetFlag(), + POriginal->GetEffectFlags(), POriginal->GetSourceType(), POriginal->GetSourceTypeParam(), POriginal->GetOriginID()); From 0f5516a0e334b3adf54e31dd48b3e59e0979a325 Mon Sep 17 00:00:00 2001 From: sruon Date: Fri, 20 Feb 2026 19:21:08 -0700 Subject: [PATCH 3/3] Migrate remaining addStatusEffectEx call --- scripts/zones/Abyssea-Empyreal_Paradox/Zone.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/zones/Abyssea-Empyreal_Paradox/Zone.lua b/scripts/zones/Abyssea-Empyreal_Paradox/Zone.lua index 82c9546ce2f..54923d2dd0f 100644 --- a/scripts/zones/Abyssea-Empyreal_Paradox/Zone.lua +++ b/scripts/zones/Abyssea-Empyreal_Paradox/Zone.lua @@ -23,7 +23,7 @@ end zoneObject.afterZoneIn = function(player) if not player:hasStatusEffect(xi.effect.VISITANT) then - player:addStatusEffectEx(xi.effect.VISITANT, xi.effect.VISITANT, 0, 0, 0) + player:addStatusEffect(xi.effect.VISITANT, { icon = xi.effect.VISITANT, origin = player }) end end