From a4fed23e47726e6c0352ef920b0fd938c960950b Mon Sep 17 00:00:00 2001 From: WinterSolstice8 <60417494+wintersolstice8@users.noreply.github.com> Date: Wed, 4 Feb 2026 16:20:54 -0700 Subject: [PATCH 1/2] [lua] Adjust mobskills/petskills to pass a table/in out of ALL of them Praise be to sed --- .../actions/abilities/pets/aerial_blast.lua | 6 +-- scripts/actions/abilities/pets/aero_ii.lua | 6 +-- scripts/actions/abilities/pets/aero_iv.lua | 6 +-- scripts/actions/abilities/pets/axe_kick.lua | 4 +- .../actions/abilities/pets/barracuda_dive.lua | 4 +- .../actions/abilities/pets/blizzard_ii.lua | 6 +-- .../actions/abilities/pets/blizzard_iv.lua | 6 +-- .../actions/abilities/pets/burning_strike.lua | 8 ++-- scripts/actions/abilities/pets/camisado.lua | 4 +- .../actions/abilities/pets/chaotic_strike.lua | 4 +- .../actions/abilities/pets/clarsach_call.lua | 6 +-- scripts/actions/abilities/pets/claw.lua | 4 +- .../actions/abilities/pets/crescent_fang.lua | 6 +-- .../actions/abilities/pets/diamond_dust.lua | 6 +-- .../actions/abilities/pets/double_punch.lua | 4 +- .../actions/abilities/pets/double_slap.lua | 4 +- .../actions/abilities/pets/earthen_fury.lua | 6 +-- .../actions/abilities/pets/eclipse_bite.lua | 4 +- scripts/actions/abilities/pets/fire_ii.lua | 6 +-- scripts/actions/abilities/pets/fire_iv.lua | 6 +-- .../actions/abilities/pets/flaming_crush.lua | 8 ++-- scripts/actions/abilities/pets/geocrush.lua | 6 +-- scripts/actions/abilities/pets/grand_fall.lua | 6 +-- .../abilities/pets/heavenly_strike.lua | 6 +-- .../actions/abilities/pets/howling_moon.lua | 6 +-- .../abilities/pets/hysteric_assault.lua | 6 +-- scripts/actions/abilities/pets/inferno.lua | 6 +-- .../actions/abilities/pets/judgment_bolt.lua | 6 +-- .../actions/abilities/pets/level_X_holy.lua | 6 +-- .../actions/abilities/pets/megalith_throw.lua | 4 +- .../actions/abilities/pets/meteor_strike.lua | 6 +-- .../actions/abilities/pets/moonlit_charge.lua | 4 +- .../abilities/pets/mountain_buster.lua | 4 +- .../actions/abilities/pets/nether_blast.lua | 6 +-- .../actions/abilities/pets/poison_nails.lua | 4 +- .../actions/abilities/pets/predator_claws.lua | 4 +- scripts/actions/abilities/pets/punch.lua | 4 +- .../actions/abilities/pets/regal_scratch.lua | 4 +- .../actions/abilities/pets/rock_buster.lua | 4 +- scripts/actions/abilities/pets/rock_throw.lua | 4 +- scripts/actions/abilities/pets/roundhouse.lua | 6 +-- scripts/actions/abilities/pets/rush.lua | 4 +- .../actions/abilities/pets/searing_light.lua | 6 +-- .../actions/abilities/pets/shock_strike.lua | 4 +- scripts/actions/abilities/pets/somnolence.lua | 6 +-- .../actions/abilities/pets/sonic_buffet.lua | 6 +-- .../actions/abilities/pets/spinning_dive.lua | 4 +- scripts/actions/abilities/pets/stone_ii.lua | 6 +-- scripts/actions/abilities/pets/stone_iv.lua | 6 +-- scripts/actions/abilities/pets/tail_whip.lua | 4 +- scripts/actions/abilities/pets/thunder_ii.lua | 6 +-- scripts/actions/abilities/pets/thunder_iv.lua | 6 +-- .../actions/abilities/pets/thunderspark.lua | 6 +-- .../actions/abilities/pets/thunderstorm.lua | 6 +-- scripts/actions/abilities/pets/tidal_wave.lua | 6 +-- scripts/actions/abilities/pets/tornado_ii.lua | 6 +-- scripts/actions/abilities/pets/water_ii.lua | 6 +-- scripts/actions/abilities/pets/water_iv.lua | 6 +-- scripts/actions/abilities/pets/welt.lua | 6 +-- scripts/actions/abilities/pets/wind_blade.lua | 6 +-- .../actions/abilities/pets/zantetsuken.lua | 6 +-- scripts/actions/mobskills/10000_needles.lua | 7 ++- scripts/actions/mobskills/1000_needles.lua | 6 ++- scripts/actions/mobskills/2000_needles.lua | 7 ++- scripts/actions/mobskills/4000_needles.lua | 7 ++- .../actions/mobskills/Preternatural_Gleam.lua | 4 +- scripts/actions/mobskills/abyss_blast.lua | 4 +- scripts/actions/mobskills/abyssal_strike.lua | 2 +- scripts/actions/mobskills/acheron_kick.lua | 2 +- scripts/actions/mobskills/acid_breath.lua | 4 +- scripts/actions/mobskills/acid_mist.lua | 4 +- scripts/actions/mobskills/acid_spray.lua | 4 +- scripts/actions/mobskills/acrid_stream.lua | 4 +- scripts/actions/mobskills/aegis_schism.lua | 2 +- scripts/actions/mobskills/aeolian_edge.lua | 2 +- scripts/actions/mobskills/aeolian_void.lua | 4 +- scripts/actions/mobskills/aerial_blast.lua | 4 +- .../actions/mobskills/aerial_collision.lua | 2 +- scripts/actions/mobskills/aerial_wheel.lua | 2 +- scripts/actions/mobskills/aero_ii.lua | 4 +- scripts/actions/mobskills/aero_iv.lua | 4 +- .../actions/mobskills/aero_meeble_warble.lua | 4 +- scripts/actions/mobskills/agaricus.lua | 2 +- .../actions/mobskills/amatsu_hanaikusa.lua | 2 +- scripts/actions/mobskills/amatsu_kazakiri.lua | 2 +- scripts/actions/mobskills/amatsu_torimai.lua | 2 +- .../actions/mobskills/amatsu_tsukikage.lua | 2 +- .../actions/mobskills/amatsu_tsukioboro.lua | 2 +- .../actions/mobskills/amatsu_yukiarashi.lua | 2 +- scripts/actions/mobskills/amon_drive.lua | 2 +- scripts/actions/mobskills/amorphic_scythe.lua | 2 +- scripts/actions/mobskills/amorphic_spikes.lua | 2 +- scripts/actions/mobskills/antigravity.lua | 2 +- scripts/actions/mobskills/antigravity_1.lua | 2 +- scripts/actions/mobskills/antigravity_2.lua | 2 +- scripts/actions/mobskills/antigravity_3.lua | 2 +- scripts/actions/mobskills/antimatter.lua | 4 +- scripts/actions/mobskills/aqua_ball.lua | 4 +- scripts/actions/mobskills/aqua_blast.lua | 4 +- scripts/actions/mobskills/aqua_breath.lua | 4 +- scripts/actions/mobskills/arbor_storm.lua | 2 +- scripts/actions/mobskills/arching_arrow.lua | 2 +- scripts/actions/mobskills/arctic_impact.lua | 4 +- scripts/actions/mobskills/armor_buster.lua | 4 +- scripts/actions/mobskills/arrow_deluge.lua | 2 +- .../actions/mobskills/artificial_gravity.lua | 2 +- .../mobskills/artificial_gravity_1.lua | 2 +- .../mobskills/artificial_gravity_2.lua | 2 +- .../mobskills/artificial_gravity_3.lua | 2 +- scripts/actions/mobskills/ascetics_fury.lua | 2 +- scripts/actions/mobskills/astral_gate.lua | 2 +- scripts/actions/mobskills/asuran_claws.lua | 2 +- scripts/actions/mobskills/asuran_fists.lua | 2 +- .../actions/mobskills/august_melee_axe.lua | 2 +- .../actions/mobskills/august_melee_bow.lua | 2 +- .../actions/mobskills/august_melee_h2h.lua | 2 +- .../actions/mobskills/august_melee_sword.lua | 2 +- .../actions/mobskills/auroral_uppercut.lua | 4 +- scripts/actions/mobskills/auroral_wind.lua | 4 +- scripts/actions/mobskills/axe_kick.lua | 2 +- scripts/actions/mobskills/axe_throw.lua | 2 +- scripts/actions/mobskills/back_heel.lua | 2 +- scripts/actions/mobskills/back_swish.lua | 2 +- scripts/actions/mobskills/bad_breath.lua | 4 +- scripts/actions/mobskills/bai_wing.lua | 4 +- scripts/actions/mobskills/barbed_crescent.lua | 2 +- scripts/actions/mobskills/barofield.lua | 4 +- scripts/actions/mobskills/barracuda_dive.lua | 2 +- scripts/actions/mobskills/batterhorn.lua | 2 +- scripts/actions/mobskills/battle_dance.lua | 2 +- scripts/actions/mobskills/beak_lunge.lua | 2 +- scripts/actions/mobskills/bear_killer.lua | 2 +- scripts/actions/mobskills/beatdown.lua | 2 +- scripts/actions/mobskills/benthic_typhoon.lua | 2 +- scripts/actions/mobskills/big_horn.lua | 2 +- scripts/actions/mobskills/big_scissors.lua | 2 +- scripts/actions/mobskills/bilgestorm.lua | 2 +- .../actions/mobskills/binary_absorption.lua | 4 +- .../actions/mobskills/binding_microtube.lua | 4 +- .../actions/mobskills/biotic_boomerang.lua | 2 +- scripts/actions/mobskills/black_cloud.lua | 4 +- scripts/actions/mobskills/black_halo.lua | 2 +- scripts/actions/mobskills/blade_jin.lua | 2 +- scripts/actions/mobskills/blade_ku.lua | 2 +- scripts/actions/mobskills/blade_metsu.lua | 2 +- scripts/actions/mobskills/blade_to.lua | 2 +- scripts/actions/mobskills/blastbomb.lua | 4 +- scripts/actions/mobskills/blazing_bound.lua | 4 +- .../actions/mobskills/blind_side_barrage.lua | 2 +- scripts/actions/mobskills/blind_vortex.lua | 2 +- scripts/actions/mobskills/blindeye.lua | 2 +- scripts/actions/mobskills/blitzstrahl.lua | 4 +- scripts/actions/mobskills/blizzard_breath.lua | 4 +- scripts/actions/mobskills/blizzard_ii.lua | 4 +- scripts/actions/mobskills/blizzard_iv.lua | 4 +- .../mobskills/blizzard_meeble_warble.lua | 4 +- scripts/actions/mobskills/blockhead.lua | 2 +- scripts/actions/mobskills/blood_drain.lua | 4 +- scripts/actions/mobskills/blood_saber.lua | 4 +- scripts/actions/mobskills/bloodrake.lua | 2 +- scripts/actions/mobskills/bloody_beak.lua | 4 +- scripts/actions/mobskills/bloody_caress.lua | 2 +- scripts/actions/mobskills/bloody_claw.lua | 2 +- scripts/actions/mobskills/blow.lua | 2 +- scripts/actions/mobskills/bludgeon.lua | 2 +- scripts/actions/mobskills/body_slam.lua | 2 +- scripts/actions/mobskills/bomb_toss.lua | 4 +- .../actions/mobskills/bomb_toss_suicide.lua | 4 +- scripts/actions/mobskills/bone_crunch.lua | 2 +- .../mobskills/bonebreaking_barrage.lua | 2 +- scripts/actions/mobskills/brain_crush.lua | 2 +- scripts/actions/mobskills/brain_drain.lua | 2 +- scripts/actions/mobskills/brain_spike.lua | 2 +- .../actions/mobskills/broadside_barrage.lua | 2 +- scripts/actions/mobskills/bubble_shower.lua | 4 +- scripts/actions/mobskills/burning_blade.lua | 4 +- scripts/actions/mobskills/burst.lua | 2 +- scripts/actions/mobskills/calamitous_wind.lua | 4 +- scripts/actions/mobskills/calamity.lua | 2 +- scripts/actions/mobskills/calcifying_claw.lua | 2 +- .../actions/mobskills/calcifying_deluge.lua | 2 +- scripts/actions/mobskills/camisado.lua | 2 +- scripts/actions/mobskills/cannonball.lua | 2 +- scripts/actions/mobskills/carousel.lua | 2 +- scripts/actions/mobskills/catapult.lua | 2 +- scripts/actions/mobskills/catastrophe.lua | 2 +- scripts/actions/mobskills/chaos_blade.lua | 4 +- scripts/actions/mobskills/chaos_breath.lua | 4 +- scripts/actions/mobskills/chaotic_strike.lua | 2 +- scripts/actions/mobskills/charged_whisker.lua | 4 +- scripts/actions/mobskills/choke_breath.lua | 7 ++- scripts/actions/mobskills/choke_chain.lua | 4 +- scripts/actions/mobskills/chomp_rush.lua | 2 +- scripts/actions/mobskills/circle_blade.lua | 2 +- .../actions/mobskills/circle_of_flames.lua | 4 +- scripts/actions/mobskills/citadel_buster.lua | 6 ++- scripts/actions/mobskills/clarsach_call.lua | 4 +- scripts/actions/mobskills/claw.lua | 2 +- scripts/actions/mobskills/claw_cyclone.lua | 2 +- scripts/actions/mobskills/claw_storm.lua | 2 +- scripts/actions/mobskills/clobber.lua | 2 +- scripts/actions/mobskills/cold_breath.lua | 4 +- scripts/actions/mobskills/colossal_blow.lua | 7 ++- scripts/actions/mobskills/colossal_slam.lua | 2 +- scripts/actions/mobskills/combo.lua | 2 +- .../mobskills/concussive_oscillation.lua | 2 +- scripts/actions/mobskills/condemnation.lua | 2 +- scripts/actions/mobskills/core_meltdown.lua | 4 +- scripts/actions/mobskills/coronach.lua | 2 +- scripts/actions/mobskills/corrosive_ooze.lua | 4 +- .../actions/mobskills/cosmic_elucidation.lua | 4 +- scripts/actions/mobskills/counterspore.lua | 4 +- scripts/actions/mobskills/crescent_fang.lua | 4 +- scripts/actions/mobskills/crescent_moon.lua | 2 +- scripts/actions/mobskills/crippling_slam.lua | 2 +- scripts/actions/mobskills/crispy_candle.lua | 4 +- scripts/actions/mobskills/critical_bite.lua | 2 +- .../actions/mobskills/cronos_sling_eta.lua | 2 +- .../actions/mobskills/cronos_sling_lambda.lua | 2 +- .../actions/mobskills/cronos_sling_theta.lua | 2 +- scripts/actions/mobskills/cross_attack.lua | 2 +- scripts/actions/mobskills/cross_reaver.lua | 2 +- scripts/actions/mobskills/crossthrash.lua | 2 +- scripts/actions/mobskills/crosswind.lua | 4 +- scripts/actions/mobskills/cryo_jet.lua | 4 +- scripts/actions/mobskills/crystal_rain.lua | 4 +- .../actions/mobskills/crystal_weapon_fire.lua | 4 +- .../mobskills/crystal_weapon_stone.lua | 4 +- .../mobskills/crystal_weapon_water.lua | 4 +- .../actions/mobskills/crystal_weapon_wind.lua | 4 +- scripts/actions/mobskills/cursed_sphere.lua | 4 +- scripts/actions/mobskills/cyclone_wing.lua | 4 +- .../actions/mobskills/cyclonic_torrent.lua | 2 +- .../actions/mobskills/cyclonic_turmoil.lua | 4 +- scripts/actions/mobskills/cyclotail.lua | 2 +- scripts/actions/mobskills/damnation_dive.lua | 2 +- .../actions/mobskills/damnation_dive_nm.lua | 2 +- scripts/actions/mobskills/dancing_edge.lua | 2 +- scripts/actions/mobskills/dark_mist.lua | 4 +- scripts/actions/mobskills/dark_nova.lua | 4 +- scripts/actions/mobskills/dark_orb.lua | 4 +- scripts/actions/mobskills/dark_sphere.lua | 4 +- scripts/actions/mobskills/dark_spore.lua | 4 +- scripts/actions/mobskills/dark_wave.lua | 4 +- scripts/actions/mobskills/deadly_drive.lua | 2 +- scripts/actions/mobskills/deadly_hold.lua | 2 +- scripts/actions/mobskills/deal_out.lua | 2 +- scripts/actions/mobskills/death_ray.lua | 4 +- scripts/actions/mobskills/death_scissors.lua | 2 +- scripts/actions/mobskills/deathgnash.lua | 7 ++- scripts/actions/mobskills/debonair_rush.lua | 2 +- .../actions/mobskills/decayed_filament.lua | 4 +- scripts/actions/mobskills/decollation.lua | 2 +- scripts/actions/mobskills/decussate.lua | 4 +- scripts/actions/mobskills/delta_thrust.lua | 2 +- scripts/actions/mobskills/di_bite_attack.lua | 2 +- scripts/actions/mobskills/di_horn_attack.lua | 2 +- scripts/actions/mobskills/di_kick_attack.lua | 2 +- scripts/actions/mobskills/di_trample.lua | 2 +- scripts/actions/mobskills/diamond_dust.lua | 4 +- scripts/actions/mobskills/dice_damage.lua | 4 +- scripts/actions/mobskills/diffusion_ray.lua | 4 +- scripts/actions/mobskills/digest.lua | 4 +- .../actions/mobskills/dimensional_death.lua | 2 +- scripts/actions/mobskills/dirty_claw.lua | 2 +- scripts/actions/mobskills/discharge.lua | 4 +- scripts/actions/mobskills/discoid.lua | 6 ++- scripts/actions/mobskills/disseverment.lua | 2 +- .../actions/mobskills/divesting_stampede.lua | 2 +- scripts/actions/mobskills/divine_judgment.lua | 4 +- scripts/actions/mobskills/divine_spear.lua | 4 +- scripts/actions/mobskills/doctors_orders.lua | 4 +- scripts/actions/mobskills/dominion_slash.lua | 2 +- scripts/actions/mobskills/double_claw.lua | 2 +- scripts/actions/mobskills/double_down.lua | 2 +- scripts/actions/mobskills/double_kick.lua | 2 +- scripts/actions/mobskills/double_punch.lua | 2 +- scripts/actions/mobskills/double_ray.lua | 4 +- scripts/actions/mobskills/double_slap.lua | 2 +- scripts/actions/mobskills/dragon_breath.lua | 6 +-- scripts/actions/mobskills/dragon_kick.lua | 2 +- scripts/actions/mobskills/dragonfall.lua | 2 +- scripts/actions/mobskills/drain_whip.lua | 4 +- scripts/actions/mobskills/drainkiss.lua | 4 +- scripts/actions/mobskills/dread_dive.lua | 2 +- scripts/actions/mobskills/dreadstorm.lua | 4 +- scripts/actions/mobskills/drill_branch.lua | 2 +- scripts/actions/mobskills/drill_branch_nm.lua | 2 +- scripts/actions/mobskills/drill_claw.lua | 2 +- scripts/actions/mobskills/drop_hammer.lua | 2 +- scripts/actions/mobskills/dual_strike.lua | 2 +- scripts/actions/mobskills/dust_cloud.lua | 4 +- scripts/actions/mobskills/dustvoid.lua | 4 +- scripts/actions/mobskills/dynamic_assault.lua | 2 +- .../actions/mobskills/dynamic_implosion.lua | 2 +- scripts/actions/mobskills/eagle_eye_shot.lua | 2 +- scripts/actions/mobskills/earth_breath.lua | 4 +- scripts/actions/mobskills/earth_pounder.lua | 4 +- scripts/actions/mobskills/earth_shock.lua | 2 +- scripts/actions/mobskills/earthbreaker.lua | 4 +- scripts/actions/mobskills/earthen_fury.lua | 4 +- scripts/actions/mobskills/eclipse_bite.lua | 2 +- scripts/actions/mobskills/ectosmash.lua | 2 +- scripts/actions/mobskills/electrocharge.lua | 4 +- .../mobskills/electromagnetic_field.lua | 4 +- .../actions/mobskills/empirical_research.lua | 4 +- scripts/actions/mobskills/empty_beleaguer.lua | 2 +- scripts/actions/mobskills/empty_crush.lua | 2 +- scripts/actions/mobskills/empty_cutter.lua | 2 +- .../mobskills/empty_cutter_thinker.lua | 2 +- scripts/actions/mobskills/empty_salvation.lua | 4 +- scripts/actions/mobskills/empty_seed.lua | 2 +- scripts/actions/mobskills/empty_thrash.lua | 2 +- scripts/actions/mobskills/entangle_drain.lua | 2 +- scripts/actions/mobskills/entangle_poison.lua | 2 +- scripts/actions/mobskills/envoutement.lua | 2 +- scripts/actions/mobskills/equalizer.lua | 2 +- scripts/actions/mobskills/erosion_dust.lua | 4 +- scripts/actions/mobskills/erratic_flutter.lua | 4 +- scripts/actions/mobskills/evisceration.lua | 2 +- scripts/actions/mobskills/eye_scratch.lua | 2 +- scripts/actions/mobskills/eyes_on_me.lua | 4 +- scripts/actions/mobskills/fang_rush.lua | 2 +- scripts/actions/mobskills/fear_touch.lua | 2 +- .../actions/mobskills/feather_maelstrom.lua | 2 +- scripts/actions/mobskills/feather_storm.lua | 2 +- scripts/actions/mobskills/fell_cleave.lua | 2 +- scripts/actions/mobskills/feral_peck.lua | 7 ++- scripts/actions/mobskills/fevered_pitch.lua | 2 +- scripts/actions/mobskills/fiery_breath.lua | 6 +-- scripts/actions/mobskills/final_exam.lua | 4 +- scripts/actions/mobskills/final_heaven.lua | 2 +- .../actions/mobskills/final_retribution.lua | 2 +- scripts/actions/mobskills/final_sting.lua | 2 +- scripts/actions/mobskills/fire_arrow.lua | 4 +- scripts/actions/mobskills/fire_break.lua | 4 +- scripts/actions/mobskills/fire_ii.lua | 4 +- scripts/actions/mobskills/fire_iv.lua | 4 +- .../actions/mobskills/fire_meeble_warble.lua | 4 +- scripts/actions/mobskills/fireball.lua | 4 +- scripts/actions/mobskills/firebomb.lua | 4 +- scripts/actions/mobskills/firespit.lua | 4 +- scripts/actions/mobskills/flailing_trunk.lua | 2 +- scripts/actions/mobskills/flame_arrow.lua | 2 +- scripts/actions/mobskills/flame_blast.lua | 4 +- scripts/actions/mobskills/flame_blast_alt.lua | 4 +- scripts/actions/mobskills/flame_breath.lua | 4 +- scripts/actions/mobskills/flame_thrower.lua | 4 +- scripts/actions/mobskills/flaming_crush.lua | 2 +- scripts/actions/mobskills/flat_blade.lua | 2 +- scripts/actions/mobskills/floodlight.lua | 4 +- scripts/actions/mobskills/fluid_spread.lua | 2 +- scripts/actions/mobskills/fluid_toss.lua | 2 +- .../actions/mobskills/fluid_toss_claret.lua | 2 +- scripts/actions/mobskills/flurry_of_rage.lua | 2 +- .../actions/mobskills/flying_hip_press.lua | 4 +- scripts/actions/mobskills/foot_kick.lua | 2 +- scripts/actions/mobskills/forceful_blow.lua | 2 +- .../actions/mobskills/formation_attack.lua | 2 +- scripts/actions/mobskills/foul_breath.lua | 4 +- scripts/actions/mobskills/fountain.lua | 4 +- scripts/actions/mobskills/foxfire.lua | 2 +- scripts/actions/mobskills/freeze_rush.lua | 2 +- scripts/actions/mobskills/freezebite.lua | 4 +- scripts/actions/mobskills/frenetic_rip.lua | 2 +- scripts/actions/mobskills/frogkick.lua | 2 +- scripts/actions/mobskills/frost_breath.lua | 4 +- scripts/actions/mobskills/frostbite.lua | 4 +- scripts/actions/mobskills/frozen_mist.lua | 4 +- scripts/actions/mobskills/frypan.lua | 2 +- scripts/actions/mobskills/full-force_blow.lua | 2 +- scripts/actions/mobskills/fulmination.lua | 4 +- scripts/actions/mobskills/fuscous_ooze.lua | 4 +- scripts/actions/mobskills/gaea_stream_eta.lua | 2 +- .../actions/mobskills/gaea_stream_lambda.lua | 2 +- .../actions/mobskills/gaea_stream_theta.lua | 2 +- scripts/actions/mobskills/gastric_bomb.lua | 4 +- .../actions/mobskills/gate_of_tartarus.lua | 2 +- scripts/actions/mobskills/gates_of_hades.lua | 4 +- scripts/actions/mobskills/geirskogul.lua | 2 +- scripts/actions/mobskills/geocrush.lua | 4 +- scripts/actions/mobskills/geotic_breath.lua | 6 +-- scripts/actions/mobskills/giga_scream.lua | 2 +- scripts/actions/mobskills/giga_slash.lua | 2 +- scripts/actions/mobskills/gigaflare.lua | 4 +- scripts/actions/mobskills/glacial_breath.lua | 6 +-- .../actions/mobskills/glacier_splitter.lua | 2 +- scripts/actions/mobskills/gnash.lua | 7 ++- scripts/actions/mobskills/goblin_rush.lua | 2 +- scripts/actions/mobskills/gouging_branch.lua | 2 +- scripts/actions/mobskills/grand_fall.lua | 4 +- scripts/actions/mobskills/grand_slam.lua | 4 +- scripts/actions/mobskills/grapeshot.lua | 2 +- scripts/actions/mobskills/grapple.lua | 2 +- scripts/actions/mobskills/grating_tantara.lua | 2 +- scripts/actions/mobskills/grave_reel.lua | 4 +- scripts/actions/mobskills/gravitic_horn.lua | 7 ++- scripts/actions/mobskills/gravity_wheel.lua | 2 +- scripts/actions/mobskills/great_sandstorm.lua | 4 +- scripts/actions/mobskills/great_wheel.lua | 2 +- scripts/actions/mobskills/great_whirlwind.lua | 4 +- scripts/actions/mobskills/gregale_wing.lua | 4 +- .../actions/mobskills/gregale_wing_air.lua | 4 +- scripts/actions/mobskills/grim_halo.lua | 2 +- scripts/actions/mobskills/grim_reaper.lua | 2 +- scripts/actions/mobskills/ground_strike.lua | 2 +- scripts/actions/mobskills/groundburst.lua | 2 +- scripts/actions/mobskills/guided_missile.lua | 2 +- .../actions/mobskills/guided_missile_ii.lua | 4 +- scripts/actions/mobskills/guillotine.lua | 2 +- scripts/actions/mobskills/gust_slash.lua | 2 +- scripts/actions/mobskills/gusting_gouge.lua | 2 +- scripts/actions/mobskills/hammer-go-round.lua | 2 +- scripts/actions/mobskills/hammer_beak.lua | 2 +- scripts/actions/mobskills/hammerblow.lua | 2 +- scripts/actions/mobskills/hane_fubuki.lua | 2 +- scripts/actions/mobskills/happobarai.lua | 2 +- scripts/actions/mobskills/hard_slash.lua | 2 +- scripts/actions/mobskills/havoc_spiral.lua | 2 +- scripts/actions/mobskills/haymaker.lua | 2 +- scripts/actions/mobskills/head_butt.lua | 2 +- .../actions/mobskills/head_butt_quadav.lua | 2 +- .../actions/mobskills/head_butt_turtle.lua | 2 +- scripts/actions/mobskills/heat_breath.lua | 4 +- scripts/actions/mobskills/heavenly_strike.lua | 4 +- scripts/actions/mobskills/heavy_blow.lua | 2 +- scripts/actions/mobskills/heavy_stomp.lua | 2 +- scripts/actions/mobskills/heavy_strike.lua | 2 +- .../actions/mobskills/heavy_strike_ulli.lua | 2 +- scripts/actions/mobskills/heavy_whisk.lua | 4 +- scripts/actions/mobskills/hecatomb_wave.lua | 4 +- scripts/actions/mobskills/hell_slash.lua | 2 +- scripts/actions/mobskills/hellclap.lua | 2 +- scripts/actions/mobskills/helldive.lua | 2 +- scripts/actions/mobskills/hellfire_arrow.lua | 4 +- scripts/actions/mobskills/hellstorm.lua | 4 +- scripts/actions/mobskills/hex_palm.lua | 4 +- scripts/actions/mobskills/hexa_strike.lua | 2 +- scripts/actions/mobskills/hexidiscs.lua | 2 +- scripts/actions/mobskills/hiden_sokyaku.lua | 2 +- scripts/actions/mobskills/hiemal_storm.lua | 6 +-- .../mobskills/high-tension_discharger.lua | 4 +- scripts/actions/mobskills/hollow_smite.lua | 2 +- scripts/actions/mobskills/hoof_volley.lua | 2 +- scripts/actions/mobskills/howling_fist.lua | 2 +- scripts/actions/mobskills/howling_moon.lua | 4 +- scripts/actions/mobskills/hungry_crunch.lua | 4 +- scripts/actions/mobskills/hurricane_wing.lua | 4 +- .../mobskills/hurricane_wing_flying.lua | 4 +- scripts/actions/mobskills/hydro_ball.lua | 4 +- scripts/actions/mobskills/hydro_canon.lua | 4 +- scripts/actions/mobskills/hydro_shot.lua | 2 +- scripts/actions/mobskills/hydro_wave.lua | 4 +- scripts/actions/mobskills/hyper_pulse.lua | 2 +- .../mobskills/hypothermal_combustion.lua | 4 +- .../mobskills/hypothermal_combustion_tzar.lua | 4 +- .../actions/mobskills/hysteric_assault.lua | 2 +- .../actions/mobskills/hysteric_barrage.lua | 2 +- scripts/actions/mobskills/ice_break.lua | 4 +- scripts/actions/mobskills/ice_break_2128.lua | 4 +- scripts/actions/mobskills/ice_roar.lua | 5 ++- scripts/actions/mobskills/ill_wind.lua | 4 +- scripts/actions/mobskills/impact_roar.lua | 10 +++-- scripts/actions/mobskills/impact_stream.lua | 4 +- scripts/actions/mobskills/impale.lua | 2 +- scripts/actions/mobskills/impalement.lua | 6 ++- .../actions/mobskills/imperial_authority.lua | 2 +- scripts/actions/mobskills/implosion.lua | 4 +- scripts/actions/mobskills/impulse_drive.lua | 2 +- scripts/actions/mobskills/incensed_pummel.lua | 2 +- scripts/actions/mobskills/incessant_fists.lua | 2 +- scripts/actions/mobskills/incinerate.lua | 4 +- scripts/actions/mobskills/inertia_stream.lua | 4 +- .../mobskills/infernal_deliverance.lua | 2 +- .../actions/mobskills/infernal_pestilence.lua | 4 +- scripts/actions/mobskills/inferno.lua | 4 +- scripts/actions/mobskills/inferno_blast.lua | 4 +- .../actions/mobskills/inferno_blast_alt.lua | 4 +- scripts/actions/mobskills/ink_jet.lua | 4 +- scripts/actions/mobskills/ink_jet_fee.lua | 4 +- scripts/actions/mobskills/insipid_nip.lua | 2 +- scripts/actions/mobskills/ion_shower.lua | 4 +- scripts/actions/mobskills/iridal_pierce.lua | 4 +- scripts/actions/mobskills/javelin_throw.lua | 2 +- scripts/actions/mobskills/jet_stream.lua | 2 +- scripts/actions/mobskills/judgment.lua | 2 +- scripts/actions/mobskills/judgment_bolt.lua | 4 +- scripts/actions/mobskills/jump.lua | 2 +- scripts/actions/mobskills/jumping_thrust.lua | 2 +- scripts/actions/mobskills/kartstrahl.lua | 4 +- scripts/actions/mobskills/kick_back.lua | 2 +- scripts/actions/mobskills/kick_out.lua | 2 +- .../actions/mobskills/king_cobra_clamp.lua | 2 +- .../actions/mobskills/knights_of_round.lua | 2 +- .../actions/mobskills/knuckle_sandwich.lua | 4 +- scripts/actions/mobskills/lamb_chop.lua | 2 +- scripts/actions/mobskills/lamentation.lua | 4 +- scripts/actions/mobskills/laser_shower.lua | 8 ++-- scripts/actions/mobskills/lateral_slash.lua | 2 +- scripts/actions/mobskills/lava_spit.lua | 4 +- scripts/actions/mobskills/leaf_dagger.lua | 2 +- scripts/actions/mobskills/leafstorm.lua | 4 +- scripts/actions/mobskills/leaping_cleave.lua | 2 +- .../actions/mobskills/leeching_current.lua | 8 +++- scripts/actions/mobskills/lesson_in_pain.lua | 4 +- scripts/actions/mobskills/lethe_arrows.lua | 2 +- scripts/actions/mobskills/light_blade.lua | 2 +- scripts/actions/mobskills/lightning_roar.lua | 5 ++- scripts/actions/mobskills/lightning_spear.lua | 4 +- scripts/actions/mobskills/luminous_lance.lua | 2 +- .../actions/mobskills/lunar_revolution.lua | 2 +- scripts/actions/mobskills/lux_arrow.lua | 4 +- scripts/actions/mobskills/maats_bash.lua | 2 +- scripts/actions/mobskills/maelstrom.lua | 4 +- scripts/actions/mobskills/magic_hammer.lua | 4 +- scripts/actions/mobskills/magma_fan.lua | 4 +- scripts/actions/mobskills/magnetite_cloud.lua | 4 +- scripts/actions/mobskills/malediction.lua | 4 +- .../actions/mobskills/malevolent_blessing.lua | 4 +- scripts/actions/mobskills/mana_storm.lua | 4 +- scripts/actions/mobskills/mandible_bite.lua | 2 +- scripts/actions/mobskills/mandibular_bite.lua | 2 +- scripts/actions/mobskills/mangle.lua | 2 +- scripts/actions/mobskills/mantle_pierce.lua | 2 +- scripts/actions/mobskills/marrow_drain.lua | 4 +- scripts/actions/mobskills/medusa_javelin.lua | 2 +- scripts/actions/mobskills/mega_holy.lua | 4 +- scripts/actions/mobskills/megaflare.lua | 4 +- scripts/actions/mobskills/megalith_throw.lua | 2 +- scripts/actions/mobskills/meltdown.lua | 4 +- scripts/actions/mobskills/memory_of_dark.lua | 4 +- scripts/actions/mobskills/memory_of_earth.lua | 4 +- scripts/actions/mobskills/memory_of_fire.lua | 4 +- scripts/actions/mobskills/memory_of_ice.lua | 4 +- scripts/actions/mobskills/memory_of_light.lua | 4 +- .../actions/mobskills/memory_of_lightning.lua | 4 +- scripts/actions/mobskills/memory_of_water.lua | 4 +- scripts/actions/mobskills/memory_of_wind.lua | 4 +- scripts/actions/mobskills/mephitic_spore.lua | 4 +- scripts/actions/mobskills/mercy_stroke.lua | 2 +- .../actions/mobskills/metatron_torment.lua | 2 +- scripts/actions/mobskills/meteor.lua | 4 +- scripts/actions/mobskills/meteor_strike.lua | 4 +- scripts/actions/mobskills/meteorite.lua | 4 +- scripts/actions/mobskills/methane_breath.lua | 4 +- scripts/actions/mobskills/miasma.lua | 4 +- scripts/actions/mobskills/miasmic_breath.lua | 4 +- scripts/actions/mobskills/microquake.lua | 2 +- scripts/actions/mobskills/mighty_snort.lua | 4 +- scripts/actions/mobskills/mijin_gakure.lua | 4 +- scripts/actions/mobskills/mind_blast.lua | 4 +- scripts/actions/mobskills/mine_blast.lua | 4 +- scripts/actions/mobskills/mix_dark_potion.lua | 7 ++- scripts/actions/mobskills/molting_burst.lua | 4 +- scripts/actions/mobskills/moonlit_charge.lua | 4 +- scripts/actions/mobskills/morning_glory.lua | 2 +- .../actions/mobskills/mortal_revolution.lua | 2 +- scripts/actions/mobskills/mountain_buster.lua | 2 +- scripts/actions/mobskills/mow.lua | 2 +- scripts/actions/mobskills/mp_absorption.lua | 4 +- scripts/actions/mobskills/mp_drainkiss.lua | 4 +- .../actions/mobskills/mysterious_light.lua | 4 +- scripts/actions/mobskills/namas_arrow.lua | 2 +- scripts/actions/mobskills/necrobane.lua | 2 +- scripts/actions/mobskills/necropurge.lua | 2 +- scripts/actions/mobskills/needleshot.lua | 2 +- scripts/actions/mobskills/negative_whirl.lua | 4 +- scripts/actions/mobskills/netherspikes.lua | 2 +- scripts/actions/mobskills/nimble_snap.lua | 2 +- .../mobskills/nocturnal_combustion.lua | 4 +- scripts/actions/mobskills/nosferatus_kiss.lua | 7 ++- scripts/actions/mobskills/nullsong.lua | 7 ++- scripts/actions/mobskills/numbing_breath.lua | 4 +- scripts/actions/mobskills/numbshroom.lua | 2 +- .../actions/mobskills/nutrient_absorption.lua | 4 +- scripts/actions/mobskills/oblivion_smash.lua | 2 +- scripts/actions/mobskills/ochre_blast.lua | 4 +- scripts/actions/mobskills/ochre_blast_alt.lua | 4 +- scripts/actions/mobskills/oisoya.lua | 2 +- scripts/actions/mobskills/omega_javelin.lua | 2 +- scripts/actions/mobskills/one-ilm_punch.lua | 2 +- scripts/actions/mobskills/onrush.lua | 2 +- scripts/actions/mobskills/onslaught.lua | 2 +- .../actions/mobskills/optic_induration.lua | 2 +- scripts/actions/mobskills/ore_toss.lua | 2 +- scripts/actions/mobskills/osmosis.lua | 4 +- scripts/actions/mobskills/overthrow.lua | 2 +- scripts/actions/mobskills/painful_whip.lua | 2 +- scripts/actions/mobskills/palsynyxis.lua | 2 +- scripts/actions/mobskills/pandemic_nip.lua | 2 +- scripts/actions/mobskills/panzerfaust.lua | 2 +- scripts/actions/mobskills/panzerschreck.lua | 2 +- .../mobskills/paralyzing_microtube.lua | 4 +- scripts/actions/mobskills/peacebreaker.lua | 2 +- scripts/actions/mobskills/pecking_flurry.lua | 2 +- scripts/actions/mobskills/pelagic_tempest.lua | 2 +- scripts/actions/mobskills/penta_thrust.lua | 2 +- .../actions/mobskills/penumbral_impact.lua | 4 +- scripts/actions/mobskills/percussive_foin.lua | 2 +- .../actions/mobskills/pestilent_penance.lua | 4 +- .../actions/mobskills/pet_flame_breath.lua | 4 +- .../actions/mobskills/pet_frost_breath.lua | 4 +- scripts/actions/mobskills/pet_gust_breath.lua | 4 +- .../actions/mobskills/pet_hydro_breath.lua | 4 +- .../mobskills/pet_lightning_breath.lua | 4 +- scripts/actions/mobskills/pet_sand_breath.lua | 4 +- .../actions/mobskills/phantasmal_dance.lua | 2 +- scripts/actions/mobskills/phase_shift_1.lua | 2 +- scripts/actions/mobskills/phase_shift_2.lua | 2 +- scripts/actions/mobskills/phase_shift_3.lua | 2 +- scripts/actions/mobskills/pile_pitch.lua | 7 ++- scripts/actions/mobskills/pinecone_bomb.lua | 2 +- .../actions/mobskills/pinecone_bomb_nm.lua | 2 +- scripts/actions/mobskills/pinning_shot.lua | 2 +- scripts/actions/mobskills/pirate_pummel.lua | 2 +- scripts/actions/mobskills/pit_ambush.lua | 2 +- scripts/actions/mobskills/pl_body_slam.lua | 2 +- scripts/actions/mobskills/pl_chaos_blade.lua | 4 +- scripts/actions/mobskills/pl_heavy_stomp.lua | 2 +- scripts/actions/mobskills/pl_hellclap.lua | 2 +- scripts/actions/mobskills/pl_hellsnap.lua | 2 +- scripts/actions/mobskills/pl_tidal_slash.lua | 2 +- scripts/actions/mobskills/plague_breath.lua | 4 +- scripts/actions/mobskills/plague_swipe.lua | 2 +- scripts/actions/mobskills/pleiades_ray.lua | 4 +- .../mobskills/poison_breath_crawler.lua | 4 +- .../mobskills/poison_breath_dragon.lua | 4 +- .../actions/mobskills/poison_breath_hound.lua | 4 +- scripts/actions/mobskills/poison_nails.lua | 2 +- scripts/actions/mobskills/poison_pick.lua | 2 +- scripts/actions/mobskills/poison_sting.lua | 2 +- scripts/actions/mobskills/polar_blast.lua | 4 +- scripts/actions/mobskills/pole_swing.lua | 2 +- scripts/actions/mobskills/potent_lunge.lua | 2 +- scripts/actions/mobskills/pounce.lua | 2 +- scripts/actions/mobskills/powder_keg.lua | 2 +- scripts/actions/mobskills/power_attack.lua | 2 +- .../actions/mobskills/power_attack_armed.lua | 2 +- .../actions/mobskills/power_attack_beetle.lua | 2 +- .../mobskills/power_attack_unarmed.lua | 2 +- scripts/actions/mobskills/power_slash.lua | 2 +- scripts/actions/mobskills/predator_claws.lua | 2 +- scripts/actions/mobskills/primal_drill.lua | 2 +- scripts/actions/mobskills/proboscis.lua | 4 +- scripts/actions/mobskills/promyvion_brume.lua | 4 +- scripts/actions/mobskills/psychomancy.lua | 4 +- scripts/actions/mobskills/punch.lua | 2 +- scripts/actions/mobskills/purulent_ooze.lua | 4 +- scripts/actions/mobskills/putrid_breath.lua | 4 +- .../actions/mobskills/pw_acheron_flame.lua | 4 +- .../mobskills/pw_calcifying_deluge.lua | 2 +- scripts/actions/mobskills/pw_decussate.lua | 4 +- scripts/actions/mobskills/pw_groundburst.lua | 2 +- scripts/actions/mobskills/pw_pinning_shot.lua | 2 +- .../actions/mobskills/pw_rushing_slash.lua | 2 +- .../actions/mobskills/pw_shadow_thrust.lua | 2 +- .../actions/mobskills/pw_tyrranic_blare.lua | 4 +- scripts/actions/mobskills/pyric_blast.lua | 4 +- scripts/actions/mobskills/quadrastrike.lua | 2 +- .../actions/mobskills/quadratic_continuum.lua | 2 +- scripts/actions/mobskills/queasyshroom.lua | 2 +- scripts/actions/mobskills/radiant_breath.lua | 4 +- .../actions/mobskills/radiant_sacrament.lua | 2 +- scripts/actions/mobskills/raging_rush.lua | 2 +- scripts/actions/mobskills/raiden_thrust.lua | 4 +- scripts/actions/mobskills/rail_cannon.lua | 4 +- scripts/actions/mobskills/rail_cannon_1.lua | 4 +- scripts/actions/mobskills/rail_cannon_2.lua | 4 +- scripts/actions/mobskills/rail_cannon_3.lua | 4 +- scripts/actions/mobskills/ram_charge.lua | 2 +- scripts/actions/mobskills/rampage.lua | 2 +- scripts/actions/mobskills/rampant_gnaw.lua | 2 +- scripts/actions/mobskills/rampant_stance.lua | 2 +- scripts/actions/mobskills/randgrith.lua | 2 +- scripts/actions/mobskills/random_kiss.lua | 4 +- scripts/actions/mobskills/random_needles.lua | 12 ++++- scripts/actions/mobskills/ranged_attack.lua | 2 +- scripts/actions/mobskills/razor_fang.lua | 2 +- .../actions/mobskills/reactor_overheat.lua | 4 +- .../actions/mobskills/reactor_overload.lua | 4 +- scripts/actions/mobskills/reaving_wind.lua | 4 +- scripts/actions/mobskills/recoil_dive.lua | 2 +- scripts/actions/mobskills/red_lotus_blade.lua | 4 +- scripts/actions/mobskills/regurgitation.lua | 4 +- scripts/actions/mobskills/rending_deluge.lua | 4 +- scripts/actions/mobskills/revelation.lua | 4 +- scripts/actions/mobskills/rhino_attack.lua | 2 +- scripts/actions/mobskills/rhinowrecker.lua | 2 +- scripts/actions/mobskills/rime_spray.lua | 4 +- scripts/actions/mobskills/ripper_fang.lua | 2 +- scripts/actions/mobskills/rock_smash.lua | 2 +- scripts/actions/mobskills/rock_throw.lua | 2 +- scripts/actions/mobskills/roller_chain.lua | 4 +- scripts/actions/mobskills/royal_bash.lua | 2 +- scripts/actions/mobskills/ruinous_omen.lua | 4 +- scripts/actions/mobskills/rush.lua | 2 +- scripts/actions/mobskills/rushing_drub.lua | 2 +- scripts/actions/mobskills/rushing_slash.lua | 2 +- scripts/actions/mobskills/rushing_stab.lua | 2 +- scripts/actions/mobskills/sable_breath.lua | 6 +-- scripts/actions/mobskills/sand_breath.lua | 4 +- scripts/actions/mobskills/sand_trap.lua | 2 +- scripts/actions/mobskills/sandspin.lua | 4 +- scripts/actions/mobskills/saucepan.lua | 2 +- scripts/actions/mobskills/savage_blade.lua | 2 +- .../actions/mobskills/scintillant_lance.lua | 4 +- scripts/actions/mobskills/scission_thrust.lua | 2 +- scripts/actions/mobskills/scorching_lash.lua | 2 +- scripts/actions/mobskills/scourge.lua | 2 +- .../actions/mobskills/scouring_bubbles.lua | 4 +- scripts/actions/mobskills/screwdriver.lua | 2 +- scripts/actions/mobskills/scythe_tail.lua | 2 +- scripts/actions/mobskills/searing_light.lua | 4 +- scripts/actions/mobskills/seaspray.lua | 4 +- scripts/actions/mobskills/seedspray.lua | 2 +- scripts/actions/mobskills/seismic_tail.lua | 2 +- scripts/actions/mobskills/seismostomp.lua | 2 +- .../actions/mobskills/self-destruct_bomb.lua | 4 +- .../mobskills/self-destruct_bomb_321.lua | 4 +- .../mobskills/self-destruct_bomb_big.lua | 4 +- .../self-destruct_cluster_1_death.lua | 4 +- .../mobskills/self-destruct_cluster_2.lua | 4 +- .../self-destruct_cluster_2_death.lua | 4 +- .../mobskills/self-destruct_cluster_3.lua | 4 +- .../self-destruct_cluster_3_death.lua | 4 +- scripts/actions/mobskills/seraph_blade.lua | 4 +- scripts/actions/mobskills/serpentine_tail.lua | 2 +- scripts/actions/mobskills/severing_fang.lua | 2 +- scripts/actions/mobskills/shackled_fists.lua | 2 +- scripts/actions/mobskills/shadow_claw.lua | 2 +- scripts/actions/mobskills/shadow_thrust.lua | 2 +- scripts/actions/mobskills/shadowstitch.lua | 2 +- scripts/actions/mobskills/shakeshroom.lua | 2 +- .../actions/mobskills/shantotto_ii_melee.lua | 4 +- scripts/actions/mobskills/shark_bite.lua | 2 +- scripts/actions/mobskills/sharp_sting.lua | 2 +- scripts/actions/mobskills/sheep_charge.lua | 2 +- .../actions/mobskills/sheep_charge_melee.lua | 2 +- scripts/actions/mobskills/shell_bash.lua | 2 +- scripts/actions/mobskills/shibaraku.lua | 2 +- scripts/actions/mobskills/shield_bash.lua | 2 +- scripts/actions/mobskills/shield_strike.lua | 2 +- scripts/actions/mobskills/shining_blade.lua | 4 +- scripts/actions/mobskills/shock_strike.lua | 2 +- scripts/actions/mobskills/shock_wave.lua | 4 +- scripts/actions/mobskills/shockwave.lua | 2 +- scripts/actions/mobskills/shoulder_attack.lua | 2 +- scripts/actions/mobskills/shoulder_slam.lua | 2 +- scripts/actions/mobskills/sickle_moon.lua | 2 +- scripts/actions/mobskills/sickle_slash.lua | 2 +- scripts/actions/mobskills/sideswipe.lua | 2 +- scripts/actions/mobskills/sidewinder.lua | 2 +- scripts/actions/mobskills/silence_gas.lua | 4 +- .../actions/mobskills/silencing_microtube.lua | 4 +- scripts/actions/mobskills/sinuate_rush.lua | 2 +- .../actions/mobskills/siphon_discharge.lua | 4 +- scripts/actions/mobskills/skewer.lua | 2 +- scripts/actions/mobskills/skullbreaker.lua | 2 +- scripts/actions/mobskills/slam_dunk.lua | 2 +- scripts/actions/mobskills/slaverous_gale.lua | 4 +- scripts/actions/mobskills/sledgehammer.lua | 2 +- scripts/actions/mobskills/sleet_blast.lua | 4 +- scripts/actions/mobskills/sleet_blast_alt.lua | 4 +- scripts/actions/mobskills/sling_bomb.lua | 2 +- scripts/actions/mobskills/smite_of_fury.lua | 2 +- scripts/actions/mobskills/smite_of_rage.lua | 2 +- .../actions/mobskills/smoke_discharger.lua | 4 +- .../actions/mobskills/smouldering_swarm.lua | 4 +- scripts/actions/mobskills/snort.lua | 4 +- scripts/actions/mobskills/snort_2127.lua | 4 +- scripts/actions/mobskills/snow_cloud.lua | 4 +- scripts/actions/mobskills/snowball.lua | 4 +- scripts/actions/mobskills/somersault.lua | 2 +- scripts/actions/mobskills/somersault_kick.lua | 2 +- scripts/actions/mobskills/sonic_blade.lua | 2 +- scripts/actions/mobskills/sonic_buffet.lua | 4 +- scripts/actions/mobskills/soul_drain.lua | 4 +- .../actions/mobskills/soulshattering_roar.lua | 4 +- scripts/actions/mobskills/spike_flail.lua | 2 +- scripts/actions/mobskills/spikeball.lua | 2 +- scripts/actions/mobskills/spinal_cleave.lua | 2 +- scripts/actions/mobskills/spine_lash.lua | 2 +- scripts/actions/mobskills/spinning_attack.lua | 2 +- scripts/actions/mobskills/spinning_claw.lua | 2 +- scripts/actions/mobskills/spinning_dive.lua | 2 +- scripts/actions/mobskills/spinning_fin.lua | 2 +- scripts/actions/mobskills/spinning_scythe.lua | 2 +- scripts/actions/mobskills/spinning_top.lua | 2 +- scripts/actions/mobskills/spiral_hell.lua | 2 +- scripts/actions/mobskills/spiral_spin.lua | 2 +- .../actions/mobskills/spirit_absorption.lua | 4 +- .../mobskills/spirit_absorption_thinker.lua | 4 +- scripts/actions/mobskills/splash_breath.lua | 4 +- scripts/actions/mobskills/sprout_smack.lua | 2 +- scripts/actions/mobskills/sprout_spin.lua | 2 +- scripts/actions/mobskills/stampede.lua | 2 +- scripts/actions/mobskills/stasis.lua | 2 +- scripts/actions/mobskills/static_filament.lua | 4 +- scripts/actions/mobskills/stave_toss.lua | 2 +- scripts/actions/mobskills/stellar_arrow.lua | 2 +- scripts/actions/mobskills/stellar_burst.lua | 4 +- .../actions/mobskills/stifling_tantara.lua | 2 +- scripts/actions/mobskills/stomping.lua | 2 +- scripts/actions/mobskills/stone_ii.lua | 4 +- scripts/actions/mobskills/stone_iv.lua | 4 +- .../actions/mobskills/stone_meeble_warble.lua | 4 +- scripts/actions/mobskills/stone_throw.lua | 2 +- scripts/actions/mobskills/storm_wing.lua | 4 +- scripts/actions/mobskills/stormwind.lua | 4 +- scripts/actions/mobskills/stun_cannon.lua | 4 +- scripts/actions/mobskills/stupor_spores.lua | 4 +- scripts/actions/mobskills/sub-zero_smash.lua | 2 +- scripts/actions/mobskills/suction.lua | 2 +- scripts/actions/mobskills/sudden_lunge.lua | 2 +- .../actions/mobskills/sulfurous_breath.lua | 4 +- scripts/actions/mobskills/sweep.lua | 2 +- scripts/actions/mobskills/sweeping_flail.lua | 2 +- scripts/actions/mobskills/sweet_breath.lua | 4 +- scripts/actions/mobskills/swift_blade.lua | 2 +- scripts/actions/mobskills/tachi_gekko.lua | 2 +- scripts/actions/mobskills/tachi_kaiten.lua | 2 +- scripts/actions/mobskills/tachi_kasha.lua | 2 +- scripts/actions/mobskills/tachi_yukikaze.lua | 2 +- scripts/actions/mobskills/tackle.lua | 2 +- scripts/actions/mobskills/tail_blow.lua | 2 +- scripts/actions/mobskills/tail_crush.lua | 2 +- scripts/actions/mobskills/tail_lash.lua | 2 +- scripts/actions/mobskills/tail_roll.lua | 2 +- scripts/actions/mobskills/tail_slap.lua | 2 +- scripts/actions/mobskills/tail_smash.lua | 2 +- scripts/actions/mobskills/tail_swing.lua | 2 +- scripts/actions/mobskills/tail_thrust.lua | 2 +- scripts/actions/mobskills/tail_whip.lua | 2 +- scripts/actions/mobskills/tebbad_wing.lua | 4 +- scripts/actions/mobskills/tebbad_wing_air.lua | 4 +- scripts/actions/mobskills/tempest_wing.lua | 4 +- .../mobskills/tempestuous_upheaval.lua | 4 +- scripts/actions/mobskills/tentacle.lua | 2 +- .../actions/mobskills/tenzen_ranged_high.lua | 2 +- .../actions/mobskills/tenzen_ranged_low.lua | 2 +- scripts/actions/mobskills/tera_slash.lua | 2 +- scripts/actions/mobskills/terror_touch.lua | 2 +- .../actions/mobskills/the_wrath_of_gudha.lua | 2 +- scripts/actions/mobskills/thermal_pulse.lua | 4 +- .../actions/mobskills/thrashing_assault.lua | 2 +- scripts/actions/mobskills/throat_stab.lua | 7 ++- scripts/actions/mobskills/thunder_break.lua | 4 +- .../actions/mobskills/thunder_break_2129.lua | 4 +- scripts/actions/mobskills/thunder_breath.lua | 4 +- scripts/actions/mobskills/thunder_ii.lua | 4 +- scripts/actions/mobskills/thunder_iv.lua | 4 +- .../mobskills/thunder_meeble_warble.lua | 4 +- .../mobskills/thunderbolt_behemoth.lua | 4 +- .../actions/mobskills/thunderbolt_raptor.lua | 4 +- scripts/actions/mobskills/thunderspark.lua | 4 +- scripts/actions/mobskills/thunderstorm.lua | 4 +- scripts/actions/mobskills/thunderstrike.lua | 4 +- scripts/actions/mobskills/thundris_shriek.lua | 4 +- scripts/actions/mobskills/tidal_dive.lua | 2 +- scripts/actions/mobskills/tidal_slash.lua | 4 +- scripts/actions/mobskills/tidal_wave.lua | 4 +- .../actions/mobskills/torrential_torment.lua | 4 +- scripts/actions/mobskills/tortoise_stomp.lua | 2 +- scripts/actions/mobskills/touchdown.lua | 4 +- .../actions/mobskills/touchdown_bahamut.lua | 4 +- scripts/actions/mobskills/tourbillion.lua | 2 +- scripts/actions/mobskills/toxic_pick.lua | 2 +- scripts/actions/mobskills/toxic_spit.lua | 4 +- scripts/actions/mobskills/tp_drainkiss.lua | 4 +- scripts/actions/mobskills/train_fall.lua | 2 +- scripts/actions/mobskills/trample.lua | 2 +- scripts/actions/mobskills/transfusion.lua | 4 +- scripts/actions/mobskills/trebuchet.lua | 2 +- scripts/actions/mobskills/trembling.lua | 2 +- scripts/actions/mobskills/tremorous_tread.lua | 2 +- scripts/actions/mobskills/tremors.lua | 4 +- scripts/actions/mobskills/triclip.lua | 2 +- .../actions/mobskills/trinary_absorption.lua | 4 +- scripts/actions/mobskills/true_strike.lua | 2 +- scripts/actions/mobskills/turbofan.lua | 4 +- scripts/actions/mobskills/turbulence.lua | 4 +- scripts/actions/mobskills/tusk.lua | 2 +- .../actions/mobskills/twirling_dervish.lua | 2 +- scripts/actions/mobskills/typhoon.lua | 2 +- scripts/actions/mobskills/typhoon_wing.lua | 4 +- scripts/actions/mobskills/tyrannic_blare.lua | 4 +- scripts/actions/mobskills/umbra_smash.lua | 2 +- scripts/actions/mobskills/unblest_jambiya.lua | 4 +- scripts/actions/mobskills/undead_mold.lua | 4 +- scripts/actions/mobskills/uppercut.lua | 2 +- .../actions/mobskills/uranos_cascade_eta.lua | 2 +- .../mobskills/uranos_cascade_lambda.lua | 2 +- .../mobskills/uranos_cascade_theta.lua | 2 +- .../actions/mobskills/vacuous_osculation.lua | 4 +- scripts/actions/mobskills/vampiric_lash.lua | 2 +- scripts/actions/mobskills/vampiric_root.lua | 4 +- scripts/actions/mobskills/vanity_dive.lua | 2 +- scripts/actions/mobskills/vanity_drive.lua | 2 +- scripts/actions/mobskills/vanity_strike.lua | 2 +- scripts/actions/mobskills/vapor_spray.lua | 4 +- scripts/actions/mobskills/velocious_blade.lua | 2 +- scripts/actions/mobskills/venom.lua | 4 +- scripts/actions/mobskills/venom_sting.lua | 2 +- scripts/actions/mobskills/vertical_cleave.lua | 2 +- scripts/actions/mobskills/vertical_slash.lua | 2 +- scripts/actions/mobskills/vicious_claw.lua | 2 +- scripts/actions/mobskills/victory_beacon.lua | 2 +- scripts/actions/mobskills/victory_smite.lua | 2 +- scripts/actions/mobskills/violent_rupture.lua | 4 +- .../actions/mobskills/vitriolic_barrage.lua | 7 ++- .../actions/mobskills/vitriolic_shower.lua | 4 +- scripts/actions/mobskills/vitriolic_spray.lua | 4 +- scripts/actions/mobskills/voiceless_storm.lua | 4 +- scripts/actions/mobskills/vorpal_blade.lua | 2 +- scripts/actions/mobskills/vorpal_scythe.lua | 2 +- scripts/actions/mobskills/vorpal_wheel.lua | 2 +- scripts/actions/mobskills/vortex.lua | 2 +- scripts/actions/mobskills/vulcan_shot.lua | 4 +- .../actions/mobskills/vulcanian_impact.lua | 4 +- scripts/actions/mobskills/walk_the_plank.lua | 2 +- scripts/actions/mobskills/warped_wail.lua | 4 +- scripts/actions/mobskills/water_bomb.lua | 4 +- scripts/actions/mobskills/water_ii.lua | 4 +- scripts/actions/mobskills/water_iv.lua | 4 +- .../actions/mobskills/water_meeble_warble.lua | 4 +- scripts/actions/mobskills/wheeling_thrust.lua | 2 +- scripts/actions/mobskills/whip_tongue.lua | 2 +- scripts/actions/mobskills/whirl_claws.lua | 2 +- scripts/actions/mobskills/whirl_of_rage.lua | 2 +- scripts/actions/mobskills/whirlwind.lua | 4 +- scripts/actions/mobskills/wild_horn.lua | 2 +- scripts/actions/mobskills/wild_oats.lua | 2 +- scripts/actions/mobskills/wild_rage.lua | 2 +- scripts/actions/mobskills/wind_blade.lua | 4 +- scripts/actions/mobskills/wind_breath.lua | 4 +- scripts/actions/mobskills/wind_shear.lua | 2 +- scripts/actions/mobskills/wind_shear_znm.lua | 2 +- scripts/actions/mobskills/wing_cutter.lua | 4 +- scripts/actions/mobskills/wing_slap.lua | 2 +- scripts/actions/mobskills/wing_thrust.lua | 2 +- scripts/actions/mobskills/wing_whirl.lua | 2 +- .../actions/mobskills/wings_of_gehenna.lua | 4 +- scripts/actions/mobskills/wire_cutter.lua | 2 +- scripts/actions/mobskills/wrath_of_zeus.lua | 4 +- scripts/actions/mobskills/zarbzan.lua | 4 +- scripts/actions/mobskills/zarraqa.lua | 4 +- scripts/actions/mobskills/zephyr_arrow.lua | 2 +- scripts/globals/mobskills.lua | 44 +++++++++++++++---- scripts/globals/summon.lua | 26 ++++++++++- 949 files changed, 1596 insertions(+), 1445 deletions(-) diff --git a/scripts/actions/abilities/pets/aerial_blast.lua b/scripts/actions/abilities/pets/aerial_blast.lua index 1d1399e416d..51a7440aef9 100644 --- a/scripts/actions/abilities/pets/aerial_blast.lua +++ b/scripts/actions/abilities/pets/aerial_blast.lua @@ -13,9 +13,9 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local damage = math.floor(48 + pet:getMainLvl() * 8 + (pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)) * 1.5) - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.WIND, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.WIND, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.WIND, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.WIND, 1) summoner:setMP(0) target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.WIND) diff --git a/scripts/actions/abilities/pets/aero_ii.lua b/scripts/actions/abilities/pets/aero_ii.lua index 0366fac9c67..af580cf4da4 100644 --- a/scripts/actions/abilities/pets/aero_ii.lua +++ b/scripts/actions/abilities/pets/aero_ii.lua @@ -13,9 +13,9 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local damage = math.floor(45 + 0.025 * pet:getTP() + (pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)) * 1.5) - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.WIND, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.WIND, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.WIND, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.WIND, 1) target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.WIND) target:updateEnmityFromDamage(pet, damage) diff --git a/scripts/actions/abilities/pets/aero_iv.lua b/scripts/actions/abilities/pets/aero_iv.lua index bbc4fd65ee7..42e8634577c 100644 --- a/scripts/actions/abilities/pets/aero_iv.lua +++ b/scripts/actions/abilities/pets/aero_iv.lua @@ -13,9 +13,9 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local damage = math.floor(325 + 0.025 * pet:getTP() + (pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)) * 1.5) - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.WIND, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.WIND, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.WIND, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.WIND, 1) target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.WIND) target:updateEnmityFromDamage(pet, damage) diff --git a/scripts/actions/abilities/pets/axe_kick.lua b/scripts/actions/abilities/pets/axe_kick.lua index 95a1ec781c0..b2b4d189700 100644 --- a/scripts/actions/abilities/pets/axe_kick.lua +++ b/scripts/actions/abilities/pets/axe_kick.lua @@ -15,8 +15,8 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action) - local damage = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, 0, xi.mobskills.magicalTpBonus.NO_EFFECT, 1, 2, 3) - local totaldamage = xi.summon.avatarFinalAdjustments(damage.dmg, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, numhits) + 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:takeDamage(totaldamage, pet, xi.attackType.PHYSICAL, xi.damageType.BLUNT) target:updateEnmityFromDamage(pet, totaldamage) diff --git a/scripts/actions/abilities/pets/barracuda_dive.lua b/scripts/actions/abilities/pets/barracuda_dive.lua index c084420d55e..93d6953424a 100644 --- a/scripts/actions/abilities/pets/barracuda_dive.lua +++ b/scripts/actions/abilities/pets/barracuda_dive.lua @@ -15,8 +15,8 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action) - local damage = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, 0, xi.mobskills.magicalTpBonus.NO_EFFECT, 1, 2, 3) - local totaldamage = xi.summon.avatarFinalAdjustments(damage.dmg, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, numhits) + 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.SLASHING, numhits) target:takeDamage(totaldamage, pet, xi.attackType.PHYSICAL, xi.damageType.SLASHING) target:updateEnmityFromDamage(pet, totaldamage) diff --git a/scripts/actions/abilities/pets/blizzard_ii.lua b/scripts/actions/abilities/pets/blizzard_ii.lua index 13855a4b715..08e9cd360ee 100644 --- a/scripts/actions/abilities/pets/blizzard_ii.lua +++ b/scripts/actions/abilities/pets/blizzard_ii.lua @@ -13,9 +13,9 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local damage = math.floor(45 + 0.025 * pet:getTP() + (pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)) * 1.5) - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.ICE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.ICE, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.ICE, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.ICE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.ICE, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.ICE, 1) target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.ICE) target:updateEnmityFromDamage(pet, damage) diff --git a/scripts/actions/abilities/pets/blizzard_iv.lua b/scripts/actions/abilities/pets/blizzard_iv.lua index f7ecae82c84..4aa7474fd12 100644 --- a/scripts/actions/abilities/pets/blizzard_iv.lua +++ b/scripts/actions/abilities/pets/blizzard_iv.lua @@ -13,9 +13,9 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local damage = math.floor(325 + 0.025 * pet:getTP() + (pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)) * 1.5) - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.ICE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.ICE, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.ICE, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.ICE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.ICE, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.ICE, 1) target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.ICE) target:updateEnmityFromDamage(pet, damage) diff --git a/scripts/actions/abilities/pets/burning_strike.lua b/scripts/actions/abilities/pets/burning_strike.lua index 170955ce8c6..a67fe2f1f90 100644 --- a/scripts/actions/abilities/pets/burning_strike.lua +++ b/scripts/actions/abilities/pets/burning_strike.lua @@ -13,12 +13,12 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action) local baseDamage = xi.summon.avatarPhysicalMove(pet, target, petskill, 1, 1, 6, 0, xi.mobskills.magicalTpBonus.NO_EFFECT, 1, 2, 3) - local damage = math.floor(baseDamage.dmg + pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)) + local damage = math.floor(baseDamage.damage + pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)) -- Add on bonuses (staff/day/weather/jas/mab/etc all go in this function) - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.FIRE, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.FIRE, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, 1) target:takeDamage(damage, pet, xi.attackType.PHYSICAL, xi.damageType.BLUNT) target:updateEnmityFromDamage(pet, damage) diff --git a/scripts/actions/abilities/pets/camisado.lua b/scripts/actions/abilities/pets/camisado.lua index 11b4eb35235..320b319d674 100644 --- a/scripts/actions/abilities/pets/camisado.lua +++ b/scripts/actions/abilities/pets/camisado.lua @@ -14,8 +14,8 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local accmod = 1 local dmgmod = 3.5 - local damage = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, 0, xi.mobskills.magicalTpBonus.NO_EFFECT, 1, 2, 3) - local totaldamage = xi.summon.avatarFinalAdjustments(damage.dmg, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, numhits) + 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:takeDamage(totaldamage, pet, xi.attackType.PHYSICAL, xi.damageType.BLUNT) target:updateEnmityFromDamage(pet, totaldamage) diff --git a/scripts/actions/abilities/pets/chaotic_strike.lua b/scripts/actions/abilities/pets/chaotic_strike.lua index 1dcb8cb7081..4aae4ca899c 100644 --- a/scripts/actions/abilities/pets/chaotic_strike.lua +++ b/scripts/actions/abilities/pets/chaotic_strike.lua @@ -16,8 +16,8 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action) local dmgmodsubsequent = 2 - local damage = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, dmgmodsubsequent, xi.mobskills.magicalTpBonus.NO_EFFECT, 1, 2, 3) - local totaldamage = xi.summon.avatarFinalAdjustments(damage.dmg, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, numhits) + 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:takeDamage(totaldamage, pet, xi.attackType.PHYSICAL, xi.damageType.BLUNT) target:updateEnmityFromDamage(pet, totaldamage) diff --git a/scripts/actions/abilities/pets/clarsach_call.lua b/scripts/actions/abilities/pets/clarsach_call.lua index e9537e15b3e..5b55dea8841 100644 --- a/scripts/actions/abilities/pets/clarsach_call.lua +++ b/scripts/actions/abilities/pets/clarsach_call.lua @@ -14,9 +14,9 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local damage = math.floor(48 + pet:getMainLvl() * 8 + (pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)) * 1.5) - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.WIND, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.WIND, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.WIND, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.WIND, 1) summoner:setMP(0) target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.WIND) diff --git a/scripts/actions/abilities/pets/claw.lua b/scripts/actions/abilities/pets/claw.lua index a6dad205c60..6f4fcc1f6c6 100644 --- a/scripts/actions/abilities/pets/claw.lua +++ b/scripts/actions/abilities/pets/claw.lua @@ -15,8 +15,8 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action) - local damage = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, 0, xi.mobskills.magicalTpBonus.NO_EFFECT, 1, 2, 3) - local totaldamage = xi.summon.avatarFinalAdjustments(damage.dmg, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, numhits) + 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.PIERCING, numhits) target:takeDamage(totaldamage, pet, xi.attackType.PHYSICAL, xi.damageType.PIERCING) target:updateEnmityFromDamage(pet, totaldamage) diff --git a/scripts/actions/abilities/pets/crescent_fang.lua b/scripts/actions/abilities/pets/crescent_fang.lua index b0ad67f7d8a..b69aed19b0b 100644 --- a/scripts/actions/abilities/pets/crescent_fang.lua +++ b/scripts/actions/abilities/pets/crescent_fang.lua @@ -15,10 +15,10 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action) - local damage = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, 0, xi.mobskills.magicalTpBonus.NO_EFFECT, 1, 2, 3) - local totaldamage = xi.summon.avatarFinalAdjustments(damage.dmg, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, numhits) + 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.PIERCING, numhits) - if damage.hitslanded > 0 then + if info.hitslanded > 0 then target:addStatusEffect(xi.effect.PARALYSIS, 22.5, 0, 90) end diff --git a/scripts/actions/abilities/pets/diamond_dust.lua b/scripts/actions/abilities/pets/diamond_dust.lua index a898611f468..f00e7372c30 100644 --- a/scripts/actions/abilities/pets/diamond_dust.lua +++ b/scripts/actions/abilities/pets/diamond_dust.lua @@ -13,9 +13,9 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local damage = math.floor(48 + pet:getMainLvl() * 8 + (pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)) * 1.5) - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.ICE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.ICE, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.ICE, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.ICE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.ICE, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.ICE, 1) summoner:setMP(0) target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.ICE) diff --git a/scripts/actions/abilities/pets/double_punch.lua b/scripts/actions/abilities/pets/double_punch.lua index b6adc82cf58..247c0849dd6 100644 --- a/scripts/actions/abilities/pets/double_punch.lua +++ b/scripts/actions/abilities/pets/double_punch.lua @@ -16,8 +16,8 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action) - local damage = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, dmgmodsubsequent, xi.mobskills.magicalTpBonus.NO_EFFECT, 1, 2, 3) - local totaldamage = xi.summon.avatarFinalAdjustments(damage.dmg, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, numhits) + 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:takeDamage(totaldamage, pet, xi.attackType.PHYSICAL, xi.damageType.BLUNT) target:updateEnmityFromDamage(pet, totaldamage) diff --git a/scripts/actions/abilities/pets/double_slap.lua b/scripts/actions/abilities/pets/double_slap.lua index d96ed1763ea..670cf17755f 100644 --- a/scripts/actions/abilities/pets/double_slap.lua +++ b/scripts/actions/abilities/pets/double_slap.lua @@ -16,8 +16,8 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action) - local damage = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, dmgmodsubsequent, xi.mobskills.magicalTpBonus.NO_EFFECT, 1, 2, 3) - local totaldamage = xi.summon.avatarFinalAdjustments(damage.dmg, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, numhits) + 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.HTH, numhits) target:takeDamage(totaldamage, pet, xi.attackType.PHYSICAL, xi.damageType.HTH) target:updateEnmityFromDamage(pet, totaldamage) diff --git a/scripts/actions/abilities/pets/earthen_fury.lua b/scripts/actions/abilities/pets/earthen_fury.lua index 89a0283e034..136824d5e23 100644 --- a/scripts/actions/abilities/pets/earthen_fury.lua +++ b/scripts/actions/abilities/pets/earthen_fury.lua @@ -13,9 +13,9 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local damage = 48 + pet:getMainLvl() * 8 + (pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)) * 1.5 - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.EARTH, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.EARTH, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.EARTH, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.EARTH, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, 1) summoner:setMP(0) target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.EARTH) diff --git a/scripts/actions/abilities/pets/eclipse_bite.lua b/scripts/actions/abilities/pets/eclipse_bite.lua index 1f68580467e..1c3106221d2 100644 --- a/scripts/actions/abilities/pets/eclipse_bite.lua +++ b/scripts/actions/abilities/pets/eclipse_bite.lua @@ -16,8 +16,8 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action) - local damage = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, dmgmodsubsequent, xi.mobskills.magicalTpBonus.NO_EFFECT, 1, 2, 3) - local totaldamage = xi.summon.avatarFinalAdjustments(damage.dmg, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, numhits) + 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.SLASHING, numhits) target:takeDamage(totaldamage, pet, xi.attackType.PHYSICAL, xi.damageType.SLASHING) target:updateEnmityFromDamage(pet, totaldamage) return totaldamage diff --git a/scripts/actions/abilities/pets/fire_ii.lua b/scripts/actions/abilities/pets/fire_ii.lua index 0cbc4faf842..2829456e99b 100644 --- a/scripts/actions/abilities/pets/fire_ii.lua +++ b/scripts/actions/abilities/pets/fire_ii.lua @@ -13,9 +13,9 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local damage = math.floor(45 + 0.025 * pet:getTP() + (pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)) * 1.5) - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.FIRE, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.FIRE, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, 1) target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.FIRE) target:updateEnmityFromDamage(pet, damage) diff --git a/scripts/actions/abilities/pets/fire_iv.lua b/scripts/actions/abilities/pets/fire_iv.lua index a21fb5fe650..6275c24d050 100644 --- a/scripts/actions/abilities/pets/fire_iv.lua +++ b/scripts/actions/abilities/pets/fire_iv.lua @@ -13,9 +13,9 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local damage = math.floor(325 + 0.025 * pet:getTP() + (pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)) * 1.5) - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.FIRE, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.FIRE, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, 1) target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.FIRE) target:updateEnmityFromDamage(pet, damage) diff --git a/scripts/actions/abilities/pets/flaming_crush.lua b/scripts/actions/abilities/pets/flaming_crush.lua index 60246266c95..26096f02f33 100644 --- a/scripts/actions/abilities/pets/flaming_crush.lua +++ b/scripts/actions/abilities/pets/flaming_crush.lua @@ -13,12 +13,12 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action) local baseDamage = xi.summon.avatarPhysicalMove(pet, target, petskill, 2, 1, 10, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 1, 2, 3) - local damage = math.floor(baseDamage.dmg + pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)) + local damage = math.floor(baseDamage.damage + pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)) -- Add on bonuses (staff/day/weather/jas/mab/etc all go in this function) - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.FIRE, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, 3) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.FIRE, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, 3) target:takeDamage(damage, pet, xi.attackType.PHYSICAL, xi.damageType.BLUNT) target:updateEnmityFromDamage(pet, damage) diff --git a/scripts/actions/abilities/pets/geocrush.lua b/scripts/actions/abilities/pets/geocrush.lua index 8409b7681a1..414cf887ad4 100644 --- a/scripts/actions/abilities/pets/geocrush.lua +++ b/scripts/actions/abilities/pets/geocrush.lua @@ -25,9 +25,9 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) --note: this formula is only accurate for level 75 - 76+ may have a different intercept and/or slope local damage = math.floor(512 + 0.172 * tp + (pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)) * 1.5) - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.EARTH, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.EARTH, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.EARTH, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.EARTH, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, 1) target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.EARTH) target:updateEnmityFromDamage(pet, damage) diff --git a/scripts/actions/abilities/pets/grand_fall.lua b/scripts/actions/abilities/pets/grand_fall.lua index fd0051dcb9f..70afc1974b7 100644 --- a/scripts/actions/abilities/pets/grand_fall.lua +++ b/scripts/actions/abilities/pets/grand_fall.lua @@ -25,9 +25,9 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) --note: this formula is only accurate for level 75 - 76+ may have a different intercept and/or slope local damage = math.floor(512 + 0.172 * tp + (pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)) * 1.5) - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.WATER, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.WATER, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.WATER, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.WATER, 1) target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.WATER) target:updateEnmityFromDamage(pet, damage) diff --git a/scripts/actions/abilities/pets/heavenly_strike.lua b/scripts/actions/abilities/pets/heavenly_strike.lua index 5ca9d7cdf6f..034e492b063 100644 --- a/scripts/actions/abilities/pets/heavenly_strike.lua +++ b/scripts/actions/abilities/pets/heavenly_strike.lua @@ -25,9 +25,9 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) --note: this formula is only accurate for level 75 - 76+ may have a different intercept and/or slope local damage = math.floor(512 + 0.172 * tp + (pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)) * 1.5) - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.ICE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.ICE, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.ICE, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.ICE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.ICE, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.ICE, 1) target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.ICE) target:updateEnmityFromDamage(pet, damage) diff --git a/scripts/actions/abilities/pets/howling_moon.lua b/scripts/actions/abilities/pets/howling_moon.lua index 6133bdf7507..69112da2dac 100644 --- a/scripts/actions/abilities/pets/howling_moon.lua +++ b/scripts/actions/abilities/pets/howling_moon.lua @@ -13,9 +13,9 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local damage = math.floor(48 + pet:getMainLvl() * 8 + (pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)) * 1.5) - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.DARK, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.DARK, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.DARK, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.DARK, 1) summoner:setMP(0) target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.DARK) diff --git a/scripts/actions/abilities/pets/hysteric_assault.lua b/scripts/actions/abilities/pets/hysteric_assault.lua index fb09d515835..ff7e9b938f4 100644 --- a/scripts/actions/abilities/pets/hysteric_assault.lua +++ b/scripts/actions/abilities/pets/hysteric_assault.lua @@ -16,10 +16,10 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action) - local damage = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, 0, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1, 1, 1) - local totaldamage = xi.summon.avatarFinalAdjustments(damage.dmg, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, numhits) + local info = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, 0, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1, 1, 1) + local totaldamage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, numhits) - xi.job_utils.summoner.calculateTPReturn(pet, target, totaldamage, damage.hitslanded) + xi.job_utils.summoner.calculateTPReturn(pet, target, totaldamage, info.hitslanded) target:takeDamage(totaldamage, pet, xi.attackType.PHYSICAL, xi.damageType.PIERCING) target:updateEnmityFromDamage(pet, totaldamage) diff --git a/scripts/actions/abilities/pets/inferno.lua b/scripts/actions/abilities/pets/inferno.lua index fc2ebbf6364..b1896fff8b8 100644 --- a/scripts/actions/abilities/pets/inferno.lua +++ b/scripts/actions/abilities/pets/inferno.lua @@ -13,9 +13,9 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local damage = math.floor(48 + pet:getMainLvl() * 8 + (pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)) * 1.5) - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.FIRE, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.FIRE, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, 1) summoner:setMP(0) target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/abilities/pets/judgment_bolt.lua b/scripts/actions/abilities/pets/judgment_bolt.lua index cb32cb52d24..4f15a52c8b1 100644 --- a/scripts/actions/abilities/pets/judgment_bolt.lua +++ b/scripts/actions/abilities/pets/judgment_bolt.lua @@ -13,9 +13,9 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local damage = math.floor(48 + pet:getMainLvl() * 8 + (pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)) * 1.5) - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.THUNDER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.THUNDER, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.THUNDER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.THUNDER, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, 1) summoner:setMP(0) target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.THUNDER) diff --git a/scripts/actions/abilities/pets/level_X_holy.lua b/scripts/actions/abilities/pets/level_X_holy.lua index 15c0683bd64..91f78028c53 100644 --- a/scripts/actions/abilities/pets/level_X_holy.lua +++ b/scripts/actions/abilities/pets/level_X_holy.lua @@ -31,9 +31,9 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) if target:getMainLvl() % power == 0 then damage = math.floor(pet:getMainLvl() * power + (pet:getStat(xi.mod.MND) - target:getStat(xi.mod.MND)) * 1.5) - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.LIGHT, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 10) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.LIGHT, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.LIGHT, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 10) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.LIGHT, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, 1) -- TODO: Magic burst? diff --git a/scripts/actions/abilities/pets/megalith_throw.lua b/scripts/actions/abilities/pets/megalith_throw.lua index e6e3b7adc23..94b5b027b6c 100644 --- a/scripts/actions/abilities/pets/megalith_throw.lua +++ b/scripts/actions/abilities/pets/megalith_throw.lua @@ -15,8 +15,8 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action) - local damage = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, 0, xi.mobskills.magicalTpBonus.NO_EFFECT, 1, 2, 3) - local totaldamage = xi.summon.avatarFinalAdjustments(damage.dmg, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, numhits) + 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.SLASHING, numhits) target:takeDamage(totaldamage, pet, xi.attackType.PHYSICAL, xi.damageType.SLASHING) target:updateEnmityFromDamage(pet, totaldamage) return totaldamage diff --git a/scripts/actions/abilities/pets/meteor_strike.lua b/scripts/actions/abilities/pets/meteor_strike.lua index 5a0265c7782..68082f88f6e 100644 --- a/scripts/actions/abilities/pets/meteor_strike.lua +++ b/scripts/actions/abilities/pets/meteor_strike.lua @@ -25,9 +25,9 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) --note: this formula is only accurate for level 75 - 76+ may have a different intercept and/or slope local damage = math.floor(512 + 0.172 * tp + (pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)) * 1.5) - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.FIRE, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.FIRE, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, 1) target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.FIRE) target:updateEnmityFromDamage(pet, damage) diff --git a/scripts/actions/abilities/pets/moonlit_charge.lua b/scripts/actions/abilities/pets/moonlit_charge.lua index ffd965ca264..870cae67e86 100644 --- a/scripts/actions/abilities/pets/moonlit_charge.lua +++ b/scripts/actions/abilities/pets/moonlit_charge.lua @@ -15,8 +15,8 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action) - local damage = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, 0, xi.mobskills.magicalTpBonus.NO_EFFECT, 1, 2, 3) - local totaldamage = xi.summon.avatarFinalAdjustments(damage.dmg, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, numhits) + 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:takeDamage(totaldamage, pet, xi.attackType.PHYSICAL, xi.damageType.BLUNT) target:updateEnmityFromDamage(pet, totaldamage) diff --git a/scripts/actions/abilities/pets/mountain_buster.lua b/scripts/actions/abilities/pets/mountain_buster.lua index 1a30e143757..e7da9472f46 100644 --- a/scripts/actions/abilities/pets/mountain_buster.lua +++ b/scripts/actions/abilities/pets/mountain_buster.lua @@ -16,8 +16,8 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action) - local damage = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, dmgmodsubsequent, xi.mobskills.magicalTpBonus.NO_EFFECT, 1, 2, 3) - local totaldamage = xi.summon.avatarFinalAdjustments(damage.dmg, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, numhits) + 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.SLASHING, numhits) target:takeDamage(totaldamage, pet, xi.attackType.PHYSICAL, xi.damageType.SLASHING) target:updateEnmityFromDamage(pet, totaldamage) diff --git a/scripts/actions/abilities/pets/nether_blast.lua b/scripts/actions/abilities/pets/nether_blast.lua index 067857422f6..7d477721021 100644 --- a/scripts/actions/abilities/pets/nether_blast.lua +++ b/scripts/actions/abilities/pets/nether_blast.lua @@ -13,9 +13,9 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local damage = math.floor(10 + 5 * pet:getMainLvl()) - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.DARK, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.DARK, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.DARK, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.DARK, 1) target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.DARK) target:updateEnmityFromDamage(pet, damage) diff --git a/scripts/actions/abilities/pets/poison_nails.lua b/scripts/actions/abilities/pets/poison_nails.lua index 85785e30582..0624931648f 100644 --- a/scripts/actions/abilities/pets/poison_nails.lua +++ b/scripts/actions/abilities/pets/poison_nails.lua @@ -13,8 +13,8 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local accmod = 1 local dmgmod = 2.5 - local damage = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, 0, xi.mobskills.magicalTpBonus.NO_EFFECT, 1, 2, 3) - local totaldamage = xi.summon.avatarFinalAdjustments(damage.dmg, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, numhits) + 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.PIERCING, numhits) xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action) diff --git a/scripts/actions/abilities/pets/predator_claws.lua b/scripts/actions/abilities/pets/predator_claws.lua index 2793b6dfaff..bd8500d558e 100644 --- a/scripts/actions/abilities/pets/predator_claws.lua +++ b/scripts/actions/abilities/pets/predator_claws.lua @@ -16,8 +16,8 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action) - local damage = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, dmgmodsubsequent, xi.mobskills.magicalTpBonus.NO_EFFECT, 1, 2, 3) - local totaldamage = xi.summon.avatarFinalAdjustments(damage.dmg, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, numhits) + 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.SLASHING, numhits) target:takeDamage(totaldamage, pet, xi.attackType.PHYSICAL, xi.damageType.SLASHING) target:updateEnmityFromDamage(pet, totaldamage) return totaldamage diff --git a/scripts/actions/abilities/pets/punch.lua b/scripts/actions/abilities/pets/punch.lua index eb1b037edf1..27d86d11fdb 100644 --- a/scripts/actions/abilities/pets/punch.lua +++ b/scripts/actions/abilities/pets/punch.lua @@ -15,8 +15,8 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action) - local damage = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, 0, xi.mobskills.magicalTpBonus.NO_EFFECT, 1, 2, 3) - local totaldamage = xi.summon.avatarFinalAdjustments(damage.dmg, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, numhits) + 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:takeDamage(totaldamage, pet, xi.attackType.PHYSICAL, xi.damageType.BLUNT) target:updateEnmityFromDamage(pet, totaldamage) diff --git a/scripts/actions/abilities/pets/regal_scratch.lua b/scripts/actions/abilities/pets/regal_scratch.lua index f6a864bff0b..1a812d57a43 100644 --- a/scripts/actions/abilities/pets/regal_scratch.lua +++ b/scripts/actions/abilities/pets/regal_scratch.lua @@ -19,8 +19,8 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local dmgmod = 3 local dmgmodsubsequent = 1 - local damage = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, dmgmodsubsequent, xi.mobskills.physicalTpBonus.NO_EFFECT, 1, 2, 3) - local totaldamage = xi.summon.avatarFinalAdjustments(damage.dmg, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, numhits) + local info = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, dmgmodsubsequent, xi.mobskills.physicalTpBonus.NO_EFFECT, 1, 2, 3) + local totaldamage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, numhits) target:takeDamage(totaldamage, pet, xi.attackType.PHYSICAL, xi.damageType.SLASHING) target:updateEnmityFromDamage(pet, totaldamage) diff --git a/scripts/actions/abilities/pets/rock_buster.lua b/scripts/actions/abilities/pets/rock_buster.lua index aa469e0b44c..179e25621f8 100644 --- a/scripts/actions/abilities/pets/rock_buster.lua +++ b/scripts/actions/abilities/pets/rock_buster.lua @@ -15,8 +15,8 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action) - local damage = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, 0, xi.mobskills.magicalTpBonus.NO_EFFECT, 1, 2, 3) - local totaldamage = xi.summon.avatarFinalAdjustments(damage.dmg, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, numhits) + 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.SLASHING, numhits) target:takeDamage(totaldamage, pet, xi.attackType.PHYSICAL, xi.damageType.SLASHING) target:updateEnmityFromDamage(pet, totaldamage) diff --git a/scripts/actions/abilities/pets/rock_throw.lua b/scripts/actions/abilities/pets/rock_throw.lua index e6a6505b77d..6ba605f617a 100644 --- a/scripts/actions/abilities/pets/rock_throw.lua +++ b/scripts/actions/abilities/pets/rock_throw.lua @@ -15,8 +15,8 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action) - local damage = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, 0, xi.mobskills.magicalTpBonus.NO_EFFECT, 1, 2, 3) - local totaldamage = xi.summon.avatarFinalAdjustments(damage.dmg, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, numhits) + 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.SLASHING, numhits) target:takeDamage(totaldamage, pet, xi.attackType.PHYSICAL, xi.damageType.SLASHING) target:updateEnmityFromDamage(pet, totaldamage) diff --git a/scripts/actions/abilities/pets/roundhouse.lua b/scripts/actions/abilities/pets/roundhouse.lua index 7ea194c4a70..607d0149286 100644 --- a/scripts/actions/abilities/pets/roundhouse.lua +++ b/scripts/actions/abilities/pets/roundhouse.lua @@ -16,10 +16,10 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action) - local damage = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, 0, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1, 1, 1) - local totaldamage = xi.summon.avatarFinalAdjustments(damage.dmg, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, numhits) + local info = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, 0, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1, 1, 1) + local totaldamage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, numhits) - xi.job_utils.summoner.calculateTPReturn(pet, target, totaldamage, damage.hitslanded) + xi.job_utils.summoner.calculateTPReturn(pet, target, totaldamage, info.hitslanded) target:takeDamage(totaldamage, pet, xi.attackType.PHYSICAL, xi.damageType.BLUNT) target:updateEnmityFromDamage(pet, totaldamage) diff --git a/scripts/actions/abilities/pets/rush.lua b/scripts/actions/abilities/pets/rush.lua index c9434625278..ef2c072160b 100644 --- a/scripts/actions/abilities/pets/rush.lua +++ b/scripts/actions/abilities/pets/rush.lua @@ -16,8 +16,8 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action) - local damage = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, dmgmodsubsequent, xi.mobskills.magicalTpBonus.NO_EFFECT, 1, 2, 3) - local totaldamage = xi.summon.avatarFinalAdjustments(damage.dmg, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, numhits) + 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) target:takeDamage(totaldamage, pet, xi.attackType.PHYSICAL, xi.damageType.BLUNT) target:updateEnmityFromDamage(pet, totaldamage) diff --git a/scripts/actions/abilities/pets/searing_light.lua b/scripts/actions/abilities/pets/searing_light.lua index 5f760e20aaa..8295b6c74c3 100644 --- a/scripts/actions/abilities/pets/searing_light.lua +++ b/scripts/actions/abilities/pets/searing_light.lua @@ -13,9 +13,9 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local damage = math.floor(26 + pet:getMainLvl() * 6 + (pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)) * 1.5) - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.LIGHT, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.LIGHT, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.LIGHT, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.LIGHT, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, 1) target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.LIGHT) target:updateEnmityFromDamage(pet, damage) diff --git a/scripts/actions/abilities/pets/shock_strike.lua b/scripts/actions/abilities/pets/shock_strike.lua index 3b2f193a987..e7a8d488df7 100644 --- a/scripts/actions/abilities/pets/shock_strike.lua +++ b/scripts/actions/abilities/pets/shock_strike.lua @@ -15,8 +15,8 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action) - local damage = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, 0, xi.mobskills.magicalTpBonus.NO_EFFECT, 1, 2, 3) - local totaldamage = xi.summon.avatarFinalAdjustments(damage.dmg, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, numhits) + 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:takeDamage(totaldamage, pet, xi.attackType.PHYSICAL, xi.damageType.BLUNT) target:updateEnmityFromDamage(pet, totaldamage) diff --git a/scripts/actions/abilities/pets/somnolence.lua b/scripts/actions/abilities/pets/somnolence.lua index b2228f6660b..76cf32fc04e 100644 --- a/scripts/actions/abilities/pets/somnolence.lua +++ b/scripts/actions/abilities/pets/somnolence.lua @@ -14,9 +14,9 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) -- Damage local damage = 10 + pet:getMainLvl() * 2 - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.DARK, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.DARK, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.DARK, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.DARK, 1) -- Effect if not target:hasStatusEffect(xi.effect.WEIGHT) then diff --git a/scripts/actions/abilities/pets/sonic_buffet.lua b/scripts/actions/abilities/pets/sonic_buffet.lua index 60d084042a5..2e3ab343e74 100644 --- a/scripts/actions/abilities/pets/sonic_buffet.lua +++ b/scripts/actions/abilities/pets/sonic_buffet.lua @@ -16,9 +16,9 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) -- fTP starts at 2.0 and scales every 150 tp by .1 for a range of 2.0 to 4.0. Base value ballparked from retail. local damage = math.floor(37.5 * (2 + 0.1 * pet:getTP() / 150) + (pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)) * 1.5) - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.WIND, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.WIND, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.WIND, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.WIND, 1) target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.WIND) target:updateEnmityFromDamage(pet, damage) diff --git a/scripts/actions/abilities/pets/spinning_dive.lua b/scripts/actions/abilities/pets/spinning_dive.lua index dfbfca43fc2..2a63cbb89b5 100644 --- a/scripts/actions/abilities/pets/spinning_dive.lua +++ b/scripts/actions/abilities/pets/spinning_dive.lua @@ -15,8 +15,8 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action) - local damage = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, 0, xi.mobskills.magicalTpBonus.NO_EFFECT, 1, 2, 3) - local totaldamage = xi.summon.avatarFinalAdjustments(damage.dmg, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, numhits) + 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:takeDamage(totaldamage, pet, xi.attackType.PHYSICAL, xi.damageType.BLUNT) target:updateEnmityFromDamage(pet, totaldamage) diff --git a/scripts/actions/abilities/pets/stone_ii.lua b/scripts/actions/abilities/pets/stone_ii.lua index 9190c1caa4b..1b099be87e4 100644 --- a/scripts/actions/abilities/pets/stone_ii.lua +++ b/scripts/actions/abilities/pets/stone_ii.lua @@ -13,9 +13,9 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local damage = math.floor(45 + 0.025 * pet:getTP() + (pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)) * 1.5) - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.EARTH, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.EARTH, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.EARTH, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.EARTH, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, 1) target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.EARTH) target:updateEnmityFromDamage(pet, damage) diff --git a/scripts/actions/abilities/pets/stone_iv.lua b/scripts/actions/abilities/pets/stone_iv.lua index 720f89fe6d2..8249a85d339 100644 --- a/scripts/actions/abilities/pets/stone_iv.lua +++ b/scripts/actions/abilities/pets/stone_iv.lua @@ -13,9 +13,9 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local damage = math.floor(325 + 0.025 * pet:getTP() + (pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)) * 1.5) - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.EARTH, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.EARTH, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.EARTH, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.EARTH, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, 1) target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.EARTH) target:updateEnmityFromDamage(pet, damage) diff --git a/scripts/actions/abilities/pets/tail_whip.lua b/scripts/actions/abilities/pets/tail_whip.lua index 3b9805804d8..ffe5d07ea63 100644 --- a/scripts/actions/abilities/pets/tail_whip.lua +++ b/scripts/actions/abilities/pets/tail_whip.lua @@ -14,8 +14,8 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local numhits = 1 local accmod = 1 local dmgmod = 5 - local damage = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, 0, xi.mobskills.magicalTpBonus.NO_EFFECT, 1, 2, 3) - local totaldamage = xi.summon.avatarFinalAdjustments(damage.dmg, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, numhits) + 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.PIERCING, numhits) local duration = 120 local resistRate = xi.combat.magicHitRate.calculateResistRate(pet, target, 0, 0, 0, xi.element.NONE, xi.mod.INT, xi.effect.WEIGHT, 0) diff --git a/scripts/actions/abilities/pets/thunder_ii.lua b/scripts/actions/abilities/pets/thunder_ii.lua index 638611dfd3b..f6b6198cf58 100644 --- a/scripts/actions/abilities/pets/thunder_ii.lua +++ b/scripts/actions/abilities/pets/thunder_ii.lua @@ -13,9 +13,9 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local damage = math.floor(45 + 0.025 * pet:getTP() + (pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)) * 1.5) - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.THUNDER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.THUNDER, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.THUNDER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.THUNDER, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, 1) target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.THUNDER) target:updateEnmityFromDamage(pet, damage) diff --git a/scripts/actions/abilities/pets/thunder_iv.lua b/scripts/actions/abilities/pets/thunder_iv.lua index b160b568630..4b3097e2bfd 100644 --- a/scripts/actions/abilities/pets/thunder_iv.lua +++ b/scripts/actions/abilities/pets/thunder_iv.lua @@ -13,9 +13,9 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local damage = math.floor(325 + 0.025 * pet:getTP() + (pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)) * 1.5) - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.THUNDER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.THUNDER, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.THUNDER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.THUNDER, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, 1) target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.THUNDER) target:updateEnmityFromDamage(pet, damage) diff --git a/scripts/actions/abilities/pets/thunderspark.lua b/scripts/actions/abilities/pets/thunderspark.lua index d66d45afa1f..c8f57aac93f 100644 --- a/scripts/actions/abilities/pets/thunderspark.lua +++ b/scripts/actions/abilities/pets/thunderspark.lua @@ -14,9 +14,9 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local damage = math.floor(275 + pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)) -- Add on bonuses (staff/day/weather/jas/mab/etc all go in this function) - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.THUNDER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.THUNDER, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.THUNDER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.THUNDER, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, 1) target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.THUNDER) target:updateEnmityFromDamage(pet, damage) diff --git a/scripts/actions/abilities/pets/thunderstorm.lua b/scripts/actions/abilities/pets/thunderstorm.lua index 9ec60ab3efd..c4af0e765d6 100644 --- a/scripts/actions/abilities/pets/thunderstorm.lua +++ b/scripts/actions/abilities/pets/thunderstorm.lua @@ -25,9 +25,9 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) --note: this formula is only accurate for level 75 - 76+ may have a different intercept and/or slope local damage = math.floor(256 + 0.172 * tp + pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)) - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.THUNDER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.THUNDER, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.THUNDER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.THUNDER, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, 1) target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.THUNDER) target:updateEnmityFromDamage(pet, damage) diff --git a/scripts/actions/abilities/pets/tidal_wave.lua b/scripts/actions/abilities/pets/tidal_wave.lua index 2121111947c..56309e7b722 100644 --- a/scripts/actions/abilities/pets/tidal_wave.lua +++ b/scripts/actions/abilities/pets/tidal_wave.lua @@ -13,9 +13,9 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local damage = math.floor(48 + pet:getMainLvl() * 8 + (pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)) * 1.5) - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.WATER, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.WATER, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.WATER, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.WATER, 1) summoner:setMP(0) target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.WATER) diff --git a/scripts/actions/abilities/pets/tornado_ii.lua b/scripts/actions/abilities/pets/tornado_ii.lua index b2123f441b1..6ae7be1c13e 100644 --- a/scripts/actions/abilities/pets/tornado_ii.lua +++ b/scripts/actions/abilities/pets/tornado_ii.lua @@ -15,9 +15,9 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) --note: this formula is only accurate for level 75 - 76+ may have a different intercept and/or slope local damage = math.floor(512 + 0.172 * pet:getTP() + (pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)) * 1.5) - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.WIND, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.WIND, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.WIND, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.WIND, 1) pet:setTP(0) -- not possible to get Occult Acumen on avatars yet, so unable to determine if magical BPs can return TP. target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.WIND) diff --git a/scripts/actions/abilities/pets/water_ii.lua b/scripts/actions/abilities/pets/water_ii.lua index eb40db1bd7f..efc5c4b3c78 100644 --- a/scripts/actions/abilities/pets/water_ii.lua +++ b/scripts/actions/abilities/pets/water_ii.lua @@ -13,9 +13,9 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local damage = math.floor(45 + 0.025 * pet:getTP() + (pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)) * 1.5) - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.WATER, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.WATER, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.WATER, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.WATER, 1) target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.WATER) target:updateEnmityFromDamage(pet, damage) diff --git a/scripts/actions/abilities/pets/water_iv.lua b/scripts/actions/abilities/pets/water_iv.lua index c144e6502d8..9253033065e 100644 --- a/scripts/actions/abilities/pets/water_iv.lua +++ b/scripts/actions/abilities/pets/water_iv.lua @@ -13,9 +13,9 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) local damage = math.floor(325 + 0.025 * pet:getTP() + (pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)) * 1.5) - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.WATER, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.WATER, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.WATER, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.WATER, 1) target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.WATER) target:updateEnmityFromDamage(pet, damage) diff --git a/scripts/actions/abilities/pets/welt.lua b/scripts/actions/abilities/pets/welt.lua index d2e29d0caa6..e207b3ec9c9 100644 --- a/scripts/actions/abilities/pets/welt.lua +++ b/scripts/actions/abilities/pets/welt.lua @@ -16,10 +16,10 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action) - local damage = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, 0, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1, 1, 1) - local totaldamage = xi.summon.avatarFinalAdjustments(damage.dmg, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, numhits) + local info = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, 0, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1, 1, 1) + local totaldamage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, numhits) - xi.job_utils.summoner.calculateTPReturn(pet, target, totaldamage, damage.hitslanded) + xi.job_utils.summoner.calculateTPReturn(pet, target, totaldamage, info.hitslanded) target:takeDamage(totaldamage, pet, xi.attackType.PHYSICAL, xi.damageType.SLASHING) target:updateEnmityFromDamage(pet, totaldamage) diff --git a/scripts/actions/abilities/pets/wind_blade.lua b/scripts/actions/abilities/pets/wind_blade.lua index b7126998eae..648008870e9 100644 --- a/scripts/actions/abilities/pets/wind_blade.lua +++ b/scripts/actions/abilities/pets/wind_blade.lua @@ -25,9 +25,9 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) --note: this formula is only accurate for level 75 - 76+ may have a different intercept and/or slope local damage = math.floor(512 + 0.172 * tp + (pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)) * 1.5) - damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage, xi.element.WIND, petskill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.WIND, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.WIND, petskill) + damage = xi.summon.avatarFinalAdjustments(info, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.WIND, 1) target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.WIND) target:updateEnmityFromDamage(pet, damage) diff --git a/scripts/actions/abilities/pets/zantetsuken.lua b/scripts/actions/abilities/pets/zantetsuken.lua index b88a9e40799..6540bfbdbef 100644 --- a/scripts/actions/abilities/pets/zantetsuken.lua +++ b/scripts/actions/abilities/pets/zantetsuken.lua @@ -23,9 +23,9 @@ abilityObject.onPetAbility = function(target, pet, skill, summoner, action) dmg = 9999 end - dmg = xi.mobskills.mobMagicalMove(pet, target, skill, dmg, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - dmg = xi.mobskills.mobAddBonuses(pet, target, dmg, xi.element.DARK, skill) - dmg = xi.summon.avatarFinalAdjustments(dmg, pet, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, 1) + local info = xi.mobskills.mobMagicalMove(pet, target, skill, dmg, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + info.damage = xi.mobskills.mobAddBonuses(pet, target, info.damage, xi.element.DARK, skill) + dmg = xi.summon.avatarFinalAdjustments(info, pet, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, 1) target:takeDamage(dmg, pet, xi.attackType.MAGICAL, xi.damageType.DARK) target:updateEnmityFromDamage(pet, dmg) diff --git a/scripts/actions/mobskills/10000_needles.lua b/scripts/actions/mobskills/10000_needles.lua index 6be48dbc245..67d136ba242 100644 --- a/scripts/actions/mobskills/10000_needles.lua +++ b/scripts/actions/mobskills/10000_needles.lua @@ -11,7 +11,12 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local needles = 10000 / skill:getTotalTargets() - local dmg = xi.mobskills.mobFinalAdjustments(needles, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = + { + damage = needles + } + + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.LIGHT) diff --git a/scripts/actions/mobskills/1000_needles.lua b/scripts/actions/mobskills/1000_needles.lua index 279ab163b12..cce9f0d7da1 100644 --- a/scripts/actions/mobskills/1000_needles.lua +++ b/scripts/actions/mobskills/1000_needles.lua @@ -11,7 +11,11 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local needles = 1000 / skill:getTotalTargets() - local dmg = xi.mobskills.mobFinalAdjustments(needles, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = + { + damage = needles + } + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.LIGHT) diff --git a/scripts/actions/mobskills/2000_needles.lua b/scripts/actions/mobskills/2000_needles.lua index 21a56f1ec1f..aec8b6b712d 100644 --- a/scripts/actions/mobskills/2000_needles.lua +++ b/scripts/actions/mobskills/2000_needles.lua @@ -11,7 +11,12 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local needles = 2000 / skill:getTotalTargets() - local dmg = xi.mobskills.mobFinalAdjustments(needles, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = + { + damage = needles + } + + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.LIGHT) diff --git a/scripts/actions/mobskills/4000_needles.lua b/scripts/actions/mobskills/4000_needles.lua index 528968865da..7b4b72837c8 100644 --- a/scripts/actions/mobskills/4000_needles.lua +++ b/scripts/actions/mobskills/4000_needles.lua @@ -11,7 +11,12 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local needles = 4000 / skill:getTotalTargets() - local dmg = xi.mobskills.mobFinalAdjustments(needles, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = + { + damage = needles + } + + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.LIGHT) diff --git a/scripts/actions/mobskills/Preternatural_Gleam.lua b/scripts/actions/mobskills/Preternatural_Gleam.lua index 1ea29a1df4f..bb3aa37fa8c 100644 --- a/scripts/actions/mobskills/Preternatural_Gleam.lua +++ b/scripts/actions/mobskills/Preternatural_Gleam.lua @@ -13,8 +13,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.LIGHT, 1.5, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.LIGHT, 1.5, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.LIGHT) diff --git a/scripts/actions/mobskills/abyss_blast.lua b/scripts/actions/mobskills/abyss_blast.lua index 662988cd494..58cbd70d00a 100644 --- a/scripts/actions/mobskills/abyss_blast.lua +++ b/scripts/actions/mobskills/abyss_blast.lua @@ -19,8 +19,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local power = 15 local duration = 120 - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.DARK) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BLINDNESS, power, 0, duration) diff --git a/scripts/actions/mobskills/abyssal_strike.lua b/scripts/actions/mobskills/abyssal_strike.lua index a5c78a00b77..f0db343cb05 100644 --- a/scripts/actions/mobskills/abyssal_strike.lua +++ b/scripts/actions/mobskills/abyssal_strike.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 2 local ftp = 4.7 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 15) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/acheron_kick.lua b/scripts/actions/mobskills/acheron_kick.lua index 1ee942914fe..d5e126d020b 100644 --- a/scripts/actions/mobskills/acheron_kick.lua +++ b/scripts/actions/mobskills/acheron_kick.lua @@ -20,7 +20,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) -- if skill hit, apply dmg if not skill:hasMissMsg() then diff --git a/scripts/actions/mobskills/acid_breath.lua b/scripts/actions/mobskills/acid_breath.lua index ad396ff35db..8c21c115be1 100644 --- a/scripts/actions/mobskills/acid_breath.lua +++ b/scripts/actions/mobskills/acid_breath.lua @@ -20,8 +20,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.WATER) diff --git a/scripts/actions/mobskills/acid_mist.lua b/scripts/actions/mobskills/acid_mist.lua index 1b9b90cb29b..8ad3d3450f0 100644 --- a/scripts/actions/mobskills/acid_mist.lua +++ b/scripts/actions/mobskills/acid_mist.lua @@ -14,8 +14,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local power = 50 local duration = 120 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.ATTACK_DOWN, power, 0, duration) diff --git a/scripts/actions/mobskills/acid_spray.lua b/scripts/actions/mobskills/acid_spray.lua index 6bfc6eca760..36606a2cd80 100644 --- a/scripts/actions/mobskills/acid_spray.lua +++ b/scripts/actions/mobskills/acid_spray.lua @@ -13,8 +13,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 local power = mob:getMainLvl() / 3.5 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.POISON, power, 3, 120) diff --git a/scripts/actions/mobskills/acrid_stream.lua b/scripts/actions/mobskills/acrid_stream.lua index e0ed4492584..6c53bac4f81 100644 --- a/scripts/actions/mobskills/acrid_stream.lua +++ b/scripts/actions/mobskills/acrid_stream.lua @@ -16,8 +16,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local power = 20 local duration = 120 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.MAGIC_DEF_DOWN, power, 0, duration) diff --git a/scripts/actions/mobskills/aegis_schism.lua b/scripts/actions/mobskills/aegis_schism.lua index d6525f92eb9..3e959b6a372 100644 --- a/scripts/actions/mobskills/aegis_schism.lua +++ b/scripts/actions/mobskills/aegis_schism.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) local power = 75 local duration = 120 diff --git a/scripts/actions/mobskills/aeolian_edge.lua b/scripts/actions/mobskills/aeolian_edge.lua index e1c4a44435a..72897e68bfc 100644 --- a/scripts/actions/mobskills/aeolian_edge.lua +++ b/scripts/actions/mobskills/aeolian_edge.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ACC_VARIES, 1, 2, 3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/aeolian_void.lua b/scripts/actions/mobskills/aeolian_void.lua index 945ebae8f44..9d3cab86006 100644 --- a/scripts/actions/mobskills/aeolian_void.lua +++ b/scripts/actions/mobskills/aeolian_void.lua @@ -22,8 +22,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.EARTH, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.EARTH, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.EARTH) diff --git a/scripts/actions/mobskills/aerial_blast.lua b/scripts/actions/mobskills/aerial_blast.lua index 6d9782fccd9..ae8b14c9ac4 100644 --- a/scripts/actions/mobskills/aerial_blast.lua +++ b/scripts/actions/mobskills/aerial_blast.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 9 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 3, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 3, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) diff --git a/scripts/actions/mobskills/aerial_collision.lua b/scripts/actions/mobskills/aerial_collision.lua index a58090f9ee1..303d5f18746 100644 --- a/scripts/actions/mobskills/aerial_collision.lua +++ b/scripts/actions/mobskills/aerial_collision.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.NONE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.NONE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) -- Inversely scales from 50% to 40% defense down depending on TP local power = 50 - math.min(10, 5 * math.floor((skill:getTP() - 1000) / 1000)) diff --git a/scripts/actions/mobskills/aerial_wheel.lua b/scripts/actions/mobskills/aerial_wheel.lua index 6fb76f616cc..725d7902c3c 100644 --- a/scripts/actions/mobskills/aerial_wheel.lua +++ b/scripts/actions/mobskills/aerial_wheel.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local dmgmod = 1 local info = xi.mobskills.mobRangedMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.magicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.RANGED, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/aero_ii.lua b/scripts/actions/mobskills/aero_ii.lua index 9197261469e..817badc2764 100644 --- a/scripts/actions/mobskills/aero_ii.lua +++ b/scripts/actions/mobskills/aero_ii.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) diff --git a/scripts/actions/mobskills/aero_iv.lua b/scripts/actions/mobskills/aero_iv.lua index 05ec7f3705f..6e394f9bee6 100644 --- a/scripts/actions/mobskills/aero_iv.lua +++ b/scripts/actions/mobskills/aero_iv.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 4 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) diff --git a/scripts/actions/mobskills/aero_meeble_warble.lua b/scripts/actions/mobskills/aero_meeble_warble.lua index 4598f16d00e..ef4827f7179 100644 --- a/scripts/actions/mobskills/aero_meeble_warble.lua +++ b/scripts/actions/mobskills/aero_meeble_warble.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 9 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 2, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 2, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.SILENCE, 0, 0, 60) diff --git a/scripts/actions/mobskills/agaricus.lua b/scripts/actions/mobskills/agaricus.lua index 7d18c56d9de..d4508ec02cb 100644 --- a/scripts/actions/mobskills/agaricus.lua +++ b/scripts/actions/mobskills/agaricus.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, 1, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.PLAGUE, 5, 0, 60) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.SLOW, 2500, 0, 120) -- TODO: Verify slow chance and duration diff --git a/scripts/actions/mobskills/amatsu_hanaikusa.lua b/scripts/actions/mobskills/amatsu_hanaikusa.lua index da2fde40751..4cedd088713 100644 --- a/scripts/actions/mobskills/amatsu_hanaikusa.lua +++ b/scripts/actions/mobskills/amatsu_hanaikusa.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 2 local ftp = 6 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/amatsu_kazakiri.lua b/scripts/actions/mobskills/amatsu_kazakiri.lua index c28d4e9cffe..ad6cb3926ea 100644 --- a/scripts/actions/mobskills/amatsu_kazakiri.lua +++ b/scripts/actions/mobskills/amatsu_kazakiri.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 2 local ftp = 4.5 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/amatsu_torimai.lua b/scripts/actions/mobskills/amatsu_torimai.lua index ea96aea4268..7ef9229601e 100644 --- a/scripts/actions/mobskills/amatsu_torimai.lua +++ b/scripts/actions/mobskills/amatsu_torimai.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 4 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/amatsu_tsukikage.lua b/scripts/actions/mobskills/amatsu_tsukikage.lua index 06962e8177a..c3ba83bbd0d 100644 --- a/scripts/actions/mobskills/amatsu_tsukikage.lua +++ b/scripts/actions/mobskills/amatsu_tsukikage.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 2 local ftp = 3.5 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/amatsu_tsukioboro.lua b/scripts/actions/mobskills/amatsu_tsukioboro.lua index 29117676764..579b029c13a 100644 --- a/scripts/actions/mobskills/amatsu_tsukioboro.lua +++ b/scripts/actions/mobskills/amatsu_tsukioboro.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 4 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/amatsu_yukiarashi.lua b/scripts/actions/mobskills/amatsu_yukiarashi.lua index ebaeb7c70dc..61ef39faeb0 100644 --- a/scripts/actions/mobskills/amatsu_yukiarashi.lua +++ b/scripts/actions/mobskills/amatsu_yukiarashi.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 2 local ftp = 6 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/amon_drive.lua b/scripts/actions/mobskills/amon_drive.lua index 866b19bd4e4..5392a7f3315 100644 --- a/scripts/actions/mobskills/amon_drive.lua +++ b/scripts/actions/mobskills/amon_drive.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.PARALYSIS, 25, 0, 60) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.PETRIFICATION, 1, 0, math.random(8, 15) + mob:getMainLvl() / 3) diff --git a/scripts/actions/mobskills/amorphic_scythe.lua b/scripts/actions/mobskills/amorphic_scythe.lua index 1398b79c255..50dbcb2272d 100644 --- a/scripts/actions/mobskills/amorphic_scythe.lua +++ b/scripts/actions/mobskills/amorphic_scythe.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/amorphic_spikes.lua b/scripts/actions/mobskills/amorphic_spikes.lua index d34eefc0844..8392db1a4f2 100644 --- a/scripts/actions/mobskills/amorphic_spikes.lua +++ b/scripts/actions/mobskills/amorphic_spikes.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 0.6 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/antigravity.lua b/scripts/actions/mobskills/antigravity.lua index 69eb965467b..51e1f9a0c4b 100644 --- a/scripts/actions/mobskills/antigravity.lua +++ b/scripts/actions/mobskills/antigravity.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/antigravity_1.lua b/scripts/actions/mobskills/antigravity_1.lua index 8dcf573488c..68867c530fd 100644 --- a/scripts/actions/mobskills/antigravity_1.lua +++ b/scripts/actions/mobskills/antigravity_1.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:delHP(dmg) diff --git a/scripts/actions/mobskills/antigravity_2.lua b/scripts/actions/mobskills/antigravity_2.lua index 8f216cb0555..66bcaeb8415 100644 --- a/scripts/actions/mobskills/antigravity_2.lua +++ b/scripts/actions/mobskills/antigravity_2.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:delHP(dmg) diff --git a/scripts/actions/mobskills/antigravity_3.lua b/scripts/actions/mobskills/antigravity_3.lua index 144ce10746a..d7f92e67863 100644 --- a/scripts/actions/mobskills/antigravity_3.lua +++ b/scripts/actions/mobskills/antigravity_3.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:delHP(dmg) diff --git a/scripts/actions/mobskills/antimatter.lua b/scripts/actions/mobskills/antimatter.lua index 4fcc0865200..b75f60b102b 100644 --- a/scripts/actions/mobskills/antimatter.lua +++ b/scripts/actions/mobskills/antimatter.lua @@ -12,8 +12,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, 750, xi.element.LIGHT, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, 750, xi.element.LIGHT, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.LIGHT) diff --git a/scripts/actions/mobskills/aqua_ball.lua b/scripts/actions/mobskills/aqua_ball.lua index 7d167145f18..4a670b44064 100644 --- a/scripts/actions/mobskills/aqua_ball.lua +++ b/scripts/actions/mobskills/aqua_ball.lua @@ -15,8 +15,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local tick = 3 local duration = power * tick - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.STR_DOWN, power, tick, duration) diff --git a/scripts/actions/mobskills/aqua_blast.lua b/scripts/actions/mobskills/aqua_blast.lua index 6092516c21a..44c3701dfad 100644 --- a/scripts/actions/mobskills/aqua_blast.lua +++ b/scripts/actions/mobskills/aqua_blast.lua @@ -24,8 +24,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER) diff --git a/scripts/actions/mobskills/aqua_breath.lua b/scripts/actions/mobskills/aqua_breath.lua index a9f26940253..249b60f4b64 100644 --- a/scripts/actions/mobskills/aqua_breath.lua +++ b/scripts/actions/mobskills/aqua_breath.lua @@ -20,8 +20,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.WATER) diff --git a/scripts/actions/mobskills/arbor_storm.lua b/scripts/actions/mobskills/arbor_storm.lua index 660b5c01614..99b0b903184 100644 --- a/scripts/actions/mobskills/arbor_storm.lua +++ b/scripts/actions/mobskills/arbor_storm.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.WEIGHT, 75, 0, 60) return dmg diff --git a/scripts/actions/mobskills/arching_arrow.lua b/scripts/actions/mobskills/arching_arrow.lua index 83e6d59ab42..39424576593 100644 --- a/scripts/actions/mobskills/arching_arrow.lua +++ b/scripts/actions/mobskills/arching_arrow.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.NUMSHADOWS_1) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.NUMSHADOWS_1) target:takeDamage(dmg, mob, xi.attackType.RANGED, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/arctic_impact.lua b/scripts/actions/mobskills/arctic_impact.lua index 300f0baa7cd..d81ea982b02 100644 --- a/scripts/actions/mobskills/arctic_impact.lua +++ b/scripts/actions/mobskills/arctic_impact.lua @@ -11,8 +11,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.ICE, 3, 0) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.ICE, 3, 0) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.ICE) diff --git a/scripts/actions/mobskills/armor_buster.lua b/scripts/actions/mobskills/armor_buster.lua index ec6facc22e2..b735e979829 100644 --- a/scripts/actions/mobskills/armor_buster.lua +++ b/scripts/actions/mobskills/armor_buster.lua @@ -18,8 +18,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 2.5, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 2.5, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.WEIGHT, 20, 3, 45) diff --git a/scripts/actions/mobskills/arrow_deluge.lua b/scripts/actions/mobskills/arrow_deluge.lua index f7abb257bae..4f2c2536d50 100644 --- a/scripts/actions/mobskills/arrow_deluge.lua +++ b/scripts/actions/mobskills/arrow_deluge.lua @@ -21,7 +21,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) target:takeDamage(dmg, mob, xi.attackType.RANGED, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/artificial_gravity.lua b/scripts/actions/mobskills/artificial_gravity.lua index 611ec56a9b2..eaaaf1c37fc 100644 --- a/scripts/actions/mobskills/artificial_gravity.lua +++ b/scripts/actions/mobskills/artificial_gravity.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.WEIGHT, 15, 0, 60) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/artificial_gravity_1.lua b/scripts/actions/mobskills/artificial_gravity_1.lua index 6faab97a091..74e20e34e69 100644 --- a/scripts/actions/mobskills/artificial_gravity_1.lua +++ b/scripts/actions/mobskills/artificial_gravity_1.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.WEIGHT, 15, 0, 60) target:delHP(dmg) diff --git a/scripts/actions/mobskills/artificial_gravity_2.lua b/scripts/actions/mobskills/artificial_gravity_2.lua index dad84c92f61..baf2e1f4e8c 100644 --- a/scripts/actions/mobskills/artificial_gravity_2.lua +++ b/scripts/actions/mobskills/artificial_gravity_2.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.WEIGHT, 30, 0, 60) target:delHP(dmg) diff --git a/scripts/actions/mobskills/artificial_gravity_3.lua b/scripts/actions/mobskills/artificial_gravity_3.lua index 90c0ad10e25..ca60b222373 100644 --- a/scripts/actions/mobskills/artificial_gravity_3.lua +++ b/scripts/actions/mobskills/artificial_gravity_3.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.WEIGHT, 60, 0, 60) target:delHP(dmg) diff --git a/scripts/actions/mobskills/ascetics_fury.lua b/scripts/actions/mobskills/ascetics_fury.lua index b3cd9be16db..209c062693e 100644 --- a/scripts/actions/mobskills/ascetics_fury.lua +++ b/scripts/actions/mobskills/ascetics_fury.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.6 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1.1, 1.3, 1.5) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.HTH) diff --git a/scripts/actions/mobskills/astral_gate.lua b/scripts/actions/mobskills/astral_gate.lua index 8f3ba7123a6..7aca3163177 100644 --- a/scripts/actions/mobskills/astral_gate.lua +++ b/scripts/actions/mobskills/astral_gate.lua @@ -23,7 +23,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/asuran_claws.lua b/scripts/actions/mobskills/asuran_claws.lua index 1fc5c1e4b9c..ae73ff2c28a 100644 --- a/scripts/actions/mobskills/asuran_claws.lua +++ b/scripts/actions/mobskills/asuran_claws.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/asuran_fists.lua b/scripts/actions/mobskills/asuran_fists.lua index 12178980d7f..99662f02254 100644 --- a/scripts/actions/mobskills/asuran_fists.lua +++ b/scripts/actions/mobskills/asuran_fists.lua @@ -20,7 +20,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 0.8 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.HTH) diff --git a/scripts/actions/mobskills/august_melee_axe.lua b/scripts/actions/mobskills/august_melee_axe.lua index cf9d81eb1d5..5b514e24b48 100644 --- a/scripts/actions/mobskills/august_melee_axe.lua +++ b/scripts/actions/mobskills/august_melee_axe.lua @@ -13,7 +13,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) skill:setMsg(xi.msg.basic.HIT_DMG) return dmg diff --git a/scripts/actions/mobskills/august_melee_bow.lua b/scripts/actions/mobskills/august_melee_bow.lua index 2666b3d1917..2201d9e63bd 100644 --- a/scripts/actions/mobskills/august_melee_bow.lua +++ b/scripts/actions/mobskills/august_melee_bow.lua @@ -13,7 +13,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) skill:setMsg(xi.msg.basic.HIT_DMG) return dmg diff --git a/scripts/actions/mobskills/august_melee_h2h.lua b/scripts/actions/mobskills/august_melee_h2h.lua index 64ad4922361..df64f5d0c51 100644 --- a/scripts/actions/mobskills/august_melee_h2h.lua +++ b/scripts/actions/mobskills/august_melee_h2h.lua @@ -13,7 +13,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) skill:setMsg(xi.msg.basic.HIT_DMG) return dmg diff --git a/scripts/actions/mobskills/august_melee_sword.lua b/scripts/actions/mobskills/august_melee_sword.lua index 685f2df7fdc..5a81dabcb06 100644 --- a/scripts/actions/mobskills/august_melee_sword.lua +++ b/scripts/actions/mobskills/august_melee_sword.lua @@ -13,7 +13,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) skill:setMsg(xi.msg.basic.HIT_DMG) return dmg diff --git a/scripts/actions/mobskills/auroral_uppercut.lua b/scripts/actions/mobskills/auroral_uppercut.lua index 8e0cb9c3891..b4514b44003 100644 --- a/scripts/actions/mobskills/auroral_uppercut.lua +++ b/scripts/actions/mobskills/auroral_uppercut.lua @@ -9,8 +9,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.LIGHT, 2, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.LIGHT, 2, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.LIGHT) diff --git a/scripts/actions/mobskills/auroral_wind.lua b/scripts/actions/mobskills/auroral_wind.lua index d40645f67eb..cb0d7ea268b 100644 --- a/scripts/actions/mobskills/auroral_wind.lua +++ b/scripts/actions/mobskills/auroral_wind.lua @@ -18,8 +18,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = 1 + mob:getMainLvl() * math.random(2, 3) -- TODO: Needs damage scaling capture - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.LIGHT) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.SILENCE, 1, 0, 120) diff --git a/scripts/actions/mobskills/axe_kick.lua b/scripts/actions/mobskills/axe_kick.lua index 9a14ef62c2b..8be2ed822f7 100644 --- a/scripts/actions/mobskills/axe_kick.lua +++ b/scripts/actions/mobskills/axe_kick.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 1, 2, 3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/axe_throw.lua b/scripts/actions/mobskills/axe_throw.lua index 7d78b6481c1..1c545307fb1 100644 --- a/scripts/actions/mobskills/axe_throw.lua +++ b/scripts/actions/mobskills/axe_throw.lua @@ -25,7 +25,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local dmgmod = 1 local info = xi.mobskills.mobRangedMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.ACC_VARIES) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.RANGED, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.RANGED, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.RANGED, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/back_heel.lua b/scripts/actions/mobskills/back_heel.lua index 36a60fef363..5e40ba5bf84 100644 --- a/scripts/actions/mobskills/back_heel.lua +++ b/scripts/actions/mobskills/back_heel.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/back_swish.lua b/scripts/actions/mobskills/back_swish.lua index c2090962dba..496e6d44957 100644 --- a/scripts/actions/mobskills/back_swish.lua +++ b/scripts/actions/mobskills/back_swish.lua @@ -20,7 +20,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 1.5 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded * math.random(2, 3)) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded * math.random(2, 3)) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/bad_breath.lua b/scripts/actions/mobskills/bad_breath.lua index 1b03f2915bb..a19c1828f8d 100644 --- a/scripts/actions/mobskills/bad_breath.lua +++ b/scripts/actions/mobskills/bad_breath.lua @@ -21,8 +21,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.resistStat = xi.mod.INT -- TODO: Sources say this skill has a low magic accuracy. - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.EARTH, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.EARTH, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.EARTH, { breakBind = false }) diff --git a/scripts/actions/mobskills/bai_wing.lua b/scripts/actions/mobskills/bai_wing.lua index f9c9fdc25bd..1a1cf46ea81 100644 --- a/scripts/actions/mobskills/bai_wing.lua +++ b/scripts/actions/mobskills/bai_wing.lua @@ -21,8 +21,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 5 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.EARTH, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.EARTH, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.EARTH) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.SLOW, 3000, 0, 120) diff --git a/scripts/actions/mobskills/barbed_crescent.lua b/scripts/actions/mobskills/barbed_crescent.lua index f80e3c52a38..c8bde298b6b 100644 --- a/scripts/actions/mobskills/barbed_crescent.lua +++ b/scripts/actions/mobskills/barbed_crescent.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.ACCURACY_DOWN, 100, 0, 180) diff --git a/scripts/actions/mobskills/barofield.lua b/scripts/actions/mobskills/barofield.lua index fe6e69d7a71..e46f0acaf9e 100644 --- a/scripts/actions/mobskills/barofield.lua +++ b/scripts/actions/mobskills/barofield.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 2 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.WEIGHT, 25, 0, 60) diff --git a/scripts/actions/mobskills/barracuda_dive.lua b/scripts/actions/mobskills/barracuda_dive.lua index 121a69d2ddc..782e1759dba 100644 --- a/scripts/actions/mobskills/barracuda_dive.lua +++ b/scripts/actions/mobskills/barracuda_dive.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 2 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 1, 2, 3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/batterhorn.lua b/scripts/actions/mobskills/batterhorn.lua index ed9bc126a3d..7b4b24d59bf 100644 --- a/scripts/actions/mobskills/batterhorn.lua +++ b/scripts/actions/mobskills/batterhorn.lua @@ -21,7 +21,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = .8 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/battle_dance.lua b/scripts/actions/mobskills/battle_dance.lua index 43d5ddd6b9d..071b1f17087 100644 --- a/scripts/actions/mobskills/battle_dance.lua +++ b/scripts/actions/mobskills/battle_dance.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.DEX_DOWN, 10, 3, 180) diff --git a/scripts/actions/mobskills/beak_lunge.lua b/scripts/actions/mobskills/beak_lunge.lua index 99a3a45b8a1..97aefb70cf6 100644 --- a/scripts/actions/mobskills/beak_lunge.lua +++ b/scripts/actions/mobskills/beak_lunge.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) return dmg end diff --git a/scripts/actions/mobskills/bear_killer.lua b/scripts/actions/mobskills/bear_killer.lua index 9a534dfd200..d4c1ff8ba38 100644 --- a/scripts/actions/mobskills/bear_killer.lua +++ b/scripts/actions/mobskills/bear_killer.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.HTH) return dmg diff --git a/scripts/actions/mobskills/beatdown.lua b/scripts/actions/mobskills/beatdown.lua index 3aa1b9278a6..7d5b38e6a9a 100644 --- a/scripts/actions/mobskills/beatdown.lua +++ b/scripts/actions/mobskills/beatdown.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ATK_VARIES, 2, 2, 2) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BIND, 1, 0, 60) diff --git a/scripts/actions/mobskills/benthic_typhoon.lua b/scripts/actions/mobskills/benthic_typhoon.lua index cf8c4ee2b35..98b98a15af7 100644 --- a/scripts/actions/mobskills/benthic_typhoon.lua +++ b/scripts/actions/mobskills/benthic_typhoon.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.MAGIC_DEF_DOWN, 30, 0, 60) diff --git a/scripts/actions/mobskills/big_horn.lua b/scripts/actions/mobskills/big_horn.lua index c2eb70d73f6..e4b8f1f3764 100644 --- a/scripts/actions/mobskills/big_horn.lua +++ b/scripts/actions/mobskills/big_horn.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/big_scissors.lua b/scripts/actions/mobskills/big_scissors.lua index 52469d031de..1a44d6633ef 100644 --- a/scripts/actions/mobskills/big_scissors.lua +++ b/scripts/actions/mobskills/big_scissors.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/bilgestorm.lua b/scripts/actions/mobskills/bilgestorm.lua index f09f193ab8b..97504ddfb2d 100644 --- a/scripts/actions/mobskills/bilgestorm.lua +++ b/scripts/actions/mobskills/bilgestorm.lua @@ -25,7 +25,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/binary_absorption.lua b/scripts/actions/mobskills/binary_absorption.lua index 32593085b03..018a7705eed 100644 --- a/scripts/actions/mobskills/binary_absorption.lua +++ b/scripts/actions/mobskills/binary_absorption.lua @@ -13,8 +13,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() * 3.5, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - local dmg = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.NUMSHADOWS_1) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() * 3.5, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.NUMSHADOWS_1) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.HP, dmg)) diff --git a/scripts/actions/mobskills/binding_microtube.lua b/scripts/actions/mobskills/binding_microtube.lua index dda923b1e96..8c7a50ccd79 100644 --- a/scripts/actions/mobskills/binding_microtube.lua +++ b/scripts/actions/mobskills/binding_microtube.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 5 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.NONE, 2.45, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.NONE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.NONE, 2.45, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.NONE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.NONE, { breakBind = false }) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BIND, 1, 0, 60) diff --git a/scripts/actions/mobskills/biotic_boomerang.lua b/scripts/actions/mobskills/biotic_boomerang.lua index 45c56a19e26..9a7741e9b6e 100644 --- a/scripts/actions/mobskills/biotic_boomerang.lua +++ b/scripts/actions/mobskills/biotic_boomerang.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) -- TODO: Need crit scaling captures local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1, 1, 1) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.PLAGUE, 18, 3, math.random(30, 60)) diff --git a/scripts/actions/mobskills/black_cloud.lua b/scripts/actions/mobskills/black_cloud.lua index 392bb3fe35f..77cac5e493e 100644 --- a/scripts/actions/mobskills/black_cloud.lua +++ b/scripts/actions/mobskills/black_cloud.lua @@ -15,8 +15,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, 1.5, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, 1.5, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.DARK) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BLINDNESS, 20, 0, 420) diff --git a/scripts/actions/mobskills/black_halo.lua b/scripts/actions/mobskills/black_halo.lua index 806489d8f05..613c78671cb 100644 --- a/scripts/actions/mobskills/black_halo.lua +++ b/scripts/actions/mobskills/black_halo.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.0 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/blade_jin.lua b/scripts/actions/mobskills/blade_jin.lua index 062b5874e9e..6b7949fc23e 100644 --- a/scripts/actions/mobskills/blade_jin.lua +++ b/scripts/actions/mobskills/blade_jin.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ACC_VARIES, 1, 2, 3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/blade_ku.lua b/scripts/actions/mobskills/blade_ku.lua index 3a577168faa..89b404c756e 100644 --- a/scripts/actions/mobskills/blade_ku.lua +++ b/scripts/actions/mobskills/blade_ku.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ACC_VARIES, 1, 2, 3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/blade_metsu.lua b/scripts/actions/mobskills/blade_metsu.lua index 90d3de3772e..e1abaae4b63 100644 --- a/scripts/actions/mobskills/blade_metsu.lua +++ b/scripts/actions/mobskills/blade_metsu.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2.5 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.PARALYSIS, 10, 0, 60) -- Is this real...? diff --git a/scripts/actions/mobskills/blade_to.lua b/scripts/actions/mobskills/blade_to.lua index 85a9a2c159c..2e63bd73487 100644 --- a/scripts/actions/mobskills/blade_to.lua +++ b/scripts/actions/mobskills/blade_to.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ACC_VARIES, 1, 2, 3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/blastbomb.lua b/scripts/actions/mobskills/blastbomb.lua index edaa5c6a5e8..dd621a6ce2a 100644 --- a/scripts/actions/mobskills/blastbomb.lua +++ b/scripts/actions/mobskills/blastbomb.lua @@ -10,8 +10,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.FIRE, 3, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.FIRE, 3, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE, { breakBind = false }) diff --git a/scripts/actions/mobskills/blazing_bound.lua b/scripts/actions/mobskills/blazing_bound.lua index 09508ac8567..11cdae3ab67 100644 --- a/scripts/actions/mobskills/blazing_bound.lua +++ b/scripts/actions/mobskills/blazing_bound.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/blind_side_barrage.lua b/scripts/actions/mobskills/blind_side_barrage.lua index 3a04f24da09..0d7d69ab83b 100644 --- a/scripts/actions/mobskills/blind_side_barrage.lua +++ b/scripts/actions/mobskills/blind_side_barrage.lua @@ -20,7 +20,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local power = 3 + math.floor(mob:getMainLvl() / 5) local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.MND_DOWN, power, 0, 120) -- Does not decay xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.INT_DOWN, power, 0, 120) diff --git a/scripts/actions/mobskills/blind_vortex.lua b/scripts/actions/mobskills/blind_vortex.lua index 65212d67a74..221dd17813e 100644 --- a/scripts/actions/mobskills/blind_vortex.lua +++ b/scripts/actions/mobskills/blind_vortex.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1.5 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/blindeye.lua b/scripts/actions/mobskills/blindeye.lua index 7b0d4c8f76b..466731a407a 100644 --- a/scripts/actions/mobskills/blindeye.lua +++ b/scripts/actions/mobskills/blindeye.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BLINDNESS, 30, 0, 30) diff --git a/scripts/actions/mobskills/blitzstrahl.lua b/scripts/actions/mobskills/blitzstrahl.lua index 2d7b8361463..96a2288736b 100644 --- a/scripts/actions/mobskills/blitzstrahl.lua +++ b/scripts/actions/mobskills/blitzstrahl.lua @@ -12,8 +12,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.THUNDER, 1.5, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.THUNDER, 1.5, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.THUNDER) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/blizzard_breath.lua b/scripts/actions/mobskills/blizzard_breath.lua index 9d6082c7afa..b1433c65962 100644 --- a/scripts/actions/mobskills/blizzard_breath.lua +++ b/scripts/actions/mobskills/blizzard_breath.lua @@ -20,8 +20,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.ICE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.ICE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.ICE) diff --git a/scripts/actions/mobskills/blizzard_ii.lua b/scripts/actions/mobskills/blizzard_ii.lua index 3527b6f6898..4fd89c6b496 100644 --- a/scripts/actions/mobskills/blizzard_ii.lua +++ b/scripts/actions/mobskills/blizzard_ii.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.ICE, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.ICE, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.ICE) diff --git a/scripts/actions/mobskills/blizzard_iv.lua b/scripts/actions/mobskills/blizzard_iv.lua index 3f00305c0b0..38445aaf11e 100644 --- a/scripts/actions/mobskills/blizzard_iv.lua +++ b/scripts/actions/mobskills/blizzard_iv.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 4 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.ICE, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.ICE, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.ICE) diff --git a/scripts/actions/mobskills/blizzard_meeble_warble.lua b/scripts/actions/mobskills/blizzard_meeble_warble.lua index b6828887001..23b5b1e1d32 100644 --- a/scripts/actions/mobskills/blizzard_meeble_warble.lua +++ b/scripts/actions/mobskills/blizzard_meeble_warble.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 9 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 2, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 2, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.PARALYSIS, 50, 0, 60) diff --git a/scripts/actions/mobskills/blockhead.lua b/scripts/actions/mobskills/blockhead.lua index 85f1d6cef4c..99037b40d0e 100644 --- a/scripts/actions/mobskills/blockhead.lua +++ b/scripts/actions/mobskills/blockhead.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/blood_drain.lua b/scripts/actions/mobskills/blood_drain.lua index 67f144db444..55681da4df8 100644 --- a/scripts/actions/mobskills/blood_drain.lua +++ b/scripts/actions/mobskills/blood_drain.lua @@ -19,8 +19,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) shadow = xi.mobskills.shadowBehavior.IGNORE_SHADOWS end - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, shadow) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, shadow) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.HP, damage)) diff --git a/scripts/actions/mobskills/blood_saber.lua b/scripts/actions/mobskills/blood_saber.lua index db722c1855c..253c0c88e07 100644 --- a/scripts/actions/mobskills/blood_saber.lua +++ b/scripts/actions/mobskills/blood_saber.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.HP, damage)) diff --git a/scripts/actions/mobskills/bloodrake.lua b/scripts/actions/mobskills/bloodrake.lua index 4b610450578..7204e8a00bb 100644 --- a/scripts/actions/mobskills/bloodrake.lua +++ b/scripts/actions/mobskills/bloodrake.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3.0 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.HP, dmg)) diff --git a/scripts/actions/mobskills/bloody_beak.lua b/scripts/actions/mobskills/bloody_beak.lua index 201265f1f11..94aa1b96ce5 100644 --- a/scripts/actions/mobskills/bloody_beak.lua +++ b/scripts/actions/mobskills/bloody_beak.lua @@ -18,8 +18,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.HP, damage)) diff --git a/scripts/actions/mobskills/bloody_caress.lua b/scripts/actions/mobskills/bloody_caress.lua index 740bcf3c1b4..d699afd121c 100644 --- a/scripts/actions/mobskills/bloody_caress.lua +++ b/scripts/actions/mobskills/bloody_caress.lua @@ -24,7 +24,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) -- the charmed monsters. local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ACC_VARIES, 1, 2, 3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.HP, dmg)) return dmg diff --git a/scripts/actions/mobskills/bloody_claw.lua b/scripts/actions/mobskills/bloody_claw.lua index f8b05e6a4e0..8a97595be3d 100644 --- a/scripts/actions/mobskills/bloody_claw.lua +++ b/scripts/actions/mobskills/bloody_claw.lua @@ -25,7 +25,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local typeEffect = 136 + math.random(0, 6) -- 136 is xi.effect.STR_DOWN add 0 to 6 for all 7 of the possible attribute reductions local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.HP, dmg)) diff --git a/scripts/actions/mobskills/blow.lua b/scripts/actions/mobskills/blow.lua index b15e310f3d2..4cdd636bcfd 100644 --- a/scripts/actions/mobskills/blow.lua +++ b/scripts/actions/mobskills/blow.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ATK_VARIES, 1.5, 1.5, 1.5) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/bludgeon.lua b/scripts/actions/mobskills/bludgeon.lua index 1cc6444f1ee..7f1c3f6cb53 100644 --- a/scripts/actions/mobskills/bludgeon.lua +++ b/scripts/actions/mobskills/bludgeon.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ACC_VARIES, 1, 2, 3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/body_slam.lua b/scripts/actions/mobskills/body_slam.lua index f06efb7bed2..bbeb9426b54 100644 --- a/scripts/actions/mobskills/body_slam.lua +++ b/scripts/actions/mobskills/body_slam.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 3 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/bomb_toss.lua b/scripts/actions/mobskills/bomb_toss.lua index 6a595e2388a..9f9d8958f9e 100644 --- a/scripts/actions/mobskills/bomb_toss.lua +++ b/scripts/actions/mobskills/bomb_toss.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/bomb_toss_suicide.lua b/scripts/actions/mobskills/bomb_toss_suicide.lua index a0c3517b362..b24e5f9c835 100644 --- a/scripts/actions/mobskills/bomb_toss_suicide.lua +++ b/scripts/actions/mobskills/bomb_toss_suicide.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = math.floor(mob:getWeaponDmg() * math.random(12, 18) * skill:getMobHPP() / 100) - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/bone_crunch.lua b/scripts/actions/mobskills/bone_crunch.lua index 0d6e82557eb..428dd86dcad 100644 --- a/scripts/actions/mobskills/bone_crunch.lua +++ b/scripts/actions/mobskills/bone_crunch.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) if dmg > 0 then diff --git a/scripts/actions/mobskills/bonebreaking_barrage.lua b/scripts/actions/mobskills/bonebreaking_barrage.lua index 9dd81a88c84..2ce593a4c64 100644 --- a/scripts/actions/mobskills/bonebreaking_barrage.lua +++ b/scripts/actions/mobskills/bonebreaking_barrage.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.0 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.MAX_HP_DOWN, 0, 0, 60) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.WEIGHT, 50, 0, 30) diff --git a/scripts/actions/mobskills/brain_crush.lua b/scripts/actions/mobskills/brain_crush.lua index c90790ae3bc..a636f557da3 100644 --- a/scripts/actions/mobskills/brain_crush.lua +++ b/scripts/actions/mobskills/brain_crush.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) if dmg > 0 then diff --git a/scripts/actions/mobskills/brain_drain.lua b/scripts/actions/mobskills/brain_drain.lua index 68b62a4bacd..5b4444badbe 100644 --- a/scripts/actions/mobskills/brain_drain.lua +++ b/scripts/actions/mobskills/brain_drain.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.INT_DOWN, 10, 3, 120) diff --git a/scripts/actions/mobskills/brain_spike.lua b/scripts/actions/mobskills/brain_spike.lua index a167865f84c..d3291dc86f7 100644 --- a/scripts/actions/mobskills/brain_spike.lua +++ b/scripts/actions/mobskills/brain_spike.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 1 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/broadside_barrage.lua b/scripts/actions/mobskills/broadside_barrage.lua index 752a8e8d528..437c01da591 100644 --- a/scripts/actions/mobskills/broadside_barrage.lua +++ b/scripts/actions/mobskills/broadside_barrage.lua @@ -20,7 +20,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local power = 3 + math.floor(mob:getMainLvl() / 5) local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STR_DOWN, power, 0, 120) -- Does not decay xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.VIT_DOWN, power, 0, 120) diff --git a/scripts/actions/mobskills/bubble_shower.lua b/scripts/actions/mobskills/bubble_shower.lua index 2f82260597e..b3885b01c9a 100644 --- a/scripts/actions/mobskills/bubble_shower.lua +++ b/scripts/actions/mobskills/bubble_shower.lua @@ -22,8 +22,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) -- TODO: Jug Pet differences - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.WATER) diff --git a/scripts/actions/mobskills/burning_blade.lua b/scripts/actions/mobskills/burning_blade.lua index d2df1bfcdb9..50049e88b88 100644 --- a/scripts/actions/mobskills/burning_blade.lua +++ b/scripts/actions/mobskills/burning_blade.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.DMG_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.NUMSHADOWS_1) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.DMG_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.NUMSHADOWS_1) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/burst.lua b/scripts/actions/mobskills/burst.lua index 57935974d9a..72cec3ae1d1 100644 --- a/scripts/actions/mobskills/burst.lua +++ b/scripts/actions/mobskills/burst.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/calamitous_wind.lua b/scripts/actions/mobskills/calamitous_wind.lua index 0ad2002a19a..b8feeff4dfc 100644 --- a/scripts/actions/mobskills/calamitous_wind.lua +++ b/scripts/actions/mobskills/calamitous_wind.lua @@ -22,8 +22,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 4 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) -- TODO: Should print *each* effect dispelled in addition to damage taken. target:dispelAllStatusEffect(bit.bor(xi.effectFlag.DISPELABLE, xi.effectFlag.FOOD)) diff --git a/scripts/actions/mobskills/calamity.lua b/scripts/actions/mobskills/calamity.lua index 019e558d18e..622633a2df8 100644 --- a/scripts/actions/mobskills/calamity.lua +++ b/scripts/actions/mobskills/calamity.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) -- Didn't see any numbers, so just giving it something on par with other AAs. target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/calcifying_claw.lua b/scripts/actions/mobskills/calcifying_claw.lua index 58e1b554bcf..44afe747998 100644 --- a/scripts/actions/mobskills/calcifying_claw.lua +++ b/scripts/actions/mobskills/calcifying_claw.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.0 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.PETRIFICATION, 50, 0, 30) diff --git a/scripts/actions/mobskills/calcifying_deluge.lua b/scripts/actions/mobskills/calcifying_deluge.lua index a1f3a4c2beb..dd20d2c652b 100644 --- a/scripts/actions/mobskills/calcifying_deluge.lua +++ b/scripts/actions/mobskills/calcifying_deluge.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.PETRIFICATION, 1, 0, 120) diff --git a/scripts/actions/mobskills/camisado.lua b/scripts/actions/mobskills/camisado.lua index ee5cb7bf344..fb845a8fc2c 100644 --- a/scripts/actions/mobskills/camisado.lua +++ b/scripts/actions/mobskills/camisado.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/cannonball.lua b/scripts/actions/mobskills/cannonball.lua index 89fcfd27f2f..5549d3f537c 100644 --- a/scripts/actions/mobskills/cannonball.lua +++ b/scripts/actions/mobskills/cannonball.lua @@ -24,7 +24,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 1.5 local params = { isCannonball = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/carousel.lua b/scripts/actions/mobskills/carousel.lua index 30ae257df48..9b0475ee06d 100644 --- a/scripts/actions/mobskills/carousel.lua +++ b/scripts/actions/mobskills/carousel.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 0.8 local ftp = 1.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/catapult.lua b/scripts/actions/mobskills/catapult.lua index 20ed2b715ca..df80a904822 100644 --- a/scripts/actions/mobskills/catapult.lua +++ b/scripts/actions/mobskills/catapult.lua @@ -21,7 +21,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local info = xi.mobskills.mobRangedMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.magicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, info.hitslanded) if dmg > 0 then target:addTP(20) diff --git a/scripts/actions/mobskills/catastrophe.lua b/scripts/actions/mobskills/catastrophe.lua index be94bde4128..40dac2ddd9d 100644 --- a/scripts/actions/mobskills/catastrophe.lua +++ b/scripts/actions/mobskills/catastrophe.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2.5 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.HP, dmg)) return dmg diff --git a/scripts/actions/mobskills/chaos_blade.lua b/scripts/actions/mobskills/chaos_blade.lua index 9809bfc6c70..953b106a7f7 100644 --- a/scripts/actions/mobskills/chaos_blade.lua +++ b/scripts/actions/mobskills/chaos_blade.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.DARK) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.CURSE_I, 25, 0, 420) diff --git a/scripts/actions/mobskills/chaos_breath.lua b/scripts/actions/mobskills/chaos_breath.lua index ad401985a15..ef644d53582 100644 --- a/scripts/actions/mobskills/chaos_breath.lua +++ b/scripts/actions/mobskills/chaos_breath.lua @@ -20,8 +20,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.DARK) diff --git a/scripts/actions/mobskills/chaotic_strike.lua b/scripts/actions/mobskills/chaotic_strike.lua index f52153ef6e3..d0931da0249 100644 --- a/scripts/actions/mobskills/chaotic_strike.lua +++ b/scripts/actions/mobskills/chaotic_strike.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 1, 2, 3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 10) diff --git a/scripts/actions/mobskills/charged_whisker.lua b/scripts/actions/mobskills/charged_whisker.lua index 3141e6cd829..13040c96327 100644 --- a/scripts/actions/mobskills/charged_whisker.lua +++ b/scripts/actions/mobskills/charged_whisker.lua @@ -10,8 +10,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.THUNDER, 3, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.THUNDER, 3, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.THUNDER) diff --git a/scripts/actions/mobskills/choke_breath.lua b/scripts/actions/mobskills/choke_breath.lua index cc7cc1af004..56419face46 100644 --- a/scripts/actions/mobskills/choke_breath.lua +++ b/scripts/actions/mobskills/choke_breath.lua @@ -13,7 +13,12 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local chokeBreath = 100 - local dmg = xi.mobskills.mobFinalAdjustments(chokeBreath, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_1) + local info = + { + damage = chokeBreath + } + + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_1) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/choke_chain.lua b/scripts/actions/mobskills/choke_chain.lua index c541766ddaa..85fccb5fe5e 100644 --- a/scripts/actions/mobskills/choke_chain.lua +++ b/scripts/actions/mobskills/choke_chain.lua @@ -21,8 +21,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 2 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.MAB_BONUS) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.NUMSHADOWS_2) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.MAB_BONUS) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.NUMSHADOWS_2) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.DARK) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BIND, 1, 0, 30) diff --git a/scripts/actions/mobskills/chomp_rush.lua b/scripts/actions/mobskills/chomp_rush.lua index 2f92f5edc27..b1a5fd36408 100644 --- a/scripts/actions/mobskills/chomp_rush.lua +++ b/scripts/actions/mobskills/chomp_rush.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.SLOW, 1250, 0, 60) diff --git a/scripts/actions/mobskills/circle_blade.lua b/scripts/actions/mobskills/circle_blade.lua index 88838ed1aa9..b48bfff1c0f 100644 --- a/scripts/actions/mobskills/circle_blade.lua +++ b/scripts/actions/mobskills/circle_blade.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_1) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_1) -- About 200-300 target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/circle_of_flames.lua b/scripts/actions/mobskills/circle_of_flames.lua index 28c04522fbb..e5bb388232b 100644 --- a/scripts/actions/mobskills/circle_of_flames.lua +++ b/scripts/actions/mobskills/circle_of_flames.lua @@ -27,8 +27,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = (mob:getMainLvl() + 2) + (25 * bombsExploded) - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 0.5, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 0.5, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/citadel_buster.lua b/scripts/actions/mobskills/citadel_buster.lua index 04906325e38..c99fffcc197 100644 --- a/scripts/actions/mobskills/citadel_buster.lua +++ b/scripts/actions/mobskills/citadel_buster.lua @@ -29,7 +29,11 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) end local damage = basedmg / (1 + (target:getMod(xi.mod.MDEF) / 100)) - local dmg = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = + { + damage = damage + } + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(dmg, mob, xi.attackType.MAGICAL, xi.damageType.LIGHT) mob:resetEnmity(target) diff --git a/scripts/actions/mobskills/clarsach_call.lua b/scripts/actions/mobskills/clarsach_call.lua index 8f293edfd0f..9b1d76474b4 100644 --- a/scripts/actions/mobskills/clarsach_call.lua +++ b/scripts/actions/mobskills/clarsach_call.lua @@ -11,8 +11,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 2.5 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 3, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 3, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) diff --git a/scripts/actions/mobskills/claw.lua b/scripts/actions/mobskills/claw.lua index 9d68849a143..e4d522546ae 100644 --- a/scripts/actions/mobskills/claw.lua +++ b/scripts/actions/mobskills/claw.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 1, 2, 3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) return dmg end diff --git a/scripts/actions/mobskills/claw_cyclone.lua b/scripts/actions/mobskills/claw_cyclone.lua index e5ae00da6ec..e3707fdb902 100644 --- a/scripts/actions/mobskills/claw_cyclone.lua +++ b/scripts/actions/mobskills/claw_cyclone.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/claw_storm.lua b/scripts/actions/mobskills/claw_storm.lua index 3e9b3813bf6..f7c586d939b 100644 --- a/scripts/actions/mobskills/claw_storm.lua +++ b/scripts/actions/mobskills/claw_storm.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.POISON, 7, 3, 60) diff --git a/scripts/actions/mobskills/clobber.lua b/scripts/actions/mobskills/clobber.lua index 7398026a33c..8c7d64a3b85 100644 --- a/scripts/actions/mobskills/clobber.lua +++ b/scripts/actions/mobskills/clobber.lua @@ -21,7 +21,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = .8 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/cold_breath.lua b/scripts/actions/mobskills/cold_breath.lua index b6ea68b7a20..ca8f8b91c79 100644 --- a/scripts/actions/mobskills/cold_breath.lua +++ b/scripts/actions/mobskills/cold_breath.lua @@ -20,8 +20,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.ICE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.ICE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.ICE, { breakBind = false }) diff --git a/scripts/actions/mobskills/colossal_blow.lua b/scripts/actions/mobskills/colossal_blow.lua index 673d23b9221..c63028a9de8 100644 --- a/scripts/actions/mobskills/colossal_blow.lua +++ b/scripts/actions/mobskills/colossal_blow.lua @@ -18,7 +18,12 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) damage = currentHP * .95 end - local dmg = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = + { + damage + } + + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) mob:resetEnmity(target) diff --git a/scripts/actions/mobskills/colossal_slam.lua b/scripts/actions/mobskills/colossal_slam.lua index 79177559485..a78de6558ca 100644 --- a/scripts/actions/mobskills/colossal_slam.lua +++ b/scripts/actions/mobskills/colossal_slam.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3.0 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.NUMSHADOWS_3) -- TODO: The duration needs verification from retail xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.CURSE_II, 0, 0, 30) diff --git a/scripts/actions/mobskills/combo.lua b/scripts/actions/mobskills/combo.lua index f151bef3c08..be7e7e18b8f 100644 --- a/scripts/actions/mobskills/combo.lua +++ b/scripts/actions/mobskills/combo.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.HTH) return dmg diff --git a/scripts/actions/mobskills/concussive_oscillation.lua b/scripts/actions/mobskills/concussive_oscillation.lua index bbde1128cc2..1815ad54a23 100644 --- a/scripts/actions/mobskills/concussive_oscillation.lua +++ b/scripts/actions/mobskills/concussive_oscillation.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.NUMSHADOWS_3) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.WEIGHT, 75, 0, 120) diff --git a/scripts/actions/mobskills/condemnation.lua b/scripts/actions/mobskills/condemnation.lua index 3dd123e7405..ed380c9f959 100644 --- a/scripts/actions/mobskills/condemnation.lua +++ b/scripts/actions/mobskills/condemnation.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 6) diff --git a/scripts/actions/mobskills/core_meltdown.lua b/scripts/actions/mobskills/core_meltdown.lua index eafebbbad0c..2d6ee44e516 100644 --- a/scripts/actions/mobskills/core_meltdown.lua +++ b/scripts/actions/mobskills/core_meltdown.lua @@ -23,8 +23,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = math.floor(mob:getHP() * 0.5) - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/coronach.lua b/scripts/actions/mobskills/coronach.lua index 1a6b0f7385f..831d9bc8c2e 100644 --- a/scripts/actions/mobskills/coronach.lua +++ b/scripts/actions/mobskills/coronach.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2.5 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.RANGED, xi.damageType.PIERCING) return dmg diff --git a/scripts/actions/mobskills/corrosive_ooze.lua b/scripts/actions/mobskills/corrosive_ooze.lua index 0dcef080bbe..03ea4393a65 100644 --- a/scripts/actions/mobskills/corrosive_ooze.lua +++ b/scripts/actions/mobskills/corrosive_ooze.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 4.2 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.ATTACK_DOWN, 15, 0, 120) diff --git a/scripts/actions/mobskills/cosmic_elucidation.lua b/scripts/actions/mobskills/cosmic_elucidation.lua index 66835265777..fb7872353d5 100644 --- a/scripts/actions/mobskills/cosmic_elucidation.lua +++ b/scripts/actions/mobskills/cosmic_elucidation.lua @@ -14,8 +14,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.LIGHT, 14, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, 0) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.LIGHT, 14, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, 0) target:takeDamage(damage, mob, xi.attackType.SPECIAL, xi.damageType.ELEMENTAL) skill:setMsg(xi.msg.basic.SKILLCHAIN_COSMIC_ELUCIDATION) diff --git a/scripts/actions/mobskills/counterspore.lua b/scripts/actions/mobskills/counterspore.lua index 1450c54e9a1..1cce5c8f754 100644 --- a/scripts/actions/mobskills/counterspore.lua +++ b/scripts/actions/mobskills/counterspore.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local dmgMod = 3.0 - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WATER, dmgMod, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WATER, dmgMod, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER) diff --git a/scripts/actions/mobskills/crescent_fang.lua b/scripts/actions/mobskills/crescent_fang.lua index 1da4d220b52..49a8417767b 100644 --- a/scripts/actions/mobskills/crescent_fang.lua +++ b/scripts/actions/mobskills/crescent_fang.lua @@ -14,8 +14,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 2 local ftp = 5 - local damage = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 1, 2, 3) - local totaldamage = xi.mobskills.mobFinalAdjustments(damage.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, numhits) + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 1, 2, 3) + local totaldamage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, numhits) target:takeDamage(totaldamage, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/crescent_moon.lua b/scripts/actions/mobskills/crescent_moon.lua index 469ec8b007d..3e062eacf06 100644 --- a/scripts/actions/mobskills/crescent_moon.lua +++ b/scripts/actions/mobskills/crescent_moon.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/crippling_slam.lua b/scripts/actions/mobskills/crippling_slam.lua index eddc91a32f7..75f5ffa39aa 100644 --- a/scripts/actions/mobskills/crippling_slam.lua +++ b/scripts/actions/mobskills/crippling_slam.lua @@ -21,7 +21,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 4 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) local duration = xi.mobskills.calculateDuration(skill:getTP(), 30, 60) diff --git a/scripts/actions/mobskills/crispy_candle.lua b/scripts/actions/mobskills/crispy_candle.lua index 3c4881504c1..4944cfc7a4e 100644 --- a/scripts/actions/mobskills/crispy_candle.lua +++ b/scripts/actions/mobskills/crispy_candle.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 4 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/critical_bite.lua b/scripts/actions/mobskills/critical_bite.lua index 07c430cb0b9..092921f0a8b 100644 --- a/scripts/actions/mobskills/critical_bite.lua +++ b/scripts/actions/mobskills/critical_bite.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ATK_VARIES, 1.5, 1.5, 1.5, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) return dmg diff --git a/scripts/actions/mobskills/cronos_sling_eta.lua b/scripts/actions/mobskills/cronos_sling_eta.lua index c4d73421863..697e5eacf23 100644 --- a/scripts/actions/mobskills/cronos_sling_eta.lua +++ b/scripts/actions/mobskills/cronos_sling_eta.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.25 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/cronos_sling_lambda.lua b/scripts/actions/mobskills/cronos_sling_lambda.lua index b12ee089b8b..885803e8be7 100644 --- a/scripts/actions/mobskills/cronos_sling_lambda.lua +++ b/scripts/actions/mobskills/cronos_sling_lambda.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.75 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/cronos_sling_theta.lua b/scripts/actions/mobskills/cronos_sling_theta.lua index efa9ce74f12..f67d689dfea 100644 --- a/scripts/actions/mobskills/cronos_sling_theta.lua +++ b/scripts/actions/mobskills/cronos_sling_theta.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.5 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/cross_attack.lua b/scripts/actions/mobskills/cross_attack.lua index a9ca3ff16a8..954e44e3e9d 100644 --- a/scripts/actions/mobskills/cross_attack.lua +++ b/scripts/actions/mobskills/cross_attack.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ATK_VARIES, 1.5, 1.5, 1.5) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.HTH) return dmg end diff --git a/scripts/actions/mobskills/cross_reaver.lua b/scripts/actions/mobskills/cross_reaver.lua index 83ab081fe71..e66d723c952 100644 --- a/scripts/actions/mobskills/cross_reaver.lua +++ b/scripts/actions/mobskills/cross_reaver.lua @@ -21,7 +21,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 4 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/crossthrash.lua b/scripts/actions/mobskills/crossthrash.lua index 381401d312a..9d59fc2c0eb 100644 --- a/scripts/actions/mobskills/crossthrash.lua +++ b/scripts/actions/mobskills/crossthrash.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/crosswind.lua b/scripts/actions/mobskills/crosswind.lua index 1f5730711d4..68c4bd1714e 100644 --- a/scripts/actions/mobskills/crosswind.lua +++ b/scripts/actions/mobskills/crosswind.lua @@ -27,8 +27,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.WIND) diff --git a/scripts/actions/mobskills/cryo_jet.lua b/scripts/actions/mobskills/cryo_jet.lua index 93d808e9c2f..0fa6b6a83f2 100644 --- a/scripts/actions/mobskills/cryo_jet.lua +++ b/scripts/actions/mobskills/cryo_jet.lua @@ -21,8 +21,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.ICE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.ICE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.ICE) diff --git a/scripts/actions/mobskills/crystal_rain.lua b/scripts/actions/mobskills/crystal_rain.lua index 93d72269ea7..75b4d5950f7 100644 --- a/scripts/actions/mobskills/crystal_rain.lua +++ b/scripts/actions/mobskills/crystal_rain.lua @@ -11,8 +11,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.NONE, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ELEMENTAL, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.NONE, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ELEMENTAL, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.ELEMENTAL) diff --git a/scripts/actions/mobskills/crystal_weapon_fire.lua b/scripts/actions/mobskills/crystal_weapon_fire.lua index 120eed283e3..7b80c6c11fc 100644 --- a/scripts/actions/mobskills/crystal_weapon_fire.lua +++ b/scripts/actions/mobskills/crystal_weapon_fire.lua @@ -15,8 +15,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.FIRE, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.FIRE, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/crystal_weapon_stone.lua b/scripts/actions/mobskills/crystal_weapon_stone.lua index 8b8c2da3997..0408308adc0 100644 --- a/scripts/actions/mobskills/crystal_weapon_stone.lua +++ b/scripts/actions/mobskills/crystal_weapon_stone.lua @@ -15,8 +15,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.EARTH, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.EARTH, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.EARTH) diff --git a/scripts/actions/mobskills/crystal_weapon_water.lua b/scripts/actions/mobskills/crystal_weapon_water.lua index 87339e41699..d0d50952667 100644 --- a/scripts/actions/mobskills/crystal_weapon_water.lua +++ b/scripts/actions/mobskills/crystal_weapon_water.lua @@ -15,8 +15,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WATER, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WATER, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER) diff --git a/scripts/actions/mobskills/crystal_weapon_wind.lua b/scripts/actions/mobskills/crystal_weapon_wind.lua index 3930f2444a9..b9044590fce 100644 --- a/scripts/actions/mobskills/crystal_weapon_wind.lua +++ b/scripts/actions/mobskills/crystal_weapon_wind.lua @@ -15,8 +15,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WIND, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WIND, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) diff --git a/scripts/actions/mobskills/cursed_sphere.lua b/scripts/actions/mobskills/cursed_sphere.lua index 8c113061d25..dbb5e26e238 100644 --- a/scripts/actions/mobskills/cursed_sphere.lua +++ b/scripts/actions/mobskills/cursed_sphere.lua @@ -12,8 +12,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, 2, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, 2, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.DARK) diff --git a/scripts/actions/mobskills/cyclone_wing.lua b/scripts/actions/mobskills/cyclone_wing.lua index 4b7396a6e1b..6a9c21164d2 100644 --- a/scripts/actions/mobskills/cyclone_wing.lua +++ b/scripts/actions/mobskills/cyclone_wing.lua @@ -22,8 +22,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, 4, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, 4, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.DARK) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.SLEEP_I, 1, 0, 60) diff --git a/scripts/actions/mobskills/cyclonic_torrent.lua b/scripts/actions/mobskills/cyclonic_torrent.lua index 96f0b1b497c..76ac7ca45b8 100644 --- a/scripts/actions/mobskills/cyclonic_torrent.lua +++ b/scripts/actions/mobskills/cyclonic_torrent.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.MUTE, 1, 0, 60) diff --git a/scripts/actions/mobskills/cyclonic_turmoil.lua b/scripts/actions/mobskills/cyclonic_turmoil.lua index bee03a8dc6a..67adb370f8e 100644 --- a/scripts/actions/mobskills/cyclonic_turmoil.lua +++ b/scripts/actions/mobskills/cyclonic_turmoil.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 2.8 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) local dispel1 = target:dispelStatusEffect() local dispel2 = target:dispelStatusEffect() diff --git a/scripts/actions/mobskills/cyclotail.lua b/scripts/actions/mobskills/cyclotail.lua index e72b73a171e..dc034ef5d39 100644 --- a/scripts/actions/mobskills/cyclotail.lua +++ b/scripts/actions/mobskills/cyclotail.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/damnation_dive.lua b/scripts/actions/mobskills/damnation_dive.lua index e659b999c8e..f63ce88db2c 100644 --- a/scripts/actions/mobskills/damnation_dive.lua +++ b/scripts/actions/mobskills/damnation_dive.lua @@ -31,7 +31,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 15) diff --git a/scripts/actions/mobskills/damnation_dive_nm.lua b/scripts/actions/mobskills/damnation_dive_nm.lua index c06981f0535..ac6bcea0e0d 100644 --- a/scripts/actions/mobskills/damnation_dive_nm.lua +++ b/scripts/actions/mobskills/damnation_dive_nm.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 15) diff --git a/scripts/actions/mobskills/dancing_edge.lua b/scripts/actions/mobskills/dancing_edge.lua index 0b3d55dc870..824a53e0f9a 100644 --- a/scripts/actions/mobskills/dancing_edge.lua +++ b/scripts/actions/mobskills/dancing_edge.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local tp = skill:getTP() local accmod = 0.8 + 0.1 * math.floor((tp - 1000) / 1000) local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/dark_mist.lua b/scripts/actions/mobskills/dark_mist.lua index 3f10dab7d84..353ec6f813b 100644 --- a/scripts/actions/mobskills/dark_mist.lua +++ b/scripts/actions/mobskills/dark_mist.lua @@ -21,8 +21,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 4 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.MAB_BONUS) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.MAB_BONUS) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.DARK) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.WEIGHT, 50, 0, 60) diff --git a/scripts/actions/mobskills/dark_nova.lua b/scripts/actions/mobskills/dark_nova.lua index 7feae2931ad..79d9469a32b 100644 --- a/scripts/actions/mobskills/dark_nova.lua +++ b/scripts/actions/mobskills/dark_nova.lua @@ -13,8 +13,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, 2, xi.mobskills.magicalTpBonus.MAB_BONUS) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, 2, xi.mobskills.magicalTpBonus.MAB_BONUS) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.DARK) diff --git a/scripts/actions/mobskills/dark_orb.lua b/scripts/actions/mobskills/dark_orb.lua index 550171a24e9..26ab016e459 100644 --- a/scripts/actions/mobskills/dark_orb.lua +++ b/scripts/actions/mobskills/dark_orb.lua @@ -21,8 +21,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 5.5 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.MAB_BONUS) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.MAB_BONUS) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.DARK) diff --git a/scripts/actions/mobskills/dark_sphere.lua b/scripts/actions/mobskills/dark_sphere.lua index 50de647cc87..a4450922a96 100644 --- a/scripts/actions/mobskills/dark_sphere.lua +++ b/scripts/actions/mobskills/dark_sphere.lua @@ -13,8 +13,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, 3.0, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.NUMSHADOWS_1) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, 3.0, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.NUMSHADOWS_1) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.DARK) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BLINDNESS, 20, 0, 300) diff --git a/scripts/actions/mobskills/dark_spore.lua b/scripts/actions/mobskills/dark_spore.lua index 4a359811c89..210098cc537 100644 --- a/scripts/actions/mobskills/dark_spore.lua +++ b/scripts/actions/mobskills/dark_spore.lua @@ -22,8 +22,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) -- TODO: Jug pet differences. - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.DARK) diff --git a/scripts/actions/mobskills/dark_wave.lua b/scripts/actions/mobskills/dark_wave.lua index bcbac5a8168..91686fd646b 100644 --- a/scripts/actions/mobskills/dark_wave.lua +++ b/scripts/actions/mobskills/dark_wave.lua @@ -23,8 +23,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) power = 8 + hour - 11 end - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.DARK) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BIO, power, 3, 60) diff --git a/scripts/actions/mobskills/deadly_drive.lua b/scripts/actions/mobskills/deadly_drive.lua index 9400d3ce106..12480552fbe 100644 --- a/scripts/actions/mobskills/deadly_drive.lua +++ b/scripts/actions/mobskills/deadly_drive.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2.5 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/deadly_hold.lua b/scripts/actions/mobskills/deadly_hold.lua index 100767b8d93..655a59b427f 100644 --- a/scripts/actions/mobskills/deadly_hold.lua +++ b/scripts/actions/mobskills/deadly_hold.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 1.5 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ATK_VARIES, 2, 2, 2, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/deal_out.lua b/scripts/actions/mobskills/deal_out.lua index 7ab0b2a1602..2db01219557 100644 --- a/scripts/actions/mobskills/deal_out.lua +++ b/scripts/actions/mobskills/deal_out.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) if mob:isMobType(xi.mobType.NOTORIOUS) then mob:resetEnmity(target) diff --git a/scripts/actions/mobskills/death_ray.lua b/scripts/actions/mobskills/death_ray.lua index 561a0e3ef58..e040e4e77fd 100644 --- a/scripts/actions/mobskills/death_ray.lua +++ b/scripts/actions/mobskills/death_ray.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getMainLvl() * 4.5 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.DARK) diff --git a/scripts/actions/mobskills/death_scissors.lua b/scripts/actions/mobskills/death_scissors.lua index da5414427d3..b794fad040e 100644 --- a/scripts/actions/mobskills/death_scissors.lua +++ b/scripts/actions/mobskills/death_scissors.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 4 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ATK_VARIES, 2.5, 2.5, 2.5, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/deathgnash.lua b/scripts/actions/mobskills/deathgnash.lua index e71511b8329..39566717177 100644 --- a/scripts/actions/mobskills/deathgnash.lua +++ b/scripts/actions/mobskills/deathgnash.lua @@ -12,7 +12,12 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = target:getHP() - 1 - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = + { + damage = damage + } + + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) mob:resetEnmity(target) diff --git a/scripts/actions/mobskills/debonair_rush.lua b/scripts/actions/mobskills/debonair_rush.lua index 71074b33abb..9b714ecf69e 100644 --- a/scripts/actions/mobskills/debonair_rush.lua +++ b/scripts/actions/mobskills/debonair_rush.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.0 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/decayed_filament.lua b/scripts/actions/mobskills/decayed_filament.lua index 1ffe1c57f55..dbb7c91fcf8 100644 --- a/scripts/actions/mobskills/decayed_filament.lua +++ b/scripts/actions/mobskills/decayed_filament.lua @@ -11,8 +11,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WATER, math.random(1, 2), xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.NUMSHADOWS_2) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WATER, math.random(1, 2), xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.NUMSHADOWS_2) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER) diff --git a/scripts/actions/mobskills/decollation.lua b/scripts/actions/mobskills/decollation.lua index df02c5e6678..1c59eeb5f35 100644 --- a/scripts/actions/mobskills/decollation.lua +++ b/scripts/actions/mobskills/decollation.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2 -- TODO: Need crit scaling captures local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1, 1, 1) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/decussate.lua b/scripts/actions/mobskills/decussate.lua index 2d54c7b32df..2e77bb15c96 100644 --- a/scripts/actions/mobskills/decussate.lua +++ b/scripts/actions/mobskills/decussate.lua @@ -21,8 +21,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.EARTH, 1.2, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, math.random(2, 3)) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.EARTH, 1.2, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, math.random(2, 3)) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.EARTH) diff --git a/scripts/actions/mobskills/delta_thrust.lua b/scripts/actions/mobskills/delta_thrust.lua index 4e83814c180..8b647cda473 100644 --- a/scripts/actions/mobskills/delta_thrust.lua +++ b/scripts/actions/mobskills/delta_thrust.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.PLAGUE, 5, 3, 60) diff --git a/scripts/actions/mobskills/di_bite_attack.lua b/scripts/actions/mobskills/di_bite_attack.lua index 13286a723e3..119ccf40857 100644 --- a/scripts/actions/mobskills/di_bite_attack.lua +++ b/scripts/actions/mobskills/di_bite_attack.lua @@ -21,7 +21,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) -- if skill hit, apply dmg and AE if not skill:hasMissMsg() then diff --git a/scripts/actions/mobskills/di_horn_attack.lua b/scripts/actions/mobskills/di_horn_attack.lua index 145c795c6ae..3306b4d8d98 100644 --- a/scripts/actions/mobskills/di_horn_attack.lua +++ b/scripts/actions/mobskills/di_horn_attack.lua @@ -21,7 +21,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) -- if skill hit, apply dmg and AE if not skill:hasMissMsg() then diff --git a/scripts/actions/mobskills/di_kick_attack.lua b/scripts/actions/mobskills/di_kick_attack.lua index c94ced9f9ed..953f656d948 100644 --- a/scripts/actions/mobskills/di_kick_attack.lua +++ b/scripts/actions/mobskills/di_kick_attack.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) -- if skill hit, apply dmg and AE if not skill:hasMissMsg() then diff --git a/scripts/actions/mobskills/di_trample.lua b/scripts/actions/mobskills/di_trample.lua index 83dc32e9290..0e5f227419f 100644 --- a/scripts/actions/mobskills/di_trample.lua +++ b/scripts/actions/mobskills/di_trample.lua @@ -24,7 +24,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) -- if skill hit, apply dmg and reduce MP if not skill:hasMissMsg() then diff --git a/scripts/actions/mobskills/diamond_dust.lua b/scripts/actions/mobskills/diamond_dust.lua index feb73aebcfa..896b61f05dc 100644 --- a/scripts/actions/mobskills/diamond_dust.lua +++ b/scripts/actions/mobskills/diamond_dust.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 9 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.ICE, 3, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.ICE, 3, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.ICE) diff --git a/scripts/actions/mobskills/dice_damage.lua b/scripts/actions/mobskills/dice_damage.lua index 0926069d8b9..524cff9334c 100644 --- a/scripts/actions/mobskills/dice_damage.lua +++ b/scripts/actions/mobskills/dice_damage.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 6 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.THUNDER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.THUNDER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.THUNDER) diff --git a/scripts/actions/mobskills/diffusion_ray.lua b/scripts/actions/mobskills/diffusion_ray.lua index 8ac13bc4e36..76f420fa80d 100644 --- a/scripts/actions/mobskills/diffusion_ray.lua +++ b/scripts/actions/mobskills/diffusion_ray.lua @@ -21,8 +21,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.MND - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.LIGHT) diff --git a/scripts/actions/mobskills/digest.lua b/scripts/actions/mobskills/digest.lua index 6c91c860884..2a1d2d34a63 100644 --- a/scripts/actions/mobskills/digest.lua +++ b/scripts/actions/mobskills/digest.lua @@ -20,8 +20,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, 2, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.NUMSHADOWS_1) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, 2, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.NUMSHADOWS_1) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.HP, damage)) diff --git a/scripts/actions/mobskills/dimensional_death.lua b/scripts/actions/mobskills/dimensional_death.lua index 346662e21f3..b2d731a3a76 100644 --- a/scripts/actions/mobskills/dimensional_death.lua +++ b/scripts/actions/mobskills/dimensional_death.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.25 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.HTH) return dmg end diff --git a/scripts/actions/mobskills/dirty_claw.lua b/scripts/actions/mobskills/dirty_claw.lua index faf02364e05..8ebe0c70ea8 100644 --- a/scripts/actions/mobskills/dirty_claw.lua +++ b/scripts/actions/mobskills/dirty_claw.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/discharge.lua b/scripts/actions/mobskills/discharge.lua index 6782e103531..f9d984e1482 100644 --- a/scripts/actions/mobskills/discharge.lua +++ b/scripts/actions/mobskills/discharge.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 4 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.THUNDER, 1.75, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.THUNDER, 1.75, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.THUNDER) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.PARALYSIS, 20, 0, 180) diff --git a/scripts/actions/mobskills/discoid.lua b/scripts/actions/mobskills/discoid.lua index e643aae3309..c1627ec2086 100644 --- a/scripts/actions/mobskills/discoid.lua +++ b/scripts/actions/mobskills/discoid.lua @@ -10,7 +10,11 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local needles = 10000 / skill:getTotalTargets() - local dmg = xi.mobskills.mobFinalAdjustments(needles, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = + { + damage = needles + } + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(dmg, mob, xi.attackType.MAGICAL, xi.damageType.LIGHT) diff --git a/scripts/actions/mobskills/disseverment.lua b/scripts/actions/mobskills/disseverment.lua index 67fe6a3c025..fc2901a74f0 100644 --- a/scripts/actions/mobskills/disseverment.lua +++ b/scripts/actions/mobskills/disseverment.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ACC_VARIES, 1, 2, 3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.POISON, 19, 3, 180) diff --git a/scripts/actions/mobskills/divesting_stampede.lua b/scripts/actions/mobskills/divesting_stampede.lua index 7388a95e91c..f87a95cc307 100644 --- a/scripts/actions/mobskills/divesting_stampede.lua +++ b/scripts/actions/mobskills/divesting_stampede.lua @@ -13,7 +13,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.0 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.MAGIC_DEF_DOWN, 30, 0, 60) diff --git a/scripts/actions/mobskills/divine_judgment.lua b/scripts/actions/mobskills/divine_judgment.lua index 72500b3c2f0..d09b5fe19c4 100644 --- a/scripts/actions/mobskills/divine_judgment.lua +++ b/scripts/actions/mobskills/divine_judgment.lua @@ -14,8 +14,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 8 local dmgMod = 2.5 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, dmgMod, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, dmgMod, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.LIGHT) diff --git a/scripts/actions/mobskills/divine_spear.lua b/scripts/actions/mobskills/divine_spear.lua index f4b65f893c7..a0ef879f006 100644 --- a/scripts/actions/mobskills/divine_spear.lua +++ b/scripts/actions/mobskills/divine_spear.lua @@ -18,8 +18,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 5 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 2.5, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 2.5, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.LIGHT) diff --git a/scripts/actions/mobskills/doctors_orders.lua b/scripts/actions/mobskills/doctors_orders.lua index 910b49cedac..335de6674ec 100644 --- a/scripts/actions/mobskills/doctors_orders.lua +++ b/scripts/actions/mobskills/doctors_orders.lua @@ -11,8 +11,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 2.8 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.NONE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.NONE, xi.damageType.NONE, 1) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.NONE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.NONE, xi.damageType.NONE, 1) target:takeDamage(damage, mob, xi.attackType.NONE, xi.damageType.NONE) diff --git a/scripts/actions/mobskills/dominion_slash.lua b/scripts/actions/mobskills/dominion_slash.lua index a80cfe41507..4c9f1df4b53 100644 --- a/scripts/actions/mobskills/dominion_slash.lua +++ b/scripts/actions/mobskills/dominion_slash.lua @@ -20,7 +20,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3.25 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) -- Damage is HIGHLY conflicting. Witnessed anywhere from 300 to 900. -- TP DMG VARIES can sort of account for this, but I feel like it's still not right. diff --git a/scripts/actions/mobskills/double_claw.lua b/scripts/actions/mobskills/double_claw.lua index 752f5e91ba8..05efa6ef20b 100644 --- a/scripts/actions/mobskills/double_claw.lua +++ b/scripts/actions/mobskills/double_claw.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.4 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/double_down.lua b/scripts/actions/mobskills/double_down.lua index 7c0df378db9..c5e4774762a 100644 --- a/scripts/actions/mobskills/double_down.lua +++ b/scripts/actions/mobskills/double_down.lua @@ -22,7 +22,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ATK_VARIES, 2.0, 2.0, 2.0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) return dmg end diff --git a/scripts/actions/mobskills/double_kick.lua b/scripts/actions/mobskills/double_kick.lua index d3c14357395..742c89b1cf8 100644 --- a/scripts/actions/mobskills/double_kick.lua +++ b/scripts/actions/mobskills/double_kick.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 0.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/double_punch.lua b/scripts/actions/mobskills/double_punch.lua index 33b6e6b8907..1a96c8360c2 100644 --- a/scripts/actions/mobskills/double_punch.lua +++ b/scripts/actions/mobskills/double_punch.lua @@ -11,7 +11,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1, 2, 3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/double_ray.lua b/scripts/actions/mobskills/double_ray.lua index 415a16e650a..61de2b8ae90 100644 --- a/scripts/actions/mobskills/double_ray.lua +++ b/scripts/actions/mobskills/double_ray.lua @@ -13,8 +13,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.NONE, 2.25, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ELEMENTAL, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.NONE, 2.25, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ELEMENTAL, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.ELEMENTAL) diff --git a/scripts/actions/mobskills/double_slap.lua b/scripts/actions/mobskills/double_slap.lua index 62fb2540dde..a771d092fee 100644 --- a/scripts/actions/mobskills/double_slap.lua +++ b/scripts/actions/mobskills/double_slap.lua @@ -11,7 +11,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/dragon_breath.lua b/scripts/actions/mobskills/dragon_breath.lua index 3c5698c32a0..f8b1637c288 100644 --- a/scripts/actions/mobskills/dragon_breath.lua +++ b/scripts/actions/mobskills/dragon_breath.lua @@ -28,9 +28,9 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = utils.conalDamageAdjustment(mob, target, skill, damage, 0.2) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + info.damage = utils.conalDamageAdjustment(mob, target, skill, info.damage, 0.2) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/dragon_kick.lua b/scripts/actions/mobskills/dragon_kick.lua index 1176323e9d1..26d3b652731 100644 --- a/scripts/actions/mobskills/dragon_kick.lua +++ b/scripts/actions/mobskills/dragon_kick.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/dragonfall.lua b/scripts/actions/mobskills/dragonfall.lua index 21859783e14..32aec448f1e 100644 --- a/scripts/actions/mobskills/dragonfall.lua +++ b/scripts/actions/mobskills/dragonfall.lua @@ -21,7 +21,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.7 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BIND, 1, 0, 30) diff --git a/scripts/actions/mobskills/drain_whip.lua b/scripts/actions/mobskills/drain_whip.lua index 991c598ac42..d385febff8e 100644 --- a/scripts/actions/mobskills/drain_whip.lua +++ b/scripts/actions/mobskills/drain_whip.lua @@ -16,8 +16,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 local drainTable = { xi.mobskills.drainType.HP, xi.mobskills.drainType.MP, xi.mobskills.drainType.TP } - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, drainTable[math.random(1, 3)], damage)) diff --git a/scripts/actions/mobskills/drainkiss.lua b/scripts/actions/mobskills/drainkiss.lua index d2344696ffc..d4aefef104a 100644 --- a/scripts/actions/mobskills/drainkiss.lua +++ b/scripts/actions/mobskills/drainkiss.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.NUMSHADOWS_1) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.NUMSHADOWS_1) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.HP, damage)) diff --git a/scripts/actions/mobskills/dread_dive.lua b/scripts/actions/mobskills/dread_dive.lua index 1c3dc3143d0..873decc2aaf 100644 --- a/scripts/actions/mobskills/dread_dive.lua +++ b/scripts/actions/mobskills/dread_dive.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/dreadstorm.lua b/scripts/actions/mobskills/dreadstorm.lua index 7d8333b2ed8..1985391adb3 100644 --- a/scripts/actions/mobskills/dreadstorm.lua +++ b/scripts/actions/mobskills/dreadstorm.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 4 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 2.5, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 2.5, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.DARK) skill:setMsg(xi.mobskills.mobGazeMove(mob, target, xi.effect.TERROR, 1, 0, 10)) diff --git a/scripts/actions/mobskills/drill_branch.lua b/scripts/actions/mobskills/drill_branch.lua index 015798bc026..636db13a852 100644 --- a/scripts/actions/mobskills/drill_branch.lua +++ b/scripts/actions/mobskills/drill_branch.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded * math.random(2, 3)) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded * math.random(2, 3)) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BLINDNESS, 50, 0, 45) diff --git a/scripts/actions/mobskills/drill_branch_nm.lua b/scripts/actions/mobskills/drill_branch_nm.lua index cb35e9f5a30..a7d35e6599e 100644 --- a/scripts/actions/mobskills/drill_branch_nm.lua +++ b/scripts/actions/mobskills/drill_branch_nm.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded * math.random(2, 3)) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded * math.random(2, 3)) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BLINDNESS, 50, 0, 45) diff --git a/scripts/actions/mobskills/drill_claw.lua b/scripts/actions/mobskills/drill_claw.lua index 481e3822a97..3b8774ee732 100644 --- a/scripts/actions/mobskills/drill_claw.lua +++ b/scripts/actions/mobskills/drill_claw.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.0 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.MAX_HP_DOWN, 50, 0, 60) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.MAX_TP_DOWN, 50, 0, 60) diff --git a/scripts/actions/mobskills/drop_hammer.lua b/scripts/actions/mobskills/drop_hammer.lua index 154fa46017a..928fed51219 100644 --- a/scripts/actions/mobskills/drop_hammer.lua +++ b/scripts/actions/mobskills/drop_hammer.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.4 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded * math.random(2, 3)) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded * math.random(2, 3)) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BIND, 1, 0, 60) diff --git a/scripts/actions/mobskills/dual_strike.lua b/scripts/actions/mobskills/dual_strike.lua index 8e8eb3b21b6..836bd18a1da 100644 --- a/scripts/actions/mobskills/dual_strike.lua +++ b/scripts/actions/mobskills/dual_strike.lua @@ -20,7 +20,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.NONE, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.NONE, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.NONE) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/dust_cloud.lua b/scripts/actions/mobskills/dust_cloud.lua index 555f3537b5b..98c1778ac7f 100644 --- a/scripts/actions/mobskills/dust_cloud.lua +++ b/scripts/actions/mobskills/dust_cloud.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getMainLvl() + 2 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.EARTH, 2, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.EARTH, 2, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.EARTH) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BLINDNESS, 30, 0, 120) diff --git a/scripts/actions/mobskills/dustvoid.lua b/scripts/actions/mobskills/dustvoid.lua index b51b80b4e5e..0bdb7ade63a 100644 --- a/scripts/actions/mobskills/dustvoid.lua +++ b/scripts/actions/mobskills/dustvoid.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) if target:isPC() then for i = xi.slot.MAIN, xi.slot.BACK do diff --git a/scripts/actions/mobskills/dynamic_assault.lua b/scripts/actions/mobskills/dynamic_assault.lua index 8ec37924419..f9bf20083d6 100644 --- a/scripts/actions/mobskills/dynamic_assault.lua +++ b/scripts/actions/mobskills/dynamic_assault.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2.5 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_1) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_1) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/dynamic_implosion.lua b/scripts/actions/mobskills/dynamic_implosion.lua index 15332272c14..cf0a8491495 100644 --- a/scripts/actions/mobskills/dynamic_implosion.lua +++ b/scripts/actions/mobskills/dynamic_implosion.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2.5 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 7) diff --git a/scripts/actions/mobskills/eagle_eye_shot.lua b/scripts/actions/mobskills/eagle_eye_shot.lua index 65c5d576044..583be488320 100644 --- a/scripts/actions/mobskills/eagle_eye_shot.lua +++ b/scripts/actions/mobskills/eagle_eye_shot.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local info = xi.mobskills.mobRangedMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.magicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, info.hitslanded) if dmg > 0 then target:addTP(20) diff --git a/scripts/actions/mobskills/earth_breath.lua b/scripts/actions/mobskills/earth_breath.lua index 8ae098a4542..7ebd960bba9 100644 --- a/scripts/actions/mobskills/earth_breath.lua +++ b/scripts/actions/mobskills/earth_breath.lua @@ -24,8 +24,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.EARTH, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.EARTH, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.EARTH) diff --git a/scripts/actions/mobskills/earth_pounder.lua b/scripts/actions/mobskills/earth_pounder.lua index bd1efa64a3c..4d2c2eee427 100644 --- a/scripts/actions/mobskills/earth_pounder.lua +++ b/scripts/actions/mobskills/earth_pounder.lua @@ -23,8 +23,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) end end - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.EARTH, fTP, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.EARTH, fTP, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.EARTH) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.DEX_DOWN, 10, 3, 120) diff --git a/scripts/actions/mobskills/earth_shock.lua b/scripts/actions/mobskills/earth_shock.lua index e96dcb3d76d..ed87eed2634 100644 --- a/scripts/actions/mobskills/earth_shock.lua +++ b/scripts/actions/mobskills/earth_shock.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 2 local ftp = 0.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.NUMSHADOWS_3) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/earthbreaker.lua b/scripts/actions/mobskills/earthbreaker.lua index 7ba220c2cb6..d7621f4b627 100644 --- a/scripts/actions/mobskills/earthbreaker.lua +++ b/scripts/actions/mobskills/earthbreaker.lua @@ -13,8 +13,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.EARTH, 4, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.EARTH, 4, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.EARTH) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.STUN, 1, 0, 10) diff --git a/scripts/actions/mobskills/earthen_fury.lua b/scripts/actions/mobskills/earthen_fury.lua index 84aaf83a98a..6e5973a356f 100644 --- a/scripts/actions/mobskills/earthen_fury.lua +++ b/scripts/actions/mobskills/earthen_fury.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 9 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.EARTH, 3, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.EARTH, 3, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.EARTH) diff --git a/scripts/actions/mobskills/eclipse_bite.lua b/scripts/actions/mobskills/eclipse_bite.lua index d128073d920..1fa109cd66b 100644 --- a/scripts/actions/mobskills/eclipse_bite.lua +++ b/scripts/actions/mobskills/eclipse_bite.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 1, 2, 3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/ectosmash.lua b/scripts/actions/mobskills/ectosmash.lua index c83cf5584f7..6a6de91368e 100644 --- a/scripts/actions/mobskills/ectosmash.lua +++ b/scripts/actions/mobskills/ectosmash.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2.0 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ATK_VARIES, 1.5, 1.5, 1.5, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.RANGED, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.RANGED, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.RANGED, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/electrocharge.lua b/scripts/actions/mobskills/electrocharge.lua index 6c9fa2b59cf..f31dda859f7 100644 --- a/scripts/actions/mobskills/electrocharge.lua +++ b/scripts/actions/mobskills/electrocharge.lua @@ -11,8 +11,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.NONE, 0.5, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ELEMENTAL, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.NONE, 0.5, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ELEMENTAL, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.ELEMENTAL) diff --git a/scripts/actions/mobskills/electromagnetic_field.lua b/scripts/actions/mobskills/electromagnetic_field.lua index 05f6ce63658..b6785bb657e 100644 --- a/scripts/actions/mobskills/electromagnetic_field.lua +++ b/scripts/actions/mobskills/electromagnetic_field.lua @@ -11,8 +11,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.THUNDER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.THUNDER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.THUNDER) diff --git a/scripts/actions/mobskills/empirical_research.lua b/scripts/actions/mobskills/empirical_research.lua index 0999000b998..1acb771817d 100644 --- a/scripts/actions/mobskills/empirical_research.lua +++ b/scripts/actions/mobskills/empirical_research.lua @@ -11,8 +11,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 2.8 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.NONE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.NONE, xi.damageType.NONE, xi.mobskills.shadowBehavior.NUMSHADOWS_1) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.NONE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.NONE, xi.damageType.NONE, xi.mobskills.shadowBehavior.NUMSHADOWS_1) target:takeDamage(damage, mob, xi.attackType.NONE, xi.damageType.NONE) diff --git a/scripts/actions/mobskills/empty_beleaguer.lua b/scripts/actions/mobskills/empty_beleaguer.lua index f6701baaeac..a156a1e99ba 100644 --- a/scripts/actions/mobskills/empty_beleaguer.lua +++ b/scripts/actions/mobskills/empty_beleaguer.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/empty_crush.lua b/scripts/actions/mobskills/empty_crush.lua index 103cfca0870..c2933231181 100644 --- a/scripts/actions/mobskills/empty_crush.lua +++ b/scripts/actions/mobskills/empty_crush.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/empty_cutter.lua b/scripts/actions/mobskills/empty_cutter.lua index a1e4618e897..6c78b0e1ceb 100644 --- a/scripts/actions/mobskills/empty_cutter.lua +++ b/scripts/actions/mobskills/empty_cutter.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/empty_cutter_thinker.lua b/scripts/actions/mobskills/empty_cutter_thinker.lua index 1127b627f54..cb6b14fb684 100644 --- a/scripts/actions/mobskills/empty_cutter_thinker.lua +++ b/scripts/actions/mobskills/empty_cutter_thinker.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/empty_salvation.lua b/scripts/actions/mobskills/empty_salvation.lua index 21e4af3c602..2c354db7e98 100644 --- a/scripts/actions/mobskills/empty_salvation.lua +++ b/scripts/actions/mobskills/empty_salvation.lua @@ -10,8 +10,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.NUMSHADOWS_3) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.DARK) diff --git a/scripts/actions/mobskills/empty_seed.lua b/scripts/actions/mobskills/empty_seed.lua index 099294ce9cf..213ff52ad8c 100644 --- a/scripts/actions/mobskills/empty_seed.lua +++ b/scripts/actions/mobskills/empty_seed.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 0.75 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.NUMSHADOWS_2) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.NUMSHADOWS_2) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/empty_thrash.lua b/scripts/actions/mobskills/empty_thrash.lua index 9f549e4935e..4acfe49e818 100644 --- a/scripts/actions/mobskills/empty_thrash.lua +++ b/scripts/actions/mobskills/empty_thrash.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/entangle_drain.lua b/scripts/actions/mobskills/entangle_drain.lua index d854053524c..bac4a52737b 100644 --- a/scripts/actions/mobskills/entangle_drain.lua +++ b/scripts/actions/mobskills/entangle_drain.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3.0 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.HP, dmg)) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BIND, 1, 0, 60) diff --git a/scripts/actions/mobskills/entangle_poison.lua b/scripts/actions/mobskills/entangle_poison.lua index 53ced867307..a94713a087a 100644 --- a/scripts/actions/mobskills/entangle_poison.lua +++ b/scripts/actions/mobskills/entangle_poison.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3.0 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) mob:resetEnmity(target) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING, { breakBind = false }) diff --git a/scripts/actions/mobskills/envoutement.lua b/scripts/actions/mobskills/envoutement.lua index ba0872a1293..0ef97ce2193 100644 --- a/scripts/actions/mobskills/envoutement.lua +++ b/scripts/actions/mobskills/envoutement.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3.2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.CURSE_I, 25, 0, 420) diff --git a/scripts/actions/mobskills/equalizer.lua b/scripts/actions/mobskills/equalizer.lua index 7a74482d66b..f0d70ae86e0 100644 --- a/scripts/actions/mobskills/equalizer.lua +++ b/scripts/actions/mobskills/equalizer.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/erosion_dust.lua b/scripts/actions/mobskills/erosion_dust.lua index 4c8f5321332..08ebc54159a 100644 --- a/scripts/actions/mobskills/erosion_dust.lua +++ b/scripts/actions/mobskills/erosion_dust.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3.3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.LIGHT) local duration = xi.mobskills.calculateDuration(skill:getTP(), 10, 30) diff --git a/scripts/actions/mobskills/erratic_flutter.lua b/scripts/actions/mobskills/erratic_flutter.lua index eeea9f39457..1b701ec07d8 100644 --- a/scripts/actions/mobskills/erratic_flutter.lua +++ b/scripts/actions/mobskills/erratic_flutter.lua @@ -26,8 +26,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 2.75 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage , mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info , mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) xi.mobskills.mobBuffMove(mob, xi.effect.HASTE, 4500, 0, 180) -- There is no message for the self buff aspect, only dmg. diff --git a/scripts/actions/mobskills/evisceration.lua b/scripts/actions/mobskills/evisceration.lua index c4f70dece7c..166852ab0df 100644 --- a/scripts/actions/mobskills/evisceration.lua +++ b/scripts/actions/mobskills/evisceration.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 1 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/eye_scratch.lua b/scripts/actions/mobskills/eye_scratch.lua index b77a4f97065..a556794136f 100644 --- a/scripts/actions/mobskills/eye_scratch.lua +++ b/scripts/actions/mobskills/eye_scratch.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/eyes_on_me.lua b/scripts/actions/mobskills/eyes_on_me.lua index a7966bbcef6..20dddaf38b0 100644 --- a/scripts/actions/mobskills/eyes_on_me.lua +++ b/scripts/actions/mobskills/eyes_on_me.lua @@ -18,8 +18,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) ftp = 7 end - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.DARK) diff --git a/scripts/actions/mobskills/fang_rush.lua b/scripts/actions/mobskills/fang_rush.lua index 5188386d6eb..c9025b7eb13 100644 --- a/scripts/actions/mobskills/fang_rush.lua +++ b/scripts/actions/mobskills/fang_rush.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 1 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/fear_touch.lua b/scripts/actions/mobskills/fear_touch.lua index 7ad9a13d33f..c8513c05740 100644 --- a/scripts/actions/mobskills/fear_touch.lua +++ b/scripts/actions/mobskills/fear_touch.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 1 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.SLOW, 2500, 0, 300) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/feather_maelstrom.lua b/scripts/actions/mobskills/feather_maelstrom.lua index 1b9899f315f..701fbafcf7f 100644 --- a/scripts/actions/mobskills/feather_maelstrom.lua +++ b/scripts/actions/mobskills/feather_maelstrom.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 2 local ftp = 2.8 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BIO, 6, 3, 60) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.AMNESIA, 1, 0, 60) diff --git a/scripts/actions/mobskills/feather_storm.lua b/scripts/actions/mobskills/feather_storm.lua index 35554ebd365..9cfaddff125 100644 --- a/scripts/actions/mobskills/feather_storm.lua +++ b/scripts/actions/mobskills/feather_storm.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 2 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/fell_cleave.lua b/scripts/actions/mobskills/fell_cleave.lua index b49f7ff1914..3048ecae78d 100644 --- a/scripts/actions/mobskills/fell_cleave.lua +++ b/scripts/actions/mobskills/fell_cleave.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ACC_VARIES, 1, 2, 3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/feral_peck.lua b/scripts/actions/mobskills/feral_peck.lua index 058305e4be0..14ccd1daef6 100644 --- a/scripts/actions/mobskills/feral_peck.lua +++ b/scripts/actions/mobskills/feral_peck.lua @@ -22,7 +22,12 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) damage = damage * 0.9 end - local dmg = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = + { + damage = damage + } + + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/fevered_pitch.lua b/scripts/actions/mobskills/fevered_pitch.lua index bef5b5bcb0a..1b44a6f18e0 100644 --- a/scripts/actions/mobskills/fevered_pitch.lua +++ b/scripts/actions/mobskills/fevered_pitch.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.DEFENSE_DOWN, 20, 0, 120) diff --git a/scripts/actions/mobskills/fiery_breath.lua b/scripts/actions/mobskills/fiery_breath.lua index 7005a2ba0e6..d0868fe9ac3 100644 --- a/scripts/actions/mobskills/fiery_breath.lua +++ b/scripts/actions/mobskills/fiery_breath.lua @@ -29,10 +29,10 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = utils.conalDamageAdjustment(mob, target, skill, damage, 0.9) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + info.damage = utils.conalDamageAdjustment(mob, target, skill, info.damage, 0.9) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/final_exam.lua b/scripts/actions/mobskills/final_exam.lua index 46875abf076..c223e56f6da 100644 --- a/scripts/actions/mobskills/final_exam.lua +++ b/scripts/actions/mobskills/final_exam.lua @@ -11,8 +11,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 2.8 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.NONE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.NUMSHADOWS_1) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.NONE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.NUMSHADOWS_1) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/final_heaven.lua b/scripts/actions/mobskills/final_heaven.lua index 3fc3ff63998..4b89a5258b0 100644 --- a/scripts/actions/mobskills/final_heaven.lua +++ b/scripts/actions/mobskills/final_heaven.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2.5 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/final_retribution.lua b/scripts/actions/mobskills/final_retribution.lua index c20d7d0c194..517825bdbc0 100644 --- a/scripts/actions/mobskills/final_retribution.lua +++ b/scripts/actions/mobskills/final_retribution.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3.2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/final_sting.lua b/scripts/actions/mobskills/final_sting.lua index 33de81eee88..80ae32eee16 100644 --- a/scripts/actions/mobskills/final_sting.lua +++ b/scripts/actions/mobskills/final_sting.lua @@ -33,7 +33,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) end local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/fire_arrow.lua b/scripts/actions/mobskills/fire_arrow.lua index 0b9a87d4314..5a256326370 100644 --- a/scripts/actions/mobskills/fire_arrow.lua +++ b/scripts/actions/mobskills/fire_arrow.lua @@ -10,8 +10,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.FIRE, 3, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.NUMSHADOWS_1) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.FIRE, 3, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.NUMSHADOWS_1) target:takeDamage(damage, mob, xi.attackType.RANGED, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/fire_break.lua b/scripts/actions/mobskills/fire_break.lua index debbe7a7de6..80ea430095f 100644 --- a/scripts/actions/mobskills/fire_break.lua +++ b/scripts/actions/mobskills/fire_break.lua @@ -20,8 +20,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/fire_ii.lua b/scripts/actions/mobskills/fire_ii.lua index aaed467fb20..2dcf4167452 100644 --- a/scripts/actions/mobskills/fire_ii.lua +++ b/scripts/actions/mobskills/fire_ii.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/fire_iv.lua b/scripts/actions/mobskills/fire_iv.lua index 8b178d99fae..85bf9d1accc 100644 --- a/scripts/actions/mobskills/fire_iv.lua +++ b/scripts/actions/mobskills/fire_iv.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 4 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/fire_meeble_warble.lua b/scripts/actions/mobskills/fire_meeble_warble.lua index 9e739f252a7..917a769a74a 100644 --- a/scripts/actions/mobskills/fire_meeble_warble.lua +++ b/scripts/actions/mobskills/fire_meeble_warble.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 9 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 2, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 2, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.PLAGUE, 30, 3, 60) diff --git a/scripts/actions/mobskills/fireball.lua b/scripts/actions/mobskills/fireball.lua index 547562430b3..f641ff54e57 100644 --- a/scripts/actions/mobskills/fireball.lua +++ b/scripts/actions/mobskills/fireball.lua @@ -11,8 +11,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2.5 - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.FIRE, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.FIRE, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/firebomb.lua b/scripts/actions/mobskills/firebomb.lua index 3992f181d62..343cf8ad34c 100644 --- a/scripts/actions/mobskills/firebomb.lua +++ b/scripts/actions/mobskills/firebomb.lua @@ -10,8 +10,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.FIRE, 3, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.FIRE, 3, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/firespit.lua b/scripts/actions/mobskills/firespit.lua index 0c4b8868767..681f98f0f8c 100644 --- a/scripts/actions/mobskills/firespit.lua +++ b/scripts/actions/mobskills/firespit.lua @@ -21,8 +21,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) numhits = xi.mobskills.shadowBehavior.IGNORE_SHADOWS end - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, numhits) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, numhits) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/flailing_trunk.lua b/scripts/actions/mobskills/flailing_trunk.lua index e57458efce7..73f938c0634 100644 --- a/scripts/actions/mobskills/flailing_trunk.lua +++ b/scripts/actions/mobskills/flailing_trunk.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/flame_arrow.lua b/scripts/actions/mobskills/flame_arrow.lua index 13cb29d7030..1c70c7265d7 100644 --- a/scripts/actions/mobskills/flame_arrow.lua +++ b/scripts/actions/mobskills/flame_arrow.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local info = xi.mobskills.mobRangedMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.magicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.RANGED, xi.damageType.PIERCING) return dmg diff --git a/scripts/actions/mobskills/flame_blast.lua b/scripts/actions/mobskills/flame_blast.lua index d0d68f9eee8..9bb0f0393dd 100644 --- a/scripts/actions/mobskills/flame_blast.lua +++ b/scripts/actions/mobskills/flame_blast.lua @@ -15,8 +15,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.FIRE, 11, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.FIRE, 11, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/flame_blast_alt.lua b/scripts/actions/mobskills/flame_blast_alt.lua index ad5575da4c3..335160cb41a 100644 --- a/scripts/actions/mobskills/flame_blast_alt.lua +++ b/scripts/actions/mobskills/flame_blast_alt.lua @@ -15,8 +15,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.FIRE, 4, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.FIRE, 4, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) skill:setMsg(xi.msg.basic.HIT_DMG) diff --git a/scripts/actions/mobskills/flame_breath.lua b/scripts/actions/mobskills/flame_breath.lua index 19a1cd24f03..51bf6699fc9 100644 --- a/scripts/actions/mobskills/flame_breath.lua +++ b/scripts/actions/mobskills/flame_breath.lua @@ -20,8 +20,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/flame_thrower.lua b/scripts/actions/mobskills/flame_thrower.lua index 2af1de21529..1747f3ed122 100644 --- a/scripts/actions/mobskills/flame_thrower.lua +++ b/scripts/actions/mobskills/flame_thrower.lua @@ -20,8 +20,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/flaming_crush.lua b/scripts/actions/mobskills/flaming_crush.lua index 943dd0a226e..59df21a6c84 100644 --- a/scripts/actions/mobskills/flaming_crush.lua +++ b/scripts/actions/mobskills/flaming_crush.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.4 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 1, 2, 3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/flat_blade.lua b/scripts/actions/mobskills/flat_blade.lua index 039248ed446..e4fa69b8bfd 100644 --- a/scripts/actions/mobskills/flat_blade.lua +++ b/scripts/actions/mobskills/flat_blade.lua @@ -26,7 +26,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.25 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1.1, 1.2, 1.3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) if math.random(1, 100) < skill:getTP() / 3 then xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/floodlight.lua b/scripts/actions/mobskills/floodlight.lua index 340ce01d016..b380e0a9265 100644 --- a/scripts/actions/mobskills/floodlight.lua +++ b/scripts/actions/mobskills/floodlight.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 1.5, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 1.5, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.LIGHT) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BLINDNESS, 15, 3, 120) diff --git a/scripts/actions/mobskills/fluid_spread.lua b/scripts/actions/mobskills/fluid_spread.lua index fe83ee4977b..4e58c8f1f14 100644 --- a/scripts/actions/mobskills/fluid_spread.lua +++ b/scripts/actions/mobskills/fluid_spread.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ATK_VARIES, 1.5, 1.5, 1.5) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/fluid_toss.lua b/scripts/actions/mobskills/fluid_toss.lua index ec33a8d9e27..34cc5751086 100644 --- a/scripts/actions/mobskills/fluid_toss.lua +++ b/scripts/actions/mobskills/fluid_toss.lua @@ -20,7 +20,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 1.5 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ATK_VARIES, 2, 2, 2, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/fluid_toss_claret.lua b/scripts/actions/mobskills/fluid_toss_claret.lua index aa9847c34ff..633c9111af5 100644 --- a/scripts/actions/mobskills/fluid_toss_claret.lua +++ b/scripts/actions/mobskills/fluid_toss_claret.lua @@ -20,7 +20,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 4.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) -- Apply poison if it hits diff --git a/scripts/actions/mobskills/flurry_of_rage.lua b/scripts/actions/mobskills/flurry_of_rage.lua index 90a1da786fa..0db134b01b2 100644 --- a/scripts/actions/mobskills/flurry_of_rage.lua +++ b/scripts/actions/mobskills/flurry_of_rage.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, 1, xi.mobskills.physicalTpBonus.ACC_VARIES, 2, 2.5, 3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/flying_hip_press.lua b/scripts/actions/mobskills/flying_hip_press.lua index c3d23c0c2d2..2d399b7c49d 100644 --- a/scripts/actions/mobskills/flying_hip_press.lua +++ b/scripts/actions/mobskills/flying_hip_press.lua @@ -23,8 +23,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) fTP = 10.0 end - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WIND, fTP, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WIND, fTP, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) diff --git a/scripts/actions/mobskills/foot_kick.lua b/scripts/actions/mobskills/foot_kick.lua index aa179670395..259077e3b78 100644 --- a/scripts/actions/mobskills/foot_kick.lua +++ b/scripts/actions/mobskills/foot_kick.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = mob:getMainLvl() >= 50 and 2 or 1 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/forceful_blow.lua b/scripts/actions/mobskills/forceful_blow.lua index d0486bd81dd..163294024cd 100644 --- a/scripts/actions/mobskills/forceful_blow.lua +++ b/scripts/actions/mobskills/forceful_blow.lua @@ -23,7 +23,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1.0, 1.5, 2.0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/formation_attack.lua b/scripts/actions/mobskills/formation_attack.lua index 6af46e744ff..cb893065d2b 100644 --- a/scripts/actions/mobskills/formation_attack.lua +++ b/scripts/actions/mobskills/formation_attack.lua @@ -22,7 +22,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) end local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/foul_breath.lua b/scripts/actions/mobskills/foul_breath.lua index f73884b7b52..9706cb19180 100644 --- a/scripts/actions/mobskills/foul_breath.lua +++ b/scripts/actions/mobskills/foul_breath.lua @@ -26,8 +26,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/fountain.lua b/scripts/actions/mobskills/fountain.lua index 535973a5a2d..2495b5e8fea 100644 --- a/scripts/actions/mobskills/fountain.lua +++ b/scripts/actions/mobskills/fountain.lua @@ -10,8 +10,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WATER, 3, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WATER, 3, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER) diff --git a/scripts/actions/mobskills/foxfire.lua b/scripts/actions/mobskills/foxfire.lua index efe0950621d..6afe4d1cbe5 100644 --- a/scripts/actions/mobskills/foxfire.lua +++ b/scripts/actions/mobskills/foxfire.lua @@ -32,7 +32,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 15) diff --git a/scripts/actions/mobskills/freeze_rush.lua b/scripts/actions/mobskills/freeze_rush.lua index b86b86d8dfc..8dc8567b63e 100644 --- a/scripts/actions/mobskills/freeze_rush.lua +++ b/scripts/actions/mobskills/freeze_rush.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/freezebite.lua b/scripts/actions/mobskills/freezebite.lua index c59a48c32cf..f54bbb98c3e 100644 --- a/scripts/actions/mobskills/freezebite.lua +++ b/scripts/actions/mobskills/freezebite.lua @@ -14,8 +14,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.ICE, 4, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.ICE, 4, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.ICE) diff --git a/scripts/actions/mobskills/frenetic_rip.lua b/scripts/actions/mobskills/frenetic_rip.lua index 8c2fb5e01a4..f16b2e6cdff 100644 --- a/scripts/actions/mobskills/frenetic_rip.lua +++ b/scripts/actions/mobskills/frenetic_rip.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/frogkick.lua b/scripts/actions/mobskills/frogkick.lua index afcf666b1e7..33417bde30e 100644 --- a/scripts/actions/mobskills/frogkick.lua +++ b/scripts/actions/mobskills/frogkick.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1.5 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, 1, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) return dmg diff --git a/scripts/actions/mobskills/frost_breath.lua b/scripts/actions/mobskills/frost_breath.lua index 63b060d5c4f..9d5e9b67155 100644 --- a/scripts/actions/mobskills/frost_breath.lua +++ b/scripts/actions/mobskills/frost_breath.lua @@ -25,8 +25,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.ICE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.ICE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.ICE) diff --git a/scripts/actions/mobskills/frostbite.lua b/scripts/actions/mobskills/frostbite.lua index 3146ca878dc..7f515a98dd1 100644 --- a/scripts/actions/mobskills/frostbite.lua +++ b/scripts/actions/mobskills/frostbite.lua @@ -14,8 +14,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.ICE, 4, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.ICE, 4, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.ICE) diff --git a/scripts/actions/mobskills/frozen_mist.lua b/scripts/actions/mobskills/frozen_mist.lua index c77f91ec597..9953be43f7c 100644 --- a/scripts/actions/mobskills/frozen_mist.lua +++ b/scripts/actions/mobskills/frozen_mist.lua @@ -20,8 +20,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local resistRate = xi.combat.magicHitRate.calculateResistRate(mob, target, 0, 0, 0, xi.element.ICE, xi.mod.INT, xi.effect.TERROR, 0) local duration = math.floor(30 * resistRate) - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.ICE, 1.5, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.ICE, 1.5, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.ICE) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.TERROR, 30, 0, duration) diff --git a/scripts/actions/mobskills/frypan.lua b/scripts/actions/mobskills/frypan.lua index fcc98b92142..3c1eb68d23c 100644 --- a/scripts/actions/mobskills/frypan.lua +++ b/scripts/actions/mobskills/frypan.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 0.8 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/full-force_blow.lua b/scripts/actions/mobskills/full-force_blow.lua index 381971827ec..61f6a974a9e 100644 --- a/scripts/actions/mobskills/full-force_blow.lua +++ b/scripts/actions/mobskills/full-force_blow.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ATK_VARIES, 1.5, 1.5, 1.5) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/fulmination.lua b/scripts/actions/mobskills/fulmination.lua index ea82bb8603d..f85d7bc506a 100644 --- a/scripts/actions/mobskills/fulmination.lua +++ b/scripts/actions/mobskills/fulmination.lua @@ -27,8 +27,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 4 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.THUNDER, 3, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.THUNDER, 3, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.THUNDER) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.PARALYSIS, 40, 0, 60) diff --git a/scripts/actions/mobskills/fuscous_ooze.lua b/scripts/actions/mobskills/fuscous_ooze.lua index 45124f07b54..30bdd067c38 100644 --- a/scripts/actions/mobskills/fuscous_ooze.lua +++ b/scripts/actions/mobskills/fuscous_ooze.lua @@ -17,8 +17,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3.7 local duration = math.random(30, 45) - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.ENCUMBRANCE_II, math.random(1, 16), 0, duration) diff --git a/scripts/actions/mobskills/gaea_stream_eta.lua b/scripts/actions/mobskills/gaea_stream_eta.lua index 7fa06cbce99..cab2eb87d9e 100644 --- a/scripts/actions/mobskills/gaea_stream_eta.lua +++ b/scripts/actions/mobskills/gaea_stream_eta.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.75 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/gaea_stream_lambda.lua b/scripts/actions/mobskills/gaea_stream_lambda.lua index 0a8042acb0c..649beb91944 100644 --- a/scripts/actions/mobskills/gaea_stream_lambda.lua +++ b/scripts/actions/mobskills/gaea_stream_lambda.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.25 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/gaea_stream_theta.lua b/scripts/actions/mobskills/gaea_stream_theta.lua index a5398e37448..a3c59924580 100644 --- a/scripts/actions/mobskills/gaea_stream_theta.lua +++ b/scripts/actions/mobskills/gaea_stream_theta.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/gastric_bomb.lua b/scripts/actions/mobskills/gastric_bomb.lua index 48bee454de0..e206a1e06da 100644 --- a/scripts/actions/mobskills/gastric_bomb.lua +++ b/scripts/actions/mobskills/gastric_bomb.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.ATTACK_DOWN, 50, 0, 180) diff --git a/scripts/actions/mobskills/gate_of_tartarus.lua b/scripts/actions/mobskills/gate_of_tartarus.lua index 229cfaaeb36..c55ce686a2f 100644 --- a/scripts/actions/mobskills/gate_of_tartarus.lua +++ b/scripts/actions/mobskills/gate_of_tartarus.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2.5 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) local duration = 60 local power = 20 diff --git a/scripts/actions/mobskills/gates_of_hades.lua b/scripts/actions/mobskills/gates_of_hades.lua index 7c7e0f2463b..04dbb5e1745 100644 --- a/scripts/actions/mobskills/gates_of_hades.lua +++ b/scripts/actions/mobskills/gates_of_hades.lua @@ -20,8 +20,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 6 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1.8, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1.8, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BURN, 21, 3, 60) diff --git a/scripts/actions/mobskills/geirskogul.lua b/scripts/actions/mobskills/geirskogul.lua index b1a2d55e32a..bf72f2c2b64 100644 --- a/scripts/actions/mobskills/geirskogul.lua +++ b/scripts/actions/mobskills/geirskogul.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2.5 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/geocrush.lua b/scripts/actions/mobskills/geocrush.lua index 249c56800cc..87014205868 100644 --- a/scripts/actions/mobskills/geocrush.lua +++ b/scripts/actions/mobskills/geocrush.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 4 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.EARTH, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.EARTH, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.EARTH) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.STUN, 1, 0, 6) diff --git a/scripts/actions/mobskills/geotic_breath.lua b/scripts/actions/mobskills/geotic_breath.lua index 0499cc56321..ead2275dcf0 100644 --- a/scripts/actions/mobskills/geotic_breath.lua +++ b/scripts/actions/mobskills/geotic_breath.lua @@ -29,9 +29,9 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = utils.conalDamageAdjustment(mob, target, skill, damage, 0.2) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.EARTH, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + info.damage = utils.conalDamageAdjustment(mob, target, skill, info.damage, 0.2) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.EARTH, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.EARTH) diff --git a/scripts/actions/mobskills/giga_scream.lua b/scripts/actions/mobskills/giga_scream.lua index b95fa71f545..f9e991d3a95 100644 --- a/scripts/actions/mobskills/giga_scream.lua +++ b/scripts/actions/mobskills/giga_scream.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1.5 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/giga_slash.lua b/scripts/actions/mobskills/giga_slash.lua index 6eef29695ec..b09a2ba4a48 100644 --- a/scripts/actions/mobskills/giga_slash.lua +++ b/scripts/actions/mobskills/giga_slash.lua @@ -20,7 +20,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2.7 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/gigaflare.lua b/scripts/actions/mobskills/gigaflare.lua index 7e14c26694b..7c0d2d23a73 100644 --- a/scripts/actions/mobskills/gigaflare.lua +++ b/scripts/actions/mobskills/gigaflare.lua @@ -34,8 +34,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 15 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/glacial_breath.lua b/scripts/actions/mobskills/glacial_breath.lua index 9f3e690b755..177a27f5ccb 100644 --- a/scripts/actions/mobskills/glacial_breath.lua +++ b/scripts/actions/mobskills/glacial_breath.lua @@ -29,9 +29,9 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = utils.conalDamageAdjustment(mob, target, skill, damage, 0.2) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.ICE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + info.damage = utils.conalDamageAdjustment(mob, target, skill, info.damage, 0.2) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.ICE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.ICE) diff --git a/scripts/actions/mobskills/glacier_splitter.lua b/scripts/actions/mobskills/glacier_splitter.lua index 7f64e2edcb6..6b3be49e2c6 100644 --- a/scripts/actions/mobskills/glacier_splitter.lua +++ b/scripts/actions/mobskills/glacier_splitter.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.PARALYSIS, 15, 0, math.random(30, 60)) diff --git a/scripts/actions/mobskills/gnash.lua b/scripts/actions/mobskills/gnash.lua index f26c2a39bbc..21ee3a195ea 100644 --- a/scripts/actions/mobskills/gnash.lua +++ b/scripts/actions/mobskills/gnash.lua @@ -13,7 +13,12 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = math.floor(target:getHP() * (math.random(45, 55) / 100)) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = + { + damage = damage + } + + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) mob:resetEnmity(target) diff --git a/scripts/actions/mobskills/goblin_rush.lua b/scripts/actions/mobskills/goblin_rush.lua index eb1687a4143..bf794a5444d 100644 --- a/scripts/actions/mobskills/goblin_rush.lua +++ b/scripts/actions/mobskills/goblin_rush.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ACC_VARIES, 1, 2, 3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/gouging_branch.lua b/scripts/actions/mobskills/gouging_branch.lua index 320df280427..143118dc3bd 100644 --- a/scripts/actions/mobskills/gouging_branch.lua +++ b/scripts/actions/mobskills/gouging_branch.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, 1, xi.mobskills.physicalTpBonus.NO_EFFECT, 2.0, 2.0, 2.0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BLINDNESS, 50, 0, 45) diff --git a/scripts/actions/mobskills/grand_fall.lua b/scripts/actions/mobskills/grand_fall.lua index 47c8f9066ca..85fbbda297e 100644 --- a/scripts/actions/mobskills/grand_fall.lua +++ b/scripts/actions/mobskills/grand_fall.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 3, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 3, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER) diff --git a/scripts/actions/mobskills/grand_slam.lua b/scripts/actions/mobskills/grand_slam.lua index c1c34a8c858..20486f373e8 100644 --- a/scripts/actions/mobskills/grand_slam.lua +++ b/scripts/actions/mobskills/grand_slam.lua @@ -14,8 +14,10 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.0 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) + return dmg end diff --git a/scripts/actions/mobskills/grapeshot.lua b/scripts/actions/mobskills/grapeshot.lua index 714ed6c3394..cb0bf9566b2 100755 --- a/scripts/actions/mobskills/grapeshot.lua +++ b/scripts/actions/mobskills/grapeshot.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 0.3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, mob:getWeaponDmg() * ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 10) diff --git a/scripts/actions/mobskills/grapple.lua b/scripts/actions/mobskills/grapple.lua index c1cd384a9fc..32fe15c61c4 100644 --- a/scripts/actions/mobskills/grapple.lua +++ b/scripts/actions/mobskills/grapple.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = math.random(2, 2.5) local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/grating_tantara.lua b/scripts/actions/mobskills/grating_tantara.lua index 97c9ea088f7..ea76b0ac866 100644 --- a/scripts/actions/mobskills/grating_tantara.lua +++ b/scripts/actions/mobskills/grating_tantara.lua @@ -23,7 +23,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3.0 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ELEMENTAL, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ELEMENTAL, xi.mobskills.shadowBehavior.WIPE_SHADOWS) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.AMNESIA, 1, 0, 60) diff --git a/scripts/actions/mobskills/grave_reel.lua b/scripts/actions/mobskills/grave_reel.lua index 9d6596d330c..226eb8d35a0 100644 --- a/scripts/actions/mobskills/grave_reel.lua +++ b/scripts/actions/mobskills/grave_reel.lua @@ -13,8 +13,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, 1.0, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, 1.0, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.WIPE_SHADOWS) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.HP, damage)) diff --git a/scripts/actions/mobskills/gravitic_horn.lua b/scripts/actions/mobskills/gravitic_horn.lua index e62aaf9adce..4501e3f0183 100644 --- a/scripts/actions/mobskills/gravitic_horn.lua +++ b/scripts/actions/mobskills/gravitic_horn.lua @@ -24,8 +24,11 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) damage = math.floor(damage * 0.95) end - damage = math.floor(damage * xi.combat.damage.magicalElementSDT(target, xi.element.WIND)) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = + { + damage = math.floor(damage * xi.combat.damage.magicalElementSDT(target, xi.element.WIND)) + } + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) mob:resetEnmity(target) diff --git a/scripts/actions/mobskills/gravity_wheel.lua b/scripts/actions/mobskills/gravity_wheel.lua index 11af39f393d..945fe598ead 100644 --- a/scripts/actions/mobskills/gravity_wheel.lua +++ b/scripts/actions/mobskills/gravity_wheel.lua @@ -22,7 +22,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.WEIGHT, 50, 0, 120) diff --git a/scripts/actions/mobskills/great_sandstorm.lua b/scripts/actions/mobskills/great_sandstorm.lua index 1cc39d0d5f2..aa2a70f97d6 100644 --- a/scripts/actions/mobskills/great_sandstorm.lua +++ b/scripts/actions/mobskills/great_sandstorm.lua @@ -13,8 +13,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() * 3, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() * 3, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) diff --git a/scripts/actions/mobskills/great_wheel.lua b/scripts/actions/mobskills/great_wheel.lua index 2fed8b7698a..6a769a3559c 100644 --- a/scripts/actions/mobskills/great_wheel.lua +++ b/scripts/actions/mobskills/great_wheel.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/great_whirlwind.lua b/scripts/actions/mobskills/great_whirlwind.lua index dc696e4bb2e..9cbe631132a 100644 --- a/scripts/actions/mobskills/great_whirlwind.lua +++ b/scripts/actions/mobskills/great_whirlwind.lua @@ -13,8 +13,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() * 4, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() * 4, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) diff --git a/scripts/actions/mobskills/gregale_wing.lua b/scripts/actions/mobskills/gregale_wing.lua index 7517458bd63..cbcc3449bf1 100644 --- a/scripts/actions/mobskills/gregale_wing.lua +++ b/scripts/actions/mobskills/gregale_wing.lua @@ -22,8 +22,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.ICE, 4, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.ICE, 4, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.ICE) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.PARALYSIS, 40, 0, 120) diff --git a/scripts/actions/mobskills/gregale_wing_air.lua b/scripts/actions/mobskills/gregale_wing_air.lua index ee312280fe8..94a72899b09 100644 --- a/scripts/actions/mobskills/gregale_wing_air.lua +++ b/scripts/actions/mobskills/gregale_wing_air.lua @@ -19,8 +19,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.ICE, 6, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.ICE, 6, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.ICE) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.PARALYSIS, 40, 0, 120) diff --git a/scripts/actions/mobskills/grim_halo.lua b/scripts/actions/mobskills/grim_halo.lua index 3487b91529a..1e902e45be1 100644 --- a/scripts/actions/mobskills/grim_halo.lua +++ b/scripts/actions/mobskills/grim_halo.lua @@ -28,7 +28,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2.5 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/grim_reaper.lua b/scripts/actions/mobskills/grim_reaper.lua index 21959059865..dc56eb15f54 100644 --- a/scripts/actions/mobskills/grim_reaper.lua +++ b/scripts/actions/mobskills/grim_reaper.lua @@ -23,7 +23,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/ground_strike.lua b/scripts/actions/mobskills/ground_strike.lua index f5ffe7b53d3..901702f206a 100644 --- a/scripts/actions/mobskills/ground_strike.lua +++ b/scripts/actions/mobskills/ground_strike.lua @@ -13,7 +13,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 4 local ftp = 3.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/groundburst.lua b/scripts/actions/mobskills/groundburst.lua index 48c14b54fd2..5aa14a87c38 100644 --- a/scripts/actions/mobskills/groundburst.lua +++ b/scripts/actions/mobskills/groundburst.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/guided_missile.lua b/scripts/actions/mobskills/guided_missile.lua index 6716dfad7c6..2fe6d17d527 100644 --- a/scripts/actions/mobskills/guided_missile.lua +++ b/scripts/actions/mobskills/guided_missile.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 0.8 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/guided_missile_ii.lua b/scripts/actions/mobskills/guided_missile_ii.lua index da12c342ea5..cd74ecc9681 100644 --- a/scripts/actions/mobskills/guided_missile_ii.lua +++ b/scripts/actions/mobskills/guided_missile_ii.lua @@ -18,8 +18,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.DARK) diff --git a/scripts/actions/mobskills/guillotine.lua b/scripts/actions/mobskills/guillotine.lua index 7eff21d28eb..7a192ba6869 100644 --- a/scripts/actions/mobskills/guillotine.lua +++ b/scripts/actions/mobskills/guillotine.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 0.8 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/gust_slash.lua b/scripts/actions/mobskills/gust_slash.lua index 0a88019b635..e5a8ed16141 100644 --- a/scripts/actions/mobskills/gust_slash.lua +++ b/scripts/actions/mobskills/gust_slash.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ACC_VARIES, 1, 2, 3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/gusting_gouge.lua b/scripts/actions/mobskills/gusting_gouge.lua index 5a5cf5956c0..101644b9f41 100644 --- a/scripts/actions/mobskills/gusting_gouge.lua +++ b/scripts/actions/mobskills/gusting_gouge.lua @@ -28,7 +28,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/hammer-go-round.lua b/scripts/actions/mobskills/hammer-go-round.lua index 7bed3975bd7..0ee63b0e72f 100644 --- a/scripts/actions/mobskills/hammer-go-round.lua +++ b/scripts/actions/mobskills/hammer-go-round.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/hammer_beak.lua b/scripts/actions/mobskills/hammer_beak.lua index d6a3f186be2..954b9ab23f8 100644 --- a/scripts/actions/mobskills/hammer_beak.lua +++ b/scripts/actions/mobskills/hammer_beak.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3.0 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/hammerblow.lua b/scripts/actions/mobskills/hammerblow.lua index 723a78bcf21..e6ae1feb5ab 100644 --- a/scripts/actions/mobskills/hammerblow.lua +++ b/scripts/actions/mobskills/hammerblow.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.8 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/hane_fubuki.lua b/scripts/actions/mobskills/hane_fubuki.lua index 017a71106c6..eab1b776d76 100644 --- a/scripts/actions/mobskills/hane_fubuki.lua +++ b/scripts/actions/mobskills/hane_fubuki.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 2 local ftp = 3 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.POISON, mob:getMainLvl() / 7, 3, 120) diff --git a/scripts/actions/mobskills/happobarai.lua b/scripts/actions/mobskills/happobarai.lua index 523c55e0a4a..d98af301b94 100644 --- a/scripts/actions/mobskills/happobarai.lua +++ b/scripts/actions/mobskills/happobarai.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/hard_slash.lua b/scripts/actions/mobskills/hard_slash.lua index c5cd2a9ecb6..11a3bb59d75 100644 --- a/scripts/actions/mobskills/hard_slash.lua +++ b/scripts/actions/mobskills/hard_slash.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/havoc_spiral.lua b/scripts/actions/mobskills/havoc_spiral.lua index 035a9610b67..fee42b134e4 100644 --- a/scripts/actions/mobskills/havoc_spiral.lua +++ b/scripts/actions/mobskills/havoc_spiral.lua @@ -20,7 +20,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) -- Witnessed 280 to a melee, 400 to a BRD, and 500 to a wyvern target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/haymaker.lua b/scripts/actions/mobskills/haymaker.lua index 4216e662b8d..a7be4a8a41f 100644 --- a/scripts/actions/mobskills/haymaker.lua +++ b/scripts/actions/mobskills/haymaker.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.AMNESIA, 1, 0, 60) diff --git a/scripts/actions/mobskills/head_butt.lua b/scripts/actions/mobskills/head_butt.lua index 7842d6b5783..bd5da5f76f6 100644 --- a/scripts/actions/mobskills/head_butt.lua +++ b/scripts/actions/mobskills/head_butt.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/head_butt_quadav.lua b/scripts/actions/mobskills/head_butt_quadav.lua index f88dd0c1601..928c902201f 100644 --- a/scripts/actions/mobskills/head_butt_quadav.lua +++ b/scripts/actions/mobskills/head_butt_quadav.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/head_butt_turtle.lua b/scripts/actions/mobskills/head_butt_turtle.lua index f2e51fe24c1..07db67861e0 100644 --- a/scripts/actions/mobskills/head_butt_turtle.lua +++ b/scripts/actions/mobskills/head_butt_turtle.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) local duration = math.random(120, 180) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.ACCURACY_DOWN, 40, 0, duration) diff --git a/scripts/actions/mobskills/heat_breath.lua b/scripts/actions/mobskills/heat_breath.lua index 55c6b25eeb5..0e1431fe600 100644 --- a/scripts/actions/mobskills/heat_breath.lua +++ b/scripts/actions/mobskills/heat_breath.lua @@ -20,8 +20,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/heavenly_strike.lua b/scripts/actions/mobskills/heavenly_strike.lua index 72a3a6d50d1..d93ac41f943 100644 --- a/scripts/actions/mobskills/heavenly_strike.lua +++ b/scripts/actions/mobskills/heavenly_strike.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.ICE, 2.7, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.ICE, 2.7, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.ICE) diff --git a/scripts/actions/mobskills/heavy_blow.lua b/scripts/actions/mobskills/heavy_blow.lua index 6066d369e1f..aade22ecfe9 100644 --- a/scripts/actions/mobskills/heavy_blow.lua +++ b/scripts/actions/mobskills/heavy_blow.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 1.5 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, nil, nil, nil, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.HTH) return dmg end diff --git a/scripts/actions/mobskills/heavy_stomp.lua b/scripts/actions/mobskills/heavy_stomp.lua index 5f33ae85917..26720eb1a24 100644 --- a/scripts/actions/mobskills/heavy_stomp.lua +++ b/scripts/actions/mobskills/heavy_stomp.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/heavy_strike.lua b/scripts/actions/mobskills/heavy_strike.lua index c3c0fff6a68..029ba80a8d1 100644 --- a/scripts/actions/mobskills/heavy_strike.lua +++ b/scripts/actions/mobskills/heavy_strike.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.SLOW, 1250, 0, 120) diff --git a/scripts/actions/mobskills/heavy_strike_ulli.lua b/scripts/actions/mobskills/heavy_strike_ulli.lua index 3baabfd4967..1e2923f45d2 100644 --- a/scripts/actions/mobskills/heavy_strike_ulli.lua +++ b/scripts/actions/mobskills/heavy_strike_ulli.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/heavy_whisk.lua b/scripts/actions/mobskills/heavy_whisk.lua index a02e4a271f4..eb729d97505 100644 --- a/scripts/actions/mobskills/heavy_whisk.lua +++ b/scripts/actions/mobskills/heavy_whisk.lua @@ -12,8 +12,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WIND, 3.5, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WIND, 3.5, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) diff --git a/scripts/actions/mobskills/hecatomb_wave.lua b/scripts/actions/mobskills/hecatomb_wave.lua index db53ac28c02..90ec344c400 100644 --- a/scripts/actions/mobskills/hecatomb_wave.lua +++ b/scripts/actions/mobskills/hecatomb_wave.lua @@ -20,8 +20,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.WIND) diff --git a/scripts/actions/mobskills/hell_slash.lua b/scripts/actions/mobskills/hell_slash.lua index 902e7e0838c..f8eae809644 100644 --- a/scripts/actions/mobskills/hell_slash.lua +++ b/scripts/actions/mobskills/hell_slash.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/hellclap.lua b/scripts/actions/mobskills/hellclap.lua index 3ec23592632..9e30d214a94 100644 --- a/scripts/actions/mobskills/hellclap.lua +++ b/scripts/actions/mobskills/hellclap.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 10 local ftp = 4.0 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded * math.random(2, 3)) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded * math.random(2, 3)) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.WEIGHT, 40, 0, 60) diff --git a/scripts/actions/mobskills/helldive.lua b/scripts/actions/mobskills/helldive.lua index 325e59b66f5..ba2c7e12098 100644 --- a/scripts/actions/mobskills/helldive.lua +++ b/scripts/actions/mobskills/helldive.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/hellfire_arrow.lua b/scripts/actions/mobskills/hellfire_arrow.lua index 38d51ef51ab..519e4743dec 100644 --- a/scripts/actions/mobskills/hellfire_arrow.lua +++ b/scripts/actions/mobskills/hellfire_arrow.lua @@ -12,8 +12,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 2.7 local power = math.random(10, 30) - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BURN, power, 3, 60) diff --git a/scripts/actions/mobskills/hellstorm.lua b/scripts/actions/mobskills/hellstorm.lua index fec2de0cc9e..93f4a8502ee 100644 --- a/scripts/actions/mobskills/hellstorm.lua +++ b/scripts/actions/mobskills/hellstorm.lua @@ -13,8 +13,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.FIRE, 4, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.FIRE, 4, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/hex_palm.lua b/scripts/actions/mobskills/hex_palm.lua index 7a3021e5582..57e97c0e8f1 100644 --- a/scripts/actions/mobskills/hex_palm.lua +++ b/scripts/actions/mobskills/hex_palm.lua @@ -21,8 +21,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getMainLvl() * 2 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.WIPE_SHADOWS) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.HP, damage)) diff --git a/scripts/actions/mobskills/hexa_strike.lua b/scripts/actions/mobskills/hexa_strike.lua index 422ab67344c..ec4e992ae94 100644 --- a/scripts/actions/mobskills/hexa_strike.lua +++ b/scripts/actions/mobskills/hexa_strike.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.0 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1.1, 1.2, 1.3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/hexidiscs.lua b/scripts/actions/mobskills/hexidiscs.lua index 1f93d23abb2..0a515a6eeff 100644 --- a/scripts/actions/mobskills/hexidiscs.lua +++ b/scripts/actions/mobskills/hexidiscs.lua @@ -27,7 +27,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = .8 local ftp = .5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ATK_VARIES, 1.25, 1.25, 1.25) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/hiden_sokyaku.lua b/scripts/actions/mobskills/hiden_sokyaku.lua index f75a3bef049..c8463cb003e 100644 --- a/scripts/actions/mobskills/hiden_sokyaku.lua +++ b/scripts/actions/mobskills/hiden_sokyaku.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/hiemal_storm.lua b/scripts/actions/mobskills/hiemal_storm.lua index a0108431d0a..cd6d0d4ad46 100644 --- a/scripts/actions/mobskills/hiemal_storm.lua +++ b/scripts/actions/mobskills/hiemal_storm.lua @@ -21,9 +21,9 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = utils.conalDamageAdjustment(mob, target, skill, damage, 0.9) -- TODO: Does this have a conal adjustment? - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.ICE, xi.mobskills.shadowBehavior.WIPE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + info.damage = utils.conalDamageAdjustment(mob, target, skill, info.damage, 0.9) -- TODO: Does this have a conal adjustment? + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.ICE, xi.mobskills.shadowBehavior.WIPE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.ICE) diff --git a/scripts/actions/mobskills/high-tension_discharger.lua b/scripts/actions/mobskills/high-tension_discharger.lua index 441cf286e5f..c39ba5779a2 100644 --- a/scripts/actions/mobskills/high-tension_discharger.lua +++ b/scripts/actions/mobskills/high-tension_discharger.lua @@ -21,8 +21,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.THUNDER) diff --git a/scripts/actions/mobskills/hollow_smite.lua b/scripts/actions/mobskills/hollow_smite.lua index b48537deb7d..3801b9c150a 100644 --- a/scripts/actions/mobskills/hollow_smite.lua +++ b/scripts/actions/mobskills/hollow_smite.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.25 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1.1, 1.25, 1.45) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.HTH) return dmg diff --git a/scripts/actions/mobskills/hoof_volley.lua b/scripts/actions/mobskills/hoof_volley.lua index b1c14190767..f05d0781995 100644 --- a/scripts/actions/mobskills/hoof_volley.lua +++ b/scripts/actions/mobskills/hoof_volley.lua @@ -20,7 +20,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 4 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) if mob:getObjType() == xi.objType.MOB then mob:resetEnmity(target) diff --git a/scripts/actions/mobskills/howling_fist.lua b/scripts/actions/mobskills/howling_fist.lua index 55bdf5f44e3..d84289731cd 100644 --- a/scripts/actions/mobskills/howling_fist.lua +++ b/scripts/actions/mobskills/howling_fist.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.HTH) return dmg diff --git a/scripts/actions/mobskills/howling_moon.lua b/scripts/actions/mobskills/howling_moon.lua index bc3e27c260a..b19c14b9c0c 100644 --- a/scripts/actions/mobskills/howling_moon.lua +++ b/scripts/actions/mobskills/howling_moon.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 9 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 3, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 3, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.DARK) diff --git a/scripts/actions/mobskills/hungry_crunch.lua b/scripts/actions/mobskills/hungry_crunch.lua index 335abce1b73..2bbf84b4476 100644 --- a/scripts/actions/mobskills/hungry_crunch.lua +++ b/scripts/actions/mobskills/hungry_crunch.lua @@ -10,8 +10,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, 2, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.NUMSHADOWS_1) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, 2, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.NUMSHADOWS_1) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.HP, damage)) diff --git a/scripts/actions/mobskills/hurricane_wing.lua b/scripts/actions/mobskills/hurricane_wing.lua index a48db77e88e..0c9491356b3 100644 --- a/scripts/actions/mobskills/hurricane_wing.lua +++ b/scripts/actions/mobskills/hurricane_wing.lua @@ -22,8 +22,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WIND, 4, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WIND, 4, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) diff --git a/scripts/actions/mobskills/hurricane_wing_flying.lua b/scripts/actions/mobskills/hurricane_wing_flying.lua index 0bbaa9cef2f..55595d0978d 100644 --- a/scripts/actions/mobskills/hurricane_wing_flying.lua +++ b/scripts/actions/mobskills/hurricane_wing_flying.lua @@ -15,8 +15,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WIND, 4, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WIND, 4, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) diff --git a/scripts/actions/mobskills/hydro_ball.lua b/scripts/actions/mobskills/hydro_ball.lua index 1c452547062..5ab30791ab3 100644 --- a/scripts/actions/mobskills/hydro_ball.lua +++ b/scripts/actions/mobskills/hydro_ball.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3.5 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.STR_DOWN, 10, 3, 120) diff --git a/scripts/actions/mobskills/hydro_canon.lua b/scripts/actions/mobskills/hydro_canon.lua index 8aa703a6e2d..de89ac50aa1 100644 --- a/scripts/actions/mobskills/hydro_canon.lua +++ b/scripts/actions/mobskills/hydro_canon.lua @@ -21,8 +21,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.WATER) diff --git a/scripts/actions/mobskills/hydro_shot.lua b/scripts/actions/mobskills/hydro_shot.lua index 981872ee3c5..adead364e97 100644 --- a/scripts/actions/mobskills/hydro_shot.lua +++ b/scripts/actions/mobskills/hydro_shot.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.ENMITY_DOWN, 10, 3, 120) mob:resetEnmity(target) diff --git a/scripts/actions/mobskills/hydro_wave.lua b/scripts/actions/mobskills/hydro_wave.lua index 7e160652c49..41b9008b662 100644 --- a/scripts/actions/mobskills/hydro_wave.lua +++ b/scripts/actions/mobskills/hydro_wave.lua @@ -21,8 +21,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local resistRate = xi.combat.magicHitRate.calculateResistRate(mob, target, 0, 0, 0, xi.element.WATER, xi.mod.INT, xi.effect.ENCUMBRANCE_II, 0) local duration = math.floor(30 * resistRate) - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 2.5, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 2.5, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.ENCUMBRANCE_II, power, 0, duration) diff --git a/scripts/actions/mobskills/hyper_pulse.lua b/scripts/actions/mobskills/hyper_pulse.lua index 9aae6db0788..e139793bab4 100644 --- a/scripts/actions/mobskills/hyper_pulse.lua +++ b/scripts/actions/mobskills/hyper_pulse.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING, { breakBind = false }) diff --git a/scripts/actions/mobskills/hypothermal_combustion.lua b/scripts/actions/mobskills/hypothermal_combustion.lua index 7be86fb7941..1e004392418 100644 --- a/scripts/actions/mobskills/hypothermal_combustion.lua +++ b/scripts/actions/mobskills/hypothermal_combustion.lua @@ -19,8 +19,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = math.floor(mob:getHP() / 3) - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.ICE, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.ICE, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.ICE) diff --git a/scripts/actions/mobskills/hypothermal_combustion_tzar.lua b/scripts/actions/mobskills/hypothermal_combustion_tzar.lua index 3535af052b0..2787109c7b9 100644 --- a/scripts/actions/mobskills/hypothermal_combustion_tzar.lua +++ b/scripts/actions/mobskills/hypothermal_combustion_tzar.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = math.floor(mob:getHP() / 3) - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.ICE, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.ICE, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.ICE) diff --git a/scripts/actions/mobskills/hysteric_assault.lua b/scripts/actions/mobskills/hysteric_assault.lua index 127e164a9a4..c355bbaa7ce 100644 --- a/scripts/actions/mobskills/hysteric_assault.lua +++ b/scripts/actions/mobskills/hysteric_assault.lua @@ -13,7 +13,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.0 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.HP, dmg)) diff --git a/scripts/actions/mobskills/hysteric_barrage.lua b/scripts/actions/mobskills/hysteric_barrage.lua index 2c43f56e607..448c654da2f 100644 --- a/scripts/actions/mobskills/hysteric_barrage.lua +++ b/scripts/actions/mobskills/hysteric_barrage.lua @@ -20,7 +20,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = .5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.HTH) return dmg end diff --git a/scripts/actions/mobskills/ice_break.lua b/scripts/actions/mobskills/ice_break.lua index e5936c5d084..6ce33e48512 100644 --- a/scripts/actions/mobskills/ice_break.lua +++ b/scripts/actions/mobskills/ice_break.lua @@ -11,8 +11,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) -- TODO: Damage should be 1 + dINT - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.ICE, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.ICE, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.ICE, { breakBind = false }) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BIND, 1, 0, math.random(120, 180)) diff --git a/scripts/actions/mobskills/ice_break_2128.lua b/scripts/actions/mobskills/ice_break_2128.lua index b74c68f5193..23183cb18a6 100644 --- a/scripts/actions/mobskills/ice_break_2128.lua +++ b/scripts/actions/mobskills/ice_break_2128.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.ICE, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.ICE, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.ICE, { breakBind = false }) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BIND, 1, 0, 30) diff --git a/scripts/actions/mobskills/ice_roar.lua b/scripts/actions/mobskills/ice_roar.lua index c1b62ec1148..f7e85d0a1b2 100644 --- a/scripts/actions/mobskills/ice_roar.lua +++ b/scripts/actions/mobskills/ice_roar.lua @@ -12,10 +12,11 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.ICE, 1.5, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.ICE, 1.5, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.ICE) + return damage end diff --git a/scripts/actions/mobskills/ill_wind.lua b/scripts/actions/mobskills/ill_wind.lua index a5bcaf6188b..dcddfb91f84 100644 --- a/scripts/actions/mobskills/ill_wind.lua +++ b/scripts/actions/mobskills/ill_wind.lua @@ -20,8 +20,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = math.floor(mob:getWeaponDmg() * 2.5) - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:dispelStatusEffect() target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) diff --git a/scripts/actions/mobskills/impact_roar.lua b/scripts/actions/mobskills/impact_roar.lua index f59e18ebdea..e6863b9804c 100644 --- a/scripts/actions/mobskills/impact_roar.lua +++ b/scripts/actions/mobskills/impact_roar.lua @@ -12,11 +12,13 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 - local accmod = 1 - local ftp = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local accmod = 1 + local ftp = 1 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) + return dmg end diff --git a/scripts/actions/mobskills/impact_stream.lua b/scripts/actions/mobskills/impact_stream.lua index c35eaa84f50..de6863974fc 100644 --- a/scripts/actions/mobskills/impact_stream.lua +++ b/scripts/actions/mobskills/impact_stream.lua @@ -13,8 +13,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() * 2, xi.element.NONE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() * 2, xi.element.NONE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.ELEMENTAL) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/impale.lua b/scripts/actions/mobskills/impale.lua index c900daf9843..cacace540c7 100644 --- a/scripts/actions/mobskills/impale.lua +++ b/scripts/actions/mobskills/impale.lua @@ -26,7 +26,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) mob:resetEnmity(target) end - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, shadows) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, shadows) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, typeEffect, 20, 0, 120) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/impalement.lua b/scripts/actions/mobskills/impalement.lua index aa74704bf82..ead5a06fd79 100644 --- a/scripts/actions/mobskills/impalement.lua +++ b/scripts/actions/mobskills/impalement.lua @@ -15,8 +15,12 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local currentHP = target:getHP() local stab = currentHP * .95 + local info = + { + damage = stab + } - local dmg = xi.mobskills.mobFinalAdjustments(stab, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/imperial_authority.lua b/scripts/actions/mobskills/imperial_authority.lua index b245c586aa0..207551c0866 100644 --- a/scripts/actions/mobskills/imperial_authority.lua +++ b/scripts/actions/mobskills/imperial_authority.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 0.3 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, mob:getWeaponDmg() * ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 10) diff --git a/scripts/actions/mobskills/implosion.lua b/scripts/actions/mobskills/implosion.lua index a8b94b87a83..00e14e92d45 100644 --- a/scripts/actions/mobskills/implosion.lua +++ b/scripts/actions/mobskills/implosion.lua @@ -13,8 +13,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.DARK) diff --git a/scripts/actions/mobskills/impulse_drive.lua b/scripts/actions/mobskills/impulse_drive.lua index 349c4486db8..c7d875ff379 100644 --- a/scripts/actions/mobskills/impulse_drive.lua +++ b/scripts/actions/mobskills/impulse_drive.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ATK_VARIES, 1, 1, 1) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/incensed_pummel.lua b/scripts/actions/mobskills/incensed_pummel.lua index 0c3df0696ea..42db0460e9d 100644 --- a/scripts/actions/mobskills/incensed_pummel.lua +++ b/scripts/actions/mobskills/incensed_pummel.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local typeEffect = 136 + math.random(0, 6) -- 136 is xi.effect.STR_DOWN add 0 to 6 for all 7 of the possible attribute reductions local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, typeEffect, 20, 3, 120) diff --git a/scripts/actions/mobskills/incessant_fists.lua b/scripts/actions/mobskills/incessant_fists.lua index e9735164386..ef5df26d3bc 100644 --- a/scripts/actions/mobskills/incessant_fists.lua +++ b/scripts/actions/mobskills/incessant_fists.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/incinerate.lua b/scripts/actions/mobskills/incinerate.lua index 43bf712ea46..3fef5f9d326 100644 --- a/scripts/actions/mobskills/incinerate.lua +++ b/scripts/actions/mobskills/incinerate.lua @@ -20,8 +20,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/inertia_stream.lua b/scripts/actions/mobskills/inertia_stream.lua index fcdac756821..6afb9c529aa 100644 --- a/scripts/actions/mobskills/inertia_stream.lua +++ b/scripts/actions/mobskills/inertia_stream.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.ICE, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.ICE, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.EARTH, { breakBind = false }) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BIND, 1, 0, 30) diff --git a/scripts/actions/mobskills/infernal_deliverance.lua b/scripts/actions/mobskills/infernal_deliverance.lua index c870267744f..b9f81998ece 100644 --- a/scripts/actions/mobskills/infernal_deliverance.lua +++ b/scripts/actions/mobskills/infernal_deliverance.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/infernal_pestilence.lua b/scripts/actions/mobskills/infernal_pestilence.lua index 7b8a37b3a44..011505de49b 100644 --- a/scripts/actions/mobskills/infernal_pestilence.lua +++ b/scripts/actions/mobskills/infernal_pestilence.lua @@ -21,8 +21,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER) diff --git a/scripts/actions/mobskills/inferno.lua b/scripts/actions/mobskills/inferno.lua index 73de09eddb8..8a8ac920137 100644 --- a/scripts/actions/mobskills/inferno.lua +++ b/scripts/actions/mobskills/inferno.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 9 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 3, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 3, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/inferno_blast.lua b/scripts/actions/mobskills/inferno_blast.lua index 47e8a702e39..29b895cf79d 100644 --- a/scripts/actions/mobskills/inferno_blast.lua +++ b/scripts/actions/mobskills/inferno_blast.lua @@ -19,8 +19,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.FIRE, 7, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.FIRE, 7, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/inferno_blast_alt.lua b/scripts/actions/mobskills/inferno_blast_alt.lua index 88a754c57ed..d21219ae846 100644 --- a/scripts/actions/mobskills/inferno_blast_alt.lua +++ b/scripts/actions/mobskills/inferno_blast_alt.lua @@ -14,8 +14,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.FIRE, 4, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.FIRE, 4, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) skill:setMsg(xi.msg.basic.HIT_DMG) diff --git a/scripts/actions/mobskills/ink_jet.lua b/scripts/actions/mobskills/ink_jet.lua index 6a15478c6ef..a76680b52d1 100644 --- a/scripts/actions/mobskills/ink_jet.lua +++ b/scripts/actions/mobskills/ink_jet.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = math.random(1.5, 2.5) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.DARK) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BLINDNESS, 80, 0, 120) diff --git a/scripts/actions/mobskills/ink_jet_fee.lua b/scripts/actions/mobskills/ink_jet_fee.lua index c4a071e7501..d0078b441c9 100644 --- a/scripts/actions/mobskills/ink_jet_fee.lua +++ b/scripts/actions/mobskills/ink_jet_fee.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill, action) local ftp = math.random(1.5, 2.5) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.DARK) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BLINDNESS, 80, 0, 120) diff --git a/scripts/actions/mobskills/insipid_nip.lua b/scripts/actions/mobskills/insipid_nip.lua index 1a475622e19..32984ece9fd 100644 --- a/scripts/actions/mobskills/insipid_nip.lua +++ b/scripts/actions/mobskills/insipid_nip.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 2 local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) if xi.mobskills.mobPhysicalHit(skill) then target:dispelStatusEffect() diff --git a/scripts/actions/mobskills/ion_shower.lua b/scripts/actions/mobskills/ion_shower.lua index d7688221182..a2490d6829d 100644 --- a/scripts/actions/mobskills/ion_shower.lua +++ b/scripts/actions/mobskills/ion_shower.lua @@ -13,8 +13,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.THUNDER, 2, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.THUNDER, 2, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.THUNDER) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.STUN, 1, 0, 5) diff --git a/scripts/actions/mobskills/iridal_pierce.lua b/scripts/actions/mobskills/iridal_pierce.lua index b20aeb83b05..38188f36ccc 100644 --- a/scripts/actions/mobskills/iridal_pierce.lua +++ b/scripts/actions/mobskills/iridal_pierce.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3.5 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 2, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 2, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.LIGHT) diff --git a/scripts/actions/mobskills/javelin_throw.lua b/scripts/actions/mobskills/javelin_throw.lua index eda6574182d..3a31f16d9df 100644 --- a/scripts/actions/mobskills/javelin_throw.lua +++ b/scripts/actions/mobskills/javelin_throw.lua @@ -25,7 +25,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local dmgmod = 1 local info = xi.mobskills.mobRangedMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.ACC_VARIES) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.RANGED, xi.damageType.PIERCING) return dmg end diff --git a/scripts/actions/mobskills/jet_stream.lua b/scripts/actions/mobskills/jet_stream.lua index 6933c4596bd..5fb85f7f2a4 100644 --- a/scripts/actions/mobskills/jet_stream.lua +++ b/scripts/actions/mobskills/jet_stream.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ACC_VARIES, 1, 1.5, 2) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/judgment.lua b/scripts/actions/mobskills/judgment.lua index 9632f585cea..bdbfae08aed 100644 --- a/scripts/actions/mobskills/judgment.lua +++ b/scripts/actions/mobskills/judgment.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 0.6 local ftp = 3.0 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ACC_VARIES, 2.0, 2.5, 3.0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/judgment_bolt.lua b/scripts/actions/mobskills/judgment_bolt.lua index 96010d16ff5..db8d56c3e05 100644 --- a/scripts/actions/mobskills/judgment_bolt.lua +++ b/scripts/actions/mobskills/judgment_bolt.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 9 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.THUNDER, 3, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.THUNDER, 3, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.THUNDER) diff --git a/scripts/actions/mobskills/jump.lua b/scripts/actions/mobskills/jump.lua index 9944188e3e8..61005f3312c 100644 --- a/scripts/actions/mobskills/jump.lua +++ b/scripts/actions/mobskills/jump.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 + (mob:getStat(xi.mod.VIT) / 256) local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/jumping_thrust.lua b/scripts/actions/mobskills/jumping_thrust.lua index 19a1c8903eb..42b61a3f862 100644 --- a/scripts/actions/mobskills/jumping_thrust.lua +++ b/scripts/actions/mobskills/jumping_thrust.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) return dmg diff --git a/scripts/actions/mobskills/kartstrahl.lua b/scripts/actions/mobskills/kartstrahl.lua index 4b5f81f1013..102ccc21c5b 100644 --- a/scripts/actions/mobskills/kartstrahl.lua +++ b/scripts/actions/mobskills/kartstrahl.lua @@ -11,8 +11,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.ICE, 2, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.ICE, 2, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.ICE) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.SLEEP_I, 1, 0, math.random(30, 90)) diff --git a/scripts/actions/mobskills/kick_back.lua b/scripts/actions/mobskills/kick_back.lua index f23598fa578..06f2f7c8c40 100644 --- a/scripts/actions/mobskills/kick_back.lua +++ b/scripts/actions/mobskills/kick_back.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1, 2, 3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/kick_out.lua b/scripts/actions/mobskills/kick_out.lua index b02f7438397..536b07fa7b2 100644 --- a/scripts/actions/mobskills/kick_out.lua +++ b/scripts/actions/mobskills/kick_out.lua @@ -23,7 +23,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BLINDNESS, 20, 0, 120) diff --git a/scripts/actions/mobskills/king_cobra_clamp.lua b/scripts/actions/mobskills/king_cobra_clamp.lua index 10a4d27fa19..c48ce920273 100644 --- a/scripts/actions/mobskills/king_cobra_clamp.lua +++ b/scripts/actions/mobskills/king_cobra_clamp.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3.0 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/knights_of_round.lua b/scripts/actions/mobskills/knights_of_round.lua index cb5890feff3..11b2b284805 100644 --- a/scripts/actions/mobskills/knights_of_round.lua +++ b/scripts/actions/mobskills/knights_of_round.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/knuckle_sandwich.lua b/scripts/actions/mobskills/knuckle_sandwich.lua index 865fb22d374..f444d6a383a 100644 --- a/scripts/actions/mobskills/knuckle_sandwich.lua +++ b/scripts/actions/mobskills/knuckle_sandwich.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.LIGHT) diff --git a/scripts/actions/mobskills/lamb_chop.lua b/scripts/actions/mobskills/lamb_chop.lua index 1594b874338..47303bcb645 100644 --- a/scripts/actions/mobskills/lamb_chop.lua +++ b/scripts/actions/mobskills/lamb_chop.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/lamentation.lua b/scripts/actions/mobskills/lamentation.lua index ea445e7b81a..a2949bad5fd 100644 --- a/scripts/actions/mobskills/lamentation.lua +++ b/scripts/actions/mobskills/lamentation.lua @@ -13,8 +13,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.LIGHT, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.LIGHT, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.LIGHT) diff --git a/scripts/actions/mobskills/laser_shower.lua b/scripts/actions/mobskills/laser_shower.lua index 5e5e9823bdb..e8cde78c8dd 100644 --- a/scripts/actions/mobskills/laser_shower.lua +++ b/scripts/actions/mobskills/laser_shower.lua @@ -25,12 +25,12 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) local dis = ((mob:checkDistance(target) * 2) / 20) -- TODO: Verify this skill has a damage adjustment based on range from mob. - damage = damage * dis - damage = utils.clamp(damage, 50, 1600) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + info.damage = info.damage * dis + info.damage = utils.clamp(info.damage, 50, 1600) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.LIGHT) diff --git a/scripts/actions/mobskills/lateral_slash.lua b/scripts/actions/mobskills/lateral_slash.lua index 5d4b4e8d734..cc66ecf0ac7 100644 --- a/scripts/actions/mobskills/lateral_slash.lua +++ b/scripts/actions/mobskills/lateral_slash.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 2 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.DEFENSE_DOWN, 83, 0, 30) diff --git a/scripts/actions/mobskills/lava_spit.lua b/scripts/actions/mobskills/lava_spit.lua index 1dd317af650..352177e0e7b 100644 --- a/scripts/actions/mobskills/lava_spit.lua +++ b/scripts/actions/mobskills/lava_spit.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 5 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/leaf_dagger.lua b/scripts/actions/mobskills/leaf_dagger.lua index deb68b3d4f6..05ff437fc2e 100644 --- a/scripts/actions/mobskills/leaf_dagger.lua +++ b/scripts/actions/mobskills/leaf_dagger.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) local power = math.max(1, mob:getMainLvl() / 10) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/leafstorm.lua b/scripts/actions/mobskills/leafstorm.lua index 71ccf437a24..4619eb2b393 100644 --- a/scripts/actions/mobskills/leafstorm.lua +++ b/scripts/actions/mobskills/leafstorm.lua @@ -12,8 +12,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WIND, 2, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WIND, 2, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) return damage diff --git a/scripts/actions/mobskills/leaping_cleave.lua b/scripts/actions/mobskills/leaping_cleave.lua index 0bccfdf450b..4c88c058f6b 100644 --- a/scripts/actions/mobskills/leaping_cleave.lua +++ b/scripts/actions/mobskills/leaping_cleave.lua @@ -23,7 +23,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 3 local ftp = 2.25 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) local duration = xi.mobskills.calculateDuration(mob:getTP(), 15, 30) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, duration) diff --git a/scripts/actions/mobskills/leeching_current.lua b/scripts/actions/mobskills/leeching_current.lua index 4cc83c36fea..03630d8597f 100644 --- a/scripts/actions/mobskills/leeching_current.lua +++ b/scripts/actions/mobskills/leeching_current.lua @@ -17,8 +17,12 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) base = 1000 end - local damage = base / skill:getTotalTargets() - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = + { + damage = base / skill:getTotalTargets() + } + + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.PHYSICAL, xi.damageType.WATER) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.HP, damage)) diff --git a/scripts/actions/mobskills/lesson_in_pain.lua b/scripts/actions/mobskills/lesson_in_pain.lua index 3d7434afff5..b22814aed95 100644 --- a/scripts/actions/mobskills/lesson_in_pain.lua +++ b/scripts/actions/mobskills/lesson_in_pain.lua @@ -11,8 +11,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = math.floor(mob:getWeaponDmg() * 2.8) - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.NONE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.NONE, xi.damageType.NONE, 1) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.NONE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.NONE, xi.damageType.NONE, 1) target:takeDamage(damage, mob, xi.attackType.NONE, xi.damageType.NONE) diff --git a/scripts/actions/mobskills/lethe_arrows.lua b/scripts/actions/mobskills/lethe_arrows.lua index d9291e825a6..e0e2898d98b 100644 --- a/scripts/actions/mobskills/lethe_arrows.lua +++ b/scripts/actions/mobskills/lethe_arrows.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 3 local ftp = 4 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BIND, 1, 0, 120) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.AMNESIA, 1, 0, 120) diff --git a/scripts/actions/mobskills/light_blade.lua b/scripts/actions/mobskills/light_blade.lua index d07fa70e661..fba02d2636c 100644 --- a/scripts/actions/mobskills/light_blade.lua +++ b/scripts/actions/mobskills/light_blade.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 6 local info = xi.mobskills.mobRangedMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.RANGED, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.RANGED, xi.damageType.SLASHING, info.hitslanded) local distance = mob:checkDistance(target) distance = utils.clamp(distance, 0, 40) diff --git a/scripts/actions/mobskills/lightning_roar.lua b/scripts/actions/mobskills/lightning_roar.lua index 61667d6d986..65844318d80 100644 --- a/scripts/actions/mobskills/lightning_roar.lua +++ b/scripts/actions/mobskills/lightning_roar.lua @@ -11,10 +11,11 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.THUNDER, 1.5, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.THUNDER, 1.5, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.THUNDER) + return damage end diff --git a/scripts/actions/mobskills/lightning_spear.lua b/scripts/actions/mobskills/lightning_spear.lua index f3af0282c66..9efe8f6e273 100644 --- a/scripts/actions/mobskills/lightning_spear.lua +++ b/scripts/actions/mobskills/lightning_spear.lua @@ -22,8 +22,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = 2 * mob:getWeaponDmg() local dmgmod = 10 -- unbuffed player hit for ~2k - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.THUNDER, dmgmod, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.THUNDER, dmgmod, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) if damage > 0 then target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.THUNDER) diff --git a/scripts/actions/mobskills/luminous_lance.lua b/scripts/actions/mobskills/luminous_lance.lua index aff764c6f4a..334013fde8f 100644 --- a/scripts/actions/mobskills/luminous_lance.lua +++ b/scripts/actions/mobskills/luminous_lance.lua @@ -13,7 +13,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local dmgmod = 3 local info = xi.mobskills.mobRangedMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.magicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.RANGED, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/lunar_revolution.lua b/scripts/actions/mobskills/lunar_revolution.lua index 0d56f0e76d4..b40311c30d3 100644 --- a/scripts/actions/mobskills/lunar_revolution.lua +++ b/scripts/actions/mobskills/lunar_revolution.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.0 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/lux_arrow.lua b/scripts/actions/mobskills/lux_arrow.lua index 38822c18097..ea0b44d20fa 100644 --- a/scripts/actions/mobskills/lux_arrow.lua +++ b/scripts/actions/mobskills/lux_arrow.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = math.floor(mob:getWeaponDmg() * 2.5) - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, 1) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, 1) target:takeDamage(damage, mob, xi.attackType.RANGED, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/maats_bash.lua b/scripts/actions/mobskills/maats_bash.lua index bbd1bc10993..ef63a021658 100644 --- a/scripts/actions/mobskills/maats_bash.lua +++ b/scripts/actions/mobskills/maats_bash.lua @@ -13,7 +13,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.2 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/maelstrom.lua b/scripts/actions/mobskills/maelstrom.lua index 24b14193d83..089e6c23d8b 100644 --- a/scripts/actions/mobskills/maelstrom.lua +++ b/scripts/actions/mobskills/maelstrom.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = math.random(2, 3) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WATER, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WATER, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.STR_DOWN, 10, 3, 120) diff --git a/scripts/actions/mobskills/magic_hammer.lua b/scripts/actions/mobskills/magic_hammer.lua index fe922901024..dca53644ef7 100644 --- a/scripts/actions/mobskills/magic_hammer.lua +++ b/scripts/actions/mobskills/magic_hammer.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.MP, damage) diff --git a/scripts/actions/mobskills/magma_fan.lua b/scripts/actions/mobskills/magma_fan.lua index f4e54f29a05..a739b636f52 100644 --- a/scripts/actions/mobskills/magma_fan.lua +++ b/scripts/actions/mobskills/magma_fan.lua @@ -22,8 +22,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) -- https://docs.google.com/spreadsheets/d/1YBoveP-weMdidrirY-vPDzHyxbEI2ryECINlfCnFkLI/edit?pli=1&gid=57955395#gid=57955395&range=A566 -- TODO: Spreadsheet states this can crit. - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/magnetite_cloud.lua b/scripts/actions/mobskills/magnetite_cloud.lua index 791d5b481c4..42454d1f955 100644 --- a/scripts/actions/mobskills/magnetite_cloud.lua +++ b/scripts/actions/mobskills/magnetite_cloud.lua @@ -20,8 +20,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.EARTH, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.EARTH, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.EARTH) diff --git a/scripts/actions/mobskills/malediction.lua b/scripts/actions/mobskills/malediction.lua index 9e34be9024b..2341e073ec8 100644 --- a/scripts/actions/mobskills/malediction.lua +++ b/scripts/actions/mobskills/malediction.lua @@ -10,8 +10,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() * 4, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() * 4, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.HP, damage)) diff --git a/scripts/actions/mobskills/malevolent_blessing.lua b/scripts/actions/mobskills/malevolent_blessing.lua index 3268c1e06fd..0b3ac003eee 100644 --- a/scripts/actions/mobskills/malevolent_blessing.lua +++ b/scripts/actions/mobskills/malevolent_blessing.lua @@ -9,8 +9,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, 3, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.NUMSHADOWS_2) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, 3, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.NUMSHADOWS_2) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.DARK) diff --git a/scripts/actions/mobskills/mana_storm.lua b/scripts/actions/mobskills/mana_storm.lua index d346cd985a3..a2f7656008b 100644 --- a/scripts/actions/mobskills/mana_storm.lua +++ b/scripts/actions/mobskills/mana_storm.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.MP, damage)) diff --git a/scripts/actions/mobskills/mandible_bite.lua b/scripts/actions/mobskills/mandible_bite.lua index 0e3616dded4..84d143be74c 100644 --- a/scripts/actions/mobskills/mandible_bite.lua +++ b/scripts/actions/mobskills/mandible_bite.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 1.5 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ATK_VARIES, 1.5, 1.5, 1.5, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) return dmg end diff --git a/scripts/actions/mobskills/mandibular_bite.lua b/scripts/actions/mobskills/mandibular_bite.lua index 9b3cd98215e..43781a215d5 100644 --- a/scripts/actions/mobskills/mandibular_bite.lua +++ b/scripts/actions/mobskills/mandibular_bite.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.7 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) return dmg end diff --git a/scripts/actions/mobskills/mangle.lua b/scripts/actions/mobskills/mangle.lua index 6bab9551585..48b4d66dd2e 100644 --- a/scripts/actions/mobskills/mangle.lua +++ b/scripts/actions/mobskills/mangle.lua @@ -23,7 +23,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ACC_VARIES) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/mantle_pierce.lua b/scripts/actions/mobskills/mantle_pierce.lua index 49cbf991a16..b232e2ab9b5 100644 --- a/scripts/actions/mobskills/mantle_pierce.lua +++ b/scripts/actions/mobskills/mantle_pierce.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 2 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1, 1, 1) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.WEIGHT, 75, 0, math.random(15, 45)) diff --git a/scripts/actions/mobskills/marrow_drain.lua b/scripts/actions/mobskills/marrow_drain.lua index 610c9703885..0fc31fe0247 100644 --- a/scripts/actions/mobskills/marrow_drain.lua +++ b/scripts/actions/mobskills/marrow_drain.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = math.floor(mob:getWeaponDmg() * 2.3) - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.MP, damage)) diff --git a/scripts/actions/mobskills/medusa_javelin.lua b/scripts/actions/mobskills/medusa_javelin.lua index 88d695f974a..3ee905080f8 100644 --- a/scripts/actions/mobskills/medusa_javelin.lua +++ b/scripts/actions/mobskills/medusa_javelin.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2 -- TODO: Need crit scaling captures local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1, 1, 1) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.PETRIFICATION, 1, 0, math.random(30, 60)) diff --git a/scripts/actions/mobskills/mega_holy.lua b/scripts/actions/mobskills/mega_holy.lua index 5c0be723bff..79378b243be 100644 --- a/scripts/actions/mobskills/mega_holy.lua +++ b/scripts/actions/mobskills/mega_holy.lua @@ -20,8 +20,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 3, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 3, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.LIGHT) diff --git a/scripts/actions/mobskills/megaflare.lua b/scripts/actions/mobskills/megaflare.lua index d4976ec72f4..ef98ded77e5 100644 --- a/scripts/actions/mobskills/megaflare.lua +++ b/scripts/actions/mobskills/megaflare.lua @@ -35,8 +35,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) -- Damage calculation local damage = mob:getWeaponDmg() * 10 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/megalith_throw.lua b/scripts/actions/mobskills/megalith_throw.lua index 28b12ed465d..a2e933c0340 100644 --- a/scripts/actions/mobskills/megalith_throw.lua +++ b/scripts/actions/mobskills/megalith_throw.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local dmgmod = 2.5 local info = xi.mobskills.mobRangedMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.magicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.SLOW, 1000, 0, 120) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/meltdown.lua b/scripts/actions/mobskills/meltdown.lua index e06dc344be3..4ab4db67f71 100644 --- a/scripts/actions/mobskills/meltdown.lua +++ b/scripts/actions/mobskills/meltdown.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getHP() / 2 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.LIGHT) diff --git a/scripts/actions/mobskills/memory_of_dark.lua b/scripts/actions/mobskills/memory_of_dark.lua index 54bc87a26f8..fc8805e6a0d 100644 --- a/scripts/actions/mobskills/memory_of_dark.lua +++ b/scripts/actions/mobskills/memory_of_dark.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 3 - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.DARK) diff --git a/scripts/actions/mobskills/memory_of_earth.lua b/scripts/actions/mobskills/memory_of_earth.lua index 60b57b75ef7..c42b3581137 100644 --- a/scripts/actions/mobskills/memory_of_earth.lua +++ b/scripts/actions/mobskills/memory_of_earth.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 3 - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.EARTH, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.EARTH, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.EARTH) diff --git a/scripts/actions/mobskills/memory_of_fire.lua b/scripts/actions/mobskills/memory_of_fire.lua index 811d0f917dc..8989cd77e4f 100644 --- a/scripts/actions/mobskills/memory_of_fire.lua +++ b/scripts/actions/mobskills/memory_of_fire.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 3 - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.FIRE, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.FIRE, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/memory_of_ice.lua b/scripts/actions/mobskills/memory_of_ice.lua index 334ecda748a..c6bf3a3b36e 100644 --- a/scripts/actions/mobskills/memory_of_ice.lua +++ b/scripts/actions/mobskills/memory_of_ice.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 3 - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.ICE, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.ICE, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.ICE) diff --git a/scripts/actions/mobskills/memory_of_light.lua b/scripts/actions/mobskills/memory_of_light.lua index 917bae62a4c..72e3c08aadf 100644 --- a/scripts/actions/mobskills/memory_of_light.lua +++ b/scripts/actions/mobskills/memory_of_light.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 3 - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.LIGHT, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.LIGHT, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.LIGHT) diff --git a/scripts/actions/mobskills/memory_of_lightning.lua b/scripts/actions/mobskills/memory_of_lightning.lua index 92b44bcd1db..916722732ee 100644 --- a/scripts/actions/mobskills/memory_of_lightning.lua +++ b/scripts/actions/mobskills/memory_of_lightning.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 3 - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.THUNDER, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.THUNDER, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.THUNDER) diff --git a/scripts/actions/mobskills/memory_of_water.lua b/scripts/actions/mobskills/memory_of_water.lua index 2b49e881ab8..995a38fef07 100644 --- a/scripts/actions/mobskills/memory_of_water.lua +++ b/scripts/actions/mobskills/memory_of_water.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 3 - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WATER, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WATER, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER) diff --git a/scripts/actions/mobskills/memory_of_wind.lua b/scripts/actions/mobskills/memory_of_wind.lua index 77f52d1d365..bd0f7b73b77 100644 --- a/scripts/actions/mobskills/memory_of_wind.lua +++ b/scripts/actions/mobskills/memory_of_wind.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 3 - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WIND, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WIND, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) diff --git a/scripts/actions/mobskills/mephitic_spore.lua b/scripts/actions/mobskills/mephitic_spore.lua index 5c6f3ee2698..5e6890b5845 100644 --- a/scripts/actions/mobskills/mephitic_spore.lua +++ b/scripts/actions/mobskills/mephitic_spore.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 4 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.DARK) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.POISON, 50, 3, 180) diff --git a/scripts/actions/mobskills/mercy_stroke.lua b/scripts/actions/mobskills/mercy_stroke.lua index fb4cc0624d3..784f26076b5 100644 --- a/scripts/actions/mobskills/mercy_stroke.lua +++ b/scripts/actions/mobskills/mercy_stroke.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2.5 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/metatron_torment.lua b/scripts/actions/mobskills/metatron_torment.lua index 3254cb0919d..2313dca05fa 100644 --- a/scripts/actions/mobskills/metatron_torment.lua +++ b/scripts/actions/mobskills/metatron_torment.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2.5 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) local duration = 60 local power = 19 diff --git a/scripts/actions/mobskills/meteor.lua b/scripts/actions/mobskills/meteor.lua index 8a4d86696c8..c862be4db1c 100644 --- a/scripts/actions/mobskills/meteor.lua +++ b/scripts/actions/mobskills/meteor.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getMainLvl() * 32 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.NONE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.NONE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.NONE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.NONE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.NONE) mob:setAnimationSub(1) diff --git a/scripts/actions/mobskills/meteor_strike.lua b/scripts/actions/mobskills/meteor_strike.lua index 40997421648..b2955e86650 100644 --- a/scripts/actions/mobskills/meteor_strike.lua +++ b/scripts/actions/mobskills/meteor_strike.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 4 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/meteorite.lua b/scripts/actions/mobskills/meteorite.lua index 48402ff5947..55f3bc0e85b 100644 --- a/scripts/actions/mobskills/meteorite.lua +++ b/scripts/actions/mobskills/meteorite.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 2, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 2, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.LIGHT) diff --git a/scripts/actions/mobskills/methane_breath.lua b/scripts/actions/mobskills/methane_breath.lua index f3f613d6813..ae3682376de 100644 --- a/scripts/actions/mobskills/methane_breath.lua +++ b/scripts/actions/mobskills/methane_breath.lua @@ -20,8 +20,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/miasma.lua b/scripts/actions/mobskills/miasma.lua index 6a41c7d74a1..348bf2d13d3 100644 --- a/scripts/actions/mobskills/miasma.lua +++ b/scripts/actions/mobskills/miasma.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 4 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.EARTH, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.EARTH, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.EARTH) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.PLAGUE, 5, 3, 60) diff --git a/scripts/actions/mobskills/miasmic_breath.lua b/scripts/actions/mobskills/miasmic_breath.lua index e760f3ad818..0621c17c1aa 100644 --- a/scripts/actions/mobskills/miasmic_breath.lua +++ b/scripts/actions/mobskills/miasmic_breath.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 4 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.DARK) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.POISON, 50, 3, 180) diff --git a/scripts/actions/mobskills/microquake.lua b/scripts/actions/mobskills/microquake.lua index b57f7b86d07..fb7a606b42c 100644 --- a/scripts/actions/mobskills/microquake.lua +++ b/scripts/actions/mobskills/microquake.lua @@ -22,7 +22,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_1) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_1) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/mighty_snort.lua b/scripts/actions/mobskills/mighty_snort.lua index d2723e6c393..1e6a60c14d7 100644 --- a/scripts/actions/mobskills/mighty_snort.lua +++ b/scripts/actions/mobskills/mighty_snort.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 2 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) mob:resetEnmity(target) diff --git a/scripts/actions/mobskills/mijin_gakure.lua b/scripts/actions/mobskills/mijin_gakure.lua index 601d17ac647..c53e6e31fb7 100644 --- a/scripts/actions/mobskills/mijin_gakure.lua +++ b/scripts/actions/mobskills/mijin_gakure.lua @@ -11,8 +11,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = math.floor(mob:getWeaponDmg() * skill:getMobHPP() / 10) + 6 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.NONE, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ELEMENTAL, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.NONE, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ELEMENTAL, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.ELEMENTAL) diff --git a/scripts/actions/mobskills/mind_blast.lua b/scripts/actions/mobskills/mind_blast.lua index ee4eb3af2da..3e88cc34487 100644 --- a/scripts/actions/mobskills/mind_blast.lua +++ b/scripts/actions/mobskills/mind_blast.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 6 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.THUNDER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.THUNDER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.THUNDER) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.PARALYSIS, 20, 0, 180) diff --git a/scripts/actions/mobskills/mine_blast.lua b/scripts/actions/mobskills/mine_blast.lua index 5ca45c53eca..4e62be07456 100644 --- a/scripts/actions/mobskills/mine_blast.lua +++ b/scripts/actions/mobskills/mine_blast.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 5 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 20, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 20, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/mix_dark_potion.lua b/scripts/actions/mobskills/mix_dark_potion.lua index 9fb7d82c08b..2b995164184 100644 --- a/scripts/actions/mobskills/mix_dark_potion.lua +++ b/scripts/actions/mobskills/mix_dark_potion.lua @@ -10,7 +10,12 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local darkpot = 666 - local dmg = xi.mobskills.mobFinalAdjustments(darkpot, mob, skill, target, xi.attackType.NONE, xi.damageType.NONE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = + { + damage = darkpot + } + + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.NONE, xi.damageType.NONE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(dmg, mob, xi.attackType.NONE, xi.damageType.NONE) diff --git a/scripts/actions/mobskills/molting_burst.lua b/scripts/actions/mobskills/molting_burst.lua index 2fce76a41a8..58e48855018 100644 --- a/scripts/actions/mobskills/molting_burst.lua +++ b/scripts/actions/mobskills/molting_burst.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 5 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.NUMSHADOWS_2) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.NUMSHADOWS_2) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.LIGHT) diff --git a/scripts/actions/mobskills/moonlit_charge.lua b/scripts/actions/mobskills/moonlit_charge.lua index 26f9a51a909..ee336f79cfe 100644 --- a/scripts/actions/mobskills/moonlit_charge.lua +++ b/scripts/actions/mobskills/moonlit_charge.lua @@ -14,8 +14,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 2 local ftp = 4 - local damage = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 1, 2, 3) - local totaldamage = xi.mobskills.mobFinalAdjustments(damage.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, numhits) + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 1, 2, 3) + local totaldamage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, numhits) target:takeDamage(totaldamage, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/morning_glory.lua b/scripts/actions/mobskills/morning_glory.lua index 8f8b4e80e88..35fd479cc2f 100644 --- a/scripts/actions/mobskills/morning_glory.lua +++ b/scripts/actions/mobskills/morning_glory.lua @@ -24,7 +24,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1, 1, 1) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) return dmg diff --git a/scripts/actions/mobskills/mortal_revolution.lua b/scripts/actions/mobskills/mortal_revolution.lua index 1030d74e38c..c6518ea9b33 100644 --- a/scripts/actions/mobskills/mortal_revolution.lua +++ b/scripts/actions/mobskills/mortal_revolution.lua @@ -13,7 +13,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/mountain_buster.lua b/scripts/actions/mobskills/mountain_buster.lua index c9e9689726b..748573e3a13 100644 --- a/scripts/actions/mobskills/mountain_buster.lua +++ b/scripts/actions/mobskills/mountain_buster.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 2 local ftp = 2 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BIND, 1, 0, 60) diff --git a/scripts/actions/mobskills/mow.lua b/scripts/actions/mobskills/mow.lua index 3b1bdd07252..48b36084021 100644 --- a/scripts/actions/mobskills/mow.lua +++ b/scripts/actions/mobskills/mow.lua @@ -20,7 +20,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 0.5 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/mp_absorption.lua b/scripts/actions/mobskills/mp_absorption.lua index 3061cfc3e0c..f37a841ae9c 100644 --- a/scripts/actions/mobskills/mp_absorption.lua +++ b/scripts/actions/mobskills/mp_absorption.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = math.floor(mob:getWeaponDmg() * 1.5) - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.MP, damage)) diff --git a/scripts/actions/mobskills/mp_drainkiss.lua b/scripts/actions/mobskills/mp_drainkiss.lua index 05e259d9cca..78dd32b19c2 100644 --- a/scripts/actions/mobskills/mp_drainkiss.lua +++ b/scripts/actions/mobskills/mp_drainkiss.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = math.floor(mob:getWeaponDmg() * 1.6) - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.NUMSHADOWS_1) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.NUMSHADOWS_1) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.MP, damage)) diff --git a/scripts/actions/mobskills/mysterious_light.lua b/scripts/actions/mobskills/mysterious_light.lua index fdacc7fb93d..8de6dfaf9f8 100644 --- a/scripts/actions/mobskills/mysterious_light.lua +++ b/scripts/actions/mobskills/mysterious_light.lua @@ -11,8 +11,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WIND, 2.5, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WIND, 2.5, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.WEIGHT, 75, 0, 120) diff --git a/scripts/actions/mobskills/namas_arrow.lua b/scripts/actions/mobskills/namas_arrow.lua index 43fb98ca4c5..2f58fc2a141 100644 --- a/scripts/actions/mobskills/namas_arrow.lua +++ b/scripts/actions/mobskills/namas_arrow.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2.5 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.RANGED, xi.damageType.PIERCING) return dmg diff --git a/scripts/actions/mobskills/necrobane.lua b/scripts/actions/mobskills/necrobane.lua index e82d203e4b0..034a6260b36 100644 --- a/scripts/actions/mobskills/necrobane.lua +++ b/scripts/actions/mobskills/necrobane.lua @@ -13,7 +13,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.CURSE_I, 1, 0, 60) diff --git a/scripts/actions/mobskills/necropurge.lua b/scripts/actions/mobskills/necropurge.lua index 61d813e96fe..708b2530c6b 100644 --- a/scripts/actions/mobskills/necropurge.lua +++ b/scripts/actions/mobskills/necropurge.lua @@ -13,7 +13,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 10 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.CURSE_I, 1, 0, 60) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/needleshot.lua b/scripts/actions/mobskills/needleshot.lua index c30ef701400..c0cb76d8605 100644 --- a/scripts/actions/mobskills/needleshot.lua +++ b/scripts/actions/mobskills/needleshot.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 0.8 local dmgmod = 2 local info = xi.mobskills.mobRangedMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.RANGED, xi.damageType.PIERCING) return dmg end diff --git a/scripts/actions/mobskills/negative_whirl.lua b/scripts/actions/mobskills/negative_whirl.lua index 9dfc39ceeb6..8d10137cbe3 100644 --- a/scripts/actions/mobskills/negative_whirl.lua +++ b/scripts/actions/mobskills/negative_whirl.lua @@ -55,8 +55,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) dmgType = elementTable[modelId][animationSub].damageType end - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, element, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, dmgType, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, element, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, dmgType, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, dmgType) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.SLOW, 8500, 0, 60) diff --git a/scripts/actions/mobskills/netherspikes.lua b/scripts/actions/mobskills/netherspikes.lua index 19d605e8901..ad88bfb0e4a 100644 --- a/scripts/actions/mobskills/netherspikes.lua +++ b/scripts/actions/mobskills/netherspikes.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded * 3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded * 3) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BIND, 1, 0, 30) diff --git a/scripts/actions/mobskills/nimble_snap.lua b/scripts/actions/mobskills/nimble_snap.lua index dfed7db6398..75b4a17e6de 100644 --- a/scripts/actions/mobskills/nimble_snap.lua +++ b/scripts/actions/mobskills/nimble_snap.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.8 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/nocturnal_combustion.lua b/scripts/actions/mobskills/nocturnal_combustion.lua index 602dc1475c4..980b94ddc0b 100644 --- a/scripts/actions/mobskills/nocturnal_combustion.lua +++ b/scripts/actions/mobskills/nocturnal_combustion.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = math.floor(mob:getWeaponDmg() * skill:getMobHPP() / 5) - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.DARK) diff --git a/scripts/actions/mobskills/nosferatus_kiss.lua b/scripts/actions/mobskills/nosferatus_kiss.lua index 47a62ec9061..a7882c43dfd 100644 --- a/scripts/actions/mobskills/nosferatus_kiss.lua +++ b/scripts/actions/mobskills/nosferatus_kiss.lua @@ -22,8 +22,11 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local drainedTp = math.random(mob:getMainLvl() / 2, mob:getMainLvl()) -- TODO: This needs more captures local drainedMp = math.random(mob:getMainLvl() / 3, mob:getMainLvl() / 2) - - drainedHp = xi.mobskills.mobFinalAdjustments(drainedHp, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = + { + damage = drainedHp + } + drainedHp = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.HP, drainedHp) xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.MP, drainedMp) xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.TP, drainedTp) diff --git a/scripts/actions/mobskills/nullsong.lua b/scripts/actions/mobskills/nullsong.lua index 63faabc42e5..758379a06af 100644 --- a/scripts/actions/mobskills/nullsong.lua +++ b/scripts/actions/mobskills/nullsong.lua @@ -28,7 +28,12 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) return count end - local damage = xi.mobskills.mobFinalAdjustments(117 * count, mob, skill, target, xi.attackType.SPECIAL, xi.damageType.ELEMENTAL, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = + { + damage = 117 * count + } + + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.SPECIAL, xi.damageType.ELEMENTAL, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.SPECIAL, xi.damageType.ELEMENTAL) return damage diff --git a/scripts/actions/mobskills/numbing_breath.lua b/scripts/actions/mobskills/numbing_breath.lua index a2dce0101d5..aadee317ace 100644 --- a/scripts/actions/mobskills/numbing_breath.lua +++ b/scripts/actions/mobskills/numbing_breath.lua @@ -20,8 +20,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.ICE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.ICE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.ICE) diff --git a/scripts/actions/mobskills/numbshroom.lua b/scripts/actions/mobskills/numbshroom.lua index 176c0bf6f59..996a74f9439 100644 --- a/scripts/actions/mobskills/numbshroom.lua +++ b/scripts/actions/mobskills/numbshroom.lua @@ -23,7 +23,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 1.5 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.PARALYSIS, 25, 0, 180) diff --git a/scripts/actions/mobskills/nutrient_absorption.lua b/scripts/actions/mobskills/nutrient_absorption.lua index 80e6f4d7959..71b41b72564 100644 --- a/scripts/actions/mobskills/nutrient_absorption.lua +++ b/scripts/actions/mobskills/nutrient_absorption.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) -- Damage is 300 + dINT - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, 300, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.NUMSHADOWS_1) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, 300, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.NUMSHADOWS_1) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.HP, damage)) diff --git a/scripts/actions/mobskills/oblivion_smash.lua b/scripts/actions/mobskills/oblivion_smash.lua index ed9ad0cefda..7aa098f9038 100644 --- a/scripts/actions/mobskills/oblivion_smash.lua +++ b/scripts/actions/mobskills/oblivion_smash.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.5 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BLINDNESS, 20, 0, 120) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.SILENCE, 0, 0, 120) diff --git a/scripts/actions/mobskills/ochre_blast.lua b/scripts/actions/mobskills/ochre_blast.lua index f1bcffda31b..1898b92e193 100644 --- a/scripts/actions/mobskills/ochre_blast.lua +++ b/scripts/actions/mobskills/ochre_blast.lua @@ -21,8 +21,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 8 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.EARTH, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.EARTH, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.EARTH) diff --git a/scripts/actions/mobskills/ochre_blast_alt.lua b/scripts/actions/mobskills/ochre_blast_alt.lua index bac76cab906..bd2ce478a18 100644 --- a/scripts/actions/mobskills/ochre_blast_alt.lua +++ b/scripts/actions/mobskills/ochre_blast_alt.lua @@ -14,8 +14,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.EARTH, 5, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.EARTH, 5, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.EARTH) skill:setMsg(xi.msg.basic.HIT_DMG) diff --git a/scripts/actions/mobskills/oisoya.lua b/scripts/actions/mobskills/oisoya.lua index e2bcbcd1d36..2e6e0c89d73 100644 --- a/scripts/actions/mobskills/oisoya.lua +++ b/scripts/actions/mobskills/oisoya.lua @@ -27,7 +27,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 5.5 local info = xi.mobskills.mobRangedMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ATK_VARIES, 2.75, 2.75, 2.75) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.RANGED, xi.damageType.PIERCING) return dmg diff --git a/scripts/actions/mobskills/omega_javelin.lua b/scripts/actions/mobskills/omega_javelin.lua index 09c41b129b4..90205ce175b 100644 --- a/scripts/actions/mobskills/omega_javelin.lua +++ b/scripts/actions/mobskills/omega_javelin.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/one-ilm_punch.lua b/scripts/actions/mobskills/one-ilm_punch.lua index accea2e88cc..463ee2782ca 100644 --- a/scripts/actions/mobskills/one-ilm_punch.lua +++ b/scripts/actions/mobskills/one-ilm_punch.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.HTH) return dmg diff --git a/scripts/actions/mobskills/onrush.lua b/scripts/actions/mobskills/onrush.lua index 8f4f579cc8d..d6e588655ce 100644 --- a/scripts/actions/mobskills/onrush.lua +++ b/scripts/actions/mobskills/onrush.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.HTH) return dmg end diff --git a/scripts/actions/mobskills/onslaught.lua b/scripts/actions/mobskills/onslaught.lua index 42211031288..f184f5664bd 100644 --- a/scripts/actions/mobskills/onslaught.lua +++ b/scripts/actions/mobskills/onslaught.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2.5 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) local duration = 60 local power = 30 diff --git a/scripts/actions/mobskills/optic_induration.lua b/scripts/actions/mobskills/optic_induration.lua index bd41b0b3186..0e16c2fbbfb 100644 --- a/scripts/actions/mobskills/optic_induration.lua +++ b/scripts/actions/mobskills/optic_induration.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 6 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1, 1, 1) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/ore_toss.lua b/scripts/actions/mobskills/ore_toss.lua index 406c00a647e..86b87511f2d 100644 --- a/scripts/actions/mobskills/ore_toss.lua +++ b/scripts/actions/mobskills/ore_toss.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobRangedMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.RANGED, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.NUMSHADOWS_1) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.RANGED, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.NUMSHADOWS_1) -- Distance-based damage scaling: 1x at 1 yalm, 3x at 10 yalms -- TODO: Determine max distance of skill diff --git a/scripts/actions/mobskills/osmosis.lua b/scripts/actions/mobskills/osmosis.lua index c8049f1a99e..7d4b258c564 100644 --- a/scripts/actions/mobskills/osmosis.lua +++ b/scripts/actions/mobskills/osmosis.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 5 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.HP, damage)) diff --git a/scripts/actions/mobskills/overthrow.lua b/scripts/actions/mobskills/overthrow.lua index e465062125d..5b808c8c28a 100644 --- a/scripts/actions/mobskills/overthrow.lua +++ b/scripts/actions/mobskills/overthrow.lua @@ -23,7 +23,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.HTH) return dmg end diff --git a/scripts/actions/mobskills/painful_whip.lua b/scripts/actions/mobskills/painful_whip.lua index c3b1ce667d8..5df46120119 100644 --- a/scripts/actions/mobskills/painful_whip.lua +++ b/scripts/actions/mobskills/painful_whip.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/palsynyxis.lua b/scripts/actions/mobskills/palsynyxis.lua index 71705f274e3..5173a0781d3 100644 --- a/scripts/actions/mobskills/palsynyxis.lua +++ b/scripts/actions/mobskills/palsynyxis.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.PARALYSIS, 25, 0, 120) diff --git a/scripts/actions/mobskills/pandemic_nip.lua b/scripts/actions/mobskills/pandemic_nip.lua index 141abfdf870..6bf8ca93a86 100644 --- a/scripts/actions/mobskills/pandemic_nip.lua +++ b/scripts/actions/mobskills/pandemic_nip.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 2 local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/panzerfaust.lua b/scripts/actions/mobskills/panzerfaust.lua index 76034fadcf2..ebf3173a2e6 100644 --- a/scripts/actions/mobskills/panzerfaust.lua +++ b/scripts/actions/mobskills/panzerfaust.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/panzerschreck.lua b/scripts/actions/mobskills/panzerschreck.lua index f42e2d701fa..9ad6ad65e89 100644 --- a/scripts/actions/mobskills/panzerschreck.lua +++ b/scripts/actions/mobskills/panzerschreck.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2 local params = { canCrit = true } local info = xi.mobskills.mobRangedMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) return dmg diff --git a/scripts/actions/mobskills/paralyzing_microtube.lua b/scripts/actions/mobskills/paralyzing_microtube.lua index 9c620c91bf3..6ae8fc4e5c8 100644 --- a/scripts/actions/mobskills/paralyzing_microtube.lua +++ b/scripts/actions/mobskills/paralyzing_microtube.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 5 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.NONE, 2.45, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.NONE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.NONE, 2.45, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.NONE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.NONE) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.PARALYSIS, 20, 0, 60) diff --git a/scripts/actions/mobskills/peacebreaker.lua b/scripts/actions/mobskills/peacebreaker.lua index e866bdfc595..0c33a4b7535 100644 --- a/scripts/actions/mobskills/peacebreaker.lua +++ b/scripts/actions/mobskills/peacebreaker.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.0 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) -- TODO: This should be Increases Magic Damage Taken, but this was faster/easier xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.MAGIC_DEF_DOWN, 50, 0, 60) diff --git a/scripts/actions/mobskills/pecking_flurry.lua b/scripts/actions/mobskills/pecking_flurry.lua index 84490869768..d37e4e6d9a2 100644 --- a/scripts/actions/mobskills/pecking_flurry.lua +++ b/scripts/actions/mobskills/pecking_flurry.lua @@ -13,7 +13,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 0.75 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/pelagic_tempest.lua b/scripts/actions/mobskills/pelagic_tempest.lua index 498a5c7bc5d..34ee5440629 100644 --- a/scripts/actions/mobskills/pelagic_tempest.lua +++ b/scripts/actions/mobskills/pelagic_tempest.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 2 local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.SHOCK, 28, 3, 180) diff --git a/scripts/actions/mobskills/penta_thrust.lua b/scripts/actions/mobskills/penta_thrust.lua index 2de563d6352..01242f8e632 100644 --- a/scripts/actions/mobskills/penta_thrust.lua +++ b/scripts/actions/mobskills/penta_thrust.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local tp = skill:getTP() local accmod = 0.8 + 0.1 * math.floor((tp - 1000) / 1000) local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/penumbral_impact.lua b/scripts/actions/mobskills/penumbral_impact.lua index 00dcddeac70..00c57f3d05f 100644 --- a/scripts/actions/mobskills/penumbral_impact.lua +++ b/scripts/actions/mobskills/penumbral_impact.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.DARK) diff --git a/scripts/actions/mobskills/percussive_foin.lua b/scripts/actions/mobskills/percussive_foin.lua index 2603bee1cc2..1a0f55770d1 100644 --- a/scripts/actions/mobskills/percussive_foin.lua +++ b/scripts/actions/mobskills/percussive_foin.lua @@ -23,7 +23,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 1 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/pestilent_penance.lua b/scripts/actions/mobskills/pestilent_penance.lua index 3939c663eed..aa5f73d5b31 100644 --- a/scripts/actions/mobskills/pestilent_penance.lua +++ b/scripts/actions/mobskills/pestilent_penance.lua @@ -9,8 +9,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, 3, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.NUMSHADOWS_2) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, 3, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.NUMSHADOWS_2) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.DARK) diff --git a/scripts/actions/mobskills/pet_flame_breath.lua b/scripts/actions/mobskills/pet_flame_breath.lua index 004994969bb..812756e6470 100644 --- a/scripts/actions/mobskills/pet_flame_breath.lua +++ b/scripts/actions/mobskills/pet_flame_breath.lua @@ -20,8 +20,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/pet_frost_breath.lua b/scripts/actions/mobskills/pet_frost_breath.lua index 1f78eec7ed5..cfc14109ce5 100644 --- a/scripts/actions/mobskills/pet_frost_breath.lua +++ b/scripts/actions/mobskills/pet_frost_breath.lua @@ -20,8 +20,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.ICE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.ICE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.ICE) diff --git a/scripts/actions/mobskills/pet_gust_breath.lua b/scripts/actions/mobskills/pet_gust_breath.lua index 04f5bdc3c2c..ce867d707a3 100644 --- a/scripts/actions/mobskills/pet_gust_breath.lua +++ b/scripts/actions/mobskills/pet_gust_breath.lua @@ -20,8 +20,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.WIND) diff --git a/scripts/actions/mobskills/pet_hydro_breath.lua b/scripts/actions/mobskills/pet_hydro_breath.lua index 642c9bc3a81..60b2c0f929d 100644 --- a/scripts/actions/mobskills/pet_hydro_breath.lua +++ b/scripts/actions/mobskills/pet_hydro_breath.lua @@ -20,8 +20,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.WATER) diff --git a/scripts/actions/mobskills/pet_lightning_breath.lua b/scripts/actions/mobskills/pet_lightning_breath.lua index 9a088dae8ff..073078dd688 100644 --- a/scripts/actions/mobskills/pet_lightning_breath.lua +++ b/scripts/actions/mobskills/pet_lightning_breath.lua @@ -20,8 +20,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.THUNDER) diff --git a/scripts/actions/mobskills/pet_sand_breath.lua b/scripts/actions/mobskills/pet_sand_breath.lua index 2af5857387e..d8a23f1e887 100644 --- a/scripts/actions/mobskills/pet_sand_breath.lua +++ b/scripts/actions/mobskills/pet_sand_breath.lua @@ -20,8 +20,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.EARTH, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.EARTH, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.EARTH) diff --git a/scripts/actions/mobskills/phantasmal_dance.lua b/scripts/actions/mobskills/phantasmal_dance.lua index 8f810c0d058..18b50bc72f7 100644 --- a/scripts/actions/mobskills/phantasmal_dance.lua +++ b/scripts/actions/mobskills/phantasmal_dance.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.0 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BIND, 1, 0, 30) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/phase_shift_1.lua b/scripts/actions/mobskills/phase_shift_1.lua index 6190bc926dd..b468995969c 100644 --- a/scripts/actions/mobskills/phase_shift_1.lua +++ b/scripts/actions/mobskills/phase_shift_1.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 3 -- fTP and fTP scaling unknown. TODO: capture ftp local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/phase_shift_2.lua b/scripts/actions/mobskills/phase_shift_2.lua index f8db0e48aac..3c8ec25e14f 100644 --- a/scripts/actions/mobskills/phase_shift_2.lua +++ b/scripts/actions/mobskills/phase_shift_2.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 5 -- fTP and fTP scaling unknown. TODO: capture ftp local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 15) diff --git a/scripts/actions/mobskills/phase_shift_3.lua b/scripts/actions/mobskills/phase_shift_3.lua index fa6fcf8efc4..a7fbdc530a8 100644 --- a/scripts/actions/mobskills/phase_shift_3.lua +++ b/scripts/actions/mobskills/phase_shift_3.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 7 -- fTP and fTP scaling unknown. TODO: capture ftp local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 15) diff --git a/scripts/actions/mobskills/pile_pitch.lua b/scripts/actions/mobskills/pile_pitch.lua index 40e5e018b95..2dc349f25eb 100644 --- a/scripts/actions/mobskills/pile_pitch.lua +++ b/scripts/actions/mobskills/pile_pitch.lua @@ -12,8 +12,11 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local currentHP = target:getHP() - local damage = currentHP * .90 - local dmg = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.NONE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = + { + damage = currentHP * .90 + } + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.NONE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(dmg, mob, xi.attackType.MAGICAL, xi.damageType.NONE, { breakBind = false }) diff --git a/scripts/actions/mobskills/pinecone_bomb.lua b/scripts/actions/mobskills/pinecone_bomb.lua index fc8fb61f7a8..6fd12ac2d21 100644 --- a/scripts/actions/mobskills/pinecone_bomb.lua +++ b/scripts/actions/mobskills/pinecone_bomb.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.SLEEP_I, 1, 0, 60) diff --git a/scripts/actions/mobskills/pinecone_bomb_nm.lua b/scripts/actions/mobskills/pinecone_bomb_nm.lua index 06e6cba5594..a478df19231 100644 --- a/scripts/actions/mobskills/pinecone_bomb_nm.lua +++ b/scripts/actions/mobskills/pinecone_bomb_nm.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) return dmg diff --git a/scripts/actions/mobskills/pinning_shot.lua b/scripts/actions/mobskills/pinning_shot.lua index 641efa20058..8d8bd97755e 100644 --- a/scripts/actions/mobskills/pinning_shot.lua +++ b/scripts/actions/mobskills/pinning_shot.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BIND, 1, 0, 60) diff --git a/scripts/actions/mobskills/pirate_pummel.lua b/scripts/actions/mobskills/pirate_pummel.lua index 907bb3c524e..41ac23bcc1a 100755 --- a/scripts/actions/mobskills/pirate_pummel.lua +++ b/scripts/actions/mobskills/pirate_pummel.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 0.3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, mob:getWeaponDmg() * ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BURN, 1, 0, 20) diff --git a/scripts/actions/mobskills/pit_ambush.lua b/scripts/actions/mobskills/pit_ambush.lua index f2e38e32046..412983425bc 100644 --- a/scripts/actions/mobskills/pit_ambush.lua +++ b/scripts/actions/mobskills/pit_ambush.lua @@ -15,7 +15,7 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 3.3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, 1, 1, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/pl_body_slam.lua b/scripts/actions/mobskills/pl_body_slam.lua index 995dc6f302d..47f71798fe5 100644 --- a/scripts/actions/mobskills/pl_body_slam.lua +++ b/scripts/actions/mobskills/pl_body_slam.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/pl_chaos_blade.lua b/scripts/actions/mobskills/pl_chaos_blade.lua index d0493dff241..1db252fd301 100644 --- a/scripts/actions/mobskills/pl_chaos_blade.lua +++ b/scripts/actions/mobskills/pl_chaos_blade.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.DARK) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.CURSE_I, 25, 0, 60) diff --git a/scripts/actions/mobskills/pl_heavy_stomp.lua b/scripts/actions/mobskills/pl_heavy_stomp.lua index c02edb245a4..1276b9ba37e 100644 --- a/scripts/actions/mobskills/pl_heavy_stomp.lua +++ b/scripts/actions/mobskills/pl_heavy_stomp.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = .7 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.PARALYSIS, 15, 0, 360) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/pl_hellclap.lua b/scripts/actions/mobskills/pl_hellclap.lua index d951aba09d5..acd7d67d7c4 100644 --- a/scripts/actions/mobskills/pl_hellclap.lua +++ b/scripts/actions/mobskills/pl_hellclap.lua @@ -13,7 +13,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 10 local ftp = 4.0 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded * math.random(2, 3)) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded * math.random(2, 3)) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BIND, 1, 0, 4) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/pl_hellsnap.lua b/scripts/actions/mobskills/pl_hellsnap.lua index 0b7cefecdd4..6f323f7681d 100644 --- a/scripts/actions/mobskills/pl_hellsnap.lua +++ b/scripts/actions/mobskills/pl_hellsnap.lua @@ -13,7 +13,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 10 local ftp = 4.0 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded * math.random(2, 3)) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded * math.random(2, 3)) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/pl_tidal_slash.lua b/scripts/actions/mobskills/pl_tidal_slash.lua index 6ded3c15cd9..eba848d3b76 100644 --- a/scripts/actions/mobskills/pl_tidal_slash.lua +++ b/scripts/actions/mobskills/pl_tidal_slash.lua @@ -21,7 +21,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/plague_breath.lua b/scripts/actions/mobskills/plague_breath.lua index 2d0ad93955e..643782965fd 100644 --- a/scripts/actions/mobskills/plague_breath.lua +++ b/scripts/actions/mobskills/plague_breath.lua @@ -20,8 +20,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.WATER) diff --git a/scripts/actions/mobskills/plague_swipe.lua b/scripts/actions/mobskills/plague_swipe.lua index ff71132fba4..3229b74c129 100644 --- a/scripts/actions/mobskills/plague_swipe.lua +++ b/scripts/actions/mobskills/plague_swipe.lua @@ -23,7 +23,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/pleiades_ray.lua b/scripts/actions/mobskills/pleiades_ray.lua index e35fdd2737a..49b3587adb4 100644 --- a/scripts/actions/mobskills/pleiades_ray.lua +++ b/scripts/actions/mobskills/pleiades_ray.lua @@ -22,8 +22,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 7 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE, { breakBind = false }) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.PARALYSIS, 40, 3, 120) diff --git a/scripts/actions/mobskills/poison_breath_crawler.lua b/scripts/actions/mobskills/poison_breath_crawler.lua index 5bf38959193..d86d1b27745 100644 --- a/scripts/actions/mobskills/poison_breath_crawler.lua +++ b/scripts/actions/mobskills/poison_breath_crawler.lua @@ -20,8 +20,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.WATER) diff --git a/scripts/actions/mobskills/poison_breath_dragon.lua b/scripts/actions/mobskills/poison_breath_dragon.lua index b263912d516..5b78a064737 100644 --- a/scripts/actions/mobskills/poison_breath_dragon.lua +++ b/scripts/actions/mobskills/poison_breath_dragon.lua @@ -20,8 +20,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.WATER) diff --git a/scripts/actions/mobskills/poison_breath_hound.lua b/scripts/actions/mobskills/poison_breath_hound.lua index d540240aca4..49eca8665e7 100644 --- a/scripts/actions/mobskills/poison_breath_hound.lua +++ b/scripts/actions/mobskills/poison_breath_hound.lua @@ -26,8 +26,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.WATER) diff --git a/scripts/actions/mobskills/poison_nails.lua b/scripts/actions/mobskills/poison_nails.lua index 05593b2d63e..5e91465e517 100644 --- a/scripts/actions/mobskills/poison_nails.lua +++ b/scripts/actions/mobskills/poison_nails.lua @@ -13,7 +13,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.WIPE_SHADOWS) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.POISON, 1, 3, 60) diff --git a/scripts/actions/mobskills/poison_pick.lua b/scripts/actions/mobskills/poison_pick.lua index 1ade400bf8a..224fb9dab9b 100644 --- a/scripts/actions/mobskills/poison_pick.lua +++ b/scripts/actions/mobskills/poison_pick.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.0 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) local power = mob:getMainLvl() / 5 + 3 xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.POISON, power, 3, 60) diff --git a/scripts/actions/mobskills/poison_sting.lua b/scripts/actions/mobskills/poison_sting.lua index f0c9e3332b9..b04fe80751f 100644 --- a/scripts/actions/mobskills/poison_sting.lua +++ b/scripts/actions/mobskills/poison_sting.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) local power = math.floor(mob:getMainLvl() / 10) + 3 target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/polar_blast.lua b/scripts/actions/mobskills/polar_blast.lua index 27efdb0e49f..bced9e684ea 100644 --- a/scripts/actions/mobskills/polar_blast.lua +++ b/scripts/actions/mobskills/polar_blast.lua @@ -25,8 +25,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.ICE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.ICE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.ICE) diff --git a/scripts/actions/mobskills/pole_swing.lua b/scripts/actions/mobskills/pole_swing.lua index a1e76cf79dc..dc30764e26a 100644 --- a/scripts/actions/mobskills/pole_swing.lua +++ b/scripts/actions/mobskills/pole_swing.lua @@ -26,7 +26,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/potent_lunge.lua b/scripts/actions/mobskills/potent_lunge.lua index f0e270e04b9..28601884f42 100644 --- a/scripts/actions/mobskills/potent_lunge.lua +++ b/scripts/actions/mobskills/potent_lunge.lua @@ -22,7 +22,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/pounce.lua b/scripts/actions/mobskills/pounce.lua index a82eda8f340..0be6a0e988a 100644 --- a/scripts/actions/mobskills/pounce.lua +++ b/scripts/actions/mobskills/pounce.lua @@ -13,7 +13,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/powder_keg.lua b/scripts/actions/mobskills/powder_keg.lua index 93c5dce7896..bcb3243fad3 100755 --- a/scripts/actions/mobskills/powder_keg.lua +++ b/scripts/actions/mobskills/powder_keg.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 2 local ftp = 0.3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, mob:getWeaponDmg() * ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.DEFENSE_DOWN, 20, 0, 60) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.MAGIC_DEF_DOWN, 20, 0, 60) diff --git a/scripts/actions/mobskills/power_attack.lua b/scripts/actions/mobskills/power_attack.lua index 413f0166ce7..227ce0cd63e 100644 --- a/scripts/actions/mobskills/power_attack.lua +++ b/scripts/actions/mobskills/power_attack.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ATK_VARIES, 2.0, 2.0, 2.0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.HTH) return dmg end diff --git a/scripts/actions/mobskills/power_attack_armed.lua b/scripts/actions/mobskills/power_attack_armed.lua index b18256719db..b443503756b 100644 --- a/scripts/actions/mobskills/power_attack_armed.lua +++ b/scripts/actions/mobskills/power_attack_armed.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.HTH) return dmg end diff --git a/scripts/actions/mobskills/power_attack_beetle.lua b/scripts/actions/mobskills/power_attack_beetle.lua index 755f3ef3719..7cedfb57ebb 100644 --- a/scripts/actions/mobskills/power_attack_beetle.lua +++ b/scripts/actions/mobskills/power_attack_beetle.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ATK_VARIES, 1.2, 1.2, 1.2) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.HTH) return dmg end diff --git a/scripts/actions/mobskills/power_attack_unarmed.lua b/scripts/actions/mobskills/power_attack_unarmed.lua index b18256719db..b443503756b 100644 --- a/scripts/actions/mobskills/power_attack_unarmed.lua +++ b/scripts/actions/mobskills/power_attack_unarmed.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.HTH) return dmg end diff --git a/scripts/actions/mobskills/power_slash.lua b/scripts/actions/mobskills/power_slash.lua index fe6324a2380..a68051f0a49 100644 --- a/scripts/actions/mobskills/power_slash.lua +++ b/scripts/actions/mobskills/power_slash.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/predator_claws.lua b/scripts/actions/mobskills/predator_claws.lua index 43cf07d4b2c..ba74e6a8d4e 100644 --- a/scripts/actions/mobskills/predator_claws.lua +++ b/scripts/actions/mobskills/predator_claws.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 2 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ACC_VARIES, 1, 2, 3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/primal_drill.lua b/scripts/actions/mobskills/primal_drill.lua index 008fbc15b6b..5b5afc8abaf 100644 --- a/scripts/actions/mobskills/primal_drill.lua +++ b/scripts/actions/mobskills/primal_drill.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BIND, 1, 0, math.random(45, 90)) diff --git a/scripts/actions/mobskills/proboscis.lua b/scripts/actions/mobskills/proboscis.lua index 2b4df09ea86..02a09d48497 100644 --- a/scripts/actions/mobskills/proboscis.lua +++ b/scripts/actions/mobskills/proboscis.lua @@ -16,8 +16,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) target:dispelStatusEffect() - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.MP, damage)) diff --git a/scripts/actions/mobskills/promyvion_brume.lua b/scripts/actions/mobskills/promyvion_brume.lua index 99f72f63ffc..34786ff9699 100644 --- a/scripts/actions/mobskills/promyvion_brume.lua +++ b/scripts/actions/mobskills/promyvion_brume.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 3 - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WATER, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WATER, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.POISON, 9, 3, 180) diff --git a/scripts/actions/mobskills/psychomancy.lua b/scripts/actions/mobskills/psychomancy.lua index a7c5f73e307..4c99bc84d3b 100644 --- a/scripts/actions/mobskills/psychomancy.lua +++ b/scripts/actions/mobskills/psychomancy.lua @@ -16,8 +16,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, 1.7, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, 1.7, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.MP, damage)) diff --git a/scripts/actions/mobskills/punch.lua b/scripts/actions/mobskills/punch.lua index 1ce15a03abe..31f71e54933 100644 --- a/scripts/actions/mobskills/punch.lua +++ b/scripts/actions/mobskills/punch.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 1, 2, 3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/purulent_ooze.lua b/scripts/actions/mobskills/purulent_ooze.lua index 5e768ee10a0..9892767db71 100644 --- a/scripts/actions/mobskills/purulent_ooze.lua +++ b/scripts/actions/mobskills/purulent_ooze.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER) diff --git a/scripts/actions/mobskills/putrid_breath.lua b/scripts/actions/mobskills/putrid_breath.lua index 80810f3fc4d..085574c59be 100644 --- a/scripts/actions/mobskills/putrid_breath.lua +++ b/scripts/actions/mobskills/putrid_breath.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 8 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.DARK) diff --git a/scripts/actions/mobskills/pw_acheron_flame.lua b/scripts/actions/mobskills/pw_acheron_flame.lua index d6511719f40..8648d025cc9 100644 --- a/scripts/actions/mobskills/pw_acheron_flame.lua +++ b/scripts/actions/mobskills/pw_acheron_flame.lua @@ -18,8 +18,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local resist = xi.combat.magicHitRate.calculateResistRate(mob, target, 0, 0, 0, xi.element.FIRE, xi.mod.INT, 0, 0) local power = (resist * 10 - 5) * math.random(1, 2) + 19 -- TODO: wtf is even this? If you are gonna make-up shit, at least limit it to a single math.random - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 3, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 3, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BURN, power, 3, 60) diff --git a/scripts/actions/mobskills/pw_calcifying_deluge.lua b/scripts/actions/mobskills/pw_calcifying_deluge.lua index c0d99161389..f98ee45de72 100644 --- a/scripts/actions/mobskills/pw_calcifying_deluge.lua +++ b/scripts/actions/mobskills/pw_calcifying_deluge.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.PETRIFICATION, 1, 0, 30) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/pw_decussate.lua b/scripts/actions/mobskills/pw_decussate.lua index f8e108ef1f9..0f732fa8c12 100644 --- a/scripts/actions/mobskills/pw_decussate.lua +++ b/scripts/actions/mobskills/pw_decussate.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.EARTH, 1.2, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, math.random(2, 3)) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.EARTH, 1.2, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, math.random(2, 3)) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.EARTH) diff --git a/scripts/actions/mobskills/pw_groundburst.lua b/scripts/actions/mobskills/pw_groundburst.lua index 2629f2d0224..505a3169a0f 100644 --- a/scripts/actions/mobskills/pw_groundburst.lua +++ b/scripts/actions/mobskills/pw_groundburst.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/pw_pinning_shot.lua b/scripts/actions/mobskills/pw_pinning_shot.lua index f50f8bc9f55..83b5896c1b8 100644 --- a/scripts/actions/mobskills/pw_pinning_shot.lua +++ b/scripts/actions/mobskills/pw_pinning_shot.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BIND, 1, 0, 30) target:takeDamage(dmg, mob, xi.attackType.RANGED, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/pw_rushing_slash.lua b/scripts/actions/mobskills/pw_rushing_slash.lua index 52ed6092517..6ddbe91824e 100644 --- a/scripts/actions/mobskills/pw_rushing_slash.lua +++ b/scripts/actions/mobskills/pw_rushing_slash.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/pw_shadow_thrust.lua b/scripts/actions/mobskills/pw_shadow_thrust.lua index 5a7b2557653..adeea2ebcf2 100644 --- a/scripts/actions/mobskills/pw_shadow_thrust.lua +++ b/scripts/actions/mobskills/pw_shadow_thrust.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) return dmg end diff --git a/scripts/actions/mobskills/pw_tyrranic_blare.lua b/scripts/actions/mobskills/pw_tyrranic_blare.lua index 3932d0aa335..57b392fe5d4 100644 --- a/scripts/actions/mobskills/pw_tyrranic_blare.lua +++ b/scripts/actions/mobskills/pw_tyrranic_blare.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = math.floor(mob:getWeaponDmg() * 2.8) - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.EARTH, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.EARTH, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.EARTH) diff --git a/scripts/actions/mobskills/pyric_blast.lua b/scripts/actions/mobskills/pyric_blast.lua index c7913c76748..96282be5c19 100644 --- a/scripts/actions/mobskills/pyric_blast.lua +++ b/scripts/actions/mobskills/pyric_blast.lua @@ -26,8 +26,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/quadrastrike.lua b/scripts/actions/mobskills/quadrastrike.lua index cf58781baef..3120c230ba4 100644 --- a/scripts/actions/mobskills/quadrastrike.lua +++ b/scripts/actions/mobskills/quadrastrike.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ATK_VARIES, 1.2, 1.2, 1.2) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/quadratic_continuum.lua b/scripts/actions/mobskills/quadratic_continuum.lua index 35a114b177c..9355c341d83 100644 --- a/scripts/actions/mobskills/quadratic_continuum.lua +++ b/scripts/actions/mobskills/quadratic_continuum.lua @@ -13,7 +13,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ATK_VARIES, 0.8, 0.8, 0.8) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/queasyshroom.lua b/scripts/actions/mobskills/queasyshroom.lua index 1ee013e47d7..2e4de383a36 100644 --- a/scripts/actions/mobskills/queasyshroom.lua +++ b/scripts/actions/mobskills/queasyshroom.lua @@ -26,7 +26,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 1.5 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.WIPE_SHADOWS) local power = mob:getMainLvl() / 10 + 1 xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.POISON, power, 3, 60) diff --git a/scripts/actions/mobskills/radiant_breath.lua b/scripts/actions/mobskills/radiant_breath.lua index 5c9cb6b9998..c1648a127d9 100644 --- a/scripts/actions/mobskills/radiant_breath.lua +++ b/scripts/actions/mobskills/radiant_breath.lua @@ -20,8 +20,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT -- TODO: Light based skills are often MND, need captures. - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.LIGHT) diff --git a/scripts/actions/mobskills/radiant_sacrament.lua b/scripts/actions/mobskills/radiant_sacrament.lua index af9881e7a5f..0483f78a92c 100644 --- a/scripts/actions/mobskills/radiant_sacrament.lua +++ b/scripts/actions/mobskills/radiant_sacrament.lua @@ -21,7 +21,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 5 local ftp = 2 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.MAGIC_DEF_DOWN, 20, 0, 60) -- Needs adjusted to retail values for power/duration diff --git a/scripts/actions/mobskills/raging_rush.lua b/scripts/actions/mobskills/raging_rush.lua index 2ee1055f42c..dda77633cf9 100644 --- a/scripts/actions/mobskills/raging_rush.lua +++ b/scripts/actions/mobskills/raging_rush.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ACC_VARIES, 1, 2, 3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/raiden_thrust.lua b/scripts/actions/mobskills/raiden_thrust.lua index 15c73f35ab3..1fdc3726650 100644 --- a/scripts/actions/mobskills/raiden_thrust.lua +++ b/scripts/actions/mobskills/raiden_thrust.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 4 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.THUNDER, 1.25, xi.mobskills.magicalTpBonus.DMG_BONUS, 2) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.NUMSHADOWS_1) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.THUNDER, 1.25, xi.mobskills.magicalTpBonus.DMG_BONUS, 2) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.NUMSHADOWS_1) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.THUNDER) diff --git a/scripts/actions/mobskills/rail_cannon.lua b/scripts/actions/mobskills/rail_cannon.lua index e134489863c..04bac133adc 100644 --- a/scripts/actions/mobskills/rail_cannon.lua +++ b/scripts/actions/mobskills/rail_cannon.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.LIGHT, { breakBind = false }) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BIND, 1, 0, 30) diff --git a/scripts/actions/mobskills/rail_cannon_1.lua b/scripts/actions/mobskills/rail_cannon_1.lua index 0e6b203a811..35e8861e420 100644 --- a/scripts/actions/mobskills/rail_cannon_1.lua +++ b/scripts/actions/mobskills/rail_cannon_1.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.LIGHT, { breakBind = false }) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BIND, 1, 0, 30) diff --git a/scripts/actions/mobskills/rail_cannon_2.lua b/scripts/actions/mobskills/rail_cannon_2.lua index 7cc8540bfd4..d4cb9ed6dab 100644 --- a/scripts/actions/mobskills/rail_cannon_2.lua +++ b/scripts/actions/mobskills/rail_cannon_2.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.LIGHT, { breakBind = false }) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BIND, 1, 0, 30) diff --git a/scripts/actions/mobskills/rail_cannon_3.lua b/scripts/actions/mobskills/rail_cannon_3.lua index 814abb4187b..3b38b291f9f 100644 --- a/scripts/actions/mobskills/rail_cannon_3.lua +++ b/scripts/actions/mobskills/rail_cannon_3.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.LIGHT, { breakBind = false }) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BIND, 1, 0, 30) diff --git a/scripts/actions/mobskills/ram_charge.lua b/scripts/actions/mobskills/ram_charge.lua index 236b25884cc..cf72784d8f4 100644 --- a/scripts/actions/mobskills/ram_charge.lua +++ b/scripts/actions/mobskills/ram_charge.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/rampage.lua b/scripts/actions/mobskills/rampage.lua index c29d336b238..187a011c345 100644 --- a/scripts/actions/mobskills/rampage.lua +++ b/scripts/actions/mobskills/rampage.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1, 1.5, 2) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) -- Witnessed 1100 to a DD. Going with it :D target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/rampant_gnaw.lua b/scripts/actions/mobskills/rampant_gnaw.lua index 0c7b28ce6fe..b34a2dd10dd 100644 --- a/scripts/actions/mobskills/rampant_gnaw.lua +++ b/scripts/actions/mobskills/rampant_gnaw.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2.4 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.PARALYSIS, 20, 0, 120) diff --git a/scripts/actions/mobskills/rampant_stance.lua b/scripts/actions/mobskills/rampant_stance.lua index 7e3553f3f16..3ce05df34d2 100644 --- a/scripts/actions/mobskills/rampant_stance.lua +++ b/scripts/actions/mobskills/rampant_stance.lua @@ -23,7 +23,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 2 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) -- if skill hit, apply dmg and AE if not skill:hasMissMsg() then diff --git a/scripts/actions/mobskills/randgrith.lua b/scripts/actions/mobskills/randgrith.lua index 3d0ed20ad8a..3c1b020fbd3 100644 --- a/scripts/actions/mobskills/randgrith.lua +++ b/scripts/actions/mobskills/randgrith.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2.5 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.EVASION_DOWN, 32, 0, 60) diff --git a/scripts/actions/mobskills/random_kiss.lua b/scripts/actions/mobskills/random_kiss.lua index 45156bb33e1..d1a1a3dc41a 100644 --- a/scripts/actions/mobskills/random_kiss.lua +++ b/scripts/actions/mobskills/random_kiss.lua @@ -11,8 +11,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = math.floor(mob:getWeaponDmg() * 2.9) - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, math.random(0, 2), damage)) diff --git a/scripts/actions/mobskills/random_needles.lua b/scripts/actions/mobskills/random_needles.lua index d0da5355833..b81be2b4b5e 100644 --- a/scripts/actions/mobskills/random_needles.lua +++ b/scripts/actions/mobskills/random_needles.lua @@ -16,14 +16,22 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) -- "Seen totals ranging from 15, 000 to 55, 000 needles." if mob:getID() == zones[xi.zone.ABYSSEA_ALTEPA].mob.CUIJATENDER then local needles = math.random(15000, 55000) / skill:getTotalTargets() - local dmg = xi.mobskills.mobFinalAdjustments(needles, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = + { + damage = needles + } + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.LIGHT) return dmg else local needles = math.random(1000, 10000) / skill:getTotalTargets() - local dmg = xi.mobskills.mobFinalAdjustments(needles, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = + { + damage = needles + } + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.LIGHT) diff --git a/scripts/actions/mobskills/ranged_attack.lua b/scripts/actions/mobskills/ranged_attack.lua index 12582a14b81..63e314debbb 100644 --- a/scripts/actions/mobskills/ranged_attack.lua +++ b/scripts/actions/mobskills/ranged_attack.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local params = { canCrit = true } local info = xi.mobskills.mobRangedMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.magicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, info.hitslanded) if skill:getMsg() ~= xi.msg.basic.SHADOW_ABSORB and diff --git a/scripts/actions/mobskills/razor_fang.lua b/scripts/actions/mobskills/razor_fang.lua index 9825f6e60d5..6531106d286 100644 --- a/scripts/actions/mobskills/razor_fang.lua +++ b/scripts/actions/mobskills/razor_fang.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) return dmg end diff --git a/scripts/actions/mobskills/reactor_overheat.lua b/scripts/actions/mobskills/reactor_overheat.lua index 01f57a43115..af33c932a73 100644 --- a/scripts/actions/mobskills/reactor_overheat.lua +++ b/scripts/actions/mobskills/reactor_overheat.lua @@ -11,8 +11,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.FIRE, math.random(1, 2), xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.NUMSHADOWS_2) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.FIRE, math.random(1, 2), xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.NUMSHADOWS_2) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/reactor_overload.lua b/scripts/actions/mobskills/reactor_overload.lua index 2a807931896..9ab65588d00 100644 --- a/scripts/actions/mobskills/reactor_overload.lua +++ b/scripts/actions/mobskills/reactor_overload.lua @@ -11,8 +11,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WIND, math.random(1, 2), xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WIND, math.random(1, 2), xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.NUMSHADOWS_3) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) diff --git a/scripts/actions/mobskills/reaving_wind.lua b/scripts/actions/mobskills/reaving_wind.lua index d7a512d45d8..9fa4a623a14 100644 --- a/scripts/actions/mobskills/reaving_wind.lua +++ b/scripts/actions/mobskills/reaving_wind.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.NONE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.NONE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.NONE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.NONE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) if target:getTP() == 0 then skill:setMsg(xi.msg.basic.SKILL_NO_EFFECT) diff --git a/scripts/actions/mobskills/recoil_dive.lua b/scripts/actions/mobskills/recoil_dive.lua index 472479a02b1..5ed91dbb457 100644 --- a/scripts/actions/mobskills/recoil_dive.lua +++ b/scripts/actions/mobskills/recoil_dive.lua @@ -13,7 +13,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1, 2, 3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/red_lotus_blade.lua b/scripts/actions/mobskills/red_lotus_blade.lua index ca4be32fcf3..9ff7c8a96b3 100644 --- a/scripts/actions/mobskills/red_lotus_blade.lua +++ b/scripts/actions/mobskills/red_lotus_blade.lua @@ -29,8 +29,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 4 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1.25, xi.mobskills.magicalTpBonus.DMG_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.NUMSHADOWS_1) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1.25, xi.mobskills.magicalTpBonus.DMG_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.NUMSHADOWS_1) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/regurgitation.lua b/scripts/actions/mobskills/regurgitation.lua index 121d50891f6..165de5a7a57 100644 --- a/scripts/actions/mobskills/regurgitation.lua +++ b/scripts/actions/mobskills/regurgitation.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER, { breakBind = false }) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BIND, 1, 0, 30) diff --git a/scripts/actions/mobskills/rending_deluge.lua b/scripts/actions/mobskills/rending_deluge.lua index e20c7e0f607..429d0b49f86 100644 --- a/scripts/actions/mobskills/rending_deluge.lua +++ b/scripts/actions/mobskills/rending_deluge.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:dispelStatusEffect() target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER) diff --git a/scripts/actions/mobskills/revelation.lua b/scripts/actions/mobskills/revelation.lua index bd50a1845fd..7767a5e723a 100644 --- a/scripts/actions/mobskills/revelation.lua +++ b/scripts/actions/mobskills/revelation.lua @@ -9,8 +9,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.LIGHT, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.LIGHT, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.LIGHT) diff --git a/scripts/actions/mobskills/rhino_attack.lua b/scripts/actions/mobskills/rhino_attack.lua index daef9a2a019..fbebe61b49b 100644 --- a/scripts/actions/mobskills/rhino_attack.lua +++ b/scripts/actions/mobskills/rhino_attack.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ATK_VARIES, 2.0, 2.0, 2.0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/rhinowrecker.lua b/scripts/actions/mobskills/rhinowrecker.lua index c419cd51960..0cbed9312bb 100644 --- a/scripts/actions/mobskills/rhinowrecker.lua +++ b/scripts/actions/mobskills/rhinowrecker.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 3 local power = 25 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.DEFENSE_DOWN, power, 0, 180) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.HTH) diff --git a/scripts/actions/mobskills/rime_spray.lua b/scripts/actions/mobskills/rime_spray.lua index 47446bd9b22..d88d03ff6b6 100644 --- a/scripts/actions/mobskills/rime_spray.lua +++ b/scripts/actions/mobskills/rime_spray.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 5 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.ICE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.ICE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.ICE) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.FROST, 15, 3, 120) diff --git a/scripts/actions/mobskills/ripper_fang.lua b/scripts/actions/mobskills/ripper_fang.lua index e2d2c8a9657..0b2101b286b 100644 --- a/scripts/actions/mobskills/ripper_fang.lua +++ b/scripts/actions/mobskills/ripper_fang.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ATK_VARIES, 1.3, 1.3, 1.3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/rock_smash.lua b/scripts/actions/mobskills/rock_smash.lua index c7eaeef964e..c8ed0cf015a 100644 --- a/scripts/actions/mobskills/rock_smash.lua +++ b/scripts/actions/mobskills/rock_smash.lua @@ -22,7 +22,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 2 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) local power = math.random(25, 40) + mob:getMainLvl() / 3 xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.PETRIFICATION, 1, 0, power) diff --git a/scripts/actions/mobskills/rock_throw.lua b/scripts/actions/mobskills/rock_throw.lua index bc87e2dbff3..9bd60975fe7 100644 --- a/scripts/actions/mobskills/rock_throw.lua +++ b/scripts/actions/mobskills/rock_throw.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 1, 2, 3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/roller_chain.lua b/scripts/actions/mobskills/roller_chain.lua index d624e6103b4..50b57fe678f 100644 --- a/scripts/actions/mobskills/roller_chain.lua +++ b/scripts/actions/mobskills/roller_chain.lua @@ -21,8 +21,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 2 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.DARK) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BIND, 1, 0, 30) diff --git a/scripts/actions/mobskills/royal_bash.lua b/scripts/actions/mobskills/royal_bash.lua index bf16f2de31c..21c4823a4c8 100644 --- a/scripts/actions/mobskills/royal_bash.lua +++ b/scripts/actions/mobskills/royal_bash.lua @@ -13,7 +13,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.2 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/ruinous_omen.lua b/scripts/actions/mobskills/ruinous_omen.lua index e17cc1c32d4..61dda54bb7f 100644 --- a/scripts/actions/mobskills/ruinous_omen.lua +++ b/scripts/actions/mobskills/ruinous_omen.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 9 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 3, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 3, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.DARK) diff --git a/scripts/actions/mobskills/rush.lua b/scripts/actions/mobskills/rush.lua index a9c7b09b594..d5f0d63e7cd 100644 --- a/scripts/actions/mobskills/rush.lua +++ b/scripts/actions/mobskills/rush.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 1, 2, 3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/rushing_drub.lua b/scripts/actions/mobskills/rushing_drub.lua index 39507e27e95..fa608b1fcec 100644 --- a/scripts/actions/mobskills/rushing_drub.lua +++ b/scripts/actions/mobskills/rushing_drub.lua @@ -26,7 +26,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 0.75 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/rushing_slash.lua b/scripts/actions/mobskills/rushing_slash.lua index c46f71920ac..d9579e6f7f0 100644 --- a/scripts/actions/mobskills/rushing_slash.lua +++ b/scripts/actions/mobskills/rushing_slash.lua @@ -23,7 +23,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/rushing_stab.lua b/scripts/actions/mobskills/rushing_stab.lua index 9caac6fa7c9..c728c6f806f 100644 --- a/scripts/actions/mobskills/rushing_stab.lua +++ b/scripts/actions/mobskills/rushing_stab.lua @@ -23,7 +23,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) return dmg end diff --git a/scripts/actions/mobskills/sable_breath.lua b/scripts/actions/mobskills/sable_breath.lua index d2feefc567d..85ce6b48e10 100644 --- a/scripts/actions/mobskills/sable_breath.lua +++ b/scripts/actions/mobskills/sable_breath.lua @@ -27,9 +27,9 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = utils.conalDamageAdjustment(mob, target, skill, damage, 0.2) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + info.damage = utils.conalDamageAdjustment(mob, target, skill, info.damage, 0.2) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.DARK) diff --git a/scripts/actions/mobskills/sand_breath.lua b/scripts/actions/mobskills/sand_breath.lua index 584d2aa9b54..a4f2e84fec1 100644 --- a/scripts/actions/mobskills/sand_breath.lua +++ b/scripts/actions/mobskills/sand_breath.lua @@ -20,8 +20,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.EARTH, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.EARTH, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.EARTH) diff --git a/scripts/actions/mobskills/sand_trap.lua b/scripts/actions/mobskills/sand_trap.lua index 4ecc5f3a230..5e23fc88a9a 100644 --- a/scripts/actions/mobskills/sand_trap.lua +++ b/scripts/actions/mobskills/sand_trap.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/sandspin.lua b/scripts/actions/mobskills/sandspin.lua index b9bb12beae0..3dd9123b6e9 100644 --- a/scripts/actions/mobskills/sandspin.lua +++ b/scripts/actions/mobskills/sandspin.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = math.floor(mob:getWeaponDmg() * 2.3) - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.EARTH, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.EARTH, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.EARTH) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.ACCURACY_DOWN, 50, 0, 120) diff --git a/scripts/actions/mobskills/saucepan.lua b/scripts/actions/mobskills/saucepan.lua index c5edc9744e5..7c8cd2e6637 100644 --- a/scripts/actions/mobskills/saucepan.lua +++ b/scripts/actions/mobskills/saucepan.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 0.8 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) if target:hasStatusEffect(xi.effect.FOOD) then target:delStatusEffectSilent(xi.effect.FOOD) end diff --git a/scripts/actions/mobskills/savage_blade.lua b/scripts/actions/mobskills/savage_blade.lua index a1b8ec7b8ab..0613627b99f 100644 --- a/scripts/actions/mobskills/savage_blade.lua +++ b/scripts/actions/mobskills/savage_blade.lua @@ -26,7 +26,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.0 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) -- AA EV: Approx 900 damage to 75 DRG/35 THF. 400 to a NIN/WAR in Arhat, but took shadows. target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/scintillant_lance.lua b/scripts/actions/mobskills/scintillant_lance.lua index deb755241f1..694eb1c66be 100644 --- a/scripts/actions/mobskills/scintillant_lance.lua +++ b/scripts/actions/mobskills/scintillant_lance.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = math.floor(mob:getWeaponDmg() * 2.5) - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 1.5, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 1.5, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.LIGHT) diff --git a/scripts/actions/mobskills/scission_thrust.lua b/scripts/actions/mobskills/scission_thrust.lua index 94e385c5d76..0362aa7ba75 100644 --- a/scripts/actions/mobskills/scission_thrust.lua +++ b/scripts/actions/mobskills/scission_thrust.lua @@ -23,7 +23,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 1 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/scorching_lash.lua b/scripts/actions/mobskills/scorching_lash.lua index 89648106b1c..048c1eed5be 100644 --- a/scripts/actions/mobskills/scorching_lash.lua +++ b/scripts/actions/mobskills/scorching_lash.lua @@ -23,7 +23,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/scourge.lua b/scripts/actions/mobskills/scourge.lua index 4f83428be49..f0409322f53 100644 --- a/scripts/actions/mobskills/scourge.lua +++ b/scripts/actions/mobskills/scourge.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2.5 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/scouring_bubbles.lua b/scripts/actions/mobskills/scouring_bubbles.lua index 809d1ae871c..badb0f522af 100644 --- a/scripts/actions/mobskills/scouring_bubbles.lua +++ b/scripts/actions/mobskills/scouring_bubbles.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 5 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 2.45, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 2.45, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER) diff --git a/scripts/actions/mobskills/screwdriver.lua b/scripts/actions/mobskills/screwdriver.lua index f73210a891c..6d4d4d0a022 100644 --- a/scripts/actions/mobskills/screwdriver.lua +++ b/scripts/actions/mobskills/screwdriver.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = math.random(2, 3) local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1, 2, 3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/scythe_tail.lua b/scripts/actions/mobskills/scythe_tail.lua index 46ea47706e0..f74aa1543cd 100644 --- a/scripts/actions/mobskills/scythe_tail.lua +++ b/scripts/actions/mobskills/scythe_tail.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/searing_light.lua b/scripts/actions/mobskills/searing_light.lua index 79244794218..85803563905 100644 --- a/scripts/actions/mobskills/searing_light.lua +++ b/scripts/actions/mobskills/searing_light.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 9 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 3, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 3, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.LIGHT) diff --git a/scripts/actions/mobskills/seaspray.lua b/scripts/actions/mobskills/seaspray.lua index 88d572ce9ad..7fc15caab8f 100644 --- a/scripts/actions/mobskills/seaspray.lua +++ b/scripts/actions/mobskills/seaspray.lua @@ -20,8 +20,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.WATER) diff --git a/scripts/actions/mobskills/seedspray.lua b/scripts/actions/mobskills/seedspray.lua index 7b99cfa0240..caef3a02ccb 100644 --- a/scripts/actions/mobskills/seedspray.lua +++ b/scripts/actions/mobskills/seedspray.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 1, 1.5, 2) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.DEFENSE_DOWN, 8, 0, 120) diff --git a/scripts/actions/mobskills/seismic_tail.lua b/scripts/actions/mobskills/seismic_tail.lua index be85f1d5a58..2653e961ed0 100644 --- a/scripts/actions/mobskills/seismic_tail.lua +++ b/scripts/actions/mobskills/seismic_tail.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, 1, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/seismostomp.lua b/scripts/actions/mobskills/seismostomp.lua index 70e1efd8270..d30143b9419 100644 --- a/scripts/actions/mobskills/seismostomp.lua +++ b/scripts/actions/mobskills/seismostomp.lua @@ -21,7 +21,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) local shadowsRemoved = math.random(1, 2) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, shadowsRemoved) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, shadowsRemoved) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/self-destruct_bomb.lua b/scripts/actions/mobskills/self-destruct_bomb.lua index 821ef748e23..18b34090486 100644 --- a/scripts/actions/mobskills/self-destruct_bomb.lua +++ b/scripts/actions/mobskills/self-destruct_bomb.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getHP() / 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/self-destruct_bomb_321.lua b/scripts/actions/mobskills/self-destruct_bomb_321.lua index b41592b186d..0d06149d7bc 100644 --- a/scripts/actions/mobskills/self-destruct_bomb_321.lua +++ b/scripts/actions/mobskills/self-destruct_bomb_321.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = 9999 + mob:getHP() - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/self-destruct_bomb_big.lua b/scripts/actions/mobskills/self-destruct_bomb_big.lua index 11d73b2fe26..32ee81c0be6 100644 --- a/scripts/actions/mobskills/self-destruct_bomb_big.lua +++ b/scripts/actions/mobskills/self-destruct_bomb_big.lua @@ -19,8 +19,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getHP() / 2 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/self-destruct_cluster_1_death.lua b/scripts/actions/mobskills/self-destruct_cluster_1_death.lua index 08ef3ae2fdb..fb2e95ad96b 100644 --- a/scripts/actions/mobskills/self-destruct_cluster_1_death.lua +++ b/scripts/actions/mobskills/self-destruct_cluster_1_death.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getHP() - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 0.24, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 0.24, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/self-destruct_cluster_2.lua b/scripts/actions/mobskills/self-destruct_cluster_2.lua index 1806647f5bd..16fa908a50e 100644 --- a/scripts/actions/mobskills/self-destruct_cluster_2.lua +++ b/scripts/actions/mobskills/self-destruct_cluster_2.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = math.floor(mob:getHP() / 3) - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 0.4, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 0.4, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) skill:setFinalAnimationSub(6) diff --git a/scripts/actions/mobskills/self-destruct_cluster_2_death.lua b/scripts/actions/mobskills/self-destruct_cluster_2_death.lua index 2931c6b54dd..2f44585a2ce 100644 --- a/scripts/actions/mobskills/self-destruct_cluster_2_death.lua +++ b/scripts/actions/mobskills/self-destruct_cluster_2_death.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getHP() - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 0.24, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 0.24, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/self-destruct_cluster_3.lua b/scripts/actions/mobskills/self-destruct_cluster_3.lua index 4225e6841b1..95d8b571306 100644 --- a/scripts/actions/mobskills/self-destruct_cluster_3.lua +++ b/scripts/actions/mobskills/self-destruct_cluster_3.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = math.floor(mob:getHP() / 3) - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 0.4, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 0.4, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) skill:setFinalAnimationSub(5) diff --git a/scripts/actions/mobskills/self-destruct_cluster_3_death.lua b/scripts/actions/mobskills/self-destruct_cluster_3_death.lua index 6938ae83d57..ec245a075cb 100644 --- a/scripts/actions/mobskills/self-destruct_cluster_3_death.lua +++ b/scripts/actions/mobskills/self-destruct_cluster_3_death.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getHP() - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 0.24, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 0.24, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/seraph_blade.lua b/scripts/actions/mobskills/seraph_blade.lua index d7fa73b154f..a9dbf10d186 100644 --- a/scripts/actions/mobskills/seraph_blade.lua +++ b/scripts/actions/mobskills/seraph_blade.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 4 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 1.25, xi.mobskills.magicalTpBonus.DMG_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.NUMSHADOWS_1) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 1.25, xi.mobskills.magicalTpBonus.DMG_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.NUMSHADOWS_1) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.LIGHT) diff --git a/scripts/actions/mobskills/serpentine_tail.lua b/scripts/actions/mobskills/serpentine_tail.lua index 0c9ca9df3ea..14e7eae3bb6 100644 --- a/scripts/actions/mobskills/serpentine_tail.lua +++ b/scripts/actions/mobskills/serpentine_tail.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 4.25 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/severing_fang.lua b/scripts/actions/mobskills/severing_fang.lua index 5696239b9d1..5b632bcb85d 100644 --- a/scripts/actions/mobskills/severing_fang.lua +++ b/scripts/actions/mobskills/severing_fang.lua @@ -24,7 +24,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.DEFENSE_DOWN, 30, 0, 60) diff --git a/scripts/actions/mobskills/shackled_fists.lua b/scripts/actions/mobskills/shackled_fists.lua index be9728067cb..5ba52966695 100644 --- a/scripts/actions/mobskills/shackled_fists.lua +++ b/scripts/actions/mobskills/shackled_fists.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 0.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.HTH) return dmg end diff --git a/scripts/actions/mobskills/shadow_claw.lua b/scripts/actions/mobskills/shadow_claw.lua index b00da0ef333..10f4fbdc70f 100644 --- a/scripts/actions/mobskills/shadow_claw.lua +++ b/scripts/actions/mobskills/shadow_claw.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/shadow_thrust.lua b/scripts/actions/mobskills/shadow_thrust.lua index 72403f00184..1e24dcba43a 100644 --- a/scripts/actions/mobskills/shadow_thrust.lua +++ b/scripts/actions/mobskills/shadow_thrust.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) return dmg end diff --git a/scripts/actions/mobskills/shadowstitch.lua b/scripts/actions/mobskills/shadowstitch.lua index 0fbdfa44308..55c04d87866 100644 --- a/scripts/actions/mobskills/shadowstitch.lua +++ b/scripts/actions/mobskills/shadowstitch.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/shakeshroom.lua b/scripts/actions/mobskills/shakeshroom.lua index 79a244ca9ad..403552f42ac 100644 --- a/scripts/actions/mobskills/shakeshroom.lua +++ b/scripts/actions/mobskills/shakeshroom.lua @@ -23,7 +23,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 1.5 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.DISEASE, 1, 0, 720) diff --git a/scripts/actions/mobskills/shantotto_ii_melee.lua b/scripts/actions/mobskills/shantotto_ii_melee.lua index 760b5b6e9b1..1e5da1cddb3 100644 --- a/scripts/actions/mobskills/shantotto_ii_melee.lua +++ b/scripts/actions/mobskills/shantotto_ii_melee.lua @@ -11,8 +11,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.NONE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.NONE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.NONE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.NONE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.NONE) skill:setMsg(xi.msg.basic.HIT_DMG) diff --git a/scripts/actions/mobskills/shark_bite.lua b/scripts/actions/mobskills/shark_bite.lua index b0e2a7624c2..6f226a178e7 100644 --- a/scripts/actions/mobskills/shark_bite.lua +++ b/scripts/actions/mobskills/shark_bite.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ATK_VARIES, 1, 1, 1) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/sharp_sting.lua b/scripts/actions/mobskills/sharp_sting.lua index c368a53b377..ffd5cbf7311 100644 --- a/scripts/actions/mobskills/sharp_sting.lua +++ b/scripts/actions/mobskills/sharp_sting.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 0.7 local dmgmod = 2.5 local info = xi.mobskills.mobRangedMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.RANGED, xi.damageType.PIERCING) return dmg end diff --git a/scripts/actions/mobskills/sheep_charge.lua b/scripts/actions/mobskills/sheep_charge.lua index 798f5f37331..8c34c8880d0 100644 --- a/scripts/actions/mobskills/sheep_charge.lua +++ b/scripts/actions/mobskills/sheep_charge.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/sheep_charge_melee.lua b/scripts/actions/mobskills/sheep_charge_melee.lua index d73a5e6eb39..349835c1e9f 100644 --- a/scripts/actions/mobskills/sheep_charge_melee.lua +++ b/scripts/actions/mobskills/sheep_charge_melee.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/shell_bash.lua b/scripts/actions/mobskills/shell_bash.lua index dd862c4f414..be0f3c35304 100644 --- a/scripts/actions/mobskills/shell_bash.lua +++ b/scripts/actions/mobskills/shell_bash.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/shibaraku.lua b/scripts/actions/mobskills/shibaraku.lua index a6f76db5cb0..78b19bde89c 100644 --- a/scripts/actions/mobskills/shibaraku.lua +++ b/scripts/actions/mobskills/shibaraku.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/shield_bash.lua b/scripts/actions/mobskills/shield_bash.lua index dbbe2bb460b..d78b225b225 100644 --- a/scripts/actions/mobskills/shield_bash.lua +++ b/scripts/actions/mobskills/shield_bash.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 8 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.STUN, 1, 0, 7) diff --git a/scripts/actions/mobskills/shield_strike.lua b/scripts/actions/mobskills/shield_strike.lua index 102ca2774a5..81baad75d96 100644 --- a/scripts/actions/mobskills/shield_strike.lua +++ b/scripts/actions/mobskills/shield_strike.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 0.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.NUMSHADOWS_1) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.NUMSHADOWS_1) -- <100 damage to pretty much anything, except on rare occasions. target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/shining_blade.lua b/scripts/actions/mobskills/shining_blade.lua index 7c60fbf0b37..e1a0c5f7ecd 100644 --- a/scripts/actions/mobskills/shining_blade.lua +++ b/scripts/actions/mobskills/shining_blade.lua @@ -18,8 +18,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 1, xi.mobskills.magicalTpBonus.DMG_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.NUMSHADOWS_1) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.LIGHT, 1, xi.mobskills.magicalTpBonus.DMG_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.LIGHT, xi.mobskills.shadowBehavior.NUMSHADOWS_1) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.LIGHT) diff --git a/scripts/actions/mobskills/shock_strike.lua b/scripts/actions/mobskills/shock_strike.lua index 3c79e04238e..c283cb156e7 100644 --- a/scripts/actions/mobskills/shock_strike.lua +++ b/scripts/actions/mobskills/shock_strike.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 1, 2, 3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/shock_wave.lua b/scripts/actions/mobskills/shock_wave.lua index 880ca5badf4..31752f63179 100644 --- a/scripts/actions/mobskills/shock_wave.lua +++ b/scripts/actions/mobskills/shock_wave.lua @@ -14,8 +14,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WIND, 0.6, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WIND, 0.6, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) diff --git a/scripts/actions/mobskills/shockwave.lua b/scripts/actions/mobskills/shockwave.lua index 45f57b2a62e..7a6d7c58b5d 100644 --- a/scripts/actions/mobskills/shockwave.lua +++ b/scripts/actions/mobskills/shockwave.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/shoulder_attack.lua b/scripts/actions/mobskills/shoulder_attack.lua index 255b2046c79..ea9487e8524 100644 --- a/scripts/actions/mobskills/shoulder_attack.lua +++ b/scripts/actions/mobskills/shoulder_attack.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/shoulder_slam.lua b/scripts/actions/mobskills/shoulder_slam.lua index c2c94c031bd..ec093589c61 100644 --- a/scripts/actions/mobskills/shoulder_slam.lua +++ b/scripts/actions/mobskills/shoulder_slam.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/sickle_moon.lua b/scripts/actions/mobskills/sickle_moon.lua index 1174dbcf1a3..51c0246890c 100644 --- a/scripts/actions/mobskills/sickle_moon.lua +++ b/scripts/actions/mobskills/sickle_moon.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 4 local ftp = 2 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/sickle_slash.lua b/scripts/actions/mobskills/sickle_slash.lua index 8b6643294f1..c25a44d403f 100644 --- a/scripts/actions/mobskills/sickle_slash.lua +++ b/scripts/actions/mobskills/sickle_slash.lua @@ -26,7 +26,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1, 1.5, 2) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/sideswipe.lua b/scripts/actions/mobskills/sideswipe.lua index ea6d87b89c6..12b02c1c61b 100644 --- a/scripts/actions/mobskills/sideswipe.lua +++ b/scripts/actions/mobskills/sideswipe.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) -- TODO: Needs damage scaling capture local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1, 1, 1) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) mob:resetEnmity(target) diff --git a/scripts/actions/mobskills/sidewinder.lua b/scripts/actions/mobskills/sidewinder.lua index 73a1d61c866..98d762efd81 100644 --- a/scripts/actions/mobskills/sidewinder.lua +++ b/scripts/actions/mobskills/sidewinder.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 5.0 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.NUMSHADOWS_1) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.NUMSHADOWS_1) target:takeDamage(dmg, mob, xi.attackType.RANGED, xi.damageType.PIERCING) return dmg end diff --git a/scripts/actions/mobskills/silence_gas.lua b/scripts/actions/mobskills/silence_gas.lua index 01a5054c4f5..3e0ec0058ab 100644 --- a/scripts/actions/mobskills/silence_gas.lua +++ b/scripts/actions/mobskills/silence_gas.lua @@ -20,8 +20,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.DARK) diff --git a/scripts/actions/mobskills/silencing_microtube.lua b/scripts/actions/mobskills/silencing_microtube.lua index f7d35b78a88..33d4baf543c 100644 --- a/scripts/actions/mobskills/silencing_microtube.lua +++ b/scripts/actions/mobskills/silencing_microtube.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 5 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.NONE, 2.45, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.NONE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.NONE, 2.45, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.NONE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.NONE) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.SILENCE, 1, 0, 60) diff --git a/scripts/actions/mobskills/sinuate_rush.lua b/scripts/actions/mobskills/sinuate_rush.lua index 227c73d0db3..79b61f51bbd 100644 --- a/scripts/actions/mobskills/sinuate_rush.lua +++ b/scripts/actions/mobskills/sinuate_rush.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2.0 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/siphon_discharge.lua b/scripts/actions/mobskills/siphon_discharge.lua index 4718d6613a1..0dc812cefc8 100644 --- a/scripts/actions/mobskills/siphon_discharge.lua +++ b/scripts/actions/mobskills/siphon_discharge.lua @@ -16,8 +16,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WATER, 2, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WATER, 2, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER) return damage diff --git a/scripts/actions/mobskills/skewer.lua b/scripts/actions/mobskills/skewer.lua index bb56349d12f..bc3e99e020a 100644 --- a/scripts/actions/mobskills/skewer.lua +++ b/scripts/actions/mobskills/skewer.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 1 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/skullbreaker.lua b/scripts/actions/mobskills/skullbreaker.lua index 1407cf3f59f..a214b19f95d 100644 --- a/scripts/actions/mobskills/skullbreaker.lua +++ b/scripts/actions/mobskills/skullbreaker.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.0 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 1.1, 1.2, 1.3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) if math.random(1, 100) < skill:getTP() / 3 then xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.INT_DOWN, 10, 3, 120) diff --git a/scripts/actions/mobskills/slam_dunk.lua b/scripts/actions/mobskills/slam_dunk.lua index 72f35b67aec..da5eefba042 100644 --- a/scripts/actions/mobskills/slam_dunk.lua +++ b/scripts/actions/mobskills/slam_dunk.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BIND, 1, 0, 60) diff --git a/scripts/actions/mobskills/slaverous_gale.lua b/scripts/actions/mobskills/slaverous_gale.lua index 2c55026bc29..95ce035ef66 100644 --- a/scripts/actions/mobskills/slaverous_gale.lua +++ b/scripts/actions/mobskills/slaverous_gale.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * math.random(4, 6) - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.EARTH, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.EARTH, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.EARTH) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.PLAGUE, 1, 3, 60) diff --git a/scripts/actions/mobskills/sledgehammer.lua b/scripts/actions/mobskills/sledgehammer.lua index 50db93cc106..dc12ef7ce8e 100644 --- a/scripts/actions/mobskills/sledgehammer.lua +++ b/scripts/actions/mobskills/sledgehammer.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3.2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, 3 * info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, 3 * info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.PETRIFICATION, 1, 0, 60) diff --git a/scripts/actions/mobskills/sleet_blast.lua b/scripts/actions/mobskills/sleet_blast.lua index 5edd78b96cb..033cf2c13a5 100644 --- a/scripts/actions/mobskills/sleet_blast.lua +++ b/scripts/actions/mobskills/sleet_blast.lua @@ -19,8 +19,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.ICE, 5, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.ICE, 5, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.ICE) diff --git a/scripts/actions/mobskills/sleet_blast_alt.lua b/scripts/actions/mobskills/sleet_blast_alt.lua index 00b5a982ae5..1e2757dce53 100644 --- a/scripts/actions/mobskills/sleet_blast_alt.lua +++ b/scripts/actions/mobskills/sleet_blast_alt.lua @@ -14,8 +14,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.ICE, 4, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.ICE, 4, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.ICE) skill:setMsg(xi.msg.basic.HIT_DMG) diff --git a/scripts/actions/mobskills/sling_bomb.lua b/scripts/actions/mobskills/sling_bomb.lua index b5d14939da3..9bcccc11372 100644 --- a/scripts/actions/mobskills/sling_bomb.lua +++ b/scripts/actions/mobskills/sling_bomb.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/smite_of_fury.lua b/scripts/actions/mobskills/smite_of_fury.lua index 4ba0c56e566..ca601df56e2 100644 --- a/scripts/actions/mobskills/smite_of_fury.lua +++ b/scripts/actions/mobskills/smite_of_fury.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 4 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target: takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/smite_of_rage.lua b/scripts/actions/mobskills/smite_of_rage.lua index 8d1a19ace64..7a4b7de461a 100644 --- a/scripts/actions/mobskills/smite_of_rage.lua +++ b/scripts/actions/mobskills/smite_of_rage.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/smoke_discharger.lua b/scripts/actions/mobskills/smoke_discharger.lua index 0dcc76439f3..466786ccba5 100644 --- a/scripts/actions/mobskills/smoke_discharger.lua +++ b/scripts/actions/mobskills/smoke_discharger.lua @@ -21,8 +21,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.EARTH, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.EARTH, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.EARTH) diff --git a/scripts/actions/mobskills/smouldering_swarm.lua b/scripts/actions/mobskills/smouldering_swarm.lua index a9ecca1d493..8edf392fc89 100644 --- a/scripts/actions/mobskills/smouldering_swarm.lua +++ b/scripts/actions/mobskills/smouldering_swarm.lua @@ -18,8 +18,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local duration = math.random(15, 90) local damage = mob:getWeaponDmg() - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, dmgmod, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, dmgmod, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/snort.lua b/scripts/actions/mobskills/snort.lua index b678d3f2d19..fd6abcda353 100644 --- a/scripts/actions/mobskills/snort.lua +++ b/scripts/actions/mobskills/snort.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 4 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) diff --git a/scripts/actions/mobskills/snort_2127.lua b/scripts/actions/mobskills/snort_2127.lua index a9b0dc3a3a9..625db646298 100644 --- a/scripts/actions/mobskills/snort_2127.lua +++ b/scripts/actions/mobskills/snort_2127.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 4 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) skill:setMsg(xi.msg.basic.HIT_DMG) diff --git a/scripts/actions/mobskills/snow_cloud.lua b/scripts/actions/mobskills/snow_cloud.lua index 52bbaddc1ae..6d408b479d2 100644 --- a/scripts/actions/mobskills/snow_cloud.lua +++ b/scripts/actions/mobskills/snow_cloud.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getMainLvl() + 2 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.ICE, 2, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.ICE, 2, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.ICE) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.PARALYSIS, 30, 0, 120) diff --git a/scripts/actions/mobskills/snowball.lua b/scripts/actions/mobskills/snowball.lua index 68bdfd1a637..f6e81bbd5f5 100644 --- a/scripts/actions/mobskills/snowball.lua +++ b/scripts/actions/mobskills/snowball.lua @@ -11,8 +11,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2.5 - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.ICE, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.ICE, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.ICE) diff --git a/scripts/actions/mobskills/somersault.lua b/scripts/actions/mobskills/somersault.lua index 40c0bc90295..c182ec01992 100644 --- a/scripts/actions/mobskills/somersault.lua +++ b/scripts/actions/mobskills/somersault.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ATK_VARIES, 1.5, 1.5, 1.5) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/somersault_kick.lua b/scripts/actions/mobskills/somersault_kick.lua index 49e6369c733..dc1966076cd 100644 --- a/scripts/actions/mobskills/somersault_kick.lua +++ b/scripts/actions/mobskills/somersault_kick.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/sonic_blade.lua b/scripts/actions/mobskills/sonic_blade.lua index 1118ce5a24f..3848e5f811d 100644 --- a/scripts/actions/mobskills/sonic_blade.lua +++ b/scripts/actions/mobskills/sonic_blade.lua @@ -22,7 +22,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/sonic_buffet.lua b/scripts/actions/mobskills/sonic_buffet.lua index b1a54d7519d..c9b49f2d012 100644 --- a/scripts/actions/mobskills/sonic_buffet.lua +++ b/scripts/actions/mobskills/sonic_buffet.lua @@ -11,8 +11,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = math.floor(mob:getWeaponDmg() * 2.5) - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) for i = 1, math.random(2, 3) do target:dispelStatusEffect(xi.effectFlag.DISPELABLE) diff --git a/scripts/actions/mobskills/soul_drain.lua b/scripts/actions/mobskills/soul_drain.lua index 53c83c30e6e..69802d20474 100644 --- a/scripts/actions/mobskills/soul_drain.lua +++ b/scripts/actions/mobskills/soul_drain.lua @@ -13,8 +13,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, 1.5, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.NUMSHADOWS_1) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, 1.5, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.NUMSHADOWS_1) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.HP, damage)) diff --git a/scripts/actions/mobskills/soulshattering_roar.lua b/scripts/actions/mobskills/soulshattering_roar.lua index 25d4919b82d..65cb23572aa 100644 --- a/scripts/actions/mobskills/soulshattering_roar.lua +++ b/scripts/actions/mobskills/soulshattering_roar.lua @@ -11,8 +11,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 4 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.DARK) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.TERROR, 1, 0, 30) diff --git a/scripts/actions/mobskills/spike_flail.lua b/scripts/actions/mobskills/spike_flail.lua index a8cc42a1401..19ea2b18209 100644 --- a/scripts/actions/mobskills/spike_flail.lua +++ b/scripts/actions/mobskills/spike_flail.lua @@ -28,7 +28,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 4 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/spikeball.lua b/scripts/actions/mobskills/spikeball.lua index 1235c5ff2d0..22642aa0259 100644 --- a/scripts/actions/mobskills/spikeball.lua +++ b/scripts/actions/mobskills/spikeball.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.RANGED, xi.damageType.PIERCING) if dmg > 0 then diff --git a/scripts/actions/mobskills/spinal_cleave.lua b/scripts/actions/mobskills/spinal_cleave.lua index 5dfdba27e47..c2a764f0ed2 100644 --- a/scripts/actions/mobskills/spinal_cleave.lua +++ b/scripts/actions/mobskills/spinal_cleave.lua @@ -23,7 +23,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 3 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.CRIT_VARIES) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/spine_lash.lua b/scripts/actions/mobskills/spine_lash.lua index ae62be46a42..cd92e78cec0 100644 --- a/scripts/actions/mobskills/spine_lash.lua +++ b/scripts/actions/mobskills/spine_lash.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1, 1, 1) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.NONE, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.NONE, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.PLAGUE, 5, 0, 120) diff --git a/scripts/actions/mobskills/spinning_attack.lua b/scripts/actions/mobskills/spinning_attack.lua index f0d5f434da8..3f34b19c4aa 100644 --- a/scripts/actions/mobskills/spinning_attack.lua +++ b/scripts/actions/mobskills/spinning_attack.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.NUMSHADOWS_3) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/spinning_claw.lua b/scripts/actions/mobskills/spinning_claw.lua index ceadb507795..c1b56dd792e 100644 --- a/scripts/actions/mobskills/spinning_claw.lua +++ b/scripts/actions/mobskills/spinning_claw.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.0 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/spinning_dive.lua b/scripts/actions/mobskills/spinning_dive.lua index 45337f5f959..ba849c6b686 100644 --- a/scripts/actions/mobskills/spinning_dive.lua +++ b/scripts/actions/mobskills/spinning_dive.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 2 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 1, 2, 3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/spinning_fin.lua b/scripts/actions/mobskills/spinning_fin.lua index c87d56ec36c..b03272d499c 100644 --- a/scripts/actions/mobskills/spinning_fin.lua +++ b/scripts/actions/mobskills/spinning_fin.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.0 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/spinning_scythe.lua b/scripts/actions/mobskills/spinning_scythe.lua index 6982a747a65..ddb456639b3 100644 --- a/scripts/actions/mobskills/spinning_scythe.lua +++ b/scripts/actions/mobskills/spinning_scythe.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_1) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_1) -- 150-200 damage target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/spinning_top.lua b/scripts/actions/mobskills/spinning_top.lua index 33a9480e476..9a6d312d73d 100644 --- a/scripts/actions/mobskills/spinning_top.lua +++ b/scripts/actions/mobskills/spinning_top.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = .8 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/spiral_hell.lua b/scripts/actions/mobskills/spiral_hell.lua index cfe328b6993..3855340bdff 100644 --- a/scripts/actions/mobskills/spiral_hell.lua +++ b/scripts/actions/mobskills/spiral_hell.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.25 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ATK_VARIES, 1, 1, 1) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/spiral_spin.lua b/scripts/actions/mobskills/spiral_spin.lua index 08d13bd9bcc..d524ff242cd 100644 --- a/scripts/actions/mobskills/spiral_spin.lua +++ b/scripts/actions/mobskills/spiral_spin.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 2 local ftp = 2 -- TODO: can crit local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.ACCURACY_DOWN, 40, 0, 60) diff --git a/scripts/actions/mobskills/spirit_absorption.lua b/scripts/actions/mobskills/spirit_absorption.lua index 7485813746d..7c2276f6436 100644 --- a/scripts/actions/mobskills/spirit_absorption.lua +++ b/scripts/actions/mobskills/spirit_absorption.lua @@ -13,8 +13,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, 3.5, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - local dmg = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.NUMSHADOWS_1) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, 3.5, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.NUMSHADOWS_1) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.HP, dmg)) diff --git a/scripts/actions/mobskills/spirit_absorption_thinker.lua b/scripts/actions/mobskills/spirit_absorption_thinker.lua index 505bcf80e95..6853dad4c30 100644 --- a/scripts/actions/mobskills/spirit_absorption_thinker.lua +++ b/scripts/actions/mobskills/spirit_absorption_thinker.lua @@ -13,8 +13,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() * 2, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - local dmg = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.NUMSHADOWS_1) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() * 2, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.NUMSHADOWS_1) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.HP, dmg)) diff --git a/scripts/actions/mobskills/splash_breath.lua b/scripts/actions/mobskills/splash_breath.lua index 1ae48ff9d8a..f9f2355090c 100644 --- a/scripts/actions/mobskills/splash_breath.lua +++ b/scripts/actions/mobskills/splash_breath.lua @@ -20,8 +20,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.WATER) diff --git a/scripts/actions/mobskills/sprout_smack.lua b/scripts/actions/mobskills/sprout_smack.lua index 0c5315c84d5..14f5a8a899f 100644 --- a/scripts/actions/mobskills/sprout_smack.lua +++ b/scripts/actions/mobskills/sprout_smack.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.SLOW, 3000, 0, 90) diff --git a/scripts/actions/mobskills/sprout_spin.lua b/scripts/actions/mobskills/sprout_spin.lua index 893353d6f94..4868503fa37 100644 --- a/scripts/actions/mobskills/sprout_spin.lua +++ b/scripts/actions/mobskills/sprout_spin.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.0 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/stampede.lua b/scripts/actions/mobskills/stampede.lua index 2d18ec9e429..ba814c6874e 100644 --- a/scripts/actions/mobskills/stampede.lua +++ b/scripts/actions/mobskills/stampede.lua @@ -13,7 +13,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/stasis.lua b/scripts/actions/mobskills/stasis.lua index d70c774e5fe..d1f139556db 100644 --- a/scripts/actions/mobskills/stasis.lua +++ b/scripts/actions/mobskills/stasis.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/static_filament.lua b/scripts/actions/mobskills/static_filament.lua index a6566d77dc7..85a0f9fc1a5 100644 --- a/scripts/actions/mobskills/static_filament.lua +++ b/scripts/actions/mobskills/static_filament.lua @@ -11,8 +11,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.THUNDER, math.random(1, 2), xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.NUMSHADOWS_2) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.THUNDER, math.random(1, 2), xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.NUMSHADOWS_2) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.THUNDER) diff --git a/scripts/actions/mobskills/stave_toss.lua b/scripts/actions/mobskills/stave_toss.lua index f5a186eb8d0..aee9b4cc70a 100644 --- a/scripts/actions/mobskills/stave_toss.lua +++ b/scripts/actions/mobskills/stave_toss.lua @@ -22,7 +22,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ACC_VARIES) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/stellar_arrow.lua b/scripts/actions/mobskills/stellar_arrow.lua index e16bceff26a..88f4ac6f784 100644 --- a/scripts/actions/mobskills/stellar_arrow.lua +++ b/scripts/actions/mobskills/stellar_arrow.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(dmg, mob, xi.attackType.RANGED, xi.damageType.PIERCING) return dmg end diff --git a/scripts/actions/mobskills/stellar_burst.lua b/scripts/actions/mobskills/stellar_burst.lua index 3a78209b921..e447f96d644 100644 --- a/scripts/actions/mobskills/stellar_burst.lua +++ b/scripts/actions/mobskills/stellar_burst.lua @@ -10,8 +10,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.NONE, 3, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.NONE, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.NONE, 3, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.NONE, xi.mobskills.shadowBehavior.NUMSHADOWS_3) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.NONE) diff --git a/scripts/actions/mobskills/stifling_tantara.lua b/scripts/actions/mobskills/stifling_tantara.lua index 34604db6989..3eb6e32f572 100644 --- a/scripts/actions/mobskills/stifling_tantara.lua +++ b/scripts/actions/mobskills/stifling_tantara.lua @@ -23,7 +23,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3.0 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ELEMENTAL, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ELEMENTAL, xi.mobskills.shadowBehavior.WIPE_SHADOWS) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.SILENCE, 1, 0, 60) diff --git a/scripts/actions/mobskills/stomping.lua b/scripts/actions/mobskills/stomping.lua index c92a8bafdcb..e90bd0b89ff 100644 --- a/scripts/actions/mobskills/stomping.lua +++ b/scripts/actions/mobskills/stomping.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ATK_VARIES, 1.5, 1.5, 1.5) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/stone_ii.lua b/scripts/actions/mobskills/stone_ii.lua index 23c1e8ec60a..ed4a1db354a 100644 --- a/scripts/actions/mobskills/stone_ii.lua +++ b/scripts/actions/mobskills/stone_ii.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.EARTH, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.EARTH, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.EARTH) diff --git a/scripts/actions/mobskills/stone_iv.lua b/scripts/actions/mobskills/stone_iv.lua index e63b3c88e1c..db9a7ca8e70 100644 --- a/scripts/actions/mobskills/stone_iv.lua +++ b/scripts/actions/mobskills/stone_iv.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 4 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.EARTH, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.EARTH, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.EARTH) diff --git a/scripts/actions/mobskills/stone_meeble_warble.lua b/scripts/actions/mobskills/stone_meeble_warble.lua index fdfe3fb8584..1f3aa48f661 100644 --- a/scripts/actions/mobskills/stone_meeble_warble.lua +++ b/scripts/actions/mobskills/stone_meeble_warble.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 9 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 2, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 2, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.PETRIFICATION, 30, 0, 60) diff --git a/scripts/actions/mobskills/stone_throw.lua b/scripts/actions/mobskills/stone_throw.lua index 723bb20cd94..205f08d27f3 100644 --- a/scripts/actions/mobskills/stone_throw.lua +++ b/scripts/actions/mobskills/stone_throw.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.5 local info = xi.mobskills.mobRangedMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.RANGED, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.RANGED, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.RANGED, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/storm_wing.lua b/scripts/actions/mobskills/storm_wing.lua index 538f4612dce..3b88e8cccce 100644 --- a/scripts/actions/mobskills/storm_wing.lua +++ b/scripts/actions/mobskills/storm_wing.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = math.floor(mob:getWeaponDmg() * 1.5) - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 3, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 3, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.NUMSHADOWS_3) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.SILENCE, 1, 0, 60) diff --git a/scripts/actions/mobskills/stormwind.lua b/scripts/actions/mobskills/stormwind.lua index c1484c51a7a..d5e8f95786c 100644 --- a/scripts/actions/mobskills/stormwind.lua +++ b/scripts/actions/mobskills/stormwind.lua @@ -25,8 +25,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) end end - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WIND, dmgMod, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WIND, dmgMod, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) diff --git a/scripts/actions/mobskills/stun_cannon.lua b/scripts/actions/mobskills/stun_cannon.lua index 444e3ffb776..a634526ab0f 100644 --- a/scripts/actions/mobskills/stun_cannon.lua +++ b/scripts/actions/mobskills/stun_cannon.lua @@ -18,8 +18,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.THUNDER, 1.5, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.THUNDER, 1.5, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.DARK) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.PARALYSIS, 20, 0, 120) diff --git a/scripts/actions/mobskills/stupor_spores.lua b/scripts/actions/mobskills/stupor_spores.lua index ca37b08535d..840c563cd82 100644 --- a/scripts/actions/mobskills/stupor_spores.lua +++ b/scripts/actions/mobskills/stupor_spores.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) -- TODO: Damage needs 1 + dINT added - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.NONE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ELEMENTAL, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.NONE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ELEMENTAL, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.ELEMENTAL) diff --git a/scripts/actions/mobskills/sub-zero_smash.lua b/scripts/actions/mobskills/sub-zero_smash.lua index 024f8e4cd25..6101c491c78 100644 --- a/scripts/actions/mobskills/sub-zero_smash.lua +++ b/scripts/actions/mobskills/sub-zero_smash.lua @@ -21,7 +21,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 1 local accmod = 1 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.PARALYSIS, 10, 0, 100) diff --git a/scripts/actions/mobskills/suction.lua b/scripts/actions/mobskills/suction.lua index 803b7c183d2..50b5e8ecbec 100644 --- a/scripts/actions/mobskills/suction.lua +++ b/scripts/actions/mobskills/suction.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/sudden_lunge.lua b/scripts/actions/mobskills/sudden_lunge.lua index 6d8364750c4..9f5e2c9eacf 100644 --- a/scripts/actions/mobskills/sudden_lunge.lua +++ b/scripts/actions/mobskills/sudden_lunge.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/sulfurous_breath.lua b/scripts/actions/mobskills/sulfurous_breath.lua index 2fd56a1375c..bfedd5ae089 100644 --- a/scripts/actions/mobskills/sulfurous_breath.lua +++ b/scripts/actions/mobskills/sulfurous_breath.lua @@ -24,8 +24,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/sweep.lua b/scripts/actions/mobskills/sweep.lua index ed6bef43d01..af12b1852d1 100644 --- a/scripts/actions/mobskills/sweep.lua +++ b/scripts/actions/mobskills/sweep.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/sweeping_flail.lua b/scripts/actions/mobskills/sweeping_flail.lua index d7f6d049803..9df587323ac 100644 --- a/scripts/actions/mobskills/sweeping_flail.lua +++ b/scripts/actions/mobskills/sweeping_flail.lua @@ -23,7 +23,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/sweet_breath.lua b/scripts/actions/mobskills/sweet_breath.lua index d9b5b87a5a4..25eef815e33 100644 --- a/scripts/actions/mobskills/sweet_breath.lua +++ b/scripts/actions/mobskills/sweet_breath.lua @@ -20,8 +20,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.DARK) diff --git a/scripts/actions/mobskills/swift_blade.lua b/scripts/actions/mobskills/swift_blade.lua index a115f57bc6c..48ece91e383 100644 --- a/scripts/actions/mobskills/swift_blade.lua +++ b/scripts/actions/mobskills/swift_blade.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ACC_VARIES, 1, 2, 3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) -- Around 700 damage from AA HM target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/tachi_gekko.lua b/scripts/actions/mobskills/tachi_gekko.lua index f1895615573..b87741f8f3e 100644 --- a/scripts/actions/mobskills/tachi_gekko.lua +++ b/scripts/actions/mobskills/tachi_gekko.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.5 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.SILENCE, 1, 0, 60) diff --git a/scripts/actions/mobskills/tachi_kaiten.lua b/scripts/actions/mobskills/tachi_kaiten.lua index 5b7fec2ee86..0658ef87b31 100644 --- a/scripts/actions/mobskills/tachi_kaiten.lua +++ b/scripts/actions/mobskills/tachi_kaiten.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2.5 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/tachi_kasha.lua b/scripts/actions/mobskills/tachi_kasha.lua index c470b9db7bf..d6dc7c30e32 100644 --- a/scripts/actions/mobskills/tachi_kasha.lua +++ b/scripts/actions/mobskills/tachi_kasha.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3.5 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.PARALYSIS, 25, 0, 60) diff --git a/scripts/actions/mobskills/tachi_yukikaze.lua b/scripts/actions/mobskills/tachi_yukikaze.lua index 52005fc5438..ec91efce4f3 100644 --- a/scripts/actions/mobskills/tachi_yukikaze.lua +++ b/scripts/actions/mobskills/tachi_yukikaze.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BLINDNESS, 25, 0, 60) diff --git a/scripts/actions/mobskills/tackle.lua b/scripts/actions/mobskills/tackle.lua index 7b10430e4dd..21fe558e5b5 100644 --- a/scripts/actions/mobskills/tackle.lua +++ b/scripts/actions/mobskills/tackle.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.7 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/tail_blow.lua b/scripts/actions/mobskills/tail_blow.lua index 520f08504fc..1f00e9776ee 100644 --- a/scripts/actions/mobskills/tail_blow.lua +++ b/scripts/actions/mobskills/tail_blow.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/tail_crush.lua b/scripts/actions/mobskills/tail_crush.lua index d0015da727b..b0b516fed56 100644 --- a/scripts/actions/mobskills/tail_crush.lua +++ b/scripts/actions/mobskills/tail_crush.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1, 1, 1) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/tail_lash.lua b/scripts/actions/mobskills/tail_lash.lua index ee0ff0fa002..702ac7e8786 100644 --- a/scripts/actions/mobskills/tail_lash.lua +++ b/scripts/actions/mobskills/tail_lash.lua @@ -22,7 +22,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.AMNESIA, 1, 0, 60) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/tail_roll.lua b/scripts/actions/mobskills/tail_roll.lua index 3b565c23106..b19ca99fc9f 100644 --- a/scripts/actions/mobskills/tail_roll.lua +++ b/scripts/actions/mobskills/tail_roll.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/tail_slap.lua b/scripts/actions/mobskills/tail_slap.lua index cfa05022d13..1923b1f56c1 100644 --- a/scripts/actions/mobskills/tail_slap.lua +++ b/scripts/actions/mobskills/tail_slap.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ATK_VARIES, 1, 2, 3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/tail_smash.lua b/scripts/actions/mobskills/tail_smash.lua index ff2bb888bd1..8eafb19021a 100644 --- a/scripts/actions/mobskills/tail_smash.lua +++ b/scripts/actions/mobskills/tail_smash.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/tail_swing.lua b/scripts/actions/mobskills/tail_swing.lua index f12e18b58e9..8373283cded 100644 --- a/scripts/actions/mobskills/tail_swing.lua +++ b/scripts/actions/mobskills/tail_swing.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/tail_thrust.lua b/scripts/actions/mobskills/tail_thrust.lua index d308f6e1739..80eef36b76e 100644 --- a/scripts/actions/mobskills/tail_thrust.lua +++ b/scripts/actions/mobskills/tail_thrust.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.PARALYSIS, 10, 0, math.random(30, 60)) diff --git a/scripts/actions/mobskills/tail_whip.lua b/scripts/actions/mobskills/tail_whip.lua index 3597506b070..1b7621e6f7b 100644 --- a/scripts/actions/mobskills/tail_whip.lua +++ b/scripts/actions/mobskills/tail_whip.lua @@ -13,7 +13,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.0 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.WEIGHT, 50, 0, 120) diff --git a/scripts/actions/mobskills/tebbad_wing.lua b/scripts/actions/mobskills/tebbad_wing.lua index 9a0c83bf493..f3059a335af 100644 --- a/scripts/actions/mobskills/tebbad_wing.lua +++ b/scripts/actions/mobskills/tebbad_wing.lua @@ -23,8 +23,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.FIRE, 4, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.FIRE, 4, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.PLAGUE, 10, 0, 120) diff --git a/scripts/actions/mobskills/tebbad_wing_air.lua b/scripts/actions/mobskills/tebbad_wing_air.lua index 4ac6ac4ecff..88503e5a18f 100644 --- a/scripts/actions/mobskills/tebbad_wing_air.lua +++ b/scripts/actions/mobskills/tebbad_wing_air.lua @@ -19,8 +19,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.FIRE, 6, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.FIRE, 6, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.PLAGUE, 10, 0, 120) diff --git a/scripts/actions/mobskills/tempest_wing.lua b/scripts/actions/mobskills/tempest_wing.lua index 9bef6bb8cb0..d1a1b1be1fe 100644 --- a/scripts/actions/mobskills/tempest_wing.lua +++ b/scripts/actions/mobskills/tempest_wing.lua @@ -20,8 +20,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 4 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) diff --git a/scripts/actions/mobskills/tempestuous_upheaval.lua b/scripts/actions/mobskills/tempestuous_upheaval.lua index 5f649f24119..734a5a58e84 100644 --- a/scripts/actions/mobskills/tempestuous_upheaval.lua +++ b/scripts/actions/mobskills/tempestuous_upheaval.lua @@ -18,8 +18,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local dmgmod = 2.1 local damage = mob:getWeaponDmg() - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, dmgmod, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, dmgmod, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) diff --git a/scripts/actions/mobskills/tentacle.lua b/scripts/actions/mobskills/tentacle.lua index 55fcae99eac..c166a444a87 100644 --- a/scripts/actions/mobskills/tentacle.lua +++ b/scripts/actions/mobskills/tentacle.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/tenzen_ranged_high.lua b/scripts/actions/mobskills/tenzen_ranged_high.lua index 598ded6eba8..eff4d264c61 100644 --- a/scripts/actions/mobskills/tenzen_ranged_high.lua +++ b/scripts/actions/mobskills/tenzen_ranged_high.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local dmgmod = 1.5 local info = xi.mobskills.mobRangedMove(mob, target, skill, numhits, accmod, dmgmod, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, info.hitslanded) local msg = skill:getMsg() if dmg > 0 and diff --git a/scripts/actions/mobskills/tenzen_ranged_low.lua b/scripts/actions/mobskills/tenzen_ranged_low.lua index 598ded6eba8..eff4d264c61 100644 --- a/scripts/actions/mobskills/tenzen_ranged_low.lua +++ b/scripts/actions/mobskills/tenzen_ranged_low.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local dmgmod = 1.5 local info = xi.mobskills.mobRangedMove(mob, target, skill, numhits, accmod, dmgmod, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, info.hitslanded) local msg = skill:getMsg() if dmg > 0 and diff --git a/scripts/actions/mobskills/tera_slash.lua b/scripts/actions/mobskills/tera_slash.lua index 874c9aeb0c1..c3d8eb0ea9d 100644 --- a/scripts/actions/mobskills/tera_slash.lua +++ b/scripts/actions/mobskills/tera_slash.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 5 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/terror_touch.lua b/scripts/actions/mobskills/terror_touch.lua index d209e8623d5..a35651578aa 100644 --- a/scripts/actions/mobskills/terror_touch.lua +++ b/scripts/actions/mobskills/terror_touch.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 1 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.ATTACK_DOWN, 70, 0, 90) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/the_wrath_of_gudha.lua b/scripts/actions/mobskills/the_wrath_of_gudha.lua index b8544326a3a..74e5ebcd0bf 100644 --- a/scripts/actions/mobskills/the_wrath_of_gudha.lua +++ b/scripts/actions/mobskills/the_wrath_of_gudha.lua @@ -13,7 +13,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, 0, 1, 2, 3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.NONE, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.NONE, info.hitslanded) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.WEIGHT, 80, 0, 10) diff --git a/scripts/actions/mobskills/thermal_pulse.lua b/scripts/actions/mobskills/thermal_pulse.lua index 110e0bfdaff..50cf0146d06 100644 --- a/scripts/actions/mobskills/thermal_pulse.lua +++ b/scripts/actions/mobskills/thermal_pulse.lua @@ -21,8 +21,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 4.5 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/thrashing_assault.lua b/scripts/actions/mobskills/thrashing_assault.lua index 8e8240b798e..6aa14d628f7 100644 --- a/scripts/actions/mobskills/thrashing_assault.lua +++ b/scripts/actions/mobskills/thrashing_assault.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.0 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 15) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.DEFENSE_BOOST, 50, 0, 60) diff --git a/scripts/actions/mobskills/throat_stab.lua b/scripts/actions/mobskills/throat_stab.lua index e75f47dcd9a..9778875294f 100644 --- a/scripts/actions/mobskills/throat_stab.lua +++ b/scripts/actions/mobskills/throat_stab.lua @@ -23,7 +23,12 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) damage = currentHP * .95 end - local dmg = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = + { + damage = damage + } + + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) mob:resetEnmity(target) diff --git a/scripts/actions/mobskills/thunder_break.lua b/scripts/actions/mobskills/thunder_break.lua index 3355f8e63fa..b9692a86a92 100644 --- a/scripts/actions/mobskills/thunder_break.lua +++ b/scripts/actions/mobskills/thunder_break.lua @@ -10,8 +10,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.THUNDER, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.THUNDER, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.THUNDER) diff --git a/scripts/actions/mobskills/thunder_break_2129.lua b/scripts/actions/mobskills/thunder_break_2129.lua index a2310194570..b128284946c 100644 --- a/scripts/actions/mobskills/thunder_break_2129.lua +++ b/scripts/actions/mobskills/thunder_break_2129.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = math.floor(mob:getWeaponDmg() * 3.2) - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.THUNDER, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.THUNDER, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.THUNDER) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/thunder_breath.lua b/scripts/actions/mobskills/thunder_breath.lua index 5ae267a76a1..2ee7657d7f1 100644 --- a/scripts/actions/mobskills/thunder_breath.lua +++ b/scripts/actions/mobskills/thunder_breath.lua @@ -27,8 +27,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.THUNDER) diff --git a/scripts/actions/mobskills/thunder_ii.lua b/scripts/actions/mobskills/thunder_ii.lua index 9d1bc1390cc..38a17ddf546 100644 --- a/scripts/actions/mobskills/thunder_ii.lua +++ b/scripts/actions/mobskills/thunder_ii.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.THUNDER, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.THUNDER, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.THUNDER) diff --git a/scripts/actions/mobskills/thunder_iv.lua b/scripts/actions/mobskills/thunder_iv.lua index 0a08b22346e..01158c8cc9a 100644 --- a/scripts/actions/mobskills/thunder_iv.lua +++ b/scripts/actions/mobskills/thunder_iv.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 4 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.THUNDER, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.THUNDER, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.THUNDER) diff --git a/scripts/actions/mobskills/thunder_meeble_warble.lua b/scripts/actions/mobskills/thunder_meeble_warble.lua index ef7133f2b17..adcc0d58223 100644 --- a/scripts/actions/mobskills/thunder_meeble_warble.lua +++ b/scripts/actions/mobskills/thunder_meeble_warble.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 9 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 2, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 2, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.SHOCK, 50, 3, 60) diff --git a/scripts/actions/mobskills/thunderbolt_behemoth.lua b/scripts/actions/mobskills/thunderbolt_behemoth.lua index 65a917f77f2..221e6537f5d 100644 --- a/scripts/actions/mobskills/thunderbolt_behemoth.lua +++ b/scripts/actions/mobskills/thunderbolt_behemoth.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local duration = math.random(8, 14) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.THUNDER, 0.6, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.THUNDER, 0.6, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.THUNDER) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.STUN, 1, 0, duration) diff --git a/scripts/actions/mobskills/thunderbolt_raptor.lua b/scripts/actions/mobskills/thunderbolt_raptor.lua index f49bd777d73..f2b7eb8a1fa 100644 --- a/scripts/actions/mobskills/thunderbolt_raptor.lua +++ b/scripts/actions/mobskills/thunderbolt_raptor.lua @@ -25,8 +25,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.THUNDER) diff --git a/scripts/actions/mobskills/thunderspark.lua b/scripts/actions/mobskills/thunderspark.lua index e7a4b4b920f..444d6221745 100644 --- a/scripts/actions/mobskills/thunderspark.lua +++ b/scripts/actions/mobskills/thunderspark.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.THUNDER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.THUNDER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.THUNDER) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.PARALYSIS, 30, 0, 60) diff --git a/scripts/actions/mobskills/thunderstorm.lua b/scripts/actions/mobskills/thunderstorm.lua index dbd8c74b913..85efd33fe0c 100644 --- a/scripts/actions/mobskills/thunderstorm.lua +++ b/scripts/actions/mobskills/thunderstorm.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 4 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.THUNDER, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.THUNDER, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.THUNDER) diff --git a/scripts/actions/mobskills/thunderstrike.lua b/scripts/actions/mobskills/thunderstrike.lua index 8560f78abf0..80a4202c7ab 100644 --- a/scripts/actions/mobskills/thunderstrike.lua +++ b/scripts/actions/mobskills/thunderstrike.lua @@ -23,8 +23,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.THUNDER, 3, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.THUNDER, 3, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.THUNDER) diff --git a/scripts/actions/mobskills/thundris_shriek.lua b/scripts/actions/mobskills/thundris_shriek.lua index 03997ea7c97..5da22fdc46d 100644 --- a/scripts/actions/mobskills/thundris_shriek.lua +++ b/scripts/actions/mobskills/thundris_shriek.lua @@ -27,8 +27,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 5 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.THUNDER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.THUNDER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.THUNDER) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.TERROR, 1, 0, 15) diff --git a/scripts/actions/mobskills/tidal_dive.lua b/scripts/actions/mobskills/tidal_dive.lua index 9d2e5de5a0c..8242feec939 100644 --- a/scripts/actions/mobskills/tidal_dive.lua +++ b/scripts/actions/mobskills/tidal_dive.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.NONE, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.NONE, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BIND, 1, 0, 60) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.WEIGHT, 50, 0, 120) diff --git a/scripts/actions/mobskills/tidal_slash.lua b/scripts/actions/mobskills/tidal_slash.lua index 86e84adb36b..0dd1dc31013 100644 --- a/scripts/actions/mobskills/tidal_slash.lua +++ b/scripts/actions/mobskills/tidal_slash.lua @@ -19,8 +19,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = math.floor(mob:getWeaponDmg() * 3.5) - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 3, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 3, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.NUMSHADOWS_3) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER) diff --git a/scripts/actions/mobskills/tidal_wave.lua b/scripts/actions/mobskills/tidal_wave.lua index 67a4c76ad39..965886c7329 100644 --- a/scripts/actions/mobskills/tidal_wave.lua +++ b/scripts/actions/mobskills/tidal_wave.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 9 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 3, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 3, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER) diff --git a/scripts/actions/mobskills/torrential_torment.lua b/scripts/actions/mobskills/torrential_torment.lua index 5dd3159e95d..5cb071a5d43 100644 --- a/scripts/actions/mobskills/torrential_torment.lua +++ b/scripts/actions/mobskills/torrential_torment.lua @@ -11,8 +11,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WATER, 2, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WATER, 2, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER) diff --git a/scripts/actions/mobskills/tortoise_stomp.lua b/scripts/actions/mobskills/tortoise_stomp.lua index 2b8e57c1940..37ff7436132 100644 --- a/scripts/actions/mobskills/tortoise_stomp.lua +++ b/scripts/actions/mobskills/tortoise_stomp.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) local duration = math.random(120, 180) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.DEFENSE_DOWN, 25, 0, duration) diff --git a/scripts/actions/mobskills/touchdown.lua b/scripts/actions/mobskills/touchdown.lua index 64e4e91965e..4d2a2971b38 100644 --- a/scripts/actions/mobskills/touchdown.lua +++ b/scripts/actions/mobskills/touchdown.lua @@ -11,8 +11,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.NONE, 1.5, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.NONE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.NONE, 1.5, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.NONE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.NONE) diff --git a/scripts/actions/mobskills/touchdown_bahamut.lua b/scripts/actions/mobskills/touchdown_bahamut.lua index 1aa878d81d0..b2d9f8c0aa1 100644 --- a/scripts/actions/mobskills/touchdown_bahamut.lua +++ b/scripts/actions/mobskills/touchdown_bahamut.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 4 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.NONE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.NONE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.NONE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.NONE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.NONE) diff --git a/scripts/actions/mobskills/tourbillion.lua b/scripts/actions/mobskills/tourbillion.lua index 1dbc1e7b635..f33b32cb67d 100644 --- a/scripts/actions/mobskills/tourbillion.lua +++ b/scripts/actions/mobskills/tourbillion.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) local duration = 20 * (skill:getTP() / 1000) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.DEFENSE_DOWN, 20, 0, duration) diff --git a/scripts/actions/mobskills/toxic_pick.lua b/scripts/actions/mobskills/toxic_pick.lua index 522b028e866..971f85bb29a 100644 --- a/scripts/actions/mobskills/toxic_pick.lua +++ b/scripts/actions/mobskills/toxic_pick.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.0 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) local power = mob:getMainLvl() / 2 xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.POISON, power, 3, 180) diff --git a/scripts/actions/mobskills/toxic_spit.lua b/scripts/actions/mobskills/toxic_spit.lua index fe56f16114e..c9cc51cf555 100644 --- a/scripts/actions/mobskills/toxic_spit.lua +++ b/scripts/actions/mobskills/toxic_spit.lua @@ -17,8 +17,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = math.floor(mob:getWeaponDmg() * 2.5) local power = math.floor(mob:getMainLvl() / 5 + 3) - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.POISON, power, 3, 120) diff --git a/scripts/actions/mobskills/tp_drainkiss.lua b/scripts/actions/mobskills/tp_drainkiss.lua index 9c4d30e50a6..5806c3882c2 100644 --- a/scripts/actions/mobskills/tp_drainkiss.lua +++ b/scripts/actions/mobskills/tp_drainkiss.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = math.floor(mob:getWeaponDmg() * 2.6) - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.NUMSHADOWS_1) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.NUMSHADOWS_1) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.TP, damage)) diff --git a/scripts/actions/mobskills/train_fall.lua b/scripts/actions/mobskills/train_fall.lua index baff124a915..d62c2a7ae7f 100644 --- a/scripts/actions/mobskills/train_fall.lua +++ b/scripts/actions/mobskills/train_fall.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 6 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.HP, dmg)) diff --git a/scripts/actions/mobskills/trample.lua b/scripts/actions/mobskills/trample.lua index c55e2f25f18..28a68932a3b 100644 --- a/scripts/actions/mobskills/trample.lua +++ b/scripts/actions/mobskills/trample.lua @@ -20,7 +20,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/transfusion.lua b/scripts/actions/mobskills/transfusion.lua index 245066ccae8..67c1ab97da9 100644 --- a/scripts/actions/mobskills/transfusion.lua +++ b/scripts/actions/mobskills/transfusion.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) skill:setMsg(xi.mobskills.mobDrainMove(mob, target, xi.mobskills.drainType.HP, damage, xi.attackType.MAGICAL, xi.damageType.DARK)) diff --git a/scripts/actions/mobskills/trebuchet.lua b/scripts/actions/mobskills/trebuchet.lua index bb0b0a25723..d80d4c74a7e 100644 --- a/scripts/actions/mobskills/trebuchet.lua +++ b/scripts/actions/mobskills/trebuchet.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local dmgmod = 1.6 local info = xi.mobskills.mobRangedMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.magicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.RANGED, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.RANGED, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.RANGED, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/trembling.lua b/scripts/actions/mobskills/trembling.lua index 0eb0243d2e2..be2ceab3c6d 100644 --- a/scripts/actions/mobskills/trembling.lua +++ b/scripts/actions/mobskills/trembling.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 4 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.NUMSHADOWS_3) local dispelled = math.random(2, 3) if info.hitslanded ~= 0 then diff --git a/scripts/actions/mobskills/tremorous_tread.lua b/scripts/actions/mobskills/tremorous_tread.lua index 9c5ea13ec23..4418e68b423 100644 --- a/scripts/actions/mobskills/tremorous_tread.lua +++ b/scripts/actions/mobskills/tremorous_tread.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/tremors.lua b/scripts/actions/mobskills/tremors.lua index 0898ee89f17..8fe2c239baf 100644 --- a/scripts/actions/mobskills/tremors.lua +++ b/scripts/actions/mobskills/tremors.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = math.floor(mob:getWeaponDmg() * 2.5) - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.EARTH, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.EARTH, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.EARTH) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.DEX_DOWN, 10, 3, 120) diff --git a/scripts/actions/mobskills/triclip.lua b/scripts/actions/mobskills/triclip.lua index 2ab85ba388b..48483f2661a 100644 --- a/scripts/actions/mobskills/triclip.lua +++ b/scripts/actions/mobskills/triclip.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 0.8 local ftp = 0.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/trinary_absorption.lua b/scripts/actions/mobskills/trinary_absorption.lua index b65a92b9078..2d085153b12 100644 --- a/scripts/actions/mobskills/trinary_absorption.lua +++ b/scripts/actions/mobskills/trinary_absorption.lua @@ -20,8 +20,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() * 5, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - local dmg = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.NUMSHADOWS_1) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() * 5, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.NUMSHADOWS_1) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.HP, dmg)) diff --git a/scripts/actions/mobskills/true_strike.lua b/scripts/actions/mobskills/true_strike.lua index 04e8ed53c57..c72805dd56a 100644 --- a/scripts/actions/mobskills/true_strike.lua +++ b/scripts/actions/mobskills/true_strike.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 0.6 local ftp = 3.0 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ACC_VARIES, 1.1, 1.2, 1.3) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/turbofan.lua b/scripts/actions/mobskills/turbofan.lua index ae22b1be309..78494b6d435 100644 --- a/scripts/actions/mobskills/turbofan.lua +++ b/scripts/actions/mobskills/turbofan.lua @@ -21,8 +21,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.WIND) diff --git a/scripts/actions/mobskills/turbulence.lua b/scripts/actions/mobskills/turbulence.lua index 4057810a97a..31d76ccf355 100644 --- a/scripts/actions/mobskills/turbulence.lua +++ b/scripts/actions/mobskills/turbulence.lua @@ -10,8 +10,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) diff --git a/scripts/actions/mobskills/tusk.lua b/scripts/actions/mobskills/tusk.lua index ef148e83fff..cf3ac145779 100644 --- a/scripts/actions/mobskills/tusk.lua +++ b/scripts/actions/mobskills/tusk.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/twirling_dervish.lua b/scripts/actions/mobskills/twirling_dervish.lua index 311c1826891..09596a839ef 100644 --- a/scripts/actions/mobskills/twirling_dervish.lua +++ b/scripts/actions/mobskills/twirling_dervish.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 2 local ftp = 6 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg end diff --git a/scripts/actions/mobskills/typhoon.lua b/scripts/actions/mobskills/typhoon.lua index 91eed7b097d..9cdd69e29cc 100644 --- a/scripts/actions/mobskills/typhoon.lua +++ b/scripts/actions/mobskills/typhoon.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/typhoon_wing.lua b/scripts/actions/mobskills/typhoon_wing.lua index 7147d1ccefe..c331ffebe47 100644 --- a/scripts/actions/mobskills/typhoon_wing.lua +++ b/scripts/actions/mobskills/typhoon_wing.lua @@ -24,8 +24,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 5 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BLINDNESS, 60, 0, 30) diff --git a/scripts/actions/mobskills/tyrannic_blare.lua b/scripts/actions/mobskills/tyrannic_blare.lua index c1c47c52d0e..40a78e231f4 100644 --- a/scripts/actions/mobskills/tyrannic_blare.lua +++ b/scripts/actions/mobskills/tyrannic_blare.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = math.floor(mob:getWeaponDmg() * 2.8) - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.EARTH, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.EARTH, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.EARTH, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.EARTH) diff --git a/scripts/actions/mobskills/umbra_smash.lua b/scripts/actions/mobskills/umbra_smash.lua index 7f3e37def76..75854052a61 100644 --- a/scripts/actions/mobskills/umbra_smash.lua +++ b/scripts/actions/mobskills/umbra_smash.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.HTH) return dmg end diff --git a/scripts/actions/mobskills/unblest_jambiya.lua b/scripts/actions/mobskills/unblest_jambiya.lua index c09dc7ba452..23873382699 100644 --- a/scripts/actions/mobskills/unblest_jambiya.lua +++ b/scripts/actions/mobskills/unblest_jambiya.lua @@ -21,8 +21,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1.3, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1.3, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.WIPE_SHADOWS) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.HP, damage)) diff --git a/scripts/actions/mobskills/undead_mold.lua b/scripts/actions/mobskills/undead_mold.lua index 6716f81870d..52765ac6669 100644 --- a/scripts/actions/mobskills/undead_mold.lua +++ b/scripts/actions/mobskills/undead_mold.lua @@ -13,8 +13,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, 2, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.DARK, 2, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.DARK) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.DISEASE, 1, 0, 660) diff --git a/scripts/actions/mobskills/uppercut.lua b/scripts/actions/mobskills/uppercut.lua index 49a84bcd5f6..b5d08820af5 100644 --- a/scripts/actions/mobskills/uppercut.lua +++ b/scripts/actions/mobskills/uppercut.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 3 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ATK_VARIES, 2.0, 2.0, 2.0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) return dmg end diff --git a/scripts/actions/mobskills/uranos_cascade_eta.lua b/scripts/actions/mobskills/uranos_cascade_eta.lua index 1b92933da2a..e5984fed48d 100644 --- a/scripts/actions/mobskills/uranos_cascade_eta.lua +++ b/scripts/actions/mobskills/uranos_cascade_eta.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.75 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/uranos_cascade_lambda.lua b/scripts/actions/mobskills/uranos_cascade_lambda.lua index 5d5db4be380..0cdef5de9e8 100644 --- a/scripts/actions/mobskills/uranos_cascade_lambda.lua +++ b/scripts/actions/mobskills/uranos_cascade_lambda.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.75 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/uranos_cascade_theta.lua b/scripts/actions/mobskills/uranos_cascade_theta.lua index 55ee589b14a..2b35d26c742 100644 --- a/scripts/actions/mobskills/uranos_cascade_theta.lua +++ b/scripts/actions/mobskills/uranos_cascade_theta.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.5 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/vacuous_osculation.lua b/scripts/actions/mobskills/vacuous_osculation.lua index bd4bbb254eb..2df31ac8723 100644 --- a/scripts/actions/mobskills/vacuous_osculation.lua +++ b/scripts/actions/mobskills/vacuous_osculation.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 3 - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.NONE, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ELEMENTAL, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.NONE, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.ELEMENTAL, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.ELEMENTAL) diff --git a/scripts/actions/mobskills/vampiric_lash.lua b/scripts/actions/mobskills/vampiric_lash.lua index 25ff2a514b1..4bf9e6ca37d 100644 --- a/scripts/actions/mobskills/vampiric_lash.lua +++ b/scripts/actions/mobskills/vampiric_lash.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, 1, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local damage = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(damage, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/vampiric_root.lua b/scripts/actions/mobskills/vampiric_root.lua index ab851d42148..8654a21f25e 100644 --- a/scripts/actions/mobskills/vampiric_root.lua +++ b/scripts/actions/mobskills/vampiric_root.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.NUMSHADOWS_1) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, xi.mobskills.shadowBehavior.NUMSHADOWS_1) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.HP, damage)) diff --git a/scripts/actions/mobskills/vanity_dive.lua b/scripts/actions/mobskills/vanity_dive.lua index d3935a3c035..993e17fbec5 100644 --- a/scripts/actions/mobskills/vanity_dive.lua +++ b/scripts/actions/mobskills/vanity_dive.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/vanity_drive.lua b/scripts/actions/mobskills/vanity_drive.lua index 71b1d848420..3f26a0d73fd 100644 --- a/scripts/actions/mobskills/vanity_drive.lua +++ b/scripts/actions/mobskills/vanity_drive.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/vanity_strike.lua b/scripts/actions/mobskills/vanity_strike.lua index 07fb38d3098..ae6a1350ed7 100644 --- a/scripts/actions/mobskills/vanity_strike.lua +++ b/scripts/actions/mobskills/vanity_strike.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 1.5 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/vapor_spray.lua b/scripts/actions/mobskills/vapor_spray.lua index 852ea8669b8..5a017cd6e07 100644 --- a/scripts/actions/mobskills/vapor_spray.lua +++ b/scripts/actions/mobskills/vapor_spray.lua @@ -20,8 +20,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.WATER) diff --git a/scripts/actions/mobskills/velocious_blade.lua b/scripts/actions/mobskills/velocious_blade.lua index 51e1c8faad9..118bd9bb4b1 100644 --- a/scripts/actions/mobskills/velocious_blade.lua +++ b/scripts/actions/mobskills/velocious_blade.lua @@ -21,7 +21,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 0.8 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/venom.lua b/scripts/actions/mobskills/venom.lua index 91e01a0a03c..b3f7178efe2 100644 --- a/scripts/actions/mobskills/venom.lua +++ b/scripts/actions/mobskills/venom.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local power = math.floor(mob:getMainLvl() / 6 + 1) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WATER, 1.5, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WATER, 1.5, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.POISON, power, 3, 60) diff --git a/scripts/actions/mobskills/venom_sting.lua b/scripts/actions/mobskills/venom_sting.lua index cead2c2c89c..b9ed8cab7d2 100644 --- a/scripts/actions/mobskills/venom_sting.lua +++ b/scripts/actions/mobskills/venom_sting.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/vertical_cleave.lua b/scripts/actions/mobskills/vertical_cleave.lua index 6fcdb2ec969..6fe39a25d94 100644 --- a/scripts/actions/mobskills/vertical_cleave.lua +++ b/scripts/actions/mobskills/vertical_cleave.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 2 -- TODO: Add ability to crit local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ATK_VARIES, 1.25, 1.25, 1.25) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/vertical_slash.lua b/scripts/actions/mobskills/vertical_slash.lua index e4a125a7e00..7143c589d42 100644 --- a/scripts/actions/mobskills/vertical_slash.lua +++ b/scripts/actions/mobskills/vertical_slash.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 2 local ftp = 1.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.ACCURACY_DOWN, 100, 0, 30) diff --git a/scripts/actions/mobskills/vicious_claw.lua b/scripts/actions/mobskills/vicious_claw.lua index 512eec3ce6d..ce4adc906fb 100644 --- a/scripts/actions/mobskills/vicious_claw.lua +++ b/scripts/actions/mobskills/vicious_claw.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/victory_beacon.lua b/scripts/actions/mobskills/victory_beacon.lua index e6f2a788750..4fc5ecf53f9 100644 --- a/scripts/actions/mobskills/victory_beacon.lua +++ b/scripts/actions/mobskills/victory_beacon.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 4 local ftp = 5 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/victory_smite.lua b/scripts/actions/mobskills/victory_smite.lua index c1bc00b07ec..a5069d91d5e 100644 --- a/scripts/actions/mobskills/victory_smite.lua +++ b/scripts/actions/mobskills/victory_smite.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.25 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1.1, 1.25, 1.45) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.HTH) return dmg diff --git a/scripts/actions/mobskills/violent_rupture.lua b/scripts/actions/mobskills/violent_rupture.lua index bf5e82b4f2e..b03d760f455 100644 --- a/scripts/actions/mobskills/violent_rupture.lua +++ b/scripts/actions/mobskills/violent_rupture.lua @@ -19,8 +19,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/vitriolic_barrage.lua b/scripts/actions/mobskills/vitriolic_barrage.lua index 2f59845d0c0..3024e4ed47c 100644 --- a/scripts/actions/mobskills/vitriolic_barrage.lua +++ b/scripts/actions/mobskills/vitriolic_barrage.lua @@ -18,8 +18,11 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local needles = 1000 / skill:getTotalTargets() xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.POISON, 18, 3, 180) - - local dmg = xi.mobskills.mobFinalAdjustments(needles, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.NONE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = + { + damage = needles + } + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.NONE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(dmg, mob, xi.attackType.MAGICAL, xi.damageType.NONE) diff --git a/scripts/actions/mobskills/vitriolic_shower.lua b/scripts/actions/mobskills/vitriolic_shower.lua index 8aec8c86e36..0a2badd449a 100644 --- a/scripts/actions/mobskills/vitriolic_shower.lua +++ b/scripts/actions/mobskills/vitriolic_shower.lua @@ -16,8 +16,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = math.floor(mob:getWeaponDmg() * 2.7) damage = damage + math.random(0, 7.5 + math.max(mob:getStat(xi.mod.INT) - target:getStat(xi.mod.INT) * 4 / 3, 0)) - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 2, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 2, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BURN, math.random(15, 35), 3, 60) diff --git a/scripts/actions/mobskills/vitriolic_spray.lua b/scripts/actions/mobskills/vitriolic_spray.lua index 16828c917e4..922dc8ca79d 100644 --- a/scripts/actions/mobskills/vitriolic_spray.lua +++ b/scripts/actions/mobskills/vitriolic_spray.lua @@ -18,8 +18,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = math.floor(mob:getWeaponDmg() * 2.7) damage = damage + math.random(0, 4.5 + math.max(mob:getStat(xi.mod.INT) - target:getStat(xi.mod.INT), 0)) - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BURN, math.random(10, 30), 3, 60) diff --git a/scripts/actions/mobskills/voiceless_storm.lua b/scripts/actions/mobskills/voiceless_storm.lua index 99d4565657f..b0d0b0e8b4f 100644 --- a/scripts/actions/mobskills/voiceless_storm.lua +++ b/scripts/actions/mobskills/voiceless_storm.lua @@ -11,8 +11,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) -- TODO: 1 + dINT to damage - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.SILENCE, 1, 0, 120) diff --git a/scripts/actions/mobskills/vorpal_blade.lua b/scripts/actions/mobskills/vorpal_blade.lua index fe0fc42a9f3..60c4125e92e 100644 --- a/scripts/actions/mobskills/vorpal_blade.lua +++ b/scripts/actions/mobskills/vorpal_blade.lua @@ -43,7 +43,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) -- AA EV: Approx 900 damage to 75 DRG/35 THF. 400 to a NIN/WAR in Arhat, but took shadows. target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/vorpal_scythe.lua b/scripts/actions/mobskills/vorpal_scythe.lua index 17a93c567fb..057c870e604 100644 --- a/scripts/actions/mobskills/vorpal_scythe.lua +++ b/scripts/actions/mobskills/vorpal_scythe.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 1 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/vorpal_wheel.lua b/scripts/actions/mobskills/vorpal_wheel.lua index 56a79294ba9..9979c91868f 100644 --- a/scripts/actions/mobskills/vorpal_wheel.lua +++ b/scripts/actions/mobskills/vorpal_wheel.lua @@ -20,7 +20,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) -- Increase damage as health drops local ftp = (1 - (mob:getHP() / mob:getMaxHP())) * 6 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/vortex.lua b/scripts/actions/mobskills/vortex.lua index 7a0776df065..f97f1b277ab 100644 --- a/scripts/actions/mobskills/vortex.lua +++ b/scripts/actions/mobskills/vortex.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.5 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/vulcan_shot.lua b/scripts/actions/mobskills/vulcan_shot.lua index ec04c478fb0..3e4f1418ead 100644 --- a/scripts/actions/mobskills/vulcan_shot.lua +++ b/scripts/actions/mobskills/vulcan_shot.lua @@ -19,8 +19,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 4 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 8, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 8, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/vulcanian_impact.lua b/scripts/actions/mobskills/vulcanian_impact.lua index a4a15b09de0..5ca6f76ead3 100644 --- a/scripts/actions/mobskills/vulcanian_impact.lua +++ b/scripts/actions/mobskills/vulcanian_impact.lua @@ -12,8 +12,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.FIRE, 4, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.FIRE, 4, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/walk_the_plank.lua b/scripts/actions/mobskills/walk_the_plank.lua index b61572a0916..9f5194b47d6 100755 --- a/scripts/actions/mobskills/walk_the_plank.lua +++ b/scripts/actions/mobskills/walk_the_plank.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 2 local ftp = 0.3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, mob:getWeaponDmg() * ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:dispelStatusEffect() target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/warped_wail.lua b/scripts/actions/mobskills/warped_wail.lua index f5a7bc79423..1dec20ec626 100644 --- a/scripts/actions/mobskills/warped_wail.lua +++ b/scripts/actions/mobskills/warped_wail.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.MAX_HP_DOWN, 50, 0, 60) diff --git a/scripts/actions/mobskills/water_bomb.lua b/scripts/actions/mobskills/water_bomb.lua index 87abfc23bc0..2c49323537e 100644 --- a/scripts/actions/mobskills/water_bomb.lua +++ b/scripts/actions/mobskills/water_bomb.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = math.floor(mob:getWeaponDmg() * 2.5) - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.SILENCE, 1, 0, 60) diff --git a/scripts/actions/mobskills/water_ii.lua b/scripts/actions/mobskills/water_ii.lua index 9ca42fccef9..81b47ca8b87 100644 --- a/scripts/actions/mobskills/water_ii.lua +++ b/scripts/actions/mobskills/water_ii.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 3 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER) diff --git a/scripts/actions/mobskills/water_iv.lua b/scripts/actions/mobskills/water_iv.lua index 7ba5cb47a05..bb5fbc5a0d2 100644 --- a/scripts/actions/mobskills/water_iv.lua +++ b/scripts/actions/mobskills/water_iv.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 8 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 1, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER) diff --git a/scripts/actions/mobskills/water_meeble_warble.lua b/scripts/actions/mobskills/water_meeble_warble.lua index 07c8d971b06..ec3f58ecef1 100644 --- a/scripts/actions/mobskills/water_meeble_warble.lua +++ b/scripts/actions/mobskills/water_meeble_warble.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 9 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 2, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WATER, 2, xi.mobskills.magicalTpBonus.NO_EFFECT, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WATER, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WATER) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.DROWN, 50, 3, 60) diff --git a/scripts/actions/mobskills/wheeling_thrust.lua b/scripts/actions/mobskills/wheeling_thrust.lua index 5b54efc3f61..7e909c94ccd 100644 --- a/scripts/actions/mobskills/wheeling_thrust.lua +++ b/scripts/actions/mobskills/wheeling_thrust.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.75 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/whip_tongue.lua b/scripts/actions/mobskills/whip_tongue.lua index 823a1bb3a8b..f0552114975 100644 --- a/scripts/actions/mobskills/whip_tongue.lua +++ b/scripts/actions/mobskills/whip_tongue.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 1.5 local params = { canCrit = true } local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0, params) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/whirl_claws.lua b/scripts/actions/mobskills/whirl_claws.lua index 9ead0607549..71f7707f3cb 100644 --- a/scripts/actions/mobskills/whirl_claws.lua +++ b/scripts/actions/mobskills/whirl_claws.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 2.0 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/whirl_of_rage.lua b/scripts/actions/mobskills/whirl_of_rage.lua index 2048af13eac..c88bf15678b 100644 --- a/scripts/actions/mobskills/whirl_of_rage.lua +++ b/scripts/actions/mobskills/whirl_of_rage.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded * math.random(2, 3)) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded * math.random(2, 3)) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/whirlwind.lua b/scripts/actions/mobskills/whirlwind.lua index 7becc65c09c..8d4a7fe44b4 100644 --- a/scripts/actions/mobskills/whirlwind.lua +++ b/scripts/actions/mobskills/whirlwind.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = math.random(2, 3) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WIND, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WIND, ftp, xi.mobskills.magicalTpBonus.NO_EFFECT) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.VIT_DOWN, 10, 3, 120) diff --git a/scripts/actions/mobskills/wild_horn.lua b/scripts/actions/mobskills/wild_horn.lua index 98ef8cd3c87..1bd8a9673e7 100644 --- a/scripts/actions/mobskills/wild_horn.lua +++ b/scripts/actions/mobskills/wild_horn.lua @@ -21,7 +21,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/wild_oats.lua b/scripts/actions/mobskills/wild_oats.lua index 37cb66a7c68..bc47a72de1c 100644 --- a/scripts/actions/mobskills/wild_oats.lua +++ b/scripts/actions/mobskills/wild_oats.lua @@ -15,7 +15,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/wild_rage.lua b/scripts/actions/mobskills/wild_rage.lua index 65c4514bc7c..6d7cbbd5646 100644 --- a/scripts/actions/mobskills/wild_rage.lua +++ b/scripts/actions/mobskills/wild_rage.lua @@ -28,7 +28,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) end local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, fTP, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) if mob:getPool() == xi.mobPool.KING_VINEGARROON then xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.POISON, 25, 3, 60) diff --git a/scripts/actions/mobskills/wind_blade.lua b/scripts/actions/mobskills/wind_blade.lua index 07e6976ff0f..27ba01e0923 100644 --- a/scripts/actions/mobskills/wind_blade.lua +++ b/scripts/actions/mobskills/wind_blade.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 4 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 2, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) diff --git a/scripts/actions/mobskills/wind_breath.lua b/scripts/actions/mobskills/wind_breath.lua index cdf1dd563c3..ee4777069d4 100644 --- a/scripts/actions/mobskills/wind_breath.lua +++ b/scripts/actions/mobskills/wind_breath.lua @@ -20,8 +20,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) params.mAccuracyBonus = { 0, 0, 0 } params.resistStat = xi.mod.INT - local damage = xi.mobskills.mobBreathMove(mob, target, skill, params) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.BREATH, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) + local info = xi.mobskills.mobBreathMove(mob, target, skill, params) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.BREATH, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS, 1) if not xi.mobskills.hasMissMessage(mob, target, skill, damage) then target:takeDamage(damage, mob, xi.attackType.BREATH, xi.damageType.WIND) diff --git a/scripts/actions/mobskills/wind_shear.lua b/scripts/actions/mobskills/wind_shear.lua index d18028ea85f..0fca97e26f4 100644 --- a/scripts/actions/mobskills/wind_shear.lua +++ b/scripts/actions/mobskills/wind_shear.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = .8 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/wind_shear_znm.lua b/scripts/actions/mobskills/wind_shear_znm.lua index 3c3c225090a..cf39799a3f7 100644 --- a/scripts/actions/mobskills/wind_shear_znm.lua +++ b/scripts/actions/mobskills/wind_shear_znm.lua @@ -19,7 +19,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.WEIGHT, 50, 0, 120) diff --git a/scripts/actions/mobskills/wing_cutter.lua b/scripts/actions/mobskills/wing_cutter.lua index ffc76adac77..c070555f943 100644 --- a/scripts/actions/mobskills/wing_cutter.lua +++ b/scripts/actions/mobskills/wing_cutter.lua @@ -14,8 +14,8 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local damage = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WIND, 3, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, mob:getMainLvl() + 2, xi.element.WIND, 3, xi.mobskills.magicalTpBonus.MAB_BONUS, 1) + local damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) return damage diff --git a/scripts/actions/mobskills/wing_slap.lua b/scripts/actions/mobskills/wing_slap.lua index fad84c9738c..4f123216750 100644 --- a/scripts/actions/mobskills/wing_slap.lua +++ b/scripts/actions/mobskills/wing_slap.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 0.25 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/wing_thrust.lua b/scripts/actions/mobskills/wing_thrust.lua index 04a44fa29e9..9f3db5afec8 100644 --- a/scripts/actions/mobskills/wing_thrust.lua +++ b/scripts/actions/mobskills/wing_thrust.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 0.5 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.ACC_VARIES, 1, 1, 1) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.NONE, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.NONE, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.SLOW, 1250, 0, math.random(30, 60)) diff --git a/scripts/actions/mobskills/wing_whirl.lua b/scripts/actions/mobskills/wing_whirl.lua index 867f22db602..84c2b21d478 100644 --- a/scripts/actions/mobskills/wing_whirl.lua +++ b/scripts/actions/mobskills/wing_whirl.lua @@ -17,7 +17,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 1 local ftp = 1 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg end diff --git a/scripts/actions/mobskills/wings_of_gehenna.lua b/scripts/actions/mobskills/wings_of_gehenna.lua index 48bf36daeed..5af37573f7a 100644 --- a/scripts/actions/mobskills/wings_of_gehenna.lua +++ b/scripts/actions/mobskills/wings_of_gehenna.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() * 4 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.WIND, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.WIND, xi.mobskills.shadowBehavior.WIPE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.WIND) -- KNOCKBACK diff --git a/scripts/actions/mobskills/wire_cutter.lua b/scripts/actions/mobskills/wire_cutter.lua index 39c3474eb75..c71b292c9fd 100644 --- a/scripts/actions/mobskills/wire_cutter.lua +++ b/scripts/actions/mobskills/wire_cutter.lua @@ -14,7 +14,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local accmod = 0.8 local ftp = 3 local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/wrath_of_zeus.lua b/scripts/actions/mobskills/wrath_of_zeus.lua index 86b47c6c417..d807501614c 100644 --- a/scripts/actions/mobskills/wrath_of_zeus.lua +++ b/scripts/actions/mobskills/wrath_of_zeus.lua @@ -21,8 +21,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() local dmgmod = 4.5 -- unbuffed hit for ~700 - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.THUNDER, dmgmod, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.THUNDER, dmgmod, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.THUNDER, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) if damage > 0 then target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.THUNDER) diff --git a/scripts/actions/mobskills/zarbzan.lua b/scripts/actions/mobskills/zarbzan.lua index bf8c8301e80..e33e71b2c6e 100644 --- a/scripts/actions/mobskills/zarbzan.lua +++ b/scripts/actions/mobskills/zarbzan.lua @@ -21,8 +21,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/zarraqa.lua b/scripts/actions/mobskills/zarraqa.lua index 84d774eecfe..6c58db67586 100644 --- a/scripts/actions/mobskills/zarraqa.lua +++ b/scripts/actions/mobskills/zarraqa.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local damage = mob:getWeaponDmg() - damage = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) - damage = xi.mobskills.mobFinalAdjustments(damage, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local info = xi.mobskills.mobMagicalMove(mob, target, skill, damage, xi.element.FIRE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT) + damage = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.MAGICAL, xi.damageType.FIRE, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(damage, mob, xi.attackType.MAGICAL, xi.damageType.FIRE) diff --git a/scripts/actions/mobskills/zephyr_arrow.lua b/scripts/actions/mobskills/zephyr_arrow.lua index 38b6a35c2de..f1c49268c20 100644 --- a/scripts/actions/mobskills/zephyr_arrow.lua +++ b/scripts/actions/mobskills/zephyr_arrow.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local ftp = 5 -- fTP and fTP scaling unknown. TODO: capture ftp local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT, 0, 0, 0) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) + local dmg = xi.mobskills.mobFinalAdjustments(info, mob, skill, target, xi.attackType.RANGED, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(dmg, mob, xi.attackType.RANGED, xi.damageType.PIERCING, { breakBind = false }) diff --git a/scripts/globals/mobskills.lua b/scripts/globals/mobskills.lua index 27454dc2dee..7c735bada10 100644 --- a/scripts/globals/mobskills.lua +++ b/scripts/globals/mobskills.lua @@ -178,7 +178,7 @@ end ---@alias physicalMobSkillParam { canCrit: boolean?, isCannonball: boolean?, isRanged: boolean?} -- return value of xi.mobskills.mobPhysicalMove ----@alias physicalMobSkillRetVal { dmg: number, hitslanded: number, isCritical: boolean} +---@alias physicalMobSkillRetVal { damage: number, hitslanded: number, isCritical: boolean} -- passed to handleSinglePhysicalHit inside xi.mobskills.mobPhysicalMove ---@alias physicalMobSkillHitParams { canCrit: boolean, tpEffect: xi.mobskills.physicalTpBonus, weaponType: xi.skill, attMod: number, applyLevelCorrection: boolean, isCannonball: boolean, isRanged: boolean} @@ -207,7 +207,7 @@ xi.mobskills.mobPhysicalMove = function(mob, target, skill, numHits, accMod, ftp params = params or {} local returninfo = { - dmg = 0, + damage = 0, hitslanded = 0, isCritical = false, } @@ -303,7 +303,7 @@ xi.mobskills.mobPhysicalMove = function(mob, target, skill, numHits, accMod, ftp mob:addTP(tpReturn) end - returninfo.dmg = finaldmg + returninfo.damage = finaldmg returninfo.hitslanded = hitslanded returninfo.isCritical = hitCrit @@ -334,6 +334,9 @@ end -- xi.mobskills.magicalTpBonus.DMG_BONUS and TP = 100, tpvalue = 2, assume V=150 --> damage is now 150*(TP*2) / 100 = 300 -- xi.mobskills.magicalTpBonus.DMG_BONUS and TP = 200, tpvalue = 2, assume V=150 --> damage is now 150*(TP*2) / 100 = 600 +-- return value of xi.mobskills.mobMagicalMove +---@alias magicalMobSkillRetVal { damage: number } + ---@param actor CBaseEntity ---@param target CBaseEntity ---@param action CPetSkill|CMobSkill @@ -342,7 +345,7 @@ end ---@param damageModifier number ---@param tpEffect xi.mobskills.magicalTpBonus? ---@param tpMultiplier number? ----@return number +---@return magicalMobSkillRetVal xi.mobskills.mobMagicalMove = function(actor, target, action, baseDamage, actionElement, damageModifier, tpEffect, tpMultiplier) local finalDamage = baseDamage @@ -389,9 +392,15 @@ xi.mobskills.mobMagicalMove = function(actor, target, action, baseDamage, action actor:addTP(tpReturn) end - return finalDamage + return { damage = finalDamage } end +---@param actor CBaseEntity +---@param target CBaseEntity +---@param damage number +---@param element xi.element +---@param skill CPetSkill|CMobSkill +---@return number xi.mobskills.mobAddBonuses = function(actor, target, damage, element, skill) -- used for SMN magical bloodpacts, despite the name. local burst = calculateMobMagicBurst(actor, element, target) @@ -417,6 +426,13 @@ end -- skillParams.mAccuracyBonus = { #, #, # } : Accuracy bonus or penalties based on fTP. -- skillParams.resistStat = xi.mod. : Determines which base stat attribute is used when calculating resist. (INT, MND, etc.) ----------------------------------- +-- return value of xi.mobskills.mobMagicalMove + +---@param mob CBaseEntity +---@param target CBaseEntity +---@param skill CPetSkill|CMobSkill +---@param skillParams table +---@return magicalMobSkillRetVal xi.mobskills.mobBreathMove = function(mob, target, skill, skillParams) local mobCurrentHP = skill:getMobHP() @@ -454,7 +470,7 @@ xi.mobskills.mobBreathMove = function(mob, target, skill, skillParams) damage = math.floor(damage * absorb * nullify) if damage <= 0 then -- Return early since the rest of the calculations are not needed if we absorbed/nullified. - return damage + return { damage = damage } end -- The values set for this modifiers are base 10000. @@ -470,14 +486,25 @@ xi.mobskills.mobBreathMove = function(mob, target, skill, skillParams) -- Apply "Damage taken" mods to damage. damage = math.floor(damage * combinedDamageTaken) - return damage + return { damage = damage } end -xi.mobskills.mobFinalAdjustments = function(damage, mob, skill, target, attackType, damageType, shadowsToRemove, hitsLanded) +---@param info magicalMobSkillRetVal|physicalMobSkillRetVal +---@param mob CBaseEntity +---@param skill CPetSkill|CMobSkill +---@param target CBaseEntity +---@param attackType xi.attackType +---@param damageType xi.damageType +---@param shadowsToRemove xi.mobskills.shadowBehavior|integer? +---@param hitsLanded number? +---@return number +xi.mobskills.mobFinalAdjustments = function(info, mob, skill, target, attackType, damageType, shadowsToRemove, hitsLanded) if hitsLanded == nil then hitsLanded = 0 end + local damage = info.damage + -- If target has Hysteria, no message skip rest -- TODO: Need to also handle in core to interrupt the mobskill. Proper behavior is: Mob will attempt to use a skill but it will not fire off. if mob:hasStatusEffect(xi.effect.HYSTERIA) then @@ -517,6 +544,7 @@ xi.mobskills.mobFinalAdjustments = function(damage, mob, skill, target, attackTy -- Handle shadows depending on shadow behavior / attackType if + shadowsToRemove ~= nil and shadowsToRemove ~= xi.mobskills.shadowBehavior.WIPE_SHADOWS and shadowsToRemove ~= xi.mobskills.shadowBehavior.IGNORE_SHADOWS then diff --git a/scripts/globals/summon.lua b/scripts/globals/summon.lua index 160808b4094..7b7e8404fea 100644 --- a/scripts/globals/summon.lua +++ b/scripts/globals/summon.lua @@ -101,6 +101,18 @@ xi.summon.getSummoningSkillOverCap = function(avatar) return math.max(summoningSkill - maxSkill, 0) end +---@param avatar CBaseEntity +---@param target CBaseEntity +---@param skill CPetSkill|CMobSkill +---@param numberofhits number +---@param accmod number +---@param dmgmod number +---@param dmgmodsubsequent number +---@param tpeffect xi.mobskills.magicalTpBonus|xi.mobskills.physicalTpBonus +---@param mtp100 number +---@param mtp200 number +---@param mtp300 number +---@return physicalMobSkillRetVal xi.summon.avatarPhysicalMove = function(avatar, target, skill, numberofhits, accmod, dmgmod, dmgmodsubsequent, tpeffect, mtp100, mtp200, mtp300) local returninfo = {} @@ -232,7 +244,7 @@ xi.summon.avatarPhysicalMove = function(avatar, target, skill, numberofhits, acc end end - returninfo.dmg = finaldmg + returninfo.damage = finaldmg returninfo.hitslanded = numHitsLanded skill:setAttackType(xi.attackType.PHYSICAL) @@ -248,12 +260,22 @@ local attackTypeShields = [xi.attackType.MAGICAL ] = xi.effect.MAGIC_SHIELD, } -xi.summon.avatarFinalAdjustments = function(dmg, mob, skill, target, skilltype, damagetype, shadowbehav) +---@param info magicalMobSkillRetVal|physicalMobSkillRetVal +---@param mob CBaseEntity +---@param skill CPetSkill|CMobSkill +---@param target CBaseEntity +---@param skilltype xi.attackType +---@param damagetype xi.damageType +---@param shadowbehav xi.mobskills.shadowBehavior? +---@return number +xi.summon.avatarFinalAdjustments = function(info, mob, skill, target, skilltype, damagetype, shadowbehav) local missMessage = xi.msg.basic.SKILL_MISS if mob:getCurrentAction() == xi.action.category.PET_MOBABILITY_FINISH then missMessage = xi.msg.basic.JA_MISS_2 end + local dmg = info.damage + -- Physical Attack Missed if skilltype == xi.attackType.PHYSICAL and From 9bcd274541af7138eb3df959750b243e750b9fd4 Mon Sep 17 00:00:00 2001 From: WinterSolstice8 <60417494+wintersolstice8@users.noreply.github.com> Date: Wed, 4 Feb 2026 18:35:50 -0700 Subject: [PATCH 2/2] [test] Adjust for rename of dmg -> damage --- scripts/tests/packets/s2c/0x028_battle2/beastmaster.lua | 2 +- scripts/tests/systems/targetfind.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/tests/packets/s2c/0x028_battle2/beastmaster.lua b/scripts/tests/packets/s2c/0x028_battle2/beastmaster.lua index 72522ecd7fe..0be0bf4b57a 100644 --- a/scripts/tests/packets/s2c/0x028_battle2/beastmaster.lua +++ b/scripts/tests/packets/s2c/0x028_battle2/beastmaster.lua @@ -6,7 +6,7 @@ local packets = ['Jug Pet Ready'] = { test = function(player, mob) - stub('xi.mobskills.mobPhysicalMove', { dmg = 1, hitslanded = 1, isCritical = false }) + stub('xi.mobskills.mobPhysicalMove', { damage = 1, hitslanded = 1, isCritical = false }) local pmob = player.entities:moveTo('Giant_Hunter') player:changeJob(xi.job.BST) player:spawnPet(xi.petId.COLDBLOOD_COMO) diff --git a/scripts/tests/systems/targetfind.lua b/scripts/tests/systems/targetfind.lua index f3baa7a3e48..2c005020197 100644 --- a/scripts/tests/systems/targetfind.lua +++ b/scripts/tests/systems/targetfind.lua @@ -43,7 +43,7 @@ describe('TargetFind', function() -- Force Flail to always hit local m = stub('xi.mobskills.mobPhysicalMove', { - dmg = 100, + damage = 100, hitslanded = 3, isCritical = false, }) @@ -85,7 +85,7 @@ describe('TargetFind', function() -- Force Flail to always hit local m = stub('xi.mobskills.mobPhysicalMove', { - dmg = 100, + damage = 100, hitslanded = 3, isCritical = false, })