diff --git a/scripts/actions/mobskills/abyssal_strike.lua b/scripts/actions/mobskills/abyssal_strike.lua index 40e91498ad4..98362536971 100644 --- a/scripts/actions/mobskills/abyssal_strike.lua +++ b/scripts/actions/mobskills/abyssal_strike.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 2 - local dmgmod = 4.7 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 4.7 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/aegis_schism.lua b/scripts/actions/mobskills/aegis_schism.lua index 6bf9668288b..c860d286017 100644 --- a/scripts/actions/mobskills/aegis_schism.lua +++ b/scripts/actions/mobskills/aegis_schism.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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 e52507b04c7..e1c4a44435a 100644 --- a/scripts/actions/mobskills/aeolian_edge.lua +++ b/scripts/actions/mobskills/aeolian_edge.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.ACC_VARIES, 1, 2, 3) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/aerial_collision.lua b/scripts/actions/mobskills/aerial_collision.lua index 0679386f49a..deea8d16b9a 100644 --- a/scripts/actions/mobskills/aerial_collision.lua +++ b/scripts/actions/mobskills/aerial_collision.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.DEFENSE_DOWN, 10, 0, 30) diff --git a/scripts/actions/mobskills/amatsu_hanaikusa.lua b/scripts/actions/mobskills/amatsu_hanaikusa.lua index bf6ac675e8c..018ecf79896 100644 --- a/scripts/actions/mobskills/amatsu_hanaikusa.lua +++ b/scripts/actions/mobskills/amatsu_hanaikusa.lua @@ -21,8 +21,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local duration = 60 local numhits = 1 local accmod = 2 - local dmgmod = 6 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1.5625, 1.875, 2.50) + local ftp = 6 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1.5625, 1.875, 2.50) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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 a78b4f8c967..5564e468429 100644 --- a/scripts/actions/mobskills/amatsu_kazakiri.lua +++ b/scripts/actions/mobskills/amatsu_kazakiri.lua @@ -19,8 +19,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 2 local accmod = 2 - local dmgmod = 4.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 1.50, 2) + local ftp = 4.5 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 1.50, 2) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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 5addd4b5277..0f9dac680de 100644 --- a/scripts/actions/mobskills/amatsu_torimai.lua +++ b/scripts/actions/mobskills/amatsu_torimai.lua @@ -19,8 +19,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 2 local accmod = 1 - local dmgmod = 4 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 1.50, 2) + local ftp = 4 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 1.50, 2) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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 3bdcbc89a3e..5360dae278b 100644 --- a/scripts/actions/mobskills/amatsu_tsukikage.lua +++ b/scripts/actions/mobskills/amatsu_tsukikage.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 2 - local dmgmod = 3.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1.5625, 1.875, 2.50) + local ftp = 3.5 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1.5625, 1.875, 2.50) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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 7d82e91697a..d61d1345594 100644 --- a/scripts/actions/mobskills/amatsu_tsukioboro.lua +++ b/scripts/actions/mobskills/amatsu_tsukioboro.lua @@ -21,8 +21,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local duration = 60 local numhits = 1 local accmod = 1 - local dmgmod = 4 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1.5625, 1.875, 2.50) + local ftp = 4 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1.5625, 1.875, 2.50) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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 5305611116a..8e872cc5499 100644 --- a/scripts/actions/mobskills/amatsu_yukiarashi.lua +++ b/scripts/actions/mobskills/amatsu_yukiarashi.lua @@ -21,8 +21,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local duration = 60 local numhits = 1 local accmod = 2 - local dmgmod = 6 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1.5625, 1.875, 2.50) + local ftp = 6 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1.5625, 1.875, 2.50) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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 5b73b7eaf2b..866b19bd4e4 100644 --- a/scripts/actions/mobskills/amon_drive.lua +++ b/scripts/actions/mobskills/amon_drive.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.PARALYSIS, 25, 0, 60) diff --git a/scripts/actions/mobskills/amorphic_scythe.lua b/scripts/actions/mobskills/amorphic_scythe.lua index d7294c92862..1398b79c255 100644 --- a/scripts/actions/mobskills/amorphic_scythe.lua +++ b/scripts/actions/mobskills/amorphic_scythe.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 2 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) 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 8df5e21abaf..db5c2b22930 100644 --- a/scripts/actions/mobskills/amorphic_spikes.lua +++ b/scripts/actions/mobskills/amorphic_spikes.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 5 local accmod = 1 - local dmgmod = 0.6 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 1.2, 1.5) + local ftp = 0.6 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 1.2, 1.5) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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 5e6b1536855..69eb965467b 100644 --- a/scripts/actions/mobskills/antigravity.lua +++ b/scripts/actions/mobskills/antigravity.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) 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 4c0b2346cb0..8dcf573488c 100644 --- a/scripts/actions/mobskills/antigravity_1.lua +++ b/scripts/actions/mobskills/antigravity_1.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:delHP(dmg) diff --git a/scripts/actions/mobskills/antigravity_2.lua b/scripts/actions/mobskills/antigravity_2.lua index 674fce59321..8f216cb0555 100644 --- a/scripts/actions/mobskills/antigravity_2.lua +++ b/scripts/actions/mobskills/antigravity_2.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:delHP(dmg) diff --git a/scripts/actions/mobskills/antigravity_3.lua b/scripts/actions/mobskills/antigravity_3.lua index 03bfc3df740..144ce10746a 100644 --- a/scripts/actions/mobskills/antigravity_3.lua +++ b/scripts/actions/mobskills/antigravity_3.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:delHP(dmg) diff --git a/scripts/actions/mobskills/arching_arrow.lua b/scripts/actions/mobskills/arching_arrow.lua index c24a53714a5..83e6d59ab42 100644 --- a/scripts/actions/mobskills/arching_arrow.lua +++ b/scripts/actions/mobskills/arching_arrow.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.RANGED, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/arrow_deluge.lua b/scripts/actions/mobskills/arrow_deluge.lua index 4925a0682dc..6a23a219bfb 100644 --- a/scripts/actions/mobskills/arrow_deluge.lua +++ b/scripts/actions/mobskills/arrow_deluge.lua @@ -19,8 +19,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) 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 18f254fc7c8..611ec56a9b2 100644 --- a/scripts/actions/mobskills/artificial_gravity.lua +++ b/scripts/actions/mobskills/artificial_gravity.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.WEIGHT, 15, 0, 60) diff --git a/scripts/actions/mobskills/artificial_gravity_1.lua b/scripts/actions/mobskills/artificial_gravity_1.lua index 5d1dc38fbac..6faab97a091 100644 --- a/scripts/actions/mobskills/artificial_gravity_1.lua +++ b/scripts/actions/mobskills/artificial_gravity_1.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.WEIGHT, 15, 0, 60) diff --git a/scripts/actions/mobskills/artificial_gravity_2.lua b/scripts/actions/mobskills/artificial_gravity_2.lua index a514ffec697..dad84c92f61 100644 --- a/scripts/actions/mobskills/artificial_gravity_2.lua +++ b/scripts/actions/mobskills/artificial_gravity_2.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.WEIGHT, 30, 0, 60) diff --git a/scripts/actions/mobskills/artificial_gravity_3.lua b/scripts/actions/mobskills/artificial_gravity_3.lua index 0f90f69c8c1..90c0ad10e25 100644 --- a/scripts/actions/mobskills/artificial_gravity_3.lua +++ b/scripts/actions/mobskills/artificial_gravity_3.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.WEIGHT, 60, 0, 60) diff --git a/scripts/actions/mobskills/ascetics_fury.lua b/scripts/actions/mobskills/ascetics_fury.lua index 43cd6d27d50..b3cd9be16db 100644 --- a/scripts/actions/mobskills/ascetics_fury.lua +++ b/scripts/actions/mobskills/ascetics_fury.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.6 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1.1, 1.3, 1.5) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.HTH) diff --git a/scripts/actions/mobskills/asuran_claws.lua b/scripts/actions/mobskills/asuran_claws.lua index 6216de04d46..1fc5c1e4b9c 100644 --- a/scripts/actions/mobskills/asuran_claws.lua +++ b/scripts/actions/mobskills/asuran_claws.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 6 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) 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 5307b02f6d2..12178980d7f 100644 --- a/scripts/actions/mobskills/asuran_fists.lua +++ b/scripts/actions/mobskills/asuran_fists.lua @@ -18,8 +18,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 8 local accmod = 1 - local dmgmod = 0.8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) 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 c4bc65a1129..cf9d81eb1d5 100644 --- a/scripts/actions/mobskills/august_melee_axe.lua +++ b/scripts/actions/mobskills/august_melee_axe.lua @@ -11,8 +11,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) skill:setMsg(xi.msg.basic.HIT_DMG) diff --git a/scripts/actions/mobskills/august_melee_bow.lua b/scripts/actions/mobskills/august_melee_bow.lua index b6c926c2f6d..2666b3d1917 100644 --- a/scripts/actions/mobskills/august_melee_bow.lua +++ b/scripts/actions/mobskills/august_melee_bow.lua @@ -11,8 +11,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) skill:setMsg(xi.msg.basic.HIT_DMG) diff --git a/scripts/actions/mobskills/august_melee_h2h.lua b/scripts/actions/mobskills/august_melee_h2h.lua index b60a7115472..64ad4922361 100644 --- a/scripts/actions/mobskills/august_melee_h2h.lua +++ b/scripts/actions/mobskills/august_melee_h2h.lua @@ -11,8 +11,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) skill:setMsg(xi.msg.basic.HIT_DMG) diff --git a/scripts/actions/mobskills/august_melee_sword.lua b/scripts/actions/mobskills/august_melee_sword.lua index 3c509dea7e8..685f2df7fdc 100644 --- a/scripts/actions/mobskills/august_melee_sword.lua +++ b/scripts/actions/mobskills/august_melee_sword.lua @@ -11,8 +11,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) skill:setMsg(xi.msg.basic.HIT_DMG) diff --git a/scripts/actions/mobskills/axe_kick.lua b/scripts/actions/mobskills/axe_kick.lua index 8c07771449d..9a14ef62c2b 100644 --- a/scripts/actions/mobskills/axe_kick.lua +++ b/scripts/actions/mobskills/axe_kick.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT, 1, 2, 3) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/back_heel.lua b/scripts/actions/mobskills/back_heel.lua index c14e7b3ce20..e477ec86c8f 100644 --- a/scripts/actions/mobskills/back_heel.lua +++ b/scripts/actions/mobskills/back_heel.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + local ftp = 2.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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/back_swish.lua b/scripts/actions/mobskills/back_swish.lua index 971357b2ac7..39298ed281d 100644 --- a/scripts/actions/mobskills/back_swish.lua +++ b/scripts/actions/mobskills/back_swish.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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 * math.random(2, 3)) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/barbed_crescent.lua b/scripts/actions/mobskills/barbed_crescent.lua index 0253f63f3a0..246b9eccc42 100644 --- a/scripts/actions/mobskills/barbed_crescent.lua +++ b/scripts/actions/mobskills/barbed_crescent.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.7 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.7 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.ACCURACY_DOWN, 50, 0, 120) diff --git a/scripts/actions/mobskills/barracuda_dive.lua b/scripts/actions/mobskills/barracuda_dive.lua index 225fc33e792..121a69d2ddc 100644 --- a/scripts/actions/mobskills/barracuda_dive.lua +++ b/scripts/actions/mobskills/barracuda_dive.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 2 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT, 1, 2, 3) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/batterhorn.lua b/scripts/actions/mobskills/batterhorn.lua index de7ad3d0aba..ed9bc126a3d 100644 --- a/scripts/actions/mobskills/batterhorn.lua +++ b/scripts/actions/mobskills/batterhorn.lua @@ -19,8 +19,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = .8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/battle_dance.lua b/scripts/actions/mobskills/battle_dance.lua index 5dac0a949f2..e10538966e8 100644 --- a/scripts/actions/mobskills/battle_dance.lua +++ b/scripts/actions/mobskills/battle_dance.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/beak_lunge.lua b/scripts/actions/mobskills/beak_lunge.lua index 28e0adebe40..99a3a45b8a1 100644 --- a/scripts/actions/mobskills/beak_lunge.lua +++ b/scripts/actions/mobskills/beak_lunge.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) return dmg diff --git a/scripts/actions/mobskills/bear_killer.lua b/scripts/actions/mobskills/bear_killer.lua index 88ab8bf4151..d25a2498297 100644 --- a/scripts/actions/mobskills/bear_killer.lua +++ b/scripts/actions/mobskills/bear_killer.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 2.5, 2.75, 3) + local ftp = 1 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 2.5, 2.75, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/beatdown.lua b/scripts/actions/mobskills/beatdown.lua index 3e84e13b035..780faf629c8 100644 --- a/scripts/actions/mobskills/beatdown.lua +++ b/scripts/actions/mobskills/beatdown.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.6 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + local ftp = 2.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.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/benthic_typhoon.lua b/scripts/actions/mobskills/benthic_typhoon.lua index 4ff406bd093..23750a2662c 100644 --- a/scripts/actions/mobskills/benthic_typhoon.lua +++ b/scripts/actions/mobskills/benthic_typhoon.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.3 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/big_horn.lua b/scripts/actions/mobskills/big_horn.lua index 8d28752e06d..c2eb70d73f6 100644 --- a/scripts/actions/mobskills/big_horn.lua +++ b/scripts/actions/mobskills/big_horn.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/big_scissors.lua b/scripts/actions/mobskills/big_scissors.lua index 3ba1417d733..d7b8c70136d 100644 --- a/scripts/actions/mobskills/big_scissors.lua +++ b/scripts/actions/mobskills/big_scissors.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.4 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.4 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/bilgestorm.lua b/scripts/actions/mobskills/bilgestorm.lua index d93b1a2bcfa..d496c0b4258 100644 --- a/scripts/actions/mobskills/bilgestorm.lua +++ b/scripts/actions/mobskills/bilgestorm.lua @@ -33,8 +33,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/biotic_boomerang.lua b/scripts/actions/mobskills/biotic_boomerang.lua index b8c4cd58884..d653370b667 100644 --- a/scripts/actions/mobskills/biotic_boomerang.lua +++ b/scripts/actions/mobskills/biotic_boomerang.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = math.random(2, 3) local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, 0, 1, 2, 3) + local ftp = 1 + 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.SLASHING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.PLAGUE, 18, 3, 60) diff --git a/scripts/actions/mobskills/black_halo.lua b/scripts/actions/mobskills/black_halo.lua index 32256107b25..4937c32987b 100644 --- a/scripts/actions/mobskills/black_halo.lua +++ b/scripts/actions/mobskills/black_halo.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 2 local accmod = 1 - local dmgmod = 2.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1.1, 1.2, 1.3) + local ftp = 2.0 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/blade_jin.lua b/scripts/actions/mobskills/blade_jin.lua index 959765b643b..062b5874e9e 100644 --- a/scripts/actions/mobskills/blade_jin.lua +++ b/scripts/actions/mobskills/blade_jin.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.ACC_VARIES, 1, 2, 3) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/blade_ku.lua b/scripts/actions/mobskills/blade_ku.lua index d80008c12c6..3a577168faa 100644 --- a/scripts/actions/mobskills/blade_ku.lua +++ b/scripts/actions/mobskills/blade_ku.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.ACC_VARIES, 1, 2, 3) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/blade_metsu.lua b/scripts/actions/mobskills/blade_metsu.lua index ac3adc9ead6..99370c142ae 100644 --- a/scripts/actions/mobskills/blade_metsu.lua +++ b/scripts/actions/mobskills/blade_metsu.lua @@ -15,9 +15,9 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 + local ftp = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 3, 3, 3) + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 3, 3, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.PARALYSIS, 10, 0, 60) diff --git a/scripts/actions/mobskills/blade_to.lua b/scripts/actions/mobskills/blade_to.lua index c11953cf567..85a9a2c159c 100644 --- a/scripts/actions/mobskills/blade_to.lua +++ b/scripts/actions/mobskills/blade_to.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.ACC_VARIES, 1, 2, 3) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/blind_vortex.lua b/scripts/actions/mobskills/blind_vortex.lua index 2cd7541bdc8..1aab7cee94b 100644 --- a/scripts/actions/mobskills/blind_vortex.lua +++ b/scripts/actions/mobskills/blind_vortex.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1.5 - local dmgmod = 2.8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BLINDNESS, 18, 0, 120) diff --git a/scripts/actions/mobskills/blindeye.lua b/scripts/actions/mobskills/blindeye.lua index 99ab8414713..17346a4e9e1 100644 --- a/scripts/actions/mobskills/blindeye.lua +++ b/scripts/actions/mobskills/blindeye.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.4 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/blockhead.lua b/scripts/actions/mobskills/blockhead.lua index 650cdfda5ed..fac38747477 100644 --- a/scripts/actions/mobskills/blockhead.lua +++ b/scripts/actions/mobskills/blockhead.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/bloodrake.lua b/scripts/actions/mobskills/bloodrake.lua index 2db2a6378e1..4b610450578 100644 --- a/scripts/actions/mobskills/bloodrake.lua +++ b/scripts/actions/mobskills/bloodrake.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.HP, dmg)) diff --git a/scripts/actions/mobskills/bloody_caress.lua b/scripts/actions/mobskills/bloody_caress.lua index 4349519ed7b..740bcf3c1b4 100644 --- a/scripts/actions/mobskills/bloody_caress.lua +++ b/scripts/actions/mobskills/bloody_caress.lua @@ -18,12 +18,12 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 1 + local ftp = 1 -- TODO: Once `Floral Bouquet` TP move is implemented, this skill is eligible to target -- the charmed monsters. - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.ACC_VARIES, 1, 2, 3) + 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) skill:setMsg(xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.HP, dmg)) diff --git a/scripts/actions/mobskills/bloody_claw.lua b/scripts/actions/mobskills/bloody_claw.lua index 98ac129f1d2..f8b05e6a4e0 100644 --- a/scripts/actions/mobskills/bloody_claw.lua +++ b/scripts/actions/mobskills/bloody_claw.lua @@ -21,10 +21,10 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 0.9 + local ftp = 0.9 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, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) 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 6f25cbe99b5..d96ba6f18da 100644 --- a/scripts/actions/mobskills/blow.lua +++ b/scripts/actions/mobskills/blow.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.2 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/bludgeon.lua b/scripts/actions/mobskills/bludgeon.lua index 84dc8c8310c..56417985faa 100644 --- a/scripts/actions/mobskills/bludgeon.lua +++ b/scripts/actions/mobskills/bludgeon.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 1.2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.ACC_VARIES, 1, 2, 3) + local ftp = 1.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.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/body_slam.lua b/scripts/actions/mobskills/body_slam.lua index 2bea6e15935..9870ecd9907 100644 --- a/scripts/actions/mobskills/body_slam.lua +++ b/scripts/actions/mobskills/body_slam.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 1 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/bone_crunch.lua b/scripts/actions/mobskills/bone_crunch.lua index de0aa353932..4437af1057a 100644 --- a/scripts/actions/mobskills/bone_crunch.lua +++ b/scripts/actions/mobskills/bone_crunch.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/bonebreaking_barrage.lua b/scripts/actions/mobskills/bonebreaking_barrage.lua index 9c9356660b0..9dd81a88c84 100644 --- a/scripts/actions/mobskills/bonebreaking_barrage.lua +++ b/scripts/actions/mobskills/bonebreaking_barrage.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.MAX_HP_DOWN, 0, 0, 60) diff --git a/scripts/actions/mobskills/brain_crush.lua b/scripts/actions/mobskills/brain_crush.lua index 2af8c96bbbe..3e980b2c827 100644 --- a/scripts/actions/mobskills/brain_crush.lua +++ b/scripts/actions/mobskills/brain_crush.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + local ftp = 2.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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/brain_drain.lua b/scripts/actions/mobskills/brain_drain.lua index c2f9eafdda2..68b62a4bacd 100644 --- a/scripts/actions/mobskills/brain_drain.lua +++ b/scripts/actions/mobskills/brain_drain.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) 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 db9602266a9..893002c0b1e 100644 --- a/scripts/actions/mobskills/brain_spike.lua +++ b/scripts/actions/mobskills/brain_spike.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/brainjack.lua b/scripts/actions/mobskills/brainjack.lua index a60ffb350d3..438058ad0fd 100644 --- a/scripts/actions/mobskills/brainjack.lua +++ b/scripts/actions/mobskills/brainjack.lua @@ -11,8 +11,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + local ftp = 2.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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.CHARM_I, 0, 0, 60) diff --git a/scripts/actions/mobskills/burst.lua b/scripts/actions/mobskills/burst.lua index 11803f21cc7..6330a279aa1 100644 --- a/scripts/actions/mobskills/burst.lua +++ b/scripts/actions/mobskills/burst.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1, 2, 3) + local ftp = 2.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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/calamity.lua b/scripts/actions/mobskills/calamity.lua index 74fc3435a70..878db90f5c1 100644 --- a/scripts/actions/mobskills/calamity.lua +++ b/scripts/actions/mobskills/calamity.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 1.5, 4) + local ftp = 3 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 1.5, 4) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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. diff --git a/scripts/actions/mobskills/calcifying_claw.lua b/scripts/actions/mobskills/calcifying_claw.lua index 04e7737bb5a..58e1b554bcf 100644 --- a/scripts/actions/mobskills/calcifying_claw.lua +++ b/scripts/actions/mobskills/calcifying_claw.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) 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 c8832c37766..a1f3a4c2beb 100644 --- a/scripts/actions/mobskills/calcifying_deluge.lua +++ b/scripts/actions/mobskills/calcifying_deluge.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.PETRIFICATION, 1, 0, 120) diff --git a/scripts/actions/mobskills/cannonball.lua b/scripts/actions/mobskills/cannonball.lua index e2118a3cfad..cbba08bc1e3 100644 --- a/scripts/actions/mobskills/cannonball.lua +++ b/scripts/actions/mobskills/cannonball.lua @@ -19,12 +19,12 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local numhits = 1 - local accmod = 1 - local dmgmod = 1.5 - local offcratio = mob:getStat(xi.mod.DEF) - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1.75, 2.125, 2.75, offcratio) - local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) + local numhits = 1 + local accmod = 1 + local ftp = 1.5 + local isCannonball = true + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1.75, 2.125, 2.75, isCannonball) + local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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 69c2a436914..1ec20888049 100644 --- a/scripts/actions/mobskills/carousel.lua +++ b/scripts/actions/mobskills/carousel.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/catastrophe.lua b/scripts/actions/mobskills/catastrophe.lua index 479af610dd4..6ff5a6fff91 100644 --- a/scripts/actions/mobskills/catastrophe.lua +++ b/scripts/actions/mobskills/catastrophe.lua @@ -15,9 +15,9 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 + local ftp = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 2.75, 2.75, 2.75) + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 2.75, 2.75, 2.75) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/chaotic_strike.lua b/scripts/actions/mobskills/chaotic_strike.lua index 44f8eddb42d..f52153ef6e3 100644 --- a/scripts/actions/mobskills/chaotic_strike.lua +++ b/scripts/actions/mobskills/chaotic_strike.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 1.1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT, 1, 2, 3) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/chomp_rush.lua b/scripts/actions/mobskills/chomp_rush.lua index 4671f4d167b..2f92f5edc27 100644 --- a/scripts/actions/mobskills/chomp_rush.lua +++ b/scripts/actions/mobskills/chomp_rush.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 1.1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/circle_blade.lua b/scripts/actions/mobskills/circle_blade.lua index 943f00fa210..88838ed1aa9 100644 --- a/scripts/actions/mobskills/circle_blade.lua +++ b/scripts/actions/mobskills/circle_blade.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) -- About 200-300 diff --git a/scripts/actions/mobskills/circle_of_flames.lua b/scripts/actions/mobskills/circle_of_flames.lua index a7a08721751..c81bece9b10 100644 --- a/scripts/actions/mobskills/circle_of_flames.lua +++ b/scripts/actions/mobskills/circle_of_flames.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = math.random(1, 3) local accmod = 1 - local dmgmod = .8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/claw.lua b/scripts/actions/mobskills/claw.lua index 92f9ade1b02..9d68849a143 100644 --- a/scripts/actions/mobskills/claw.lua +++ b/scripts/actions/mobskills/claw.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT, 1, 2, 3) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) return dmg diff --git a/scripts/actions/mobskills/claw_cyclone.lua b/scripts/actions/mobskills/claw_cyclone.lua index 8ebd035ba18..2f62cd4d9a1 100644 --- a/scripts/actions/mobskills/claw_cyclone.lua +++ b/scripts/actions/mobskills/claw_cyclone.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 2 local accmod = 1 - local dmgmod = 1.1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 1.1 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/claw_storm.lua b/scripts/actions/mobskills/claw_storm.lua index 49a36dc6836..6caf0571c9a 100644 --- a/scripts/actions/mobskills/claw_storm.lua +++ b/scripts/actions/mobskills/claw_storm.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 1.1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/clobber.lua b/scripts/actions/mobskills/clobber.lua index 23f7411dd21..7398026a33c 100644 --- a/scripts/actions/mobskills/clobber.lua +++ b/scripts/actions/mobskills/clobber.lua @@ -19,8 +19,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = .8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/colossal_slam.lua b/scripts/actions/mobskills/colossal_slam.lua index bd22e613977..a665c69c492 100644 --- a/scripts/actions/mobskills/colossal_slam.lua +++ b/scripts/actions/mobskills/colossal_slam.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 3.0 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.NUMSHADOWS_3) -- TODO: The duration needs verification from retail diff --git a/scripts/actions/mobskills/combo.lua b/scripts/actions/mobskills/combo.lua index 183d4aa1401..b929ba3fbeb 100644 --- a/scripts/actions/mobskills/combo.lua +++ b/scripts/actions/mobskills/combo.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 2.5, 2.75, 3) + local ftp = 1 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 2.5, 2.75, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/concussive_oscillation.lua b/scripts/actions/mobskills/concussive_oscillation.lua index 85fc5b231cd..48bd12dbe22 100644 --- a/scripts/actions/mobskills/concussive_oscillation.lua +++ b/scripts/actions/mobskills/concussive_oscillation.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.3 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.NUMSHADOWS_3) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.WEIGHT, 50, 0, 300) diff --git a/scripts/actions/mobskills/condemnation.lua b/scripts/actions/mobskills/condemnation.lua index d7220919f1c..e567c8400fc 100644 --- a/scripts/actions/mobskills/condemnation.lua +++ b/scripts/actions/mobskills/condemnation.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 1.2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 1.2, 1.5) + local ftp = 1.2 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 1.2, 1.5) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/coronach.lua b/scripts/actions/mobskills/coronach.lua index a54aac8115b..d6dfa701fc5 100644 --- a/scripts/actions/mobskills/coronach.lua +++ b/scripts/actions/mobskills/coronach.lua @@ -16,9 +16,9 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 + local ftp = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 3, 3, 3) + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 3, 3, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/crescent_fang.lua b/scripts/actions/mobskills/crescent_fang.lua index e92f41a38d6..9a56a262a3c 100644 --- a/scripts/actions/mobskills/crescent_fang.lua +++ b/scripts/actions/mobskills/crescent_fang.lua @@ -12,9 +12,9 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 2 - local dmgmod = 5 + local ftp = 5 - local damage = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, 0, xi.mobskills.physicalTpBonus.NO_EFFECT, 1, 2, 3) + local damage = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, 0, 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) if damage.hitslanded > 0 then diff --git a/scripts/actions/mobskills/crippling_slam.lua b/scripts/actions/mobskills/crippling_slam.lua index fd15e73043c..d13491130a4 100644 --- a/scripts/actions/mobskills/crippling_slam.lua +++ b/scripts/actions/mobskills/crippling_slam.lua @@ -19,8 +19,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 4 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/critical_bite.lua b/scripts/actions/mobskills/critical_bite.lua index 47246675e0c..95e36465876 100644 --- a/scripts/actions/mobskills/critical_bite.lua +++ b/scripts/actions/mobskills/critical_bite.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 6 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/cronos_sling_eta.lua b/scripts/actions/mobskills/cronos_sling_eta.lua index 2565d228ada..5200c63abce 100644 --- a/scripts/actions/mobskills/cronos_sling_eta.lua +++ b/scripts/actions/mobskills/cronos_sling_eta.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.25 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.25 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/cronos_sling_lambda.lua b/scripts/actions/mobskills/cronos_sling_lambda.lua index a9d41a0ea9a..6fb22818db8 100644 --- a/scripts/actions/mobskills/cronos_sling_lambda.lua +++ b/scripts/actions/mobskills/cronos_sling_lambda.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.75 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.75 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/cronos_sling_theta.lua b/scripts/actions/mobskills/cronos_sling_theta.lua index 19a094d6903..10f21b880e8 100644 --- a/scripts/actions/mobskills/cronos_sling_theta.lua +++ b/scripts/actions/mobskills/cronos_sling_theta.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.5 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/cross_attack.lua b/scripts/actions/mobskills/cross_attack.lua index e3a0010f798..c1c455203aa 100644 --- a/scripts/actions/mobskills/cross_attack.lua +++ b/scripts/actions/mobskills/cross_attack.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 2 local accmod = 1 - local dmgmod = 1.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.HTH) return dmg diff --git a/scripts/actions/mobskills/cross_reaver.lua b/scripts/actions/mobskills/cross_reaver.lua index 17177e5666d..83ab081fe71 100644 --- a/scripts/actions/mobskills/cross_reaver.lua +++ b/scripts/actions/mobskills/cross_reaver.lua @@ -19,8 +19,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 2 local accmod = 1 - local dmgmod = 4 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/cyclonic_torrent.lua b/scripts/actions/mobskills/cyclonic_torrent.lua index 95fb01f9b28..96f0b1b497c 100644 --- a/scripts/actions/mobskills/cyclonic_torrent.lua +++ b/scripts/actions/mobskills/cyclonic_torrent.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/cyclotail.lua b/scripts/actions/mobskills/cyclotail.lua index 7368e4db963..b99b1fb2bab 100644 --- a/scripts/actions/mobskills/cyclotail.lua +++ b/scripts/actions/mobskills/cyclotail.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 1.5, 2) + local ftp = 1.5 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/damnation_dive.lua b/scripts/actions/mobskills/damnation_dive.lua index c6a6fa1d892..f214a0970ce 100644 --- a/scripts/actions/mobskills/damnation_dive.lua +++ b/scripts/actions/mobskills/damnation_dive.lua @@ -29,8 +29,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = .8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/dancing_edge.lua b/scripts/actions/mobskills/dancing_edge.lua index 31a1f0a83a2..728389f5ef3 100644 --- a/scripts/actions/mobskills/dancing_edge.lua +++ b/scripts/actions/mobskills/dancing_edge.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 5 local accmod = 1 - local dmgmod = 1.1875 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, 2, 1, 1, 1) + local ftp = 1.1875 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, 2, 1, 1, 1) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/deadly_drive.lua b/scripts/actions/mobskills/deadly_drive.lua index bd8a4c4a13e..0cd2ea95444 100644 --- a/scripts/actions/mobskills/deadly_drive.lua +++ b/scripts/actions/mobskills/deadly_drive.lua @@ -9,8 +9,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.5 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/deadly_hold.lua b/scripts/actions/mobskills/deadly_hold.lua index 9de4f5b330b..f677dfb3ee1 100644 --- a/scripts/actions/mobskills/deadly_hold.lua +++ b/scripts/actions/mobskills/deadly_hold.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = math.random(3, 5) + math.random() - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + local ftp = math.random(3, 5) + math.random() + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/deal_out.lua b/scripts/actions/mobskills/deal_out.lua index de6242265b7..8216a304f51 100644 --- a/scripts/actions/mobskills/deal_out.lua +++ b/scripts/actions/mobskills/deal_out.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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, xi.mobskills.shadowBehavior.NUMSHADOWS_3) if mob:isMobType(xi.mobType.NOTORIOUS) then diff --git a/scripts/actions/mobskills/death_scissors.lua b/scripts/actions/mobskills/death_scissors.lua index aca2d12ac8a..06b05a81a6d 100644 --- a/scripts/actions/mobskills/death_scissors.lua +++ b/scripts/actions/mobskills/death_scissors.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = math.random(4, 6) + math.random() - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = math.random(4, 6) + math.random() + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) -- keep damage around 700 diff --git a/scripts/actions/mobskills/debonair_rush.lua b/scripts/actions/mobskills/debonair_rush.lua index d0e0ab24966..db4c437c254 100644 --- a/scripts/actions/mobskills/debonair_rush.lua +++ b/scripts/actions/mobskills/debonair_rush.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.0 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/decayed_filament.lua b/scripts/actions/mobskills/decayed_filament.lua index 0f12f91c480..0a2941bb712 100644 --- a/scripts/actions/mobskills/decayed_filament.lua +++ b/scripts/actions/mobskills/decayed_filament.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 2 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, 0, 1, 2, 3) + local ftp = 1 + 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.PIERCING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.POISON, 18, 3, 60) diff --git a/scripts/actions/mobskills/delta_thrust.lua b/scripts/actions/mobskills/delta_thrust.lua index b6909a70d53..f1e924cea42 100644 --- a/scripts/actions/mobskills/delta_thrust.lua +++ b/scripts/actions/mobskills/delta_thrust.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 1 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/dimensional_death.lua b/scripts/actions/mobskills/dimensional_death.lua index 67e1420601a..b6f0c3c636d 100644 --- a/scripts/actions/mobskills/dimensional_death.lua +++ b/scripts/actions/mobskills/dimensional_death.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.9 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 1.5, 2) + local ftp = 2.9 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 1.5, 2) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/dirty_claw.lua b/scripts/actions/mobskills/dirty_claw.lua index 795af31651d..106641a59ad 100644 --- a/scripts/actions/mobskills/dirty_claw.lua +++ b/scripts/actions/mobskills/dirty_claw.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.4 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/disseverment.lua b/scripts/actions/mobskills/disseverment.lua index aff9c49285a..3617301206e 100644 --- a/scripts/actions/mobskills/disseverment.lua +++ b/scripts/actions/mobskills/disseverment.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 5 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.ACC_VARIES, 1, 2, 3) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/divesting_stampede.lua b/scripts/actions/mobskills/divesting_stampede.lua index 00536f775f2..c8748690b2e 100644 --- a/scripts/actions/mobskills/divesting_stampede.lua +++ b/scripts/actions/mobskills/divesting_stampede.lua @@ -11,8 +11,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.0 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/dominion_slash.lua b/scripts/actions/mobskills/dominion_slash.lua index 54ca9d69fd3..18d1dc1a770 100644 --- a/scripts/actions/mobskills/dominion_slash.lua +++ b/scripts/actions/mobskills/dominion_slash.lua @@ -18,8 +18,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3.25 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 3.25 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.SILENCE, 1, 0, 60) diff --git a/scripts/actions/mobskills/double_claw.lua b/scripts/actions/mobskills/double_claw.lua index 9afd39f107d..752f5e91ba8 100644 --- a/scripts/actions/mobskills/double_claw.lua +++ b/scripts/actions/mobskills/double_claw.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.4 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/double_down.lua b/scripts/actions/mobskills/double_down.lua index 9b217004e23..8261cafa950 100644 --- a/scripts/actions/mobskills/double_down.lua +++ b/scripts/actions/mobskills/double_down.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.4 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.4 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/double_kick.lua b/scripts/actions/mobskills/double_kick.lua index d980aaf8116..ce9b45116a1 100644 --- a/scripts/actions/mobskills/double_kick.lua +++ b/scripts/actions/mobskills/double_kick.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/double_punch.lua b/scripts/actions/mobskills/double_punch.lua index f8ff63884dd..33b6e6b8907 100644 --- a/scripts/actions/mobskills/double_punch.lua +++ b/scripts/actions/mobskills/double_punch.lua @@ -9,8 +9,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 2 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1, 2, 3) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/double_slap.lua b/scripts/actions/mobskills/double_slap.lua index fe578073363..62fb2540dde 100644 --- a/scripts/actions/mobskills/double_slap.lua +++ b/scripts/actions/mobskills/double_slap.lua @@ -9,8 +9,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 2 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/dragon_kick.lua b/scripts/actions/mobskills/dragon_kick.lua index 92596065230..2aaeddd7534 100644 --- a/scripts/actions/mobskills/dragon_kick.lua +++ b/scripts/actions/mobskills/dragon_kick.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 1.75, 2.50) + local ftp = 3 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 1.75, 2.50) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/dragonfall.lua b/scripts/actions/mobskills/dragonfall.lua index 19a6f158dd8..21859783e14 100644 --- a/scripts/actions/mobskills/dragonfall.lua +++ b/scripts/actions/mobskills/dragonfall.lua @@ -19,8 +19,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.7 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BIND, 1, 0, 30) diff --git a/scripts/actions/mobskills/dread_dive.lua b/scripts/actions/mobskills/dread_dive.lua index d7098358e1f..c08669fcec8 100644 --- a/scripts/actions/mobskills/dread_dive.lua +++ b/scripts/actions/mobskills/dread_dive.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.4 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/drill_branch.lua b/scripts/actions/mobskills/drill_branch.lua index e0f23cd4f0a..c4b31f60d8c 100644 --- a/scripts/actions/mobskills/drill_branch.lua +++ b/scripts/actions/mobskills/drill_branch.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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)) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BLINDNESS, 15, 0, 120) diff --git a/scripts/actions/mobskills/drill_claw.lua b/scripts/actions/mobskills/drill_claw.lua index 778865f7d3d..481e3822a97 100644 --- a/scripts/actions/mobskills/drill_claw.lua +++ b/scripts/actions/mobskills/drill_claw.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.MAX_HP_DOWN, 50, 0, 60) diff --git a/scripts/actions/mobskills/drop_hammer.lua b/scripts/actions/mobskills/drop_hammer.lua index f724b93acf9..17cb980f746 100644 --- a/scripts/actions/mobskills/drop_hammer.lua +++ b/scripts/actions/mobskills/drop_hammer.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.4 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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)) 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 65397894257..7ecd1b9b42a 100644 --- a/scripts/actions/mobskills/dual_strike.lua +++ b/scripts/actions/mobskills/dual_strike.lua @@ -18,8 +18,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 2 local accmod = 1 - local dmgmod = 1.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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.NONE, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.NONE) diff --git a/scripts/actions/mobskills/dynamic_assault.lua b/scripts/actions/mobskills/dynamic_assault.lua index 5d98acbdb0e..4556f949696 100644 --- a/scripts/actions/mobskills/dynamic_assault.lua +++ b/scripts/actions/mobskills/dynamic_assault.lua @@ -15,9 +15,9 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 + local ftp = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/dynamic_implosion.lua b/scripts/actions/mobskills/dynamic_implosion.lua index b16a0dec4db..873f9209802 100644 --- a/scripts/actions/mobskills/dynamic_implosion.lua +++ b/scripts/actions/mobskills/dynamic_implosion.lua @@ -15,9 +15,9 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 + local ftp = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/earth_shock.lua b/scripts/actions/mobskills/earth_shock.lua index 459bc337054..82efdde0506 100644 --- a/scripts/actions/mobskills/earth_shock.lua +++ b/scripts/actions/mobskills/earth_shock.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 2 - local dmgmod = 2.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.0 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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) diff --git a/scripts/actions/mobskills/eclipse_bite.lua b/scripts/actions/mobskills/eclipse_bite.lua index 7bcd50d55cd..d128073d920 100644 --- a/scripts/actions/mobskills/eclipse_bite.lua +++ b/scripts/actions/mobskills/eclipse_bite.lua @@ -12,9 +12,9 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 1 + local ftp = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT, 1, 2, 3) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/ectosmash.lua b/scripts/actions/mobskills/ectosmash.lua index c538a6d18ae..0776a2aebcb 100644 --- a/scripts/actions/mobskills/ectosmash.lua +++ b/scripts/actions/mobskills/ectosmash.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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.RANGED, xi.damageType.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.RANGED, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/empty_beleaguer.lua b/scripts/actions/mobskills/empty_beleaguer.lua index fdc710b0e0c..f09287bf582 100644 --- a/scripts/actions/mobskills/empty_beleaguer.lua +++ b/scripts/actions/mobskills/empty_beleaguer.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 1.5, 2) + local ftp = 2 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/empty_crush.lua b/scripts/actions/mobskills/empty_crush.lua index bb15d3e3f2d..aff7e46fd85 100644 --- a/scripts/actions/mobskills/empty_crush.lua +++ b/scripts/actions/mobskills/empty_crush.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) diff --git a/scripts/actions/mobskills/empty_cutter.lua b/scripts/actions/mobskills/empty_cutter.lua index b78079d8bf2..0b6dd4ccca6 100644 --- a/scripts/actions/mobskills/empty_cutter.lua +++ b/scripts/actions/mobskills/empty_cutter.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/empty_seed.lua b/scripts/actions/mobskills/empty_seed.lua index 0e809b605ba..87292d29113 100644 --- a/scripts/actions/mobskills/empty_seed.lua +++ b/scripts/actions/mobskills/empty_seed.lua @@ -16,8 +16,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) -- Add knock back! local numhits = 1 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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.NUMSHADOWS_3) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/empty_thrash.lua b/scripts/actions/mobskills/empty_thrash.lua index ad90da78bc4..e94bf84dc68 100644 --- a/scripts/actions/mobskills/empty_thrash.lua +++ b/scripts/actions/mobskills/empty_thrash.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.6 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + local ftp = 2.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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/entangle.lua b/scripts/actions/mobskills/entangle.lua index 92e262587d6..315a0f857c2 100644 --- a/scripts/actions/mobskills/entangle.lua +++ b/scripts/actions/mobskills/entangle.lua @@ -19,8 +19,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) if mob:getName() == 'Cernunnos' then local numhits = 3 local accmod = 1 - local dmgmod = 2.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobPhysicalDrainMove(mob, target, skill, xi.mobskills.drainType.HP, dmg) @@ -31,8 +31,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) elseif mob:getPool() == 671 or mob:getPool() == 1346 then -- Cemetery Cherry and leafless Jidra local numhits = 3 local accmod = 1 - local dmgmod = 2.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) mob:resetEnmity(target) diff --git a/scripts/actions/mobskills/envoutement.lua b/scripts/actions/mobskills/envoutement.lua index 7044ad27080..ba0872a1293 100644 --- a/scripts/actions/mobskills/envoutement.lua +++ b/scripts/actions/mobskills/envoutement.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3.2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) 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 9cb984d3d03..140e630dffe 100644 --- a/scripts/actions/mobskills/equalizer.lua +++ b/scripts/actions/mobskills/equalizer.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 2 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/evisceration.lua b/scripts/actions/mobskills/evisceration.lua index de183b97c32..c27cacb5b8a 100644 --- a/scripts/actions/mobskills/evisceration.lua +++ b/scripts/actions/mobskills/evisceration.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 5 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, 3, 1, 1, 1) + local ftp = 1 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, 3, 1, 1, 1) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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 294dfed6e11..29248fb33c6 100644 --- a/scripts/actions/mobskills/eye_scratch.lua +++ b/scripts/actions/mobskills/eye_scratch.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BLINDNESS, 15, 0, 120) diff --git a/scripts/actions/mobskills/fang_rush.lua b/scripts/actions/mobskills/fang_rush.lua index 3f2962e0247..cbcdeccb230 100644 --- a/scripts/actions/mobskills/fang_rush.lua +++ b/scripts/actions/mobskills/fang_rush.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 1.1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/fear_touch.lua b/scripts/actions/mobskills/fear_touch.lua index f3949c22f9c..fdecbaf2375 100644 --- a/scripts/actions/mobskills/fear_touch.lua +++ b/scripts/actions/mobskills/fear_touch.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.3 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/feather_maelstrom.lua b/scripts/actions/mobskills/feather_maelstrom.lua index d400a486a04..8813c0a2587 100644 --- a/scripts/actions/mobskills/feather_maelstrom.lua +++ b/scripts/actions/mobskills/feather_maelstrom.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 2 - local dmgmod = 2.8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.8 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BIO, 6, 3, 60) diff --git a/scripts/actions/mobskills/feather_storm.lua b/scripts/actions/mobskills/feather_storm.lua index e84b707ef54..886eef4dd69 100644 --- a/scripts/actions/mobskills/feather_storm.lua +++ b/scripts/actions/mobskills/feather_storm.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 2 - local dmgmod = 2.8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.8 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/fell_cleave.lua b/scripts/actions/mobskills/fell_cleave.lua index 56665f8a96d..b49f7ff1914 100644 --- a/scripts/actions/mobskills/fell_cleave.lua +++ b/scripts/actions/mobskills/fell_cleave.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.ACC_VARIES, 1, 2, 3) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/fevered_pitch.lua b/scripts/actions/mobskills/fevered_pitch.lua index e61cc5b72e2..74bf7776678 100644 --- a/scripts/actions/mobskills/fevered_pitch.lua +++ b/scripts/actions/mobskills/fevered_pitch.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.5 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.DEFENSE_DOWN, 30, 0, 120) diff --git a/scripts/actions/mobskills/final_heaven.lua b/scripts/actions/mobskills/final_heaven.lua index 0833904b9eb..aba96ef84f3 100644 --- a/scripts/actions/mobskills/final_heaven.lua +++ b/scripts/actions/mobskills/final_heaven.lua @@ -14,9 +14,9 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 + local ftp = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 3, 3, 3) + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 3, 3, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/final_retribution.lua b/scripts/actions/mobskills/final_retribution.lua index d2938efcc62..c20d7d0c194 100644 --- a/scripts/actions/mobskills/final_retribution.lua +++ b/scripts/actions/mobskills/final_retribution.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3.2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) 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 4a59312977b..672f805878d 100644 --- a/scripts/actions/mobskills/final_sting.lua +++ b/scripts/actions/mobskills/final_sting.lua @@ -22,18 +22,18 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1 + local ftp = 1 local hpMod = skill:getMobHPP() / 100 - dmgmod = dmgmod + hpMod * 14 + math.random(2, 6) + ftp = ftp + hpMod * 14 + math.random(2, 6) if mob:isMobType(xi.mobType.NOTORIOUS) then - dmgmod = dmgmod * 5 + ftp = ftp * 5 end mob:setHP(0) - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/flailing_trunk.lua b/scripts/actions/mobskills/flailing_trunk.lua index 7ea37ae06c8..ac8f898bec2 100644 --- a/scripts/actions/mobskills/flailing_trunk.lua +++ b/scripts/actions/mobskills/flailing_trunk.lua @@ -15,8 +15,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 1.5, 2) + local ftp = 2 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 1.5, 2) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/flaming_crush.lua b/scripts/actions/mobskills/flaming_crush.lua index 8034f62e7f7..943dd0a226e 100644 --- a/scripts/actions/mobskills/flaming_crush.lua +++ b/scripts/actions/mobskills/flaming_crush.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 1.4 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT, 1, 2, 3) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/flat_blade.lua b/scripts/actions/mobskills/flat_blade.lua index 9a8e2a46f43..01fdc7ea140 100644 --- a/scripts/actions/mobskills/flat_blade.lua +++ b/scripts/actions/mobskills/flat_blade.lua @@ -24,8 +24,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1.25 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1.1, 1.2, 1.3) + 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) if math.random(1, 100) < skill:getTP() / 3 then diff --git a/scripts/actions/mobskills/fluid_spread.lua b/scripts/actions/mobskills/fluid_spread.lua index 60150f3810d..74625d70bc9 100644 --- a/scripts/actions/mobskills/fluid_spread.lua +++ b/scripts/actions/mobskills/fluid_spread.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = math.random(2, 3) local accmod = 1 - local dmgmod = .6 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/fluid_toss.lua b/scripts/actions/mobskills/fluid_toss.lua index a94122ed91d..cd48d4c5d18 100644 --- a/scripts/actions/mobskills/fluid_toss.lua +++ b/scripts/actions/mobskills/fluid_toss.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.7 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.7 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/fluid_toss_claret.lua b/scripts/actions/mobskills/fluid_toss_claret.lua index ea9749fce0c..d0e81a2ae1f 100644 --- a/scripts/actions/mobskills/fluid_toss_claret.lua +++ b/scripts/actions/mobskills/fluid_toss_claret.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 4.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 4.5 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/foot_kick.lua b/scripts/actions/mobskills/foot_kick.lua index 4d83282e6b4..3d8b54bcad0 100644 --- a/scripts/actions/mobskills/foot_kick.lua +++ b/scripts/actions/mobskills/foot_kick.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.6 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1, 2, 3) + local ftp = 2.6 + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/forceful_blow.lua b/scripts/actions/mobskills/forceful_blow.lua index 0a6b4c04d43..ddd53c3734b 100644 --- a/scripts/actions/mobskills/forceful_blow.lua +++ b/scripts/actions/mobskills/forceful_blow.lua @@ -21,8 +21,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 1.5, 2) + local ftp = 1 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 1.5, 2) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/formation_attack.lua b/scripts/actions/mobskills/formation_attack.lua index 923e0a2737a..1e123c48b08 100644 --- a/scripts/actions/mobskills/formation_attack.lua +++ b/scripts/actions/mobskills/formation_attack.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 -- should be number of bombs left local accmod = 1 - local dmgmod = math.random(0.5, 1) - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + local ftp = math.random(0.5, 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/foxfire.lua b/scripts/actions/mobskills/foxfire.lua index e6afec03d39..e895636c51f 100644 --- a/scripts/actions/mobskills/foxfire.lua +++ b/scripts/actions/mobskills/foxfire.lua @@ -30,8 +30,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.6 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.6 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 6) diff --git a/scripts/actions/mobskills/frenetic_rip.lua b/scripts/actions/mobskills/frenetic_rip.lua index 584119fdccf..82aca0c74ef 100644 --- a/scripts/actions/mobskills/frenetic_rip.lua +++ b/scripts/actions/mobskills/frenetic_rip.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 1 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/frypan.lua b/scripts/actions/mobskills/frypan.lua index d95370837e1..fcc98b92142 100644 --- a/scripts/actions/mobskills/frypan.lua +++ b/scripts/actions/mobskills/frypan.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 0.8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) 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 6bc7a8dc761..f449376f1b9 100644 --- a/scripts/actions/mobskills/full-force_blow.lua +++ b/scripts/actions/mobskills/full-force_blow.lua @@ -14,8 +14,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) -- Add Knockback Animation local numhits = 1 local accmod = 1 - local dmgmod = 2.8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.8 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/gaea_stream_eta.lua b/scripts/actions/mobskills/gaea_stream_eta.lua index 8bed2b295a9..674c0eecc39 100644 --- a/scripts/actions/mobskills/gaea_stream_eta.lua +++ b/scripts/actions/mobskills/gaea_stream_eta.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1.75 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 1.75 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/gaea_stream_lambda.lua b/scripts/actions/mobskills/gaea_stream_lambda.lua index 9725aa1185b..63294b820c6 100644 --- a/scripts/actions/mobskills/gaea_stream_lambda.lua +++ b/scripts/actions/mobskills/gaea_stream_lambda.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.25 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.25 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/gaea_stream_theta.lua b/scripts/actions/mobskills/gaea_stream_theta.lua index a5399869e1a..3f5fd379da7 100644 --- a/scripts/actions/mobskills/gaea_stream_theta.lua +++ b/scripts/actions/mobskills/gaea_stream_theta.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/gate_of_tartarus.lua b/scripts/actions/mobskills/gate_of_tartarus.lua index fd34b0d8fe4..4d0a8c2f78d 100644 --- a/scripts/actions/mobskills/gate_of_tartarus.lua +++ b/scripts/actions/mobskills/gate_of_tartarus.lua @@ -16,9 +16,9 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 + local ftp = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 3, 3, 3) + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 3, 3, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) local duration = 60 diff --git a/scripts/actions/mobskills/geirskogul.lua b/scripts/actions/mobskills/geirskogul.lua index 2a6f9533fb6..aec2f337e8a 100644 --- a/scripts/actions/mobskills/geirskogul.lua +++ b/scripts/actions/mobskills/geirskogul.lua @@ -14,9 +14,9 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 + local ftp = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 3, 3, 3) + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 3, 3, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/giga_scream.lua b/scripts/actions/mobskills/giga_scream.lua index 2803ccd9884..1d42e65507c 100644 --- a/scripts/actions/mobskills/giga_scream.lua +++ b/scripts/actions/mobskills/giga_scream.lua @@ -18,8 +18,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1.5 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/giga_slash.lua b/scripts/actions/mobskills/giga_slash.lua index fe643df58de..92fa389e03b 100644 --- a/scripts/actions/mobskills/giga_slash.lua +++ b/scripts/actions/mobskills/giga_slash.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.7 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1, 2, 3) + local ftp = 2.7 + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/glacier_splitter.lua b/scripts/actions/mobskills/glacier_splitter.lua index ddffad85f3f..2e10588a75d 100644 --- a/scripts/actions/mobskills/glacier_splitter.lua +++ b/scripts/actions/mobskills/glacier_splitter.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = math.random(1, 3) local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.PARALYSIS, 15, 0, 120) diff --git a/scripts/actions/mobskills/gliding_spike.lua b/scripts/actions/mobskills/gliding_spike.lua index 1d76a266088..bfd09ff1f96 100644 --- a/scripts/actions/mobskills/gliding_spike.lua +++ b/scripts/actions/mobskills/gliding_spike.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.5 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/goblin_rush.lua b/scripts/actions/mobskills/goblin_rush.lua index c710b389be2..eb1687a4143 100644 --- a/scripts/actions/mobskills/goblin_rush.lua +++ b/scripts/actions/mobskills/goblin_rush.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.ACC_VARIES, 1, 2, 3) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/grand_slam.lua b/scripts/actions/mobskills/grand_slam.lua index 8a546b930cc..f541eb62b16 100644 --- a/scripts/actions/mobskills/grand_slam.lua +++ b/scripts/actions/mobskills/grand_slam.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.0 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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 diff --git a/scripts/actions/mobskills/grapeshot.lua b/scripts/actions/mobskills/grapeshot.lua index b6106b53ea9..714ed6c3394 100755 --- a/scripts/actions/mobskills/grapeshot.lua +++ b/scripts/actions/mobskills/grapeshot.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 0.3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, mob:getWeaponDmg() * dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) 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 eb8d7aac8fa..c1cd384a9fc 100644 --- a/scripts/actions/mobskills/grapple.lua +++ b/scripts/actions/mobskills/grapple.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = math.random(2, 2.5) - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/grating_tantara.lua b/scripts/actions/mobskills/grating_tantara.lua index dc4bf1887a0..1c1cec2e58c 100644 --- a/scripts/actions/mobskills/grating_tantara.lua +++ b/scripts/actions/mobskills/grating_tantara.lua @@ -21,8 +21,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.AMNESIA, 1, 0, 60) diff --git a/scripts/actions/mobskills/gravity_wheel.lua b/scripts/actions/mobskills/gravity_wheel.lua index 160819203ad..580668a5a00 100644 --- a/scripts/actions/mobskills/gravity_wheel.lua +++ b/scripts/actions/mobskills/gravity_wheel.lua @@ -20,8 +20,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/great_wheel.lua b/scripts/actions/mobskills/great_wheel.lua index b61e57d9253..c8c1cd1b361 100644 --- a/scripts/actions/mobskills/great_wheel.lua +++ b/scripts/actions/mobskills/great_wheel.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/grim_halo.lua b/scripts/actions/mobskills/grim_halo.lua index a14ce5bedc2..41315a52870 100644 --- a/scripts/actions/mobskills/grim_halo.lua +++ b/scripts/actions/mobskills/grim_halo.lua @@ -25,8 +25,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/grim_reaper.lua b/scripts/actions/mobskills/grim_reaper.lua index a80309e1d40..c55e2e52ee8 100644 --- a/scripts/actions/mobskills/grim_reaper.lua +++ b/scripts/actions/mobskills/grim_reaper.lua @@ -21,8 +21,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 1.2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/ground_strike.lua b/scripts/actions/mobskills/ground_strike.lua index 98d8d452913..f5ffe7b53d3 100644 --- a/scripts/actions/mobskills/ground_strike.lua +++ b/scripts/actions/mobskills/ground_strike.lua @@ -11,8 +11,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 4 - local dmgmod = 3.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/groundburst.lua b/scripts/actions/mobskills/groundburst.lua index 04cc0c20877..48c14b54fd2 100644 --- a/scripts/actions/mobskills/groundburst.lua +++ b/scripts/actions/mobskills/groundburst.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/guided_missile.lua b/scripts/actions/mobskills/guided_missile.lua index a3343ccee34..0857beb614d 100644 --- a/scripts/actions/mobskills/guided_missile.lua +++ b/scripts/actions/mobskills/guided_missile.lua @@ -20,8 +20,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/guillotine.lua b/scripts/actions/mobskills/guillotine.lua index 0809a4e279b..048a26d85a5 100644 --- a/scripts/actions/mobskills/guillotine.lua +++ b/scripts/actions/mobskills/guillotine.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 4 local accmod = 1 - local dmgmod = 1.2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.SILENCE, 1, 0, (skill:getTP() * 30 / 1000) + 30) diff --git a/scripts/actions/mobskills/gust_slash.lua b/scripts/actions/mobskills/gust_slash.lua index 11f42068706..0a88019b635 100644 --- a/scripts/actions/mobskills/gust_slash.lua +++ b/scripts/actions/mobskills/gust_slash.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.ACC_VARIES, 1, 2, 3) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/gusting_gouge.lua b/scripts/actions/mobskills/gusting_gouge.lua index 8efe36b57f2..a4c03fd623d 100644 --- a/scripts/actions/mobskills/gusting_gouge.lua +++ b/scripts/actions/mobskills/gusting_gouge.lua @@ -26,8 +26,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/hammer-go-round.lua b/scripts/actions/mobskills/hammer-go-round.lua index dfe8d8fcc93..7bed3975bd7 100644 --- a/scripts/actions/mobskills/hammer-go-round.lua +++ b/scripts/actions/mobskills/hammer-go-round.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = math.random(2, 3) local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/hammer_beak.lua b/scripts/actions/mobskills/hammer_beak.lua index 1ba6906fc75..39826ef0d45 100644 --- a/scripts/actions/mobskills/hammer_beak.lua +++ b/scripts/actions/mobskills/hammer_beak.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) 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 9773f78e4e1..723a78bcf21 100644 --- a/scripts/actions/mobskills/hammerblow.lua +++ b/scripts/actions/mobskills/hammerblow.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/hane_fubuki.lua b/scripts/actions/mobskills/hane_fubuki.lua index 34651270937..81f9b84137f 100644 --- a/scripts/actions/mobskills/hane_fubuki.lua +++ b/scripts/actions/mobskills/hane_fubuki.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 2 - local dmgmod = 3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 3 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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 52190a4276f..523c55e0a4a 100644 --- a/scripts/actions/mobskills/happobarai.lua +++ b/scripts/actions/mobskills/happobarai.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/havoc_spiral.lua b/scripts/actions/mobskills/havoc_spiral.lua index d15a4f79d80..035a9610b67 100644 --- a/scripts/actions/mobskills/havoc_spiral.lua +++ b/scripts/actions/mobskills/havoc_spiral.lua @@ -18,8 +18,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) -- Witnessed 280 to a melee, 400 to a BRD, and 500 to a wyvern diff --git a/scripts/actions/mobskills/haymaker.lua b/scripts/actions/mobskills/haymaker.lua index d57370f661d..4216e662b8d 100644 --- a/scripts/actions/mobskills/haymaker.lua +++ b/scripts/actions/mobskills/haymaker.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) 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 29272240836..ed25dca9810 100644 --- a/scripts/actions/mobskills/head_butt.lua +++ b/scripts/actions/mobskills/head_butt.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.7 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.7 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/head_butt_turtle.lua b/scripts/actions/mobskills/head_butt_turtle.lua index 39b03f1bad3..1fdb79dbebe 100644 --- a/scripts/actions/mobskills/head_butt_turtle.lua +++ b/scripts/actions/mobskills/head_butt_turtle.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 1 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) local duration = math.random(120, 180) diff --git a/scripts/actions/mobskills/heavy_blow.lua b/scripts/actions/mobskills/heavy_blow.lua index ed3d7aa54b5..1c84e95152b 100644 --- a/scripts/actions/mobskills/heavy_blow.lua +++ b/scripts/actions/mobskills/heavy_blow.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = math.random(2, 3) - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + local ftp = math.random(2, 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.HTH) return dmg diff --git a/scripts/actions/mobskills/heavy_stomp.lua b/scripts/actions/mobskills/heavy_stomp.lua index e25755f2da5..88352f4b609 100644 --- a/scripts/actions/mobskills/heavy_stomp.lua +++ b/scripts/actions/mobskills/heavy_stomp.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = math.random(2, 3) local accmod = 1 - local dmgmod = .7 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.PARALYSIS, 15, 0, 360) diff --git a/scripts/actions/mobskills/heavy_strike.lua b/scripts/actions/mobskills/heavy_strike.lua index c4e44fb09f2..648104a9391 100644 --- a/scripts/actions/mobskills/heavy_strike.lua +++ b/scripts/actions/mobskills/heavy_strike.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.7 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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.SLASHING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.SLOW, 1250, 0, 120) diff --git a/scripts/actions/mobskills/heavy_whisk.lua b/scripts/actions/mobskills/heavy_whisk.lua index 5b2f1c0ab40..a985fbcc620 100644 --- a/scripts/actions/mobskills/heavy_whisk.lua +++ b/scripts/actions/mobskills/heavy_whisk.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.HTH) return dmg diff --git a/scripts/actions/mobskills/hell_slash.lua b/scripts/actions/mobskills/hell_slash.lua index 25ab79cddf0..dfde67a8384 100644 --- a/scripts/actions/mobskills/hell_slash.lua +++ b/scripts/actions/mobskills/hell_slash.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/hellclap.lua b/scripts/actions/mobskills/hellclap.lua index 94df39a657d..96a2a74619c 100644 --- a/scripts/actions/mobskills/hellclap.lua +++ b/scripts/actions/mobskills/hellclap.lua @@ -32,8 +32,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 10 - local dmgmod = 4.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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)) 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 ebb5b7b8a49..04bfbb8c89d 100644 --- a/scripts/actions/mobskills/helldive.lua +++ b/scripts/actions/mobskills/helldive.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.8 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/hexa_strike.lua b/scripts/actions/mobskills/hexa_strike.lua index 34432d89bc6..422ab67344c 100644 --- a/scripts/actions/mobskills/hexa_strike.lua +++ b/scripts/actions/mobskills/hexa_strike.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 6 local accmod = 1 - local dmgmod = 1.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1.1, 1.2, 1.3) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/hexidiscs.lua b/scripts/actions/mobskills/hexidiscs.lua index 4a2669aa891..d0575ee15d7 100644 --- a/scripts/actions/mobskills/hexidiscs.lua +++ b/scripts/actions/mobskills/hexidiscs.lua @@ -25,8 +25,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 6 local accmod = 1 - local dmgmod = .7 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/hiden_sokyaku.lua b/scripts/actions/mobskills/hiden_sokyaku.lua index 61dd60aef08..f75a3bef049 100644 --- a/scripts/actions/mobskills/hiden_sokyaku.lua +++ b/scripts/actions/mobskills/hiden_sokyaku.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/hollow_smite.lua b/scripts/actions/mobskills/hollow_smite.lua index 9bff71fe8c7..b48537deb7d 100644 --- a/scripts/actions/mobskills/hollow_smite.lua +++ b/scripts/actions/mobskills/hollow_smite.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 4 local accmod = 1 - local dmgmod = 2.25 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1.1, 1.25, 1.45) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.HTH) diff --git a/scripts/actions/mobskills/hoof_volley.lua b/scripts/actions/mobskills/hoof_volley.lua index 049c099167b..a3b25b6175c 100644 --- a/scripts/actions/mobskills/hoof_volley.lua +++ b/scripts/actions/mobskills/hoof_volley.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1, 1, 1) + local ftp = 2.5 + 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, info.hitslanded) mob:resetEnmity(target) diff --git a/scripts/actions/mobskills/howling_fist.lua b/scripts/actions/mobskills/howling_fist.lua index b53691cfff3..8ca833e13c2 100644 --- a/scripts/actions/mobskills/howling_fist.lua +++ b/scripts/actions/mobskills/howling_fist.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 2 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 2.5, 2.75, 3) + local ftp = 1 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 2.5, 2.75, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/hydro_shot.lua b/scripts/actions/mobskills/hydro_shot.lua index 165d7934761..1902d34ed2e 100644 --- a/scripts/actions/mobskills/hydro_shot.lua +++ b/scripts/actions/mobskills/hydro_shot.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.8 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.HTH, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.ENMITY_DOWN, 10, 3, 120) diff --git a/scripts/actions/mobskills/hysteric_assault.lua b/scripts/actions/mobskills/hysteric_assault.lua index 06c4f0b0eaf..127e164a9a4 100644 --- a/scripts/actions/mobskills/hysteric_assault.lua +++ b/scripts/actions/mobskills/hysteric_assault.lua @@ -11,8 +11,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 5 local accmod = 1 - local dmgmod = 1.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) 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 0ba26ff0b5f..cafe32818aa 100644 --- a/scripts/actions/mobskills/hysteric_barrage.lua +++ b/scripts/actions/mobskills/hysteric_barrage.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 5 local accmod = 1 - local dmgmod = .5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = .5 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/impale.lua b/scripts/actions/mobskills/impale.lua index 4db1264e72e..c900daf9843 100644 --- a/scripts/actions/mobskills/impale.lua +++ b/scripts/actions/mobskills/impale.lua @@ -16,8 +16,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local typeEffect = xi.effect.PARALYSIS local numhits = 1 local accmod = 1 - local dmgmod = 2.3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + local ftp = 2.3 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) local shadows = info.hitslanded if mob:isMobType(xi.mobType.NOTORIOUS) then diff --git a/scripts/actions/mobskills/imperial_authority.lua b/scripts/actions/mobskills/imperial_authority.lua index ae2a526983b..77be28b4552 100644 --- a/scripts/actions/mobskills/imperial_authority.lua +++ b/scripts/actions/mobskills/imperial_authority.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 0.3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, mob:getWeaponDmg() * dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 0.3 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, mob:getWeaponDmg() * ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/impulse_drive.lua b/scripts/actions/mobskills/impulse_drive.lua index 4dd07732a72..20f47165d2b 100644 --- a/scripts/actions/mobskills/impulse_drive.lua +++ b/scripts/actions/mobskills/impulse_drive.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 2 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, 2, 1, 1, 1) + local ftp = 1 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, 2, 1, 1, 1) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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 f632a68e2fc..0c3df0696ea 100644 --- a/scripts/actions/mobskills/incensed_pummel.lua +++ b/scripts/actions/mobskills/incensed_pummel.lua @@ -11,11 +11,11 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.0 + local ftp = 2.0 -- Random stat down 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, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) 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 2f567fdd16f..e9735164386 100644 --- a/scripts/actions/mobskills/incessant_fists.lua +++ b/scripts/actions/mobskills/incessant_fists.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 5 local accmod = 1 - local dmgmod = 1.3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/infernal_deliverance.lua b/scripts/actions/mobskills/infernal_deliverance.lua index f6e7d7334a3..1fe4b078969 100644 --- a/scripts/actions/mobskills/infernal_deliverance.lua +++ b/scripts/actions/mobskills/infernal_deliverance.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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, info.hitslanded) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.STUN, 0, 0, 10) diff --git a/scripts/actions/mobskills/insipid_nip.lua b/scripts/actions/mobskills/insipid_nip.lua index befa0b55929..1a475622e19 100644 --- a/scripts/actions/mobskills/insipid_nip.lua +++ b/scripts/actions/mobskills/insipid_nip.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 2 - local dmgmod = 3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) if xi.mobskills.mobPhysicalHit(skill) then diff --git a/scripts/actions/mobskills/jet_stream.lua b/scripts/actions/mobskills/jet_stream.lua index 847ee28675f..7693c7fc4a0 100644 --- a/scripts/actions/mobskills/jet_stream.lua +++ b/scripts/actions/mobskills/jet_stream.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 0.9 + (mob:getMainLvl() / 100) - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.ACC_VARIES, 1, 1.5, 2) + local ftp = 0.9 + (mob:getMainLvl() / 100) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/judgment.lua b/scripts/actions/mobskills/judgment.lua index b6f99d49b58..9632f585cea 100644 --- a/scripts/actions/mobskills/judgment.lua +++ b/scripts/actions/mobskills/judgment.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 0.6 - local dmgmod = 3.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.ACC_VARIES, 2.0, 2.5, 3.0) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/jump.lua b/scripts/actions/mobskills/jump.lua index 6003e389477..e544e3b9597 100644 --- a/scripts/actions/mobskills/jump.lua +++ b/scripts/actions/mobskills/jump.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 3 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/jumping_thrust.lua b/scripts/actions/mobskills/jumping_thrust.lua index 616acfdeccc..3b0fb3f7ca9 100644 --- a/scripts/actions/mobskills/jumping_thrust.lua +++ b/scripts/actions/mobskills/jumping_thrust.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 3 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/kartstrahl.lua b/scripts/actions/mobskills/kartstrahl.lua index 60710dfbfd2..1e678f50511 100644 --- a/scripts/actions/mobskills/kartstrahl.lua +++ b/scripts/actions/mobskills/kartstrahl.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.SLEEP_I, 1, 0, 30) diff --git a/scripts/actions/mobskills/kick_back.lua b/scripts/actions/mobskills/kick_back.lua index 25bff67df39..f23598fa578 100644 --- a/scripts/actions/mobskills/kick_back.lua +++ b/scripts/actions/mobskills/kick_back.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1, 2, 3) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/kick_out.lua b/scripts/actions/mobskills/kick_out.lua index ed951cb78a1..b02f7438397 100644 --- a/scripts/actions/mobskills/kick_out.lua +++ b/scripts/actions/mobskills/kick_out.lua @@ -21,8 +21,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = math.random(2, 3) local accmod = 1 - local dmgmod = 3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) 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 40fb051dcad..10a4d27fa19 100644 --- a/scripts/actions/mobskills/king_cobra_clamp.lua +++ b/scripts/actions/mobskills/king_cobra_clamp.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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.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 06b4471e101..3e51763b148 100644 --- a/scripts/actions/mobskills/knights_of_round.lua +++ b/scripts/actions/mobskills/knights_of_round.lua @@ -15,9 +15,9 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 + local ftp = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 3, 3, 3) + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 3, 3, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/lamb_chop.lua b/scripts/actions/mobskills/lamb_chop.lua index 967bb7e6abe..5a2d3a8f688 100644 --- a/scripts/actions/mobskills/lamb_chop.lua +++ b/scripts/actions/mobskills/lamb_chop.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/lateral_slash.lua b/scripts/actions/mobskills/lateral_slash.lua index 2df40bde8df..cfd63e79b03 100644 --- a/scripts/actions/mobskills/lateral_slash.lua +++ b/scripts/actions/mobskills/lateral_slash.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 2 - local dmgmod = 2.7 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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.SLASHING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.DEFENSE_DOWN, 75, 0, 60) diff --git a/scripts/actions/mobskills/leaf_dagger.lua b/scripts/actions/mobskills/leaf_dagger.lua index 87da238f502..c976bead4ee 100644 --- a/scripts/actions/mobskills/leaf_dagger.lua +++ b/scripts/actions/mobskills/leaf_dagger.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 2 local accmod = 1 - local dmgmod = 1.4 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + local ftp = 1.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.PIERCING, info.hitslanded) local power = math.max(1, mob:getMainLvl() / 10) diff --git a/scripts/actions/mobskills/leaping_cleave.lua b/scripts/actions/mobskills/leaping_cleave.lua index 713ac36775e..0bccfdf450b 100644 --- a/scripts/actions/mobskills/leaping_cleave.lua +++ b/scripts/actions/mobskills/leaping_cleave.lua @@ -21,8 +21,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 3 - local dmgmod = 2.25 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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 duration = xi.mobskills.calculateDuration(mob:getTP(), 15, 30) diff --git a/scripts/actions/mobskills/lethe_arrows.lua b/scripts/actions/mobskills/lethe_arrows.lua index 131f777dc63..635f539aed7 100644 --- a/scripts/actions/mobskills/lethe_arrows.lua +++ b/scripts/actions/mobskills/lethe_arrows.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 3 - local dmgmod = 4 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 4 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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) diff --git a/scripts/actions/mobskills/light_blade.lua b/scripts/actions/mobskills/light_blade.lua index 54552e7e97f..ba26f63ed57 100644 --- a/scripts/actions/mobskills/light_blade.lua +++ b/scripts/actions/mobskills/light_blade.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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.RANGED, xi.damageType.SLASHING, info.hitslanded) -- TODO: There's no MOBPARAM_RANGED, but MOBPARAM doesn't appear to do anything? -- Guessing ~40-100% damage based on range (20/50+). diff --git a/scripts/actions/mobskills/lunar_revolution.lua b/scripts/actions/mobskills/lunar_revolution.lua index 41101f124df..dd4ae668c29 100644 --- a/scripts/actions/mobskills/lunar_revolution.lua +++ b/scripts/actions/mobskills/lunar_revolution.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.0 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/maats_bash.lua b/scripts/actions/mobskills/maats_bash.lua index 9f2d4966027..e57e27d0236 100644 --- a/scripts/actions/mobskills/maats_bash.lua +++ b/scripts/actions/mobskills/maats_bash.lua @@ -11,8 +11,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1.2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 1.2 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/mandible_bite.lua b/scripts/actions/mobskills/mandible_bite.lua index 6b39e056ba9..115eb3ccc9a 100644 --- a/scripts/actions/mobskills/mandible_bite.lua +++ b/scripts/actions/mobskills/mandible_bite.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.7 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) return dmg diff --git a/scripts/actions/mobskills/mandibular_bite.lua b/scripts/actions/mobskills/mandibular_bite.lua index b6830b6e193..9b3cd98215e 100644 --- a/scripts/actions/mobskills/mandibular_bite.lua +++ b/scripts/actions/mobskills/mandibular_bite.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.7 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) return dmg diff --git a/scripts/actions/mobskills/mangle.lua b/scripts/actions/mobskills/mangle.lua index 2f279b0ef2e..6bab9551585 100644 --- a/scripts/actions/mobskills/mangle.lua +++ b/scripts/actions/mobskills/mangle.lua @@ -21,8 +21,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.ACC_VARIES) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/mantle_pierce.lua b/scripts/actions/mobskills/mantle_pierce.lua index 4efd7624736..accb6034810 100644 --- a/scripts/actions/mobskills/mantle_pierce.lua +++ b/scripts/actions/mobskills/mantle_pierce.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = math.random(1, 3) local accmod = 2 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.WEIGHT, 50, 0, 120) diff --git a/scripts/actions/mobskills/medusa_javelin.lua b/scripts/actions/mobskills/medusa_javelin.lua index dd428efa57b..2c82349c90c 100644 --- a/scripts/actions/mobskills/medusa_javelin.lua +++ b/scripts/actions/mobskills/medusa_javelin.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/mercy_stroke.lua b/scripts/actions/mobskills/mercy_stroke.lua index ee2e8c27d66..5b0f258104e 100644 --- a/scripts/actions/mobskills/mercy_stroke.lua +++ b/scripts/actions/mobskills/mercy_stroke.lua @@ -15,9 +15,9 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 + local ftp = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 3, 3, 3) + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 3, 3, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/metatron_torment.lua b/scripts/actions/mobskills/metatron_torment.lua index 1a154aba47f..4dd61c5d5e6 100644 --- a/scripts/actions/mobskills/metatron_torment.lua +++ b/scripts/actions/mobskills/metatron_torment.lua @@ -15,9 +15,9 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 + local ftp = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 3, 3, 3) + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 3, 3, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) local duration = 60 diff --git a/scripts/actions/mobskills/microquake.lua b/scripts/actions/mobskills/microquake.lua index 7bb5a3264d2..43b49efa47c 100644 --- a/scripts/actions/mobskills/microquake.lua +++ b/scripts/actions/mobskills/microquake.lua @@ -20,8 +20,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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_1) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/moonlit_charge.lua b/scripts/actions/mobskills/moonlit_charge.lua index e66e3d1aa02..b54490f3f95 100644 --- a/scripts/actions/mobskills/moonlit_charge.lua +++ b/scripts/actions/mobskills/moonlit_charge.lua @@ -12,9 +12,9 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 2 - local dmgmod = 4 + local ftp = 4 - local damage = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, 0, xi.mobskills.physicalTpBonus.NO_EFFECT, 1, 2, 3) + local damage = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, 0, 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) target:addStatusEffect(xi.effect.BLINDNESS, 20, 0, 30) target:takeDamage(totaldamage, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/mortal_revolution.lua b/scripts/actions/mobskills/mortal_revolution.lua index eac20d116ab..1030d74e38c 100644 --- a/scripts/actions/mobskills/mortal_revolution.lua +++ b/scripts/actions/mobskills/mortal_revolution.lua @@ -11,8 +11,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 2 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/mountain_buster.lua b/scripts/actions/mobskills/mountain_buster.lua index fadd512ff6b..d991cf8010f 100644 --- a/scripts/actions/mobskills/mountain_buster.lua +++ b/scripts/actions/mobskills/mountain_buster.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 2 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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 99a49caa082..37235afbbdf 100644 --- a/scripts/actions/mobskills/mow.lua +++ b/scripts/actions/mobskills/mow.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = math.random(2, 3) local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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 power = mob:getMainLvl() / 4 + 3 diff --git a/scripts/actions/mobskills/namas_arrow.lua b/scripts/actions/mobskills/namas_arrow.lua index 4a32fc82748..1cbdb4828b9 100644 --- a/scripts/actions/mobskills/namas_arrow.lua +++ b/scripts/actions/mobskills/namas_arrow.lua @@ -15,9 +15,9 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 + local ftp = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 2.75, 2.75, 2.75) + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_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) target:takeDamage(dmg, mob, xi.attackType.RANGED, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/necrobane.lua b/scripts/actions/mobskills/necrobane.lua index d69ae65c3ac..dfe986bf729 100644 --- a/scripts/actions/mobskills/necrobane.lua +++ b/scripts/actions/mobskills/necrobane.lua @@ -31,8 +31,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/necropurge.lua b/scripts/actions/mobskills/necropurge.lua index 622b81c2e9e..5e8aa164dd9 100644 --- a/scripts/actions/mobskills/necropurge.lua +++ b/scripts/actions/mobskills/necropurge.lua @@ -31,8 +31,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 10 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.CURSE_I, 1, 0, 60) diff --git a/scripts/actions/mobskills/needleshot.lua b/scripts/actions/mobskills/needleshot.lua index 0767e4b1588..cfeac8587ac 100644 --- a/scripts/actions/mobskills/needleshot.lua +++ b/scripts/actions/mobskills/needleshot.lua @@ -16,7 +16,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 0.8 local dmgmod = 2.2 - local info = xi.mobskills.mobRangedMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES) + 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) target:takeDamage(dmg, mob, xi.attackType.RANGED, xi.damageType.PIERCING) return dmg diff --git a/scripts/actions/mobskills/netherspikes.lua b/scripts/actions/mobskills/netherspikes.lua index eedda5ac254..fa46d56f5f3 100644 --- a/scripts/actions/mobskills/netherspikes.lua +++ b/scripts/actions/mobskills/netherspikes.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.7 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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.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 34a22f250cc..dfed7db6398 100644 --- a/scripts/actions/mobskills/nimble_snap.lua +++ b/scripts/actions/mobskills/nimble_snap.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/nullifying_dropkick.lua b/scripts/actions/mobskills/nullifying_dropkick.lua index e165ad064bf..c5abf9f2da7 100644 --- a/scripts/actions/mobskills/nullifying_dropkick.lua +++ b/scripts/actions/mobskills/nullifying_dropkick.lua @@ -21,8 +21,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.0 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) target:delStatusEffect(xi.effect.PHYSICAL_SHIELD) diff --git a/scripts/actions/mobskills/numbshroom.lua b/scripts/actions/mobskills/numbshroom.lua index 8c2818dd6c3..4c904a1ddfa 100644 --- a/scripts/actions/mobskills/numbshroom.lua +++ b/scripts/actions/mobskills/numbshroom.lua @@ -20,8 +20,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) mob:setMobMod(xi.mobMod.VAR, 2) local numhits = 1 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.PARALYSIS, 35, 0, 180) diff --git a/scripts/actions/mobskills/oblivion_smash.lua b/scripts/actions/mobskills/oblivion_smash.lua index 1406a366e92..11afe653213 100644 --- a/scripts/actions/mobskills/oblivion_smash.lua +++ b/scripts/actions/mobskills/oblivion_smash.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 1.5, 2) + local ftp = 2.5 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 1.5, 2) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BLINDNESS, 20, 0, 120) diff --git a/scripts/actions/mobskills/oisoya.lua b/scripts/actions/mobskills/oisoya.lua index 45713b32fb3..c0fcf5e6524 100644 --- a/scripts/actions/mobskills/oisoya.lua +++ b/scripts/actions/mobskills/oisoya.lua @@ -23,9 +23,9 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 5.5 + local ftp = 5.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, 2, 2.75, 2.75, 2.75) + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, 2, 2.75, 2.75, 2.75) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/omega_javelin.lua b/scripts/actions/mobskills/omega_javelin.lua index 762330792b4..2058625c278 100644 --- a/scripts/actions/mobskills/omega_javelin.lua +++ b/scripts/actions/mobskills/omega_javelin.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.PETRIFICATION, 1, 0, 45) 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 7686b9f9cad..42e6b9934d9 100644 --- a/scripts/actions/mobskills/one-ilm_punch.lua +++ b/scripts/actions/mobskills/one-ilm_punch.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 2.5, 2.75, 3) + local ftp = 1 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 2.5, 2.75, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/onrush.lua b/scripts/actions/mobskills/onrush.lua index 78a65e5b703..61cb895ae76 100644 --- a/scripts/actions/mobskills/onrush.lua +++ b/scripts/actions/mobskills/onrush.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.5 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/onslaught.lua b/scripts/actions/mobskills/onslaught.lua index cd444fdb105..827825c0f2b 100644 --- a/scripts/actions/mobskills/onslaught.lua +++ b/scripts/actions/mobskills/onslaught.lua @@ -15,9 +15,9 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 + local ftp = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 3, 3, 3) + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 3, 3, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) local duration = 60 diff --git a/scripts/actions/mobskills/ore_toss.lua b/scripts/actions/mobskills/ore_toss.lua index 6705773da8c..76e6b3ddd57 100644 --- a/scripts/actions/mobskills/ore_toss.lua +++ b/scripts/actions/mobskills/ore_toss.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.RANGED, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.NUMSHADOWS_1) target:takeDamage(dmg, mob, xi.attackType.RANGED, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/overthrow.lua b/scripts/actions/mobskills/overthrow.lua index 3907b35d6b9..e465062125d 100644 --- a/scripts/actions/mobskills/overthrow.lua +++ b/scripts/actions/mobskills/overthrow.lua @@ -21,8 +21,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.HTH) return dmg diff --git a/scripts/actions/mobskills/painful_whip.lua b/scripts/actions/mobskills/painful_whip.lua index 147831d4154..551385a70a3 100644 --- a/scripts/actions/mobskills/painful_whip.lua +++ b/scripts/actions/mobskills/painful_whip.lua @@ -11,9 +11,9 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 - local dmgmod = 2.5 + local ftp = 2.5 local accmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/palsynyxis.lua b/scripts/actions/mobskills/palsynyxis.lua index 8fe9e6e589e..f60d964bdc1 100644 --- a/scripts/actions/mobskills/palsynyxis.lua +++ b/scripts/actions/mobskills/palsynyxis.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = math.random(1, 2) - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + local ftp = math.random(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) 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 c35741e1a92..141abfdf870 100644 --- a/scripts/actions/mobskills/pandemic_nip.lua +++ b/scripts/actions/mobskills/pandemic_nip.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 2 - local dmgmod = 3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/panzerfaust.lua b/scripts/actions/mobskills/panzerfaust.lua index 01ee58597e2..1e5a5e12eef 100644 --- a/scripts/actions/mobskills/panzerfaust.lua +++ b/scripts/actions/mobskills/panzerfaust.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 2 local accmod = 1 - local dmgmod = 1.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/panzerschreck.lua b/scripts/actions/mobskills/panzerschreck.lua index 214363d81ff..8a5686de2e8 100644 --- a/scripts/actions/mobskills/panzerschreck.lua +++ b/scripts/actions/mobskills/panzerschreck.lua @@ -11,8 +11,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/peacebreaker.lua b/scripts/actions/mobskills/peacebreaker.lua index cf2327235ff..5f64177f778 100644 --- a/scripts/actions/mobskills/peacebreaker.lua +++ b/scripts/actions/mobskills/peacebreaker.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.0 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, info.hitslanded) -- TODO: This should be Increases Magic Damage Taken, but this was faster/easier diff --git a/scripts/actions/mobskills/pecking_flurry.lua b/scripts/actions/mobskills/pecking_flurry.lua index e2154a4d802..84490869768 100644 --- a/scripts/actions/mobskills/pecking_flurry.lua +++ b/scripts/actions/mobskills/pecking_flurry.lua @@ -11,8 +11,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 4 local accmod = 1 - local dmgmod = 0.75 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/pelagic_tempest.lua b/scripts/actions/mobskills/pelagic_tempest.lua index 7f40f6513cf..498a5c7bc5d 100644 --- a/scripts/actions/mobskills/pelagic_tempest.lua +++ b/scripts/actions/mobskills/pelagic_tempest.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 2 - local dmgmod = 3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) 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 eec673e0b3d..4e2cf11c2d7 100644 --- a/scripts/actions/mobskills/penta_thrust.lua +++ b/scripts/actions/mobskills/penta_thrust.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 5 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, 1, 1, 1, 1) + local ftp = 1 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, 1, 1, 1, 1) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/percussive_foin.lua b/scripts/actions/mobskills/percussive_foin.lua index adae7f2d8f4..adf8eea3aac 100644 --- a/scripts/actions/mobskills/percussive_foin.lua +++ b/scripts/actions/mobskills/percussive_foin.lua @@ -20,8 +20,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/phantasmal_dance.lua b/scripts/actions/mobskills/phantasmal_dance.lua index ff432043912..8f810c0d058 100644 --- a/scripts/actions/mobskills/phantasmal_dance.lua +++ b/scripts/actions/mobskills/phantasmal_dance.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BIND, 1, 0, 30) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/phase_shift_1.lua b/scripts/actions/mobskills/phase_shift_1.lua index 0317f81d730..7af5da82a11 100644 --- a/scripts/actions/mobskills/phase_shift_1.lua +++ b/scripts/actions/mobskills/phase_shift_1.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 3, 3, 3) + local ftp = 3 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 3, 3, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/phase_shift_2.lua b/scripts/actions/mobskills/phase_shift_2.lua index a2a89b91cf4..859e8ce5087 100644 --- a/scripts/actions/mobskills/phase_shift_2.lua +++ b/scripts/actions/mobskills/phase_shift_2.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 3.5, 3.5, 3.5) + local ftp = 5 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 3.5, 3.5, 3.5) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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, 15) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/phase_shift_3.lua b/scripts/actions/mobskills/phase_shift_3.lua index afdbd9fa9f7..703301ef248 100644 --- a/scripts/actions/mobskills/phase_shift_3.lua +++ b/scripts/actions/mobskills/phase_shift_3.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 7 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 4, 4, 4) + local ftp = 7 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 4, 4, 4) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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, 15) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BIND, 1, 0, 30) diff --git a/scripts/actions/mobskills/pinecone_bomb.lua b/scripts/actions/mobskills/pinecone_bomb.lua index eeae550b844..a713fb9ebd2 100644 --- a/scripts/actions/mobskills/pinecone_bomb.lua +++ b/scripts/actions/mobskills/pinecone_bomb.lua @@ -12,15 +12,15 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 - local accmod = 1 - local dmgmod + local accmod = 1 + local ftp = 1 if mob:getPool() == 671 or mob:getPool() == 1346 then -- Cemetery Cherry and leafless Jidra - dmgmod = 3 + ftp = 3 else - dmgmod = 2.3 + ftp = 2.3 end - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/pinning_shot.lua b/scripts/actions/mobskills/pinning_shot.lua index 984b85c8a31..641efa20058 100644 --- a/scripts/actions/mobskills/pinning_shot.lua +++ b/scripts/actions/mobskills/pinning_shot.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = math.random(2, 3) local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) 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 0fb9230a709..907bb3c524e 100755 --- a/scripts/actions/mobskills/pirate_pummel.lua +++ b/scripts/actions/mobskills/pirate_pummel.lua @@ -15,8 +15,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) -- TODO: verify exact number of hits from this ability local numhits = 2 local accmod = 1 - local dmgmod = 0.3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, mob:getWeaponDmg() * dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) 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 a402f629655..960a4a07b01 100644 --- a/scripts/actions/mobskills/pit_ambush.lua +++ b/scripts/actions/mobskills/pit_ambush.lua @@ -19,8 +19,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3.3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + local ftp = 3.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, xi.mobskills.shadowBehavior.WIPE_SHADOWS) mob:setLocalVar('AMBUSH', 1) -- Used it for the last time! diff --git a/scripts/actions/mobskills/pl_body_slam.lua b/scripts/actions/mobskills/pl_body_slam.lua index d69cfa83db2..871fa5c7350 100644 --- a/scripts/actions/mobskills/pl_body_slam.lua +++ b/scripts/actions/mobskills/pl_body_slam.lua @@ -19,8 +19,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 1 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/pl_heavy_stomp.lua b/scripts/actions/mobskills/pl_heavy_stomp.lua index 5c637e4abf0..a284923f0d2 100644 --- a/scripts/actions/mobskills/pl_heavy_stomp.lua +++ b/scripts/actions/mobskills/pl_heavy_stomp.lua @@ -23,8 +23,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = math.random(2, 3) local accmod = 1 - local dmgmod = .7 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.PARALYSIS, 15, 0, 360) diff --git a/scripts/actions/mobskills/pl_hellclap.lua b/scripts/actions/mobskills/pl_hellclap.lua index 4023482e439..b784de9bc3f 100644 --- a/scripts/actions/mobskills/pl_hellclap.lua +++ b/scripts/actions/mobskills/pl_hellclap.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 10 - local dmgmod = 4.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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)) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BIND, 1, 0, 4) diff --git a/scripts/actions/mobskills/pl_hellsnap.lua b/scripts/actions/mobskills/pl_hellsnap.lua index dfff4848e78..fbe285d81b5 100644 --- a/scripts/actions/mobskills/pl_hellsnap.lua +++ b/scripts/actions/mobskills/pl_hellsnap.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 10 - local dmgmod = 4.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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)) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/pl_tidal_slash.lua b/scripts/actions/mobskills/pl_tidal_slash.lua index 75dbb90cf1c..af88adc21cf 100644 --- a/scripts/actions/mobskills/pl_tidal_slash.lua +++ b/scripts/actions/mobskills/pl_tidal_slash.lua @@ -25,8 +25,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/plague_swipe.lua b/scripts/actions/mobskills/plague_swipe.lua index 7955a2f9e10..bbb894d1499 100644 --- a/scripts/actions/mobskills/plague_swipe.lua +++ b/scripts/actions/mobskills/plague_swipe.lua @@ -21,8 +21,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BIO, 7, 3, 60) diff --git a/scripts/actions/mobskills/poison_nails.lua b/scripts/actions/mobskills/poison_nails.lua index ee9e21bdddb..fa38be94cd2 100644 --- a/scripts/actions/mobskills/poison_nails.lua +++ b/scripts/actions/mobskills/poison_nails.lua @@ -11,8 +11,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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 2a0122d003b..8f1717a4a42 100644 --- a/scripts/actions/mobskills/poison_pick.lua +++ b/scripts/actions/mobskills/poison_pick.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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 power = mob:getMainLvl() / 5 + 3 diff --git a/scripts/actions/mobskills/poison_sting.lua b/scripts/actions/mobskills/poison_sting.lua index bdee3b59f54..d80d015f3b5 100644 --- a/scripts/actions/mobskills/poison_sting.lua +++ b/scripts/actions/mobskills/poison_sting.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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 power = mob:getMainLvl() / 10 + 3 diff --git a/scripts/actions/mobskills/pole_swing.lua b/scripts/actions/mobskills/pole_swing.lua index c245a779f73..606aca28d7a 100644 --- a/scripts/actions/mobskills/pole_swing.lua +++ b/scripts/actions/mobskills/pole_swing.lua @@ -24,8 +24,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/potent_lunge.lua b/scripts/actions/mobskills/potent_lunge.lua index 16c6ee6263c..f0e270e04b9 100644 --- a/scripts/actions/mobskills/potent_lunge.lua +++ b/scripts/actions/mobskills/potent_lunge.lua @@ -20,8 +20,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/pounce.lua b/scripts/actions/mobskills/pounce.lua index 4ac11c769e7..455b0b867be 100644 --- a/scripts/actions/mobskills/pounce.lua +++ b/scripts/actions/mobskills/pounce.lua @@ -11,8 +11,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.4 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.4 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/powder_keg.lua b/scripts/actions/mobskills/powder_keg.lua index 35eac6b3340..93c5dce7896 100755 --- a/scripts/actions/mobskills/powder_keg.lua +++ b/scripts/actions/mobskills/powder_keg.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 2 - local dmgmod = 0.3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, mob:getWeaponDmg() * dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.DEFENSE_DOWN, 20, 0, 60) diff --git a/scripts/actions/mobskills/power_attack.lua b/scripts/actions/mobskills/power_attack.lua index 0f3eb75500c..8990fce861e 100644 --- a/scripts/actions/mobskills/power_attack.lua +++ b/scripts/actions/mobskills/power_attack.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.8 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/power_attack_beetle.lua b/scripts/actions/mobskills/power_attack_beetle.lua index 49e16ded036..b5353bfd4c2 100644 --- a/scripts/actions/mobskills/power_attack_beetle.lua +++ b/scripts/actions/mobskills/power_attack_beetle.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.8 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/power_attack_weapon.lua b/scripts/actions/mobskills/power_attack_weapon.lua index 7cd0fee1214..dad05ee62ff 100644 --- a/scripts/actions/mobskills/power_attack_weapon.lua +++ b/scripts/actions/mobskills/power_attack_weapon.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 3 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/power_slash.lua b/scripts/actions/mobskills/power_slash.lua index a7229986774..2889253516d 100644 --- a/scripts/actions/mobskills/power_slash.lua +++ b/scripts/actions/mobskills/power_slash.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/predator_claws.lua b/scripts/actions/mobskills/predator_claws.lua index d8cd99b0aa6..43cf07d4b2c 100644 --- a/scripts/actions/mobskills/predator_claws.lua +++ b/scripts/actions/mobskills/predator_claws.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 2 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.ACC_VARIES, 1, 2, 3) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/primal_drill.lua b/scripts/actions/mobskills/primal_drill.lua index ae3970ce5e4..b652d1a321e 100644 --- a/scripts/actions/mobskills/primal_drill.lua +++ b/scripts/actions/mobskills/primal_drill.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = math.random(2, 3) local accmod = 1 - local dmgmod = .8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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.PIERCING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BIND, 1, 0, 45) diff --git a/scripts/actions/mobskills/punch.lua b/scripts/actions/mobskills/punch.lua index 32aeeaf8e4c..1ce15a03abe 100644 --- a/scripts/actions/mobskills/punch.lua +++ b/scripts/actions/mobskills/punch.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT, 1, 2, 3) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/pw_calcifying_deluge.lua b/scripts/actions/mobskills/pw_calcifying_deluge.lua index d0985fe2bc5..f428e22d39d 100644 --- a/scripts/actions/mobskills/pw_calcifying_deluge.lua +++ b/scripts/actions/mobskills/pw_calcifying_deluge.lua @@ -23,8 +23,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.PETRIFICATION, 1, 0, 30) diff --git a/scripts/actions/mobskills/pw_groundburst.lua b/scripts/actions/mobskills/pw_groundburst.lua index f07bcedc552..2f5f83617ea 100644 --- a/scripts/actions/mobskills/pw_groundburst.lua +++ b/scripts/actions/mobskills/pw_groundburst.lua @@ -23,8 +23,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/pw_pinning_shot.lua b/scripts/actions/mobskills/pw_pinning_shot.lua index e6a1977a092..f5a8174458b 100644 --- a/scripts/actions/mobskills/pw_pinning_shot.lua +++ b/scripts/actions/mobskills/pw_pinning_shot.lua @@ -23,8 +23,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = math.random(2, 3) local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BIND, 1, 0, 30) diff --git a/scripts/actions/mobskills/pw_rushing_slash.lua b/scripts/actions/mobskills/pw_rushing_slash.lua index fbb0665b038..4cd2fc3a484 100644 --- a/scripts/actions/mobskills/pw_rushing_slash.lua +++ b/scripts/actions/mobskills/pw_rushing_slash.lua @@ -23,8 +23,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 4 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/pw_shadow_thrust.lua b/scripts/actions/mobskills/pw_shadow_thrust.lua index 15976b75bec..ae15ce111c6 100644 --- a/scripts/actions/mobskills/pw_shadow_thrust.lua +++ b/scripts/actions/mobskills/pw_shadow_thrust.lua @@ -23,8 +23,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) return dmg diff --git a/scripts/actions/mobskills/quadrastrike.lua b/scripts/actions/mobskills/quadrastrike.lua index fdc08175609..51d1ed5a7d1 100644 --- a/scripts/actions/mobskills/quadrastrike.lua +++ b/scripts/actions/mobskills/quadrastrike.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 4 local accmod = 1 - local dmgmod = 1.3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 1.2, 1.5) + local ftp = 1.3 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 1.2, 1.5) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/quadratic_continuum.lua b/scripts/actions/mobskills/quadratic_continuum.lua index 12ab8a3cf40..d90ce437286 100644 --- a/scripts/actions/mobskills/quadratic_continuum.lua +++ b/scripts/actions/mobskills/quadratic_continuum.lua @@ -11,8 +11,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 4 local accmod = 1 - local dmgmod = 1.1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 1.5, 2) + local ftp = 1.1 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 1.5, 2) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/queasyshroom.lua b/scripts/actions/mobskills/queasyshroom.lua index a801174c0b1..d961f6b5fd6 100644 --- a/scripts/actions/mobskills/queasyshroom.lua +++ b/scripts/actions/mobskills/queasyshroom.lua @@ -23,8 +23,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) mob:setMobMod(xi.mobMod.VAR, 1) local numhits = 1 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, xi.mobskills.shadowBehavior.WIPE_SHADOWS) local power = mob:getMainLvl() / 4 + 1 diff --git a/scripts/actions/mobskills/radiant_sacrament.lua b/scripts/actions/mobskills/radiant_sacrament.lua index 777d70366e3..3982d6a8769 100644 --- a/scripts/actions/mobskills/radiant_sacrament.lua +++ b/scripts/actions/mobskills/radiant_sacrament.lua @@ -19,8 +19,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 5 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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 5f9af0da33b..2ee1055f42c 100644 --- a/scripts/actions/mobskills/raging_rush.lua +++ b/scripts/actions/mobskills/raging_rush.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.ACC_VARIES, 1, 2, 3) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/ram_charge.lua b/scripts/actions/mobskills/ram_charge.lua index 580bfd154a3..f33751f7cfe 100644 --- a/scripts/actions/mobskills/ram_charge.lua +++ b/scripts/actions/mobskills/ram_charge.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.3 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/rampage.lua b/scripts/actions/mobskills/rampage.lua index 63e89068c70..c29d336b238 100644 --- a/scripts/actions/mobskills/rampage.lua +++ b/scripts/actions/mobskills/rampage.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 5 local accmod = 1 - local dmgmod = 1.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1, 1.5, 2) + 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) -- Witnessed 1100 to a DD. Going with it :D diff --git a/scripts/actions/mobskills/rampant_gnaw.lua b/scripts/actions/mobskills/rampant_gnaw.lua index 1f804e43dfe..0c7b28ce6fe 100644 --- a/scripts/actions/mobskills/rampant_gnaw.lua +++ b/scripts/actions/mobskills/rampant_gnaw.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.4 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) diff --git a/scripts/actions/mobskills/randgrith.lua b/scripts/actions/mobskills/randgrith.lua index 5c3c31afcac..5ff41c3dc65 100644 --- a/scripts/actions/mobskills/randgrith.lua +++ b/scripts/actions/mobskills/randgrith.lua @@ -15,9 +15,9 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 + local ftp = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 3, 3, 3) + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 3, 3, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/razor_fang.lua b/scripts/actions/mobskills/razor_fang.lua index 44a03a7974a..9144ee71272 100644 --- a/scripts/actions/mobskills/razor_fang.lua +++ b/scripts/actions/mobskills/razor_fang.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 2 local accmod = 1 - local dmgmod = 1.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) return dmg diff --git a/scripts/actions/mobskills/reactor_overheat.lua b/scripts/actions/mobskills/reactor_overheat.lua index a624de21a41..7e8892a2546 100644 --- a/scripts/actions/mobskills/reactor_overheat.lua +++ b/scripts/actions/mobskills/reactor_overheat.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 2 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, 0, 1, 2, 3) + local ftp = 1 + 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.MAGICAL, xi.damageType.FIRE, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.PLAGUE, 1, 0, 60) diff --git a/scripts/actions/mobskills/reactor_overload.lua b/scripts/actions/mobskills/reactor_overload.lua index 841743efafa..dbbdc78ec2a 100644 --- a/scripts/actions/mobskills/reactor_overload.lua +++ b/scripts/actions/mobskills/reactor_overload.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 2 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, 0, 1, 2, 3) + local ftp = 1 + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.SILENCE, 1, 0, 60) diff --git a/scripts/actions/mobskills/recoil_dive.lua b/scripts/actions/mobskills/recoil_dive.lua index 6723806211a..472479a02b1 100644 --- a/scripts/actions/mobskills/recoil_dive.lua +++ b/scripts/actions/mobskills/recoil_dive.lua @@ -11,8 +11,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1, 2, 3) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/rhino_attack.lua b/scripts/actions/mobskills/rhino_attack.lua index 8f28533996b..a65eca75de6 100644 --- a/scripts/actions/mobskills/rhino_attack.lua +++ b/scripts/actions/mobskills/rhino_attack.lua @@ -15,8 +15,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/ripper_fang.lua b/scripts/actions/mobskills/ripper_fang.lua index 0f2fdbd88da..e2d2c8a9657 100644 --- a/scripts/actions/mobskills/ripper_fang.lua +++ b/scripts/actions/mobskills/ripper_fang.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.ATK_VARIES, 1.3, 1.3, 1.3) + 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) 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 1019403caf7..5eff5ce0203 100644 --- a/scripts/actions/mobskills/rock_smash.lua +++ b/scripts/actions/mobskills/rock_smash.lua @@ -30,8 +30,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 2 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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 power = math.random(25, 40) + mob:getMainLvl() / 3 diff --git a/scripts/actions/mobskills/rock_throw.lua b/scripts/actions/mobskills/rock_throw.lua index d5556da269e..bc87e2dbff3 100644 --- a/scripts/actions/mobskills/rock_throw.lua +++ b/scripts/actions/mobskills/rock_throw.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT, 1, 2, 3) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/royal_bash.lua b/scripts/actions/mobskills/royal_bash.lua index a9329fa2801..34c1b483df7 100644 --- a/scripts/actions/mobskills/royal_bash.lua +++ b/scripts/actions/mobskills/royal_bash.lua @@ -11,8 +11,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1.2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 1.2 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/rush.lua b/scripts/actions/mobskills/rush.lua index 9b9e9a1c1e6..a9c7b09b594 100644 --- a/scripts/actions/mobskills/rush.lua +++ b/scripts/actions/mobskills/rush.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 5 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT, 1, 2, 3) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/rushing_drub.lua b/scripts/actions/mobskills/rushing_drub.lua index 7cac20800df..39507e27e95 100644 --- a/scripts/actions/mobskills/rushing_drub.lua +++ b/scripts/actions/mobskills/rushing_drub.lua @@ -24,8 +24,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 4 local accmod = 1 - local dmgmod = 0.75 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/rushing_slash.lua b/scripts/actions/mobskills/rushing_slash.lua index cfd77883ae9..c46f71920ac 100644 --- a/scripts/actions/mobskills/rushing_slash.lua +++ b/scripts/actions/mobskills/rushing_slash.lua @@ -21,8 +21,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 4 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/rushing_stab.lua b/scripts/actions/mobskills/rushing_stab.lua index a1f94de528c..9caac6fa7c9 100644 --- a/scripts/actions/mobskills/rushing_stab.lua +++ b/scripts/actions/mobskills/rushing_stab.lua @@ -21,8 +21,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 4 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) return dmg diff --git a/scripts/actions/mobskills/saucepan.lua b/scripts/actions/mobskills/saucepan.lua index 5356b27f218..265d64ad77f 100644 --- a/scripts/actions/mobskills/saucepan.lua +++ b/scripts/actions/mobskills/saucepan.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 0.8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) if target:hasStatusEffect(xi.effect.FOOD) then target:delStatusEffectSilent(xi.effect.FOOD) diff --git a/scripts/actions/mobskills/savage_blade.lua b/scripts/actions/mobskills/savage_blade.lua index cdfd87d6fa8..c0a0ec2a63e 100644 --- a/scripts/actions/mobskills/savage_blade.lua +++ b/scripts/actions/mobskills/savage_blade.lua @@ -24,8 +24,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 2 local accmod = 1 - local dmgmod = 2.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1.1, 1.2, 1.3) + local ftp = 2.0 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_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) -- AA EV: Approx 900 damage to 75 DRG/35 THF. 400 to a NIN/WAR in Arhat, but took shadows. diff --git a/scripts/actions/mobskills/scission_thrust.lua b/scripts/actions/mobskills/scission_thrust.lua index 8d7c8657477..a82c5f08425 100644 --- a/scripts/actions/mobskills/scission_thrust.lua +++ b/scripts/actions/mobskills/scission_thrust.lua @@ -20,8 +20,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/scorching_lash.lua b/scripts/actions/mobskills/scorching_lash.lua index c3bb9086e89..e3b1bc4a627 100644 --- a/scripts/actions/mobskills/scorching_lash.lua +++ b/scripts/actions/mobskills/scorching_lash.lua @@ -31,8 +31,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 1.3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/scourge.lua b/scripts/actions/mobskills/scourge.lua index 692c312b100..65857e0a2b2 100644 --- a/scripts/actions/mobskills/scourge.lua +++ b/scripts/actions/mobskills/scourge.lua @@ -14,9 +14,9 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 + local ftp = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 3, 3, 3) + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 3, 3, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/scratch.lua b/scripts/actions/mobskills/scratch.lua index 79d158a92c5..03af87c4e31 100644 --- a/scripts/actions/mobskills/scratch.lua +++ b/scripts/actions/mobskills/scratch.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.4 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BLINDNESS, 18, 0, 120) diff --git a/scripts/actions/mobskills/screwdriver.lua b/scripts/actions/mobskills/screwdriver.lua index 8962015cb26..f73210a891c 100644 --- a/scripts/actions/mobskills/screwdriver.lua +++ b/scripts/actions/mobskills/screwdriver.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = math.random(2, 3) - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1, 2, 3) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/scythe_tail.lua b/scripts/actions/mobskills/scythe_tail.lua index b1ce9e4e4f1..46ea47706e0 100644 --- a/scripts/actions/mobskills/scythe_tail.lua +++ b/scripts/actions/mobskills/scythe_tail.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/seedspray.lua b/scripts/actions/mobskills/seedspray.lua index c8cca5dbf14..7b99cfa0240 100644 --- a/scripts/actions/mobskills/seedspray.lua +++ b/scripts/actions/mobskills/seedspray.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT, 1, 1.5, 2) + 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) 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 cda617a4a8b..be85f1d5a58 100644 --- a/scripts/actions/mobskills/seismic_tail.lua +++ b/scripts/actions/mobskills/seismic_tail.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, 1, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/seismostomp.lua b/scripts/actions/mobskills/seismostomp.lua index 929b6c0e634..70e1efd8270 100644 --- a/scripts/actions/mobskills/seismostomp.lua +++ b/scripts/actions/mobskills/seismostomp.lua @@ -13,13 +13,13 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.3 + local ftp = 2.3 if mob:isMobType(xi.mobType.NOTORIOUS) then - dmgmod = dmgmod + math.random() + ftp = ftp + math.random() end - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES) + 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) diff --git a/scripts/actions/mobskills/serpentine_tail.lua b/scripts/actions/mobskills/serpentine_tail.lua index 3aedfddd2bf..7de8f5818bc 100644 --- a/scripts/actions/mobskills/serpentine_tail.lua +++ b/scripts/actions/mobskills/serpentine_tail.lua @@ -32,8 +32,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 4.25 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 2, 3, 4) + local ftp = 4.25 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 2, 3, 4) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/severing_fang.lua b/scripts/actions/mobskills/severing_fang.lua index 45d0619189e..5696239b9d1 100644 --- a/scripts/actions/mobskills/severing_fang.lua +++ b/scripts/actions/mobskills/severing_fang.lua @@ -22,8 +22,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 2 local accmod = 1 - local dmgmod = 1.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) 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 cf228b74b95..28b12b6c104 100644 --- a/scripts/actions/mobskills/shackled_fists.lua +++ b/scripts/actions/mobskills/shackled_fists.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 5 local accmod = 1 - local dmgmod = 1.4 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + local ftp = 1.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.HTH, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.HTH) return dmg diff --git a/scripts/actions/mobskills/shadow_claw.lua b/scripts/actions/mobskills/shadow_claw.lua index f7474ffc8e9..fd48bbca3aa 100644 --- a/scripts/actions/mobskills/shadow_claw.lua +++ b/scripts/actions/mobskills/shadow_claw.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.7 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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.SLASHING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BLINDNESS, 20, 0, 120) diff --git a/scripts/actions/mobskills/shadow_thrust.lua b/scripts/actions/mobskills/shadow_thrust.lua index 7125d78d251..72403f00184 100644 --- a/scripts/actions/mobskills/shadow_thrust.lua +++ b/scripts/actions/mobskills/shadow_thrust.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.PIERCING) return dmg diff --git a/scripts/actions/mobskills/shadowstitch.lua b/scripts/actions/mobskills/shadowstitch.lua index 8af0402754b..ad0c0166cdb 100644 --- a/scripts/actions/mobskills/shadowstitch.lua +++ b/scripts/actions/mobskills/shadowstitch.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, 2, 1, 1, 1) + local ftp = 1 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, 2, 1, 1, 1) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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 fe95a7348f2..7312d3dd40c 100644 --- a/scripts/actions/mobskills/shakeshroom.lua +++ b/scripts/actions/mobskills/shakeshroom.lua @@ -20,8 +20,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) mob:setMobMod(xi.mobMod.VAR, 3) local numhits = 1 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.PIERCING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.DISEASE, 1, 0, 180) diff --git a/scripts/actions/mobskills/sharp_sting.lua b/scripts/actions/mobskills/sharp_sting.lua index e0eac0cb605..c368a53b377 100644 --- a/scripts/actions/mobskills/sharp_sting.lua +++ b/scripts/actions/mobskills/sharp_sting.lua @@ -18,7 +18,7 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 0.7 local dmgmod = 2.5 - local info = xi.mobskills.mobRangedMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES) + 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) target:takeDamage(dmg, mob, xi.attackType.RANGED, xi.damageType.PIERCING) return dmg diff --git a/scripts/actions/mobskills/sheep_charge.lua b/scripts/actions/mobskills/sheep_charge.lua index 76f22bc3ce5..afd108ac777 100644 --- a/scripts/actions/mobskills/sheep_charge.lua +++ b/scripts/actions/mobskills/sheep_charge.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/sheep_charge_melee.lua b/scripts/actions/mobskills/sheep_charge_melee.lua index f0abb74ce9a..8cdc34939e5 100644 --- a/scripts/actions/mobskills/sheep_charge_melee.lua +++ b/scripts/actions/mobskills/sheep_charge_melee.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/shell_bash.lua b/scripts/actions/mobskills/shell_bash.lua index 3fa1f290046..9ac0932cc1e 100644 --- a/scripts/actions/mobskills/shell_bash.lua +++ b/scripts/actions/mobskills/shell_bash.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.4 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) 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 902d71a00c7..a6f76db5cb0 100644 --- a/scripts/actions/mobskills/shibaraku.lua +++ b/scripts/actions/mobskills/shibaraku.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) 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 e5abbe351ec..c29f47a3547 100644 --- a/scripts/actions/mobskills/shield_bash.lua +++ b/scripts/actions/mobskills/shield_bash.lua @@ -14,9 +14,9 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 8 + local ftp = 8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 2, 2, 2) + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 2, 2, 2) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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 3b781c6cc38..199e2e2daf5 100644 --- a/scripts/actions/mobskills/shield_strike.lua +++ b/scripts/actions/mobskills/shield_strike.lua @@ -18,8 +18,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 0.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/shock_strike.lua b/scripts/actions/mobskills/shock_strike.lua index 23ff7950d6e..3c79e04238e 100644 --- a/scripts/actions/mobskills/shock_strike.lua +++ b/scripts/actions/mobskills/shock_strike.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT, 1, 2, 3) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/shoulder_attack.lua b/scripts/actions/mobskills/shoulder_attack.lua index 5fbe93186b3..db679f35ecb 100644 --- a/scripts/actions/mobskills/shoulder_attack.lua +++ b/scripts/actions/mobskills/shoulder_attack.lua @@ -13,8 +13,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) -- KNOCKBACK local numhits = 1 local accmod = 1 - local dmgmod = 2.4 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.4 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/shoulder_slam.lua b/scripts/actions/mobskills/shoulder_slam.lua index c412b5c3dd5..98f5e01d2d2 100644 --- a/scripts/actions/mobskills/shoulder_slam.lua +++ b/scripts/actions/mobskills/shoulder_slam.lua @@ -13,8 +13,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) -- KNOCKBACK local numhits = 1 local accmod = 1 - local dmgmod = 2.8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.8 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/sickle_moon.lua b/scripts/actions/mobskills/sickle_moon.lua index 0926b419a86..d456b5de787 100644 --- a/scripts/actions/mobskills/sickle_moon.lua +++ b/scripts/actions/mobskills/sickle_moon.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 2 local accmod = 4 - local dmgmod = 4 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1.5, 2, 2.75) + local ftp = 4 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1.5, 2, 2.75) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/sickle_slash.lua b/scripts/actions/mobskills/sickle_slash.lua index b39edf1d8f5..4d6f62127cf 100644 --- a/scripts/actions/mobskills/sickle_slash.lua +++ b/scripts/actions/mobskills/sickle_slash.lua @@ -24,8 +24,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = math.random(2, 4) + math.random() - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1, 1.5, 2) + local ftp = math.random(2, 4) + math.random() + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/sideswipe.lua b/scripts/actions/mobskills/sideswipe.lua index 290bbc76b08..5749d5a13e6 100644 --- a/scripts/actions/mobskills/sideswipe.lua +++ b/scripts/actions/mobskills/sideswipe.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/sidewinder.lua b/scripts/actions/mobskills/sidewinder.lua index 7ea2fa71744..73a1d61c866 100644 --- a/scripts/actions/mobskills/sidewinder.lua +++ b/scripts/actions/mobskills/sidewinder.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 5.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.RANGED, xi.damageType.PIERCING) return dmg diff --git a/scripts/actions/mobskills/sinuate_rush.lua b/scripts/actions/mobskills/sinuate_rush.lua index 15187a3a63b..e08cabdd151 100644 --- a/scripts/actions/mobskills/sinuate_rush.lua +++ b/scripts/actions/mobskills/sinuate_rush.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/skewer.lua b/scripts/actions/mobskills/skewer.lua index 301be41c928..451775d08cd 100644 --- a/scripts/actions/mobskills/skewer.lua +++ b/scripts/actions/mobskills/skewer.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, 3, 1, 1, 1) + local ftp = 1 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, 3, 1, 1, 1) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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 6973c5fb94b..1407cf3f59f 100644 --- a/scripts/actions/mobskills/skullbreaker.lua +++ b/scripts/actions/mobskills/skullbreaker.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT, 1.1, 1.2, 1.3) + 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) if math.random(1, 100) < skill:getTP() / 3 then diff --git a/scripts/actions/mobskills/slam_dunk.lua b/scripts/actions/mobskills/slam_dunk.lua index 674d42f1045..5bf63411542 100644 --- a/scripts/actions/mobskills/slam_dunk.lua +++ b/scripts/actions/mobskills/slam_dunk.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.4 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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.HTH, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BIND, 1, 0, 20) diff --git a/scripts/actions/mobskills/sledgehammer.lua b/scripts/actions/mobskills/sledgehammer.lua index 3ffdd0d3fe8..50db93cc106 100644 --- a/scripts/actions/mobskills/sledgehammer.lua +++ b/scripts/actions/mobskills/sledgehammer.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3.2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.PETRIFICATION, 1, 0, 60) diff --git a/scripts/actions/mobskills/sling_bomb.lua b/scripts/actions/mobskills/sling_bomb.lua index 11147d96520..d91f5cff05b 100644 --- a/scripts/actions/mobskills/sling_bomb.lua +++ b/scripts/actions/mobskills/sling_bomb.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.6 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + local ftp = 2.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.BLUNT, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/smite_of_rage.lua b/scripts/actions/mobskills/smite_of_rage.lua index 937f996c990..8d1a19ace64 100644 --- a/scripts/actions/mobskills/smite_of_rage.lua +++ b/scripts/actions/mobskills/smite_of_rage.lua @@ -12,9 +12,9 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3 + local ftp = 3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/somersault.lua b/scripts/actions/mobskills/somersault.lua index bdcf63c6194..95691feaa64 100644 --- a/scripts/actions/mobskills/somersault.lua +++ b/scripts/actions/mobskills/somersault.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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, xi.mobskills.shadowBehavior.NUMSHADOWS_1) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/somersault_kick.lua b/scripts/actions/mobskills/somersault_kick.lua index cf8bd602cfc..41f57248cbe 100644 --- a/scripts/actions/mobskills/somersault_kick.lua +++ b/scripts/actions/mobskills/somersault_kick.lua @@ -26,8 +26,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/sonic_blade.lua b/scripts/actions/mobskills/sonic_blade.lua index 23bc52e0034..c4e0dbd7b9e 100644 --- a/scripts/actions/mobskills/sonic_blade.lua +++ b/scripts/actions/mobskills/sonic_blade.lua @@ -20,8 +20,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/spike_flail.lua b/scripts/actions/mobskills/spike_flail.lua index 2b6198149ad..1e239f570a4 100644 --- a/scripts/actions/mobskills/spike_flail.lua +++ b/scripts/actions/mobskills/spike_flail.lua @@ -26,8 +26,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 4 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 2, 3, 4) + local ftp = 4 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 2, 3, 4) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/spikeball.lua b/scripts/actions/mobskills/spikeball.lua index 00819894956..bf7538a4413 100644 --- a/scripts/actions/mobskills/spikeball.lua +++ b/scripts/actions/mobskills/spikeball.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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.RANGED, xi.damageType.PIERCING, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.RANGED, xi.damageType.PIERCING) diff --git a/scripts/actions/mobskills/spinal_cleave.lua b/scripts/actions/mobskills/spinal_cleave.lua index 20dd1cc3da2..5dfdba27e47 100644 --- a/scripts/actions/mobskills/spinal_cleave.lua +++ b/scripts/actions/mobskills/spinal_cleave.lua @@ -21,8 +21,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 3 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.CRIT_VARIES) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/spine_lash.lua b/scripts/actions/mobskills/spine_lash.lua index 72a7ad68706..557ed3b50fa 100644 --- a/scripts/actions/mobskills/spine_lash.lua +++ b/scripts/actions/mobskills/spine_lash.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, 0, 1, 2, 3) + local ftp = 1 + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.PLAGUE, 1, 0, 60) diff --git a/scripts/actions/mobskills/spinning_attack.lua b/scripts/actions/mobskills/spinning_attack.lua index 864195b612a..ffd049983fe 100644 --- a/scripts/actions/mobskills/spinning_attack.lua +++ b/scripts/actions/mobskills/spinning_attack.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.6 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + local ftp = 2.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.BLUNT, xi.mobskills.shadowBehavior.NUMSHADOWS_3) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) return dmg diff --git a/scripts/actions/mobskills/spinning_claw.lua b/scripts/actions/mobskills/spinning_claw.lua index 7294cfb3595..ceadb507795 100644 --- a/scripts/actions/mobskills/spinning_claw.lua +++ b/scripts/actions/mobskills/spinning_claw.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/spinning_dive.lua b/scripts/actions/mobskills/spinning_dive.lua index 6a4704d7c00..45337f5f959 100644 --- a/scripts/actions/mobskills/spinning_dive.lua +++ b/scripts/actions/mobskills/spinning_dive.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 2 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT, 1, 2, 3) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/spinning_fin.lua b/scripts/actions/mobskills/spinning_fin.lua index 2007e8674d0..c87d56ec36c 100644 --- a/scripts/actions/mobskills/spinning_fin.lua +++ b/scripts/actions/mobskills/spinning_fin.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) 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 a302684a706..6982a747a65 100644 --- a/scripts/actions/mobskills/spinning_scythe.lua +++ b/scripts/actions/mobskills/spinning_scythe.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) -- 150-200 damage diff --git a/scripts/actions/mobskills/spinning_top.lua b/scripts/actions/mobskills/spinning_top.lua index d1f2550cc26..33a9480e476 100644 --- a/scripts/actions/mobskills/spinning_top.lua +++ b/scripts/actions/mobskills/spinning_top.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = math.random(2, 4) local accmod = 1 - local dmgmod = .8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/spiral_hell.lua b/scripts/actions/mobskills/spiral_hell.lua index 4af7045f3dc..2e2901d405f 100644 --- a/scripts/actions/mobskills/spiral_hell.lua +++ b/scripts/actions/mobskills/spiral_hell.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1.375 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, 2, 1, 1, 1) + local ftp = 1.375 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, 2, 1, 1, 1) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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 edee5202bc9..da97da83936 100644 --- a/scripts/actions/mobskills/spiral_spin.lua +++ b/scripts/actions/mobskills/spiral_spin.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 2 - local dmgmod = 3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 3 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.ACCURACY_DOWN, 50, 0, 120) diff --git a/scripts/actions/mobskills/sprout_smack.lua b/scripts/actions/mobskills/sprout_smack.lua index 534bbfbdd45..f1c62d51bcd 100644 --- a/scripts/actions/mobskills/sprout_smack.lua +++ b/scripts/actions/mobskills/sprout_smack.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.SLOW, 1000, 0, 120) diff --git a/scripts/actions/mobskills/sprout_spin.lua b/scripts/actions/mobskills/sprout_spin.lua index f14ff3c7437..6496dd26071 100644 --- a/scripts/actions/mobskills/sprout_spin.lua +++ b/scripts/actions/mobskills/sprout_spin.lua @@ -13,8 +13,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) -- Knockback local numhits = 1 local accmod = 1 - local dmgmod = 2.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.0 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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 8efc15f998d..fd0e3adb539 100644 --- a/scripts/actions/mobskills/stampede.lua +++ b/scripts/actions/mobskills/stampede.lua @@ -11,8 +11,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 2 local accmod = 1 - local dmgmod = 1.8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 1.5, 2) + local ftp = 1.8 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 1.5, 2) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/static_filament.lua b/scripts/actions/mobskills/static_filament.lua index e3d89eaac33..8e59ef21e9e 100644 --- a/scripts/actions/mobskills/static_filament.lua +++ b/scripts/actions/mobskills/static_filament.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 2 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, 0, 1, 2, 3) + local ftp = 1 + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/stave_toss.lua b/scripts/actions/mobskills/stave_toss.lua index cc5e2fa8139..c198ff6cacb 100644 --- a/scripts/actions/mobskills/stave_toss.lua +++ b/scripts/actions/mobskills/stave_toss.lua @@ -19,8 +19,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.ACC_VARIES) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/stellar_arrow.lua b/scripts/actions/mobskills/stellar_arrow.lua index ecb9b66f4da..e16bceff26a 100644 --- a/scripts/actions/mobskills/stellar_arrow.lua +++ b/scripts/actions/mobskills/stellar_arrow.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.RANGED, xi.damageType.PIERCING) return dmg diff --git a/scripts/actions/mobskills/stifling_tantara.lua b/scripts/actions/mobskills/stifling_tantara.lua index e5f6b695b5f..fa71ebcb0f2 100644 --- a/scripts/actions/mobskills/stifling_tantara.lua +++ b/scripts/actions/mobskills/stifling_tantara.lua @@ -21,8 +21,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) 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 bd3693ec95b..d1cc53f58eb 100644 --- a/scripts/actions/mobskills/stomping.lua +++ b/scripts/actions/mobskills/stomping.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 2, 3, 4) + local ftp = 2.5 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 2, 3, 4) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/stone_throw.lua b/scripts/actions/mobskills/stone_throw.lua index a83b5abb9a9..dcfca3dda54 100644 --- a/scripts/actions/mobskills/stone_throw.lua +++ b/scripts/actions/mobskills/stone_throw.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 0.8 - local dmgmod = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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.RANGED, xi.damageType.BLUNT, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.PARALYSIS, 20, 0, 60) diff --git a/scripts/actions/mobskills/sub-zero_smash.lua b/scripts/actions/mobskills/sub-zero_smash.lua index f50a28a10e0..5b296f346ae 100644 --- a/scripts/actions/mobskills/sub-zero_smash.lua +++ b/scripts/actions/mobskills/sub-zero_smash.lua @@ -18,9 +18,9 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 -- Hits once, despite the animation looking like it hits twice. - local dmgmod = 1 + local ftp = 1 local accmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 1.5, 2) + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 1.5, 2) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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 0383b7c3378..803b7c183d2 100644 --- a/scripts/actions/mobskills/suction.lua +++ b/scripts/actions/mobskills/suction.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) 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 8be6a14a36d..6d8364750c4 100644 --- a/scripts/actions/mobskills/sudden_lunge.lua +++ b/scripts/actions/mobskills/sudden_lunge.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, 0) + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/sweep.lua b/scripts/actions/mobskills/sweep.lua index 60366371a65..02f3eb5780c 100644 --- a/scripts/actions/mobskills/sweep.lua +++ b/scripts/actions/mobskills/sweep.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) 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 71e4b33a965..d7f6d049803 100644 --- a/scripts/actions/mobskills/sweeping_flail.lua +++ b/scripts/actions/mobskills/sweeping_flail.lua @@ -21,8 +21,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/swift_blade.lua b/scripts/actions/mobskills/swift_blade.lua index 1ac06c2bae4..a115f57bc6c 100644 --- a/scripts/actions/mobskills/swift_blade.lua +++ b/scripts/actions/mobskills/swift_blade.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.ACC_VARIES, 1, 2, 3) + 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) -- Around 700 damage from AA HM diff --git a/scripts/actions/mobskills/tachi_gekko.lua b/scripts/actions/mobskills/tachi_gekko.lua index 711fc75e866..473cf800d95 100644 --- a/scripts/actions/mobskills/tachi_gekko.lua +++ b/scripts/actions/mobskills/tachi_gekko.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1.56, 1.88, 2.50) + local ftp = 2.5 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1.56, 1.88, 2.50) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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 66b0949d780..2365cb154c5 100644 --- a/scripts/actions/mobskills/tachi_kaiten.lua +++ b/scripts/actions/mobskills/tachi_kaiten.lua @@ -15,9 +15,9 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 + local ftp = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 3, 3, 3) + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 3, 3, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/tachi_kasha.lua b/scripts/actions/mobskills/tachi_kasha.lua index 48ef2f4d8bd..58d759f0ad9 100644 --- a/scripts/actions/mobskills/tachi_kasha.lua +++ b/scripts/actions/mobskills/tachi_kasha.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1.56, 1.88, 2.50) + local ftp = 3.5 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1.56, 1.88, 2.50) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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 7673ea1cd45..8c29f34fc1f 100644 --- a/scripts/actions/mobskills/tachi_yukikaze.lua +++ b/scripts/actions/mobskills/tachi_yukikaze.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1.56, 1.88, 2.50) + local ftp = 3 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1.56, 1.88, 2.50) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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 c8b64b7f3b5..d7ebd7dde2d 100644 --- a/scripts/actions/mobskills/tackle.lua +++ b/scripts/actions/mobskills/tackle.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.7 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.7 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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 c96b10157f0..1d581faf322 100644 --- a/scripts/actions/mobskills/tail_blow.lua +++ b/scripts/actions/mobskills/tail_blow.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + local ftp = 2.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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/tail_crush.lua b/scripts/actions/mobskills/tail_crush.lua index 7488492e2cc..a9b3f44ca1d 100644 --- a/scripts/actions/mobskills/tail_crush.lua +++ b/scripts/actions/mobskills/tail_crush.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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 power = mob:getMainLvl() / 10 + 10 diff --git a/scripts/actions/mobskills/tail_lash.lua b/scripts/actions/mobskills/tail_lash.lua index fa5dd8b6fe2..ee0ff0fa002 100644 --- a/scripts/actions/mobskills/tail_lash.lua +++ b/scripts/actions/mobskills/tail_lash.lua @@ -20,8 +20,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.AMNESIA, 1, 0, 60) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/tail_roll.lua b/scripts/actions/mobskills/tail_roll.lua index c649f544c6d..28b9610b919 100644 --- a/scripts/actions/mobskills/tail_roll.lua +++ b/scripts/actions/mobskills/tail_roll.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.6 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + local ftp = 2.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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/tail_slap.lua b/scripts/actions/mobskills/tail_slap.lua index 40a9736e6ee..2cd89ef066c 100644 --- a/scripts/actions/mobskills/tail_slap.lua +++ b/scripts/actions/mobskills/tail_slap.lua @@ -23,8 +23,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.ATK_VARIES, 1, 2, 3) + 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) 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 8c4ab1284d8..58746beca59 100644 --- a/scripts/actions/mobskills/tail_smash.lua +++ b/scripts/actions/mobskills/tail_smash.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.7 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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.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 81d01f11f4a..a34f0bc7478 100644 --- a/scripts/actions/mobskills/tail_swing.lua +++ b/scripts/actions/mobskills/tail_swing.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.4 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BIND, 1, 0, 30) diff --git a/scripts/actions/mobskills/tail_thrust.lua b/scripts/actions/mobskills/tail_thrust.lua index adbb1268cf3..28995a4183e 100644 --- a/scripts/actions/mobskills/tail_thrust.lua +++ b/scripts/actions/mobskills/tail_thrust.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.4 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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.PIERCING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.PARALYSIS, 15, 0, 120) diff --git a/scripts/actions/mobskills/tail_whip.lua b/scripts/actions/mobskills/tail_whip.lua index 679541f7386..e2f6e4eb223 100644 --- a/scripts/actions/mobskills/tail_whip.lua +++ b/scripts/actions/mobskills/tail_whip.lua @@ -11,8 +11,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 1.5, 2) + local ftp = 2.0 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.WEIGHT, 50, 0, 120) diff --git a/scripts/actions/mobskills/tentacle.lua b/scripts/actions/mobskills/tentacle.lua index e35b64a5c64..3a561b383d4 100644 --- a/scripts/actions/mobskills/tentacle.lua +++ b/scripts/actions/mobskills/tentacle.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.6 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + local ftp = 2.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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/tera_slash.lua b/scripts/actions/mobskills/tera_slash.lua index 2476f60b0ea..a191a42b7b7 100644 --- a/scripts/actions/mobskills/tera_slash.lua +++ b/scripts/actions/mobskills/tera_slash.lua @@ -15,9 +15,9 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 2 - local dmgmod = 5 + local ftp = 5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 1.5, 2) + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 1.5, 2) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.IGNORE_SHADOWS) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/terror_touch.lua b/scripts/actions/mobskills/terror_touch.lua index 8362f59b724..a3fe8cd5e5c 100644 --- a/scripts/actions/mobskills/terror_touch.lua +++ b/scripts/actions/mobskills/terror_touch.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.ACC_VARIES, 1, 2, 3) + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.ATTACK_DOWN, 75, 0, 30) diff --git a/scripts/actions/mobskills/test.py b/scripts/actions/mobskills/test.py new file mode 100644 index 00000000000..78ae1972efc --- /dev/null +++ b/scripts/actions/mobskills/test.py @@ -0,0 +1,36 @@ +#!/usr/bin/env python3 +import os +import re + + +def main(): + folder = "." # <-- Change this if you want a different folder + pattern = re.compile(r"\bdmgmod\b") # Regex to match exact words + + for filename in os.listdir(folder): + # Skip non-files or files that don't end with .lua (adjust as needed) + if not filename.endswith(".lua"): + continue + + filepath = os.path.join(folder, filename) + + # Read file contents + with open(filepath, "r", encoding="utf-8") as f: + content = f.read() + + # Check if file contains the target string + if "xi.mobskills.mobPhysicalMove" in content: + # Perform the replacement + new_content = pattern.sub("ftp", content) + + # Only write if there's an actual change + if new_content != content: + with open(filepath, "w", encoding="utf-8") as f: + f.write(new_content) + print(f"Modified: {filename}") + + print("Done.") + + +if __name__ == "__main__": + main() diff --git a/scripts/actions/mobskills/the_wrath_of_gudha.lua b/scripts/actions/mobskills/the_wrath_of_gudha.lua index 9d7c5fe5a6a..b8544326a3a 100644 --- a/scripts/actions/mobskills/the_wrath_of_gudha.lua +++ b/scripts/actions/mobskills/the_wrath_of_gudha.lua @@ -11,8 +11,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, 0, 1, 2, 3) + 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) xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.WEIGHT, 80, 0, 10) diff --git a/scripts/actions/mobskills/thrashing_assault.lua b/scripts/actions/mobskills/thrashing_assault.lua index 33e7905e824..8e8240b798e 100644 --- a/scripts/actions/mobskills/thrashing_assault.lua +++ b/scripts/actions/mobskills/thrashing_assault.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 4 local accmod = 1 - local dmgmod = 2.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 15) diff --git a/scripts/actions/mobskills/tidal_dive.lua b/scripts/actions/mobskills/tidal_dive.lua index b86bbbeae6a..86e5a437009 100644 --- a/scripts/actions/mobskills/tidal_dive.lua +++ b/scripts/actions/mobskills/tidal_dive.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = math.random(2, 3) local accmod = 1 - local dmgmod = .8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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.NONE, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BIND, 1, 0, 30) diff --git a/scripts/actions/mobskills/tortoise_stomp.lua b/scripts/actions/mobskills/tortoise_stomp.lua index 57c7aee3b29..2b8e57c1940 100644 --- a/scripts/actions/mobskills/tortoise_stomp.lua +++ b/scripts/actions/mobskills/tortoise_stomp.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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 duration = math.random(120, 180) diff --git a/scripts/actions/mobskills/tourbillion.lua b/scripts/actions/mobskills/tourbillion.lua index d6d927eeb04..01ad9799dd1 100644 --- a/scripts/actions/mobskills/tourbillion.lua +++ b/scripts/actions/mobskills/tourbillion.lua @@ -29,8 +29,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 1.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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 duration = 20 * (skill:getTP() / 1000) diff --git a/scripts/actions/mobskills/trample.lua b/scripts/actions/mobskills/trample.lua index c64992b5146..c55e2f25f18 100644 --- a/scripts/actions/mobskills/trample.lua +++ b/scripts/actions/mobskills/trample.lua @@ -18,8 +18,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/trembling.lua b/scripts/actions/mobskills/trembling.lua index d9af6e64622..ff1cd106f18 100644 --- a/scripts/actions/mobskills/trembling.lua +++ b/scripts/actions/mobskills/trembling.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 4 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 4 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, xi.mobskills.shadowBehavior.NUMSHADOWS_3) local dispelled = math.random(2, 3) diff --git a/scripts/actions/mobskills/tremorous_tread.lua b/scripts/actions/mobskills/tremorous_tread.lua index 12d655844bb..e9ff14ff93b 100644 --- a/scripts/actions/mobskills/tremorous_tread.lua +++ b/scripts/actions/mobskills/tremorous_tread.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 3) diff --git a/scripts/actions/mobskills/triclip.lua b/scripts/actions/mobskills/triclip.lua index ec1d8b1981d..02b93c9000f 100644 --- a/scripts/actions/mobskills/triclip.lua +++ b/scripts/actions/mobskills/triclip.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 1.3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.DEX_DOWN, 10, 3, 120) diff --git a/scripts/actions/mobskills/triple_attack.lua b/scripts/actions/mobskills/triple_attack.lua index 0f1899a0566..1a61d59b0ab 100644 --- a/scripts/actions/mobskills/triple_attack.lua +++ b/scripts/actions/mobskills/triple_attack.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/true_strike.lua b/scripts/actions/mobskills/true_strike.lua index 331fb3ca3e4..04e8ed53c57 100644 --- a/scripts/actions/mobskills/true_strike.lua +++ b/scripts/actions/mobskills/true_strike.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 0.6 - local dmgmod = 3.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.ACC_VARIES, 1.1, 1.2, 1.3) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/tusk.lua b/scripts/actions/mobskills/tusk.lua index 66de3aa3bbd..c8cfb90ce71 100644 --- a/scripts/actions/mobskills/tusk.lua +++ b/scripts/actions/mobskills/tusk.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/twirling_dervish.lua b/scripts/actions/mobskills/twirling_dervish.lua index 4936c6ac602..72a7157dac7 100644 --- a/scripts/actions/mobskills/twirling_dervish.lua +++ b/scripts/actions/mobskills/twirling_dervish.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 2 - local dmgmod = 6 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 2, 3, 5) + local ftp = 6 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 2, 3, 5) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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.lua b/scripts/actions/mobskills/typhoon.lua index a415f36fd2a..3f1851f4ed4 100644 --- a/scripts/actions/mobskills/typhoon.lua +++ b/scripts/actions/mobskills/typhoon.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 4 local accmod = 1 - local dmgmod = 0.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.BLUNT) diff --git a/scripts/actions/mobskills/umbra_smash.lua b/scripts/actions/mobskills/umbra_smash.lua index 2e8541b26bd..7f3e37def76 100644 --- a/scripts/actions/mobskills/umbra_smash.lua +++ b/scripts/actions/mobskills/umbra_smash.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, 0) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.HTH) return dmg diff --git a/scripts/actions/mobskills/uppercut.lua b/scripts/actions/mobskills/uppercut.lua index 0526814f413..0699f0d404a 100644 --- a/scripts/actions/mobskills/uppercut.lua +++ b/scripts/actions/mobskills/uppercut.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.5 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/uranos_cascade_eta.lua b/scripts/actions/mobskills/uranos_cascade_eta.lua index 67dcf8618f1..d4382f443a3 100644 --- a/scripts/actions/mobskills/uranos_cascade_eta.lua +++ b/scripts/actions/mobskills/uranos_cascade_eta.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1.25 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 1.25 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BIND, 1, 0, 10) 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 512ea42a083..9681cce1181 100644 --- a/scripts/actions/mobskills/uranos_cascade_lambda.lua +++ b/scripts/actions/mobskills/uranos_cascade_lambda.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1.75 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 1.75 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BIND, 1, 0, 10) 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 2b440ff2b50..db61cb489c9 100644 --- a/scripts/actions/mobskills/uranos_cascade_theta.lua +++ b/scripts/actions/mobskills/uranos_cascade_theta.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 1.5 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_2) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BIND, 1, 0, 10) 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 49537724931..8ead273e89e 100644 --- a/scripts/actions/mobskills/vacuous_osculation.lua +++ b/scripts/actions/mobskills/vacuous_osculation.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.6 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + local ftp = 2.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.PIERCING, info.hitslanded) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.PLAGUE, 5, 3, 60) diff --git a/scripts/actions/mobskills/vanity_dive.lua b/scripts/actions/mobskills/vanity_dive.lua index 00e1f6f5200..7d855870257 100644 --- a/scripts/actions/mobskills/vanity_dive.lua +++ b/scripts/actions/mobskills/vanity_dive.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/vanity_drive.lua b/scripts/actions/mobskills/vanity_drive.lua index 31ae89fe787..e8c970d8d23 100644 --- a/scripts/actions/mobskills/vanity_drive.lua +++ b/scripts/actions/mobskills/vanity_drive.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = math.random(2, 3) local accmod = 1 - local dmgmod = math.random(1, 2) + math.random() - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + local ftp = math.random(1, 2) + math.random() + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/vanity_strike.lua b/scripts/actions/mobskills/vanity_strike.lua index 7885e6445c6..da2e41e45e8 100644 --- a/scripts/actions/mobskills/vanity_strike.lua +++ b/scripts/actions/mobskills/vanity_strike.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.8 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/velocious_blade.lua b/scripts/actions/mobskills/velocious_blade.lua index 2392bd68c04..f69d25b3d29 100644 --- a/scripts/actions/mobskills/velocious_blade.lua +++ b/scripts/actions/mobskills/velocious_blade.lua @@ -19,8 +19,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 5 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/venom_sting.lua b/scripts/actions/mobskills/venom_sting.lua index 39ac80b84fa..0381075ad34 100644 --- a/scripts/actions/mobskills/venom_sting.lua +++ b/scripts/actions/mobskills/venom_sting.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 3.3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + local ftp = 3.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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.POISON, 100, 3, 60) diff --git a/scripts/actions/mobskills/vertical_cleave.lua b/scripts/actions/mobskills/vertical_cleave.lua index ba387f8aa4f..65eeb8996b8 100644 --- a/scripts/actions/mobskills/vertical_cleave.lua +++ b/scripts/actions/mobskills/vertical_cleave.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.6 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 2.6 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/vertical_slash.lua b/scripts/actions/mobskills/vertical_slash.lua index 0d77546bad6..dc2b60bd91a 100644 --- a/scripts/actions/mobskills/vertical_slash.lua +++ b/scripts/actions/mobskills/vertical_slash.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 2 - local dmgmod = 2.6 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + local ftp = 2.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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.ACCURACY_DOWN, 25, 0, 120) diff --git a/scripts/actions/mobskills/vicious_claw.lua b/scripts/actions/mobskills/vicious_claw.lua index 31eef4cb4f3..c3904f193f0 100644 --- a/scripts/actions/mobskills/vicious_claw.lua +++ b/scripts/actions/mobskills/vicious_claw.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.2 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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, info.hitslanded) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/victory_beacon.lua b/scripts/actions/mobskills/victory_beacon.lua index 27bdb59192e..db2a53d4bae 100644 --- a/scripts/actions/mobskills/victory_beacon.lua +++ b/scripts/actions/mobskills/victory_beacon.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 4 - local dmgmod = 5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1.5, 3, 4.5) + local ftp = 5 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1.5, 3, 4.5) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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/victory_smite.lua b/scripts/actions/mobskills/victory_smite.lua index d183716b9b4..c1bc00b07ec 100644 --- a/scripts/actions/mobskills/victory_smite.lua +++ b/scripts/actions/mobskills/victory_smite.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 4 local accmod = 1 - local dmgmod = 2.25 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1.1, 1.25, 1.45) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.HTH) diff --git a/scripts/actions/mobskills/voiceless_storm.lua b/scripts/actions/mobskills/voiceless_storm.lua index 8cf075e236d..1ce56c698c7 100644 --- a/scripts/actions/mobskills/voiceless_storm.lua +++ b/scripts/actions/mobskills/voiceless_storm.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.SILENCE, 1, 0, 60) diff --git a/scripts/actions/mobskills/vorpal_blade.lua b/scripts/actions/mobskills/vorpal_blade.lua index e72534b930a..922668c3aa5 100644 --- a/scripts/actions/mobskills/vorpal_blade.lua +++ b/scripts/actions/mobskills/vorpal_blade.lua @@ -38,8 +38,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 4 local accmod = 1 - local dmgmod = 1.25 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.CRIT_VARIES, 1.1, 1.2, 1.3) + 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) -- AA EV: Approx 900 damage to 75 DRG/35 THF. 400 to a NIN/WAR in Arhat, but took shadows. diff --git a/scripts/actions/mobskills/vorpal_scythe.lua b/scripts/actions/mobskills/vorpal_scythe.lua index 92edd8d608a..4682ab48a5c 100644 --- a/scripts/actions/mobskills/vorpal_scythe.lua +++ b/scripts/actions/mobskills/vorpal_scythe.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, 3, 1, 1, 1) + local ftp = 1 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, 3, 1, 1, 1) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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 85087b3a0f1..56a79294ba9 100644 --- a/scripts/actions/mobskills/vorpal_wheel.lua +++ b/scripts/actions/mobskills/vorpal_wheel.lua @@ -18,8 +18,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 -- Increase damage as health drops - local dmgmod = (1 - (mob:getHP() / mob:getMaxHP())) * 6 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/vortex.lua b/scripts/actions/mobskills/vortex.lua index 7f152951535..2102f2c2809 100644 --- a/scripts/actions/mobskills/vortex.lua +++ b/scripts/actions/mobskills/vortex.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 1.5 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, mob, skill, target, xi.attackType.PHYSICAL, xi.damageType.SLASHING, xi.mobskills.shadowBehavior.NUMSHADOWS_3) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.TERROR, 1, 0, 9) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.BIND, 1, 0, 30) diff --git a/scripts/actions/mobskills/walk_the_plank.lua b/scripts/actions/mobskills/walk_the_plank.lua index d9e34db3279..b61572a0916 100755 --- a/scripts/actions/mobskills/walk_the_plank.lua +++ b/scripts/actions/mobskills/walk_the_plank.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 2 - local dmgmod = 0.3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, mob:getWeaponDmg() * dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:dispelStatusEffect() diff --git a/scripts/actions/mobskills/wheeling_thrust.lua b/scripts/actions/mobskills/wheeling_thrust.lua index aa30b071684..3e34f42fbd0 100644 --- a/scripts/actions/mobskills/wheeling_thrust.lua +++ b/scripts/actions/mobskills/wheeling_thrust.lua @@ -14,8 +14,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 1.75 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, 2, 1, 1, 1) + local ftp = 1.75 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, 2, 1, 1, 1) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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 cd96f2297b2..e1be0a9b83d 100644 --- a/scripts/actions/mobskills/whip_tongue.lua +++ b/scripts/actions/mobskills/whip_tongue.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/whirl_claws.lua b/scripts/actions/mobskills/whirl_claws.lua index 223851ec0f5..3a2448659c4 100644 --- a/scripts/actions/mobskills/whirl_claws.lua +++ b/scripts/actions/mobskills/whirl_claws.lua @@ -13,8 +13,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 1.5, 2) + local ftp = 2.0 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/whirl_of_rage.lua b/scripts/actions/mobskills/whirl_of_rage.lua index daf6bb6126b..392fc5c0da9 100644 --- a/scripts/actions/mobskills/whirl_of_rage.lua +++ b/scripts/actions/mobskills/whirl_of_rage.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.0 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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 * math.random(2, 3)) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.STUN, 1, 0, 4) diff --git a/scripts/actions/mobskills/wild_horn.lua b/scripts/actions/mobskills/wild_horn.lua index 9779b64cdf7..98ef8cd3c87 100644 --- a/scripts/actions/mobskills/wild_horn.lua +++ b/scripts/actions/mobskills/wild_horn.lua @@ -19,8 +19,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 3 local accmod = 1 - local dmgmod = 1.5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/wild_rage.lua b/scripts/actions/mobskills/wild_rage.lua index 8fbf4c41228..39b80f9da09 100644 --- a/scripts/actions/mobskills/wild_rage.lua +++ b/scripts/actions/mobskills/wild_rage.lua @@ -20,9 +20,9 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 1 - local dmgmod = 2.1 + local ftp = 2.1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.NO_EFFECT) if mob:getPool() == platoonScorpionPoolID then -- should not have to verify because platoon scorps only in battlefield local numScorpsDead = mob:getBattlefield():getLocalVar('[ODS]NumScorpsDead') diff --git a/scripts/actions/mobskills/wind_shear.lua b/scripts/actions/mobskills/wind_shear.lua index ac0683c5151..8224c7ddd7a 100644 --- a/scripts/actions/mobskills/wind_shear.lua +++ b/scripts/actions/mobskills/wind_shear.lua @@ -27,8 +27,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = math.random(2, 3) local accmod = 1 - local dmgmod = .8 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/wind_shear_znm.lua b/scripts/actions/mobskills/wind_shear_znm.lua index 0aa84a16673..3c3c225090a 100644 --- a/scripts/actions/mobskills/wind_shear_znm.lua +++ b/scripts/actions/mobskills/wind_shear_znm.lua @@ -17,8 +17,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = math.random(2, 3) local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.WEIGHT, 50, 0, 120) diff --git a/scripts/actions/mobskills/wing_slap.lua b/scripts/actions/mobskills/wing_slap.lua index fc9bed7b145..fad84c9738c 100644 --- a/scripts/actions/mobskills/wing_slap.lua +++ b/scripts/actions/mobskills/wing_slap.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 4 local accmod = 1 - local dmgmod = 0.25 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) 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 49d6c832436..841589e5a77 100644 --- a/scripts/actions/mobskills/wing_thrust.lua +++ b/scripts/actions/mobskills/wing_thrust.lua @@ -16,8 +16,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 4 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) xi.mobskills.mobPhysicalStatusEffectMove(mob, target, skill, xi.effect.SLOW, 1250, 0, 60) diff --git a/scripts/actions/mobskills/wing_whirl.lua b/scripts/actions/mobskills/wing_whirl.lua index 5f6c5dbc346..867f22db602 100644 --- a/scripts/actions/mobskills/wing_whirl.lua +++ b/scripts/actions/mobskills/wing_whirl.lua @@ -15,8 +15,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 4 local accmod = 1 - local dmgmod = 1 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) return dmg diff --git a/scripts/actions/mobskills/wire_cutter.lua b/scripts/actions/mobskills/wire_cutter.lua index 0f151aa42c8..659f1d846de 100644 --- a/scripts/actions/mobskills/wire_cutter.lua +++ b/scripts/actions/mobskills/wire_cutter.lua @@ -12,8 +12,8 @@ end mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 2 local accmod = 1 - local dmgmod = 3 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.NO_EFFECT) + 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) target:takeDamage(dmg, mob, xi.attackType.PHYSICAL, xi.damageType.SLASHING) diff --git a/scripts/actions/mobskills/zephyr_arrow.lua b/scripts/actions/mobskills/zephyr_arrow.lua index 4e6feb2f63f..7e7c80bf193 100644 --- a/scripts/actions/mobskills/zephyr_arrow.lua +++ b/scripts/actions/mobskills/zephyr_arrow.lua @@ -17,8 +17,8 @@ mobskillObject.onMobWeaponSkill = function(target, mob, skill) local numhits = 1 local accmod = 4 - local dmgmod = 5 - local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) + local ftp = 5 + local info = xi.mobskills.mobPhysicalMove(mob, target, skill, numhits, accmod, ftp, xi.mobskills.physicalTpBonus.DMG_VARIES, 1, 2, 3) local dmg = xi.mobskills.mobFinalAdjustments(info.dmg, 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 }) return dmg diff --git a/scripts/globals/combat/physical_utilities.lua b/scripts/globals/combat/physical_utilities.lua index 679ba0a9d15..3d3d97c32d7 100644 --- a/scripts/globals/combat/physical_utilities.lua +++ b/scripts/globals/combat/physical_utilities.lua @@ -389,7 +389,8 @@ end ---@param tpFactor number ---@param isWeaponskill boolean ---@param weaponSlot xi.slot -xi.combat.physical.calculateMeleePDIF = function(actor, target, weaponType, wsAttackMod, isCritical, applyLevelCorrection, tpIgnoresDefense, tpFactor, isWeaponskill, weaponSlot) +---@param isCannonball boolean +xi.combat.physical.calculateMeleePDIF = function(actor, target, weaponType, wsAttackMod, isCritical, applyLevelCorrection, tpIgnoresDefense, tpFactor, isWeaponskill, weaponSlot, isCannonball) local pDif = 0 ---------------------------------------- @@ -421,6 +422,10 @@ xi.combat.physical.calculateMeleePDIF = function(actor, target, weaponType, wsAt targetDefense = math.floor(targetDefense * ignoreDefenseFactor) end + if isCannonball then + actorAttack = actor:getStat(xi.mod.DEF) + end + -- Actor Attack / Target Defense ratio baseRatio = actorAttack / targetDefense diff --git a/scripts/globals/mobskills.lua b/scripts/globals/mobskills.lua index f1290321313..25232aa9716 100644 --- a/scripts/globals/mobskills.lua +++ b/scripts/globals/mobskills.lua @@ -95,23 +95,19 @@ local function fTP(tp, ftp1, ftp2, ftp3) return 1 -- no ftp mod end -xi.mobskills.mobRangedMove = function(mob, target, skill, numberofhits, accmod, dmgmod, tpeffect) +xi.mobskills.mobRangedMove = function(mob, target, skill, numberofhits, accmod, ftp, tpeffect) -- TODO: Replace this with ranged attack code - return xi.mobskills.mobPhysicalMove(mob, target, skill, numberofhits, accmod, dmgmod, xi.mobskills.physicalTpBonus.RANGED) + return xi.mobskills.mobPhysicalMove(mob, target, skill, numberofhits, accmod, ftp, xi.mobskills.physicalTpBonus.RANGED) end -- helper function to handle a single hit and check for parrying, guarding, and blocking -local function handleSinglePhysicalHit(mob, target, hitdamage, hitslanded, finaldmg, tpEffect, minRatio, maxRatio) +local function handleSinglePhysicalHit(mob, target, hitdamage, hitslanded, finaldmg, tpEffect) -- if a non-ranged physical mobskill then can parry or guard if tpEffect == xi.mobskills.physicalTpBonus.RANGED or (not xi.combat.physical.isParried(target, mob) and not xi.combat.physical.isGuarded(target, mob)) then - local pdif = math.random((minRatio * 1000), (maxRatio * 1000)) --generate random PDIF - pdif = pdif / 1000 --multiplier set. - hitdamage = hitdamage * pdif - -- also handle blocking local isBlockedWithShieldMastery = false if xi.combat.physical.isBlocked(target, mob) then @@ -137,10 +133,10 @@ end ----------------------------------- -- Mob Physical Abilities -- accMod : linear multiplier for accuracy (1 default) --- dmgMod : linear multiplier for damage (1 default) +-- ftp : linear multiplier for damage (1 default) -- tpEffect : Defined in xi.mobskills.physicalTpBonus ----------------------------------- -xi.mobskills.mobPhysicalMove = function(mob, target, skill, numHits, accMod, dmgMod, tpEffect, mtp000, mtp150, mtp300, offcratiomod) +xi.mobskills.mobPhysicalMove = function(mob, target, skill, numHits, accMod, ftp, tpEffect, mtp000, mtp150, mtp300, isCannonball) local returninfo = {} -- mobs use fSTR (but with special calculation in the called function) @@ -159,60 +155,30 @@ xi.mobskills.mobPhysicalMove = function(mob, target, skill, numHits, accMod, dmg targetEvasion = targetEvasion + target:getStatusEffect(xi.effect.YONIN):getPower() end - local base = math.max(1, mob:getWeaponDmg() + fSTR) - - --work out and cap ratio - if not offcratiomod then -- default to attack. Pretty much every physical mobskill will use this, Cannonball being the exception. - offcratiomod = mob:getStat(xi.mod.ATT) - end - - local ratio = offcratiomod / target:getStat(xi.mod.DEF) local lvldiff = math.max(0, mob:getMainLvl() - target:getMainLvl()) - ratio = ratio + lvldiff * 0.05 - ratio = utils.clamp(ratio, 0, 4) - --work out hit rate for mobs local hitrate = ((mob:getACC() * accMod) - targetEvasion) / 2 + (lvldiff * 2) + 75 hitrate = utils.clamp(hitrate, 20, 95) --work out the base damage for a single hit - local hitdamage = math.max(1, base + lvldiff) * dmgMod - - --work out min and max cRatio - local maxRatio = ratio - local minRatio = ratio - 0.375 - - if ratio < 0.5 then - maxRatio = ratio + 0.5 - elseif ratio <= 0.7 then - maxRatio = 1 - elseif ratio <= 1.2 then - maxRatio = ratio + 0.3 - elseif ratio <= 1.5 then - maxRatio = (ratio * 0.25) + ratio - elseif ratio <= 2.625 then - maxRatio = ratio + 0.375 - elseif ratio <= 3.25 then - maxRatio = 3 - end - - if ratio < 0.38 then - minRatio = 0 - elseif ratio <= 1.25 then - minRatio = ratio * (1176 / 1024) - (448 / 1024) - elseif ratio <= 1.51 then - minRatio = 1 - elseif ratio <= 2.44 then - minRatio = ratio * (1176 / 1024) - (775 / 1024) - end - - --apply ftp (assumes 1~3 scalar linear mod) + local hitdamage = math.max(1, mob:getWeaponDmg() + fSTR) * ftp + + -- TODO: Remove this and use a scalable function for a single FTP value if tpEffect == xi.mobskills.physicalTpBonus.DMG_VARIES then hitdamage = hitdamage * fTP(skill:getTP(), mtp000, mtp150, mtp300) end + local applyLevelCorrection = xi.combat.levelCorrection.isLevelCorrectedZone(mob) + local weaponType = xi.skill.NONE -- use NONE for mobs + local attMod = 1 -- TODO: implement attack boosts for mobskills + local canCrit = false -- TODO: implement which skills can crit + local isCannonball = isCannonball or false + local pDif = xi.combat.physical.calculateMeleePDIF(mob, target, weaponType, attMod, canCrit, applyLevelCorrection, false, 0, false, xi.slot.MAIN, isCannonball) + + hitdamage = hitdamage * pDif + -- start the hits local finaldmg = 0 local hitsdone = 1 @@ -229,12 +195,12 @@ xi.mobskills.mobPhysicalMove = function(mob, target, skill, numHits, accMod, dmg if (math.random(1, 100)) <= firstHitChance then -- use helper function check for parry guard and blocking and handle the hit - hitslanded, finaldmg = handleSinglePhysicalHit(mob, target, hitdamage, hitslanded, finaldmg, tpEffect, minRatio, maxRatio) + hitslanded, finaldmg = handleSinglePhysicalHit(mob, target, hitdamage, hitslanded, finaldmg, tpEffect) end while hitsdone < numHits do if (math.random(1, 100)) <= hitrate then --it hit - hitslanded, finaldmg = handleSinglePhysicalHit(mob, target, hitdamage, hitslanded, finaldmg, tpEffect, minRatio, maxRatio) + hitslanded, finaldmg = handleSinglePhysicalHit(mob, target, hitdamage, hitslanded, finaldmg, tpEffect) end hitsdone = hitsdone + 1 diff --git a/scripts/globals/weaponskills.lua b/scripts/globals/weaponskills.lua index 33b9a572eef..2c77cf76354 100644 --- a/scripts/globals/weaponskills.lua +++ b/scripts/globals/weaponskills.lua @@ -319,7 +319,7 @@ local function getSingleHitDamage(attacker, target, dmg, ftp, wsParams, calcPara end if calcParams.attackType == xi.attackType.PHYSICAL then - calcParams.pdif = xi.combat.physical.calculateMeleePDIF(attacker, target, calcParams.attackInfo.weaponType, atkMultiplier, criticalHit, applyLevelCorrection, ignoresDefense, ignoreDefMultiplier, true, calcParams.attackInfo.slot) + calcParams.pdif = xi.combat.physical.calculateMeleePDIF(attacker, target, calcParams.attackInfo.weaponType, atkMultiplier, criticalHit, applyLevelCorrection, ignoresDefense, ignoreDefMultiplier, true, calcParams.attackInfo.slot, false) else calcParams.pdif = xi.combat.physical.calculateRangedPDIF(attacker, target, calcParams.skillType, atkMultiplier, criticalHit, applyLevelCorrection, ignoresDefense, ignoreDefMultiplier, true, 0) end diff --git a/src/map/attack.cpp b/src/map/attack.cpp index 140a8eeffec..8d813317b16 100644 --- a/src/map/attack.cpp +++ b/src/map/attack.cpp @@ -139,7 +139,7 @@ void CAttack::SetCritical(bool value) } // need to pass the weapon slot because damage ratio depends on ATT which varies by slot - m_damageRatio = battleutils::GetDamageRatio(m_attacker, m_victim, m_isCritical, attBonus, skilltype, weaponSlot); + m_damageRatio = battleutils::GetDamageRatio(m_attacker, m_victim, m_isCritical, attBonus, skilltype, weaponSlot, false); } } diff --git a/src/map/entities/battleentity.cpp b/src/map/entities/battleentity.cpp index 985ac70691f..604dd01861c 100644 --- a/src/map/entities/battleentity.cpp +++ b/src/map/entities/battleentity.cpp @@ -2417,7 +2417,7 @@ bool CBattleEntity::OnAttack(CAttackState& state, action_t& action) attBonus += ((static_cast(targetDex) / 100) * csJpModifier); } - float DamageRatio = battleutils::GetDamageRatio(PTarget, this, attack.IsCritical(), attBonus, skilltype, SLOT_MAIN); + float DamageRatio = battleutils::GetDamageRatio(PTarget, this, attack.IsCritical(), attBonus, skilltype, SLOT_MAIN, false); auto damage = (int32)((PTarget->GetMainWeaponDmg() + naturalh2hDMG + battleutils::GetFSTR(PTarget, this, SLOT_MAIN)) * DamageRatio); actionTarget.spikesParam = diff --git a/src/map/utils/battleutils.cpp b/src/map/utils/battleutils.cpp index 85ee575f7ab..b32d8bc524a 100644 --- a/src/map/utils/battleutils.cpp +++ b/src/map/utils/battleutils.cpp @@ -817,7 +817,7 @@ namespace battleutils bool crit = battleutils::GetCritHitRate(PDefender, PAttacker, true) > xirand::GetRandomNumber(100); // Dmg math. - float DamageRatio = GetDamageRatio(PDefender, PAttacker, crit, 1.f, skilltype, SLOT_MAIN); + float DamageRatio = GetDamageRatio(PDefender, PAttacker, crit, 1.f, skilltype, SLOT_MAIN, false); uint16 dmg = (uint32)((PDefender->GetMainWeaponDmg() + battleutils::GetFSTR(PDefender, PAttacker, SLOT_MAIN)) * DamageRatio); dmg = attackutils::CheckForDamageMultiplier(((CCharEntity*)PDefender), dynamic_cast(PDefender->m_Weapons[SLOT_MAIN]), dmg, PHYSICAL_ATTACK_TYPE::NORMAL, SLOT_MAIN); @@ -2961,7 +2961,7 @@ namespace battleutils * * ************************************************************************/ - float GetDamageRatio(CBattleEntity* PAttacker, CBattleEntity* PDefender, bool isCritical, float bonusAttPercent, SKILLTYPE weaponType, SLOTTYPE weaponSlot) + float GetDamageRatio(CBattleEntity* PAttacker, CBattleEntity* PDefender, bool isCritical, float bonusAttPercent, SKILLTYPE weaponType, SLOTTYPE weaponSlot, bool isCannonball) { float pDIF = 1.0f; @@ -2979,7 +2979,7 @@ namespace battleutils return pDIF; } - auto meleePDIFFuncResult = meleePDIFFunc(luaAttackerEntity, CLuaBaseEntity(PDefender), weaponType, bonusAttPercent, isCritical, levelCorrectionResult.get(0), false, 0.0, false, weaponSlot); + auto meleePDIFFuncResult = meleePDIFFunc(luaAttackerEntity, CLuaBaseEntity(PDefender), weaponType, bonusAttPercent, isCritical, levelCorrectionResult.get(0), false, 0.0, false, weaponSlot, false); if (!meleePDIFFuncResult.valid()) { sol::error err = meleePDIFFuncResult; diff --git a/src/map/utils/battleutils.h b/src/map/utils/battleutils.h index dd7d3807176..49eb3b738bb 100644 --- a/src/map/utils/battleutils.h +++ b/src/map/utils/battleutils.h @@ -153,7 +153,7 @@ namespace battleutils float GetBlockRate(CBattleEntity* PAttacker, CBattleEntity* PDefender); uint8 GetParryRate(CBattleEntity* PAttacker, CBattleEntity* PDefender); uint8 GetGuardRate(CBattleEntity* PAttacker, CBattleEntity* PDefender); - float GetDamageRatio(CBattleEntity* PAttacker, CBattleEntity* PDefender, bool isCritical, float bonusAttPercent, SKILLTYPE weaponType, SLOTTYPE weaponSlot); + float GetDamageRatio(CBattleEntity* PAttacker, CBattleEntity* PDefender, bool isCritical, float bonusAttPercent, SKILLTYPE weaponType, SLOTTYPE weaponSlot, bool isCannonball); int32 TakePhysicalDamage(CBattleEntity* PAttacker, CBattleEntity* PDefender, PHYSICAL_ATTACK_TYPE physicalAttackType, int32 damage, bool isBlocked, uint8 slot, uint16 tpMultiplier, CBattleEntity* taChar, bool giveTPtoVictim, bool giveTPtoAttacker, bool isCounter = false,