From 4834f127025e3f19b99f2480a61c03dbbfa6e6b0 Mon Sep 17 00:00:00 2001 From: MrHappyAsthma Date: Sat, 8 Feb 2020 22:50:16 -0800 Subject: [PATCH] Audit all damage type values in BLU spells. Corrects /adds any inaccurate or missing damage types. Also updated the param value in the Lua table to use `damageType` instead of `dmgtype`. This better matches the enum value naming convention for `dsp.damageType`. --- scripts/globals/bluemagic.lua | 2 +- scripts/globals/spells/bluemagic/1000_needles.lua | 2 +- scripts/globals/spells/bluemagic/asuran_claws.lua | 2 +- scripts/globals/spells/bluemagic/bad_breath.lua | 1 + scripts/globals/spells/bluemagic/battle_dance.lua | 2 +- scripts/globals/spells/bluemagic/blastbomb.lua | 1 + scripts/globals/spells/bluemagic/blitzstrahl.lua | 1 + scripts/globals/spells/bluemagic/blood_drain.lua | 1 + scripts/globals/spells/bluemagic/blood_saber.lua | 1 + scripts/globals/spells/bluemagic/bludgeon.lua | 2 +- scripts/globals/spells/bluemagic/body_slam.lua | 2 +- scripts/globals/spells/bluemagic/bomb_toss.lua | 1 + scripts/globals/spells/bluemagic/cannonball.lua | 2 +- scripts/globals/spells/bluemagic/claw_cyclone.lua | 2 +- scripts/globals/spells/bluemagic/corrosive_ooze.lua | 1 + scripts/globals/spells/bluemagic/cursed_sphere.lua | 1 + scripts/globals/spells/bluemagic/death_ray.lua | 1 + scripts/globals/spells/bluemagic/death_scissors.lua | 2 +- scripts/globals/spells/bluemagic/digest.lua | 1 + scripts/globals/spells/bluemagic/dimensional_death.lua | 2 +- scripts/globals/spells/bluemagic/disseverment.lua | 2 +- scripts/globals/spells/bluemagic/eyes_on_me.lua | 1 + scripts/globals/spells/bluemagic/feather_storm.lua | 2 +- scripts/globals/spells/bluemagic/firespit.lua | 1 + scripts/globals/spells/bluemagic/flying_hip_press.lua | 1 + scripts/globals/spells/bluemagic/foot_kick.lua | 2 +- scripts/globals/spells/bluemagic/frenetic_rip.lua | 2 +- scripts/globals/spells/bluemagic/frost_breath.lua | 1 + scripts/globals/spells/bluemagic/frypan.lua | 2 +- scripts/globals/spells/bluemagic/grand_slam.lua | 2 +- scripts/globals/spells/bluemagic/head_butt.lua | 2 +- scripts/globals/spells/bluemagic/heat_breath.lua | 1 + scripts/globals/spells/bluemagic/hecatomb_wave.lua | 1 + scripts/globals/spells/bluemagic/helldive.lua | 2 +- scripts/globals/spells/bluemagic/hydro_shot.lua | 2 +- scripts/globals/spells/bluemagic/hysteric_barrage.lua | 2 +- scripts/globals/spells/bluemagic/ice_break.lua | 1 + scripts/globals/spells/bluemagic/jet_stream.lua | 2 +- scripts/globals/spells/bluemagic/maelstrom.lua | 1 + scripts/globals/spells/bluemagic/magic_hammer.lua | 1 + scripts/globals/spells/bluemagic/magnetite_cloud.lua | 1 + scripts/globals/spells/bluemagic/mandibular_bite.lua | 2 +- scripts/globals/spells/bluemagic/mind_blast.lua | 1 + scripts/globals/spells/bluemagic/mysterious_light.lua | 1 + scripts/globals/spells/bluemagic/poison_breath.lua | 1 + scripts/globals/spells/bluemagic/power_attack.lua | 2 +- scripts/globals/spells/bluemagic/queasyshroom.lua | 2 +- scripts/globals/spells/bluemagic/radiant_breath.lua | 1 + scripts/globals/spells/bluemagic/ram_charge.lua | 2 +- scripts/globals/spells/bluemagic/regurgitation.lua | 1 + scripts/globals/spells/bluemagic/rending_deluge.lua | 2 ++ scripts/globals/spells/bluemagic/sandspin.lua | 1 + scripts/globals/spells/bluemagic/screwdriver.lua | 2 +- scripts/globals/spells/bluemagic/seedspray.lua | 2 +- scripts/globals/spells/bluemagic/sickle_slash.lua | 2 +- scripts/globals/spells/bluemagic/smite_of_rage.lua | 2 +- scripts/globals/spells/bluemagic/spinal_cleave.lua | 2 +- scripts/globals/spells/bluemagic/spiral_spin.lua | 2 +- scripts/globals/spells/bluemagic/sprout_smack.lua | 2 +- scripts/globals/spells/bluemagic/sub-zero_smash.lua | 2 +- scripts/globals/spells/bluemagic/sudden_lunge.lua | 2 +- scripts/globals/spells/bluemagic/tail_slap.lua | 2 +- scripts/globals/spells/bluemagic/terror_touch.lua | 2 +- scripts/globals/spells/bluemagic/uppercut.lua | 2 +- scripts/globals/spells/bluemagic/vertical_cleave.lua | 2 +- scripts/globals/spells/bluemagic/wild_oats.lua | 2 +- 66 files changed, 67 insertions(+), 39 deletions(-) diff --git a/scripts/globals/bluemagic.lua b/scripts/globals/bluemagic.lua index 57708bcee51..d8dd965db13 100644 --- a/scripts/globals/bluemagic.lua +++ b/scripts/globals/bluemagic.lua @@ -230,7 +230,7 @@ function BlueFinalAdjustments(caster, target, spell, dmg, params) -- handling stoneskin dmg = utils.stoneskin(target, dmg) - local damageType = params.dmgType or dsp.damageType.NONE + local damageType = params.damageType or dsp.damageType.NONE target:takeSpellDamage(caster, spell, dmg, dsp.attackType.PHYSICAL, damageType) target:updateEnmityFromDamage(caster,dmg) target:handleAfflatusMiseryDamage(dmg) diff --git a/scripts/globals/spells/bluemagic/1000_needles.lua b/scripts/globals/spells/bluemagic/1000_needles.lua index 40cdd3c3b83..f4a1576895b 100644 --- a/scripts/globals/spells/bluemagic/1000_needles.lua +++ b/scripts/globals/spells/bluemagic/1000_needles.lua @@ -25,7 +25,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_CRITICAL - params.dmgtype = dsp.damageType.PIERCING + params.damageType = dsp.damageType.LIGHT params.scattr = SC_COMPRESSION params.numhits = 1 params.multiplier = 1.5 diff --git a/scripts/globals/spells/bluemagic/asuran_claws.lua b/scripts/globals/spells/bluemagic/asuran_claws.lua index 361c70e7ac8..677823c7b4d 100644 --- a/scripts/globals/spells/bluemagic/asuran_claws.lua +++ b/scripts/globals/spells/bluemagic/asuran_claws.lua @@ -25,7 +25,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_ACC - params.dmgtype = dsp.damageType.HTH + params.damageType = dsp.damageType.BLUNT params.scattr = SC_IMPACTION params.numhits = 6 params.multiplier = 1.0 diff --git a/scripts/globals/spells/bluemagic/bad_breath.lua b/scripts/globals/spells/bluemagic/bad_breath.lua index 4fd192b38e1..0500fc0dbc2 100644 --- a/scripts/globals/spells/bluemagic/bad_breath.lua +++ b/scripts/globals/spells/bluemagic/bad_breath.lua @@ -28,6 +28,7 @@ function onSpellCast(caster,target,spell) if (caster:hasStatusEffect(dsp.effect.AZURE_LORE)) then multi = multi + 0.50 end + params.damageType = dsp.damageType.EARTH params.multiplier = multi params.tMultiplier = 1.5 params.duppercap = 69 diff --git a/scripts/globals/spells/bluemagic/battle_dance.lua b/scripts/globals/spells/bluemagic/battle_dance.lua index 7c0422e0173..1d64b8ddb58 100644 --- a/scripts/globals/spells/bluemagic/battle_dance.lua +++ b/scripts/globals/spells/bluemagic/battle_dance.lua @@ -26,7 +26,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_DURATION - params.dmgtype = dsp.damageType.SLASHING + params.damageType = dsp.damageType.SLASHING params.scattr = SC_IMPACTION params.numhits = 1 params.multiplier = 2.0 diff --git a/scripts/globals/spells/bluemagic/blastbomb.lua b/scripts/globals/spells/bluemagic/blastbomb.lua index 33417925112..133aec81ac2 100644 --- a/scripts/globals/spells/bluemagic/blastbomb.lua +++ b/scripts/globals/spells/bluemagic/blastbomb.lua @@ -23,6 +23,7 @@ end function onSpellCast(caster,target,spell) local params = {} + params.damageType = dsp.damageType.FIRE params.multiplier = 1.375 params.tMultiplier = 1.0 params.duppercap = 30 diff --git a/scripts/globals/spells/bluemagic/blitzstrahl.lua b/scripts/globals/spells/bluemagic/blitzstrahl.lua index 35e9b1071b6..5404284aaa4 100644 --- a/scripts/globals/spells/bluemagic/blitzstrahl.lua +++ b/scripts/globals/spells/bluemagic/blitzstrahl.lua @@ -24,6 +24,7 @@ end function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage + params.damageType = dsp.damageType.LIGHTNING params.multiplier = 1.5625 params.tMultiplier = 1.0 params.duppercap = 61 diff --git a/scripts/globals/spells/bluemagic/blood_drain.lua b/scripts/globals/spells/bluemagic/blood_drain.lua index 880028b441d..fb171cce02e 100644 --- a/scripts/globals/spells/bluemagic/blood_drain.lua +++ b/scripts/globals/spells/bluemagic/blood_drain.lua @@ -51,6 +51,7 @@ function onSpellCast(caster,target,spell) dmg = target:getHP() end + params.damageType = dsp.damageType.DARK dmg = BlueFinalAdjustments(caster,target,spell,dmg,params) caster:addHP(dmg) diff --git a/scripts/globals/spells/bluemagic/blood_saber.lua b/scripts/globals/spells/bluemagic/blood_saber.lua index b4f3a234af9..fbb917b262f 100644 --- a/scripts/globals/spells/bluemagic/blood_saber.lua +++ b/scripts/globals/spells/bluemagic/blood_saber.lua @@ -51,6 +51,7 @@ function onSpellCast(caster,target,spell) dmg = target:getHP() end + params.damageType = dsp.damageType.DARK dmg = BlueFinalAdjustments(caster,target,spell,dmg,params) caster:addHP(dmg) diff --git a/scripts/globals/spells/bluemagic/bludgeon.lua b/scripts/globals/spells/bluemagic/bludgeon.lua index 0643b9fd44c..8b6718265fc 100644 --- a/scripts/globals/spells/bluemagic/bludgeon.lua +++ b/scripts/globals/spells/bluemagic/bludgeon.lua @@ -25,7 +25,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_ACC - params.dmgtype = dsp.damageType.HTH + params.damageType = dsp.damageType.BLUNT params.scattr = SC_LIQUEFACTION params.numhits = 3 params.multiplier = 1.0 diff --git a/scripts/globals/spells/bluemagic/body_slam.lua b/scripts/globals/spells/bluemagic/body_slam.lua index 9b4347af709..f315e6c5bcb 100644 --- a/scripts/globals/spells/bluemagic/body_slam.lua +++ b/scripts/globals/spells/bluemagic/body_slam.lua @@ -25,7 +25,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_ATTACK - params.dmgtype = dsp.damageType.BLUNT + params.damageType = dsp.damageType.BLUNT params.scattr = SC_IMPACTION params.numhits = 1 params.multiplier = 1.5 diff --git a/scripts/globals/spells/bluemagic/bomb_toss.lua b/scripts/globals/spells/bluemagic/bomb_toss.lua index 5c296145c70..3271a66dce3 100644 --- a/scripts/globals/spells/bluemagic/bomb_toss.lua +++ b/scripts/globals/spells/bluemagic/bomb_toss.lua @@ -24,6 +24,7 @@ end function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage + params.damageType = dsp.damageType.FIRE params.multiplier = 1.625 params.tMultiplier = 1.0 params.duppercap = 40 diff --git a/scripts/globals/spells/bluemagic/cannonball.lua b/scripts/globals/spells/bluemagic/cannonball.lua index a2c4bac4fa9..6a9075e7e24 100644 --- a/scripts/globals/spells/bluemagic/cannonball.lua +++ b/scripts/globals/spells/bluemagic/cannonball.lua @@ -25,7 +25,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_DAMAGE - params.dmgtype = dsp.damageType.HTH + params.damageType = dsp.damageType.BLUNT params.scattr = SC_FUSION params.numhits = 1 params.multiplier = 1.75 diff --git a/scripts/globals/spells/bluemagic/claw_cyclone.lua b/scripts/globals/spells/bluemagic/claw_cyclone.lua index 9c95ff790f5..710ed2921a1 100644 --- a/scripts/globals/spells/bluemagic/claw_cyclone.lua +++ b/scripts/globals/spells/bluemagic/claw_cyclone.lua @@ -25,7 +25,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_ATTACK - params.dmgtype = dsp.damageType.SLASHING + params.damageType = dsp.damageType.SLASHING params.scattr = SC_SCISSION params.numhits = 2 params.multiplier = 1.4375 diff --git a/scripts/globals/spells/bluemagic/corrosive_ooze.lua b/scripts/globals/spells/bluemagic/corrosive_ooze.lua index 8ea35126037..a11aae822c3 100644 --- a/scripts/globals/spells/bluemagic/corrosive_ooze.lua +++ b/scripts/globals/spells/bluemagic/corrosive_ooze.lua @@ -28,6 +28,7 @@ function onSpellCast(caster,target,spell) if (caster:hasStatusEffect(dsp.effect.AZURE_LORE)) then multi = multi + 0.50 end + params.damageType = dsp.damageType.WATER params.multiplier = multi params.tMultiplier = 2.0 params.duppercap = 69 diff --git a/scripts/globals/spells/bluemagic/cursed_sphere.lua b/scripts/globals/spells/bluemagic/cursed_sphere.lua index 2794a3c4ca1..e1a9bb35b73 100644 --- a/scripts/globals/spells/bluemagic/cursed_sphere.lua +++ b/scripts/globals/spells/bluemagic/cursed_sphere.lua @@ -24,6 +24,7 @@ end function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage + params.damageType = dsp.damageType.WATER params.multiplier = 1.50 params.tMultiplier = 1.0 params.duppercap = 30 diff --git a/scripts/globals/spells/bluemagic/death_ray.lua b/scripts/globals/spells/bluemagic/death_ray.lua index c954f2444c4..fbd3b90e423 100644 --- a/scripts/globals/spells/bluemagic/death_ray.lua +++ b/scripts/globals/spells/bluemagic/death_ray.lua @@ -28,6 +28,7 @@ function onSpellCast(caster,target,spell) if (caster:hasStatusEffect(dsp.effect.AZURE_LORE)) then multi = multi + 2.0 end + params.damageType = dsp.damageType.DARK params.multiplier = multi params.tMultiplier = 1.0 params.duppercap = 51 diff --git a/scripts/globals/spells/bluemagic/death_scissors.lua b/scripts/globals/spells/bluemagic/death_scissors.lua index 44731d1c5e0..75556353e45 100644 --- a/scripts/globals/spells/bluemagic/death_scissors.lua +++ b/scripts/globals/spells/bluemagic/death_scissors.lua @@ -25,7 +25,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_DAMAGE - params.dmgtype = dsp.damageType.SLASHING + params.damageType = dsp.damageType.SLASHING params.scattr = SC_COMPRESSION params.numhits = 1 params.multiplier = 1.5 diff --git a/scripts/globals/spells/bluemagic/digest.lua b/scripts/globals/spells/bluemagic/digest.lua index 2c28e7d306c..f25840c787d 100644 --- a/scripts/globals/spells/bluemagic/digest.lua +++ b/scripts/globals/spells/bluemagic/digest.lua @@ -52,6 +52,7 @@ function onSpellCast(caster,target,spell) dmg = target:getHP() end + params.damageType = dsp.damageType.DARK dmg = BlueFinalAdjustments(caster,target,spell,dmg,params) caster:addHP(dmg) diff --git a/scripts/globals/spells/bluemagic/dimensional_death.lua b/scripts/globals/spells/bluemagic/dimensional_death.lua index 90370d6ee77..0c102795926 100644 --- a/scripts/globals/spells/bluemagic/dimensional_death.lua +++ b/scripts/globals/spells/bluemagic/dimensional_death.lua @@ -25,7 +25,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_ATTACK - params.dmgtype = dsp.damageType.HTH + params.damageType = dsp.damageType.BLUNT params.scattr = SC_IMPACTION params.numhits = 1 params.multiplier = 2.25 diff --git a/scripts/globals/spells/bluemagic/disseverment.lua b/scripts/globals/spells/bluemagic/disseverment.lua index 73c04b4a5f0..0efb1f764d9 100644 --- a/scripts/globals/spells/bluemagic/disseverment.lua +++ b/scripts/globals/spells/bluemagic/disseverment.lua @@ -25,7 +25,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_ACC - params.dmgtype = dsp.damageType.PIERCING + params.damageType = dsp.damageType.PIERCING params.scattr = SC_DISTORTION params.numhits = 5 params.multiplier = 1.5 diff --git a/scripts/globals/spells/bluemagic/eyes_on_me.lua b/scripts/globals/spells/bluemagic/eyes_on_me.lua index ebe6d9702b0..bb9ae9b7894 100644 --- a/scripts/globals/spells/bluemagic/eyes_on_me.lua +++ b/scripts/globals/spells/bluemagic/eyes_on_me.lua @@ -28,6 +28,7 @@ function onSpellCast(caster,target,spell) if (caster:hasStatusEffect(dsp.effect.AZURE_LORE)) then multi = multi + 2.0 end + params.damageType = dsp.damageType.DARK params.multiplier = multi params.tMultiplier = 1.5 params.duppercap = 69 diff --git a/scripts/globals/spells/bluemagic/feather_storm.lua b/scripts/globals/spells/bluemagic/feather_storm.lua index d56586b38d6..b43a4702233 100644 --- a/scripts/globals/spells/bluemagic/feather_storm.lua +++ b/scripts/globals/spells/bluemagic/feather_storm.lua @@ -25,7 +25,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_CRITICAL - params.dmgtype = dsp.damageType.PIERCING + params.damageType = dsp.damageType.PIERCING params.scattr = SC_LIGHT params.numhits = 1 params.multiplier = 1.25 diff --git a/scripts/globals/spells/bluemagic/firespit.lua b/scripts/globals/spells/bluemagic/firespit.lua index bb79d0aac11..4bfb5f7a0ce 100644 --- a/scripts/globals/spells/bluemagic/firespit.lua +++ b/scripts/globals/spells/bluemagic/firespit.lua @@ -24,6 +24,7 @@ end function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage + params.damageType = dsp.damageType.FIRE params.multiplier = 3.0 params.tMultiplier = 1.5 params.duppercap = 69 diff --git a/scripts/globals/spells/bluemagic/flying_hip_press.lua b/scripts/globals/spells/bluemagic/flying_hip_press.lua index 74bf19efc22..e8db4132936 100644 --- a/scripts/globals/spells/bluemagic/flying_hip_press.lua +++ b/scripts/globals/spells/bluemagic/flying_hip_press.lua @@ -23,6 +23,7 @@ end function onSpellCast(caster,target,spell) local params = {} + params.damageType = dsp.damageType.WIND params.multiplier = 2.775 params.tMultiplier = 2.912 params.duppercap = 58 diff --git a/scripts/globals/spells/bluemagic/foot_kick.lua b/scripts/globals/spells/bluemagic/foot_kick.lua index e92f7a383ba..b4188941f82 100644 --- a/scripts/globals/spells/bluemagic/foot_kick.lua +++ b/scripts/globals/spells/bluemagic/foot_kick.lua @@ -25,7 +25,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_CRITICAL - params.dmgtype = dsp.damageType.SLASHING + params.damageType = dsp.damageType.SLASHING params.scattr = SC_DETONATION params.numhits = 1 params.multiplier = 1.0 diff --git a/scripts/globals/spells/bluemagic/frenetic_rip.lua b/scripts/globals/spells/bluemagic/frenetic_rip.lua index 6a18ebb74c3..d288aa5cfd0 100644 --- a/scripts/globals/spells/bluemagic/frenetic_rip.lua +++ b/scripts/globals/spells/bluemagic/frenetic_rip.lua @@ -25,7 +25,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_DAMAGE - params.dmgtype = dsp.damageType.HTH + params.damageType = dsp.damageType.BLUNT params.scattr = SC_INDURATION params.numhits = 3 params.multiplier = 1.36 diff --git a/scripts/globals/spells/bluemagic/frost_breath.lua b/scripts/globals/spells/bluemagic/frost_breath.lua index e1c82429970..7b78835b637 100644 --- a/scripts/globals/spells/bluemagic/frost_breath.lua +++ b/scripts/globals/spells/bluemagic/frost_breath.lua @@ -31,6 +31,7 @@ function onSpellCast(caster,target,spell) local resist = applyResistance(caster, target, spell, params) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage + params.damageType = dsp.damageType.ICE params.multiplier = multi params.tMultiplier = 1.5 params.duppercap = 69 diff --git a/scripts/globals/spells/bluemagic/frypan.lua b/scripts/globals/spells/bluemagic/frypan.lua index e895f08983e..012f842b84c 100644 --- a/scripts/globals/spells/bluemagic/frypan.lua +++ b/scripts/globals/spells/bluemagic/frypan.lua @@ -33,7 +33,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_ACC - params.dmgtype = dsp.damageType.BLUNT + params.damageType = dsp.damageType.BLUNT params.scattr = SC_IMPACTION params.numhits = 1 params.multiplier = 1.78 diff --git a/scripts/globals/spells/bluemagic/grand_slam.lua b/scripts/globals/spells/bluemagic/grand_slam.lua index f736ab64817..047465d845f 100644 --- a/scripts/globals/spells/bluemagic/grand_slam.lua +++ b/scripts/globals/spells/bluemagic/grand_slam.lua @@ -25,7 +25,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_ATTACK - params.dmgtype = dsp.damageType.BLUNT + params.damageType = dsp.damageType.BLUNT params.scattr = SC_INDURATION params.numhits = 1 params.multiplier = 1.0 diff --git a/scripts/globals/spells/bluemagic/head_butt.lua b/scripts/globals/spells/bluemagic/head_butt.lua index b9eb4a954a1..685bc50da80 100644 --- a/scripts/globals/spells/bluemagic/head_butt.lua +++ b/scripts/globals/spells/bluemagic/head_butt.lua @@ -33,7 +33,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_DAMAGE - params.dmgtype = dsp.damageType.BLUNT + params.damageType = dsp.damageType.BLUNT params.scattr = SC_IMPACTION params.numhits = 1 params.multiplier = 1.75 diff --git a/scripts/globals/spells/bluemagic/heat_breath.lua b/scripts/globals/spells/bluemagic/heat_breath.lua index 97b6a9f0f34..4aaa1da9fe3 100644 --- a/scripts/globals/spells/bluemagic/heat_breath.lua +++ b/scripts/globals/spells/bluemagic/heat_breath.lua @@ -31,6 +31,7 @@ function onSpellCast(caster,target,spell) local resist = applyResistance(caster, target, spell, params) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage + params.damageType = dsp.damageType.FIRE params.multiplier = multi params.tMultiplier = 1.5 params.duppercap = 69 diff --git a/scripts/globals/spells/bluemagic/hecatomb_wave.lua b/scripts/globals/spells/bluemagic/hecatomb_wave.lua index eddc43dfb0d..0509fa2ff4a 100644 --- a/scripts/globals/spells/bluemagic/hecatomb_wave.lua +++ b/scripts/globals/spells/bluemagic/hecatomb_wave.lua @@ -36,6 +36,7 @@ function onSpellCast(caster,target,spell) local resist = applyResistance(caster, target, spell, params) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage + params.damageType = dsp.damageType.WIND params.multiplier = 1.375 params.tMultiplier = 1.0 params.duppercap = 54 diff --git a/scripts/globals/spells/bluemagic/helldive.lua b/scripts/globals/spells/bluemagic/helldive.lua index 30d2bc3ee4a..55282763715 100644 --- a/scripts/globals/spells/bluemagic/helldive.lua +++ b/scripts/globals/spells/bluemagic/helldive.lua @@ -25,7 +25,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_DAMAGE - params.dmgtype = dsp.damageType.BLUNT + params.damageType = dsp.damageType.BLUNT params.scattr = SC_TRANSFIXION params.numhits = 1 params.multiplier = 1.25 diff --git a/scripts/globals/spells/bluemagic/hydro_shot.lua b/scripts/globals/spells/bluemagic/hydro_shot.lua index 7bb41510490..1c935dd83a7 100644 --- a/scripts/globals/spells/bluemagic/hydro_shot.lua +++ b/scripts/globals/spells/bluemagic/hydro_shot.lua @@ -25,7 +25,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_CHANCE - params.dmgtype = dsp.damageType.HTH + params.damageType = dsp.damageType.BLUNT params.scattr = SC_REVERBERATION params.numhits = 1 params.multiplier = 1.25 diff --git a/scripts/globals/spells/bluemagic/hysteric_barrage.lua b/scripts/globals/spells/bluemagic/hysteric_barrage.lua index ecb9a0ca6d2..52ef5ac0e95 100644 --- a/scripts/globals/spells/bluemagic/hysteric_barrage.lua +++ b/scripts/globals/spells/bluemagic/hysteric_barrage.lua @@ -25,7 +25,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_DAMAGE - params.dmgtype = dsp.damageType.HTH + params.damageType = dsp.damageType.HTH params.scattr = SC_DETONATION params.numhits = 5 params.multiplier = 1.25 diff --git a/scripts/globals/spells/bluemagic/ice_break.lua b/scripts/globals/spells/bluemagic/ice_break.lua index bd7f6888890..1a8aea00065 100644 --- a/scripts/globals/spells/bluemagic/ice_break.lua +++ b/scripts/globals/spells/bluemagic/ice_break.lua @@ -36,6 +36,7 @@ function onSpellCast(caster,target,spell) local resist = applyResistance(caster, target, spell, params) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage + params.damageType = dsp.damageType.ICE params.multiplier = 2.25 params.tMultiplier = 1.0 params.duppercap = 69 diff --git a/scripts/globals/spells/bluemagic/jet_stream.lua b/scripts/globals/spells/bluemagic/jet_stream.lua index 97c1bbb30c3..e71014fb1fc 100644 --- a/scripts/globals/spells/bluemagic/jet_stream.lua +++ b/scripts/globals/spells/bluemagic/jet_stream.lua @@ -25,7 +25,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_ACC - params.dmgtype = dsp.damageType.BLUNT + params.damageType = dsp.damageType.BLUNT params.scattr = SC_IMPACTION params.numhits = 3 params.multiplier = 1.125 diff --git a/scripts/globals/spells/bluemagic/maelstrom.lua b/scripts/globals/spells/bluemagic/maelstrom.lua index 04d92f77004..908812084ea 100644 --- a/scripts/globals/spells/bluemagic/maelstrom.lua +++ b/scripts/globals/spells/bluemagic/maelstrom.lua @@ -24,6 +24,7 @@ end function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage + params.damageType = dsp.damageType.WATER params.multiplier = 2.375 params.tMultiplier = 1.5 params.duppercap = 69 diff --git a/scripts/globals/spells/bluemagic/magic_hammer.lua b/scripts/globals/spells/bluemagic/magic_hammer.lua index 7b5f76a2ab4..1b5a8e216e3 100644 --- a/scripts/globals/spells/bluemagic/magic_hammer.lua +++ b/scripts/globals/spells/bluemagic/magic_hammer.lua @@ -39,6 +39,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage + params.damageType = dsp.damageType.LIGHT params.multiplier = multi params.tMultiplier = 1.0 params.duppercap = 35 diff --git a/scripts/globals/spells/bluemagic/magnetite_cloud.lua b/scripts/globals/spells/bluemagic/magnetite_cloud.lua index 93bea9d469f..61288ad3fdc 100644 --- a/scripts/globals/spells/bluemagic/magnetite_cloud.lua +++ b/scripts/globals/spells/bluemagic/magnetite_cloud.lua @@ -23,6 +23,7 @@ end function onSpellCast(caster,target,spell) local params = {} + params.damageType = dsp.damageType.EARTH params.diff = caster:getStat(dsp.mod.INT) - target:getStat(dsp.mod.INT) params.attribute = dsp.mod.INT params.skillType = dsp.skill.BLUE_MAGIC diff --git a/scripts/globals/spells/bluemagic/mandibular_bite.lua b/scripts/globals/spells/bluemagic/mandibular_bite.lua index f9fb17ea4dd..849e59a73d8 100644 --- a/scripts/globals/spells/bluemagic/mandibular_bite.lua +++ b/scripts/globals/spells/bluemagic/mandibular_bite.lua @@ -25,7 +25,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_ATTACK - params.dmgtype = dsp.damageType.SLASHING + params.damageType = dsp.damageType.SLASHING params.scattr = SC_INDURATION params.numhits = 1 params.multiplier = 2.0 diff --git a/scripts/globals/spells/bluemagic/mind_blast.lua b/scripts/globals/spells/bluemagic/mind_blast.lua index adbcc702234..f529cba2712 100644 --- a/scripts/globals/spells/bluemagic/mind_blast.lua +++ b/scripts/globals/spells/bluemagic/mind_blast.lua @@ -23,6 +23,7 @@ end function onSpellCast(caster,target,spell) local params = {} + params.damageType = dsp.damageType.LIGHTNING params.diff = caster:getStat(dsp.mod.INT) - target:getStat(dsp.mod.INT) params.attribute = dsp.mod.INT params.skillType = dsp.skill.BLUE_MAGIC diff --git a/scripts/globals/spells/bluemagic/mysterious_light.lua b/scripts/globals/spells/bluemagic/mysterious_light.lua index 04470b44cfb..1dbdb36c725 100644 --- a/scripts/globals/spells/bluemagic/mysterious_light.lua +++ b/scripts/globals/spells/bluemagic/mysterious_light.lua @@ -23,6 +23,7 @@ end function onSpellCast(caster,target,spell) local params = {} + params.damageType = dsp.damageType.WIND params.diff = caster:getStat(dsp.mod.INT) - target:getStat(dsp.mod.INT) params.attribute = dsp.mod.INT params.skillType = dsp.skill.BLUE_MAGIC diff --git a/scripts/globals/spells/bluemagic/poison_breath.lua b/scripts/globals/spells/bluemagic/poison_breath.lua index a4f4a563d04..00119d10a20 100644 --- a/scripts/globals/spells/bluemagic/poison_breath.lua +++ b/scripts/globals/spells/bluemagic/poison_breath.lua @@ -26,6 +26,7 @@ end function onSpellCast(caster,target,spell) local params = {} + params.damageType = dsp.damageType.WATER params.diff = caster:getStat(dsp.mod.INT) - target:getStat(dsp.mod.INT) params.attribute = dsp.mod.INT params.skillType = dsp.skill.BLUE_MAGIC diff --git a/scripts/globals/spells/bluemagic/power_attack.lua b/scripts/globals/spells/bluemagic/power_attack.lua index 0856f6a6a3d..bc9ce848411 100644 --- a/scripts/globals/spells/bluemagic/power_attack.lua +++ b/scripts/globals/spells/bluemagic/power_attack.lua @@ -25,7 +25,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_CRITICAL - params.dmgtype = dsp.damageType.BLUNT + params.damageType = dsp.damageType.BLUNT params.scattr = SC_REVERBERATION params.numhits = 1 params.multiplier = 1.125 diff --git a/scripts/globals/spells/bluemagic/queasyshroom.lua b/scripts/globals/spells/bluemagic/queasyshroom.lua index ccdc5fa9cba..5ecf9543e06 100644 --- a/scripts/globals/spells/bluemagic/queasyshroom.lua +++ b/scripts/globals/spells/bluemagic/queasyshroom.lua @@ -25,7 +25,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_CRITICAL - params.dmgtype = dsp.damageType.PIERCING + params.damageType = dsp.damageType.PIERCING params.scattr = SC_DARK params.numhits = 1 params.multiplier = 1.25 diff --git a/scripts/globals/spells/bluemagic/radiant_breath.lua b/scripts/globals/spells/bluemagic/radiant_breath.lua index 161340d3df7..19e49c0c496 100644 --- a/scripts/globals/spells/bluemagic/radiant_breath.lua +++ b/scripts/globals/spells/bluemagic/radiant_breath.lua @@ -29,6 +29,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage + params.damageType = dsp.damageType.LIGHT params.multiplier = multi params.tMultiplier = 1.5 params.duppercap = 69 diff --git a/scripts/globals/spells/bluemagic/ram_charge.lua b/scripts/globals/spells/bluemagic/ram_charge.lua index ac1f93e8683..e8d1b8912dc 100644 --- a/scripts/globals/spells/bluemagic/ram_charge.lua +++ b/scripts/globals/spells/bluemagic/ram_charge.lua @@ -25,7 +25,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_DAMAGE - params.dmgtype = dsp.damageType.BLUNT + params.damageType = dsp.damageType.BLUNT params.scattr = SC_FRAGMENTATION params.numhits = 1 params.multiplier = 1.0 diff --git a/scripts/globals/spells/bluemagic/regurgitation.lua b/scripts/globals/spells/bluemagic/regurgitation.lua index 6b4fae4f030..05fb9beb53e 100644 --- a/scripts/globals/spells/bluemagic/regurgitation.lua +++ b/scripts/globals/spells/bluemagic/regurgitation.lua @@ -23,6 +23,7 @@ end function onSpellCast(caster,target,spell) local params = {} + params.damageType = dsp.damageType.WATER params.multiplier = 1.83 params.tMultiplier = 2.0 params.duppercap = 69 diff --git a/scripts/globals/spells/bluemagic/rending_deluge.lua b/scripts/globals/spells/bluemagic/rending_deluge.lua index 0444f6fc0d3..4a1a809b5d2 100644 --- a/scripts/globals/spells/bluemagic/rending_deluge.lua +++ b/scripts/globals/spells/bluemagic/rending_deluge.lua @@ -13,6 +13,7 @@ ----------------------------------------- require("scripts/globals/bluemagic") require("scripts/globals/magic") +require("scripts/globals/status") ----------------------------------------- function onMagicCastingCheck(caster,target,spell) @@ -25,6 +26,7 @@ function onSpellCast(caster,target,spell) multi = multi + 1.50 end local params = {} + params.damageType = dsp.damageType.WATER params.attribute = dsp.mod.INT params.skillType = dsp.skill.BLUE_MAGIC params.effect = dsp.effect.NONE diff --git a/scripts/globals/spells/bluemagic/sandspin.lua b/scripts/globals/spells/bluemagic/sandspin.lua index 899551b46da..d8549236161 100644 --- a/scripts/globals/spells/bluemagic/sandspin.lua +++ b/scripts/globals/spells/bluemagic/sandspin.lua @@ -24,6 +24,7 @@ end function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage + params.damageType = dsp.damageType.EARTH params.multiplier = 1.0 params.tMultiplier = 1.0 params.duppercap = 13 diff --git a/scripts/globals/spells/bluemagic/screwdriver.lua b/scripts/globals/spells/bluemagic/screwdriver.lua index f5c1b20d33d..0d0f472164e 100644 --- a/scripts/globals/spells/bluemagic/screwdriver.lua +++ b/scripts/globals/spells/bluemagic/screwdriver.lua @@ -25,7 +25,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_CRITICAL - params.dmgtype = dsp.damageType.PIERCING + params.damageType = dsp.damageType.PIERCING params.scattr = SC_TRANSFIXION params.scattr2 = SC_SCISSION params.numhits = 1 diff --git a/scripts/globals/spells/bluemagic/seedspray.lua b/scripts/globals/spells/bluemagic/seedspray.lua index ee31c0aaf73..75d41e1ad6f 100644 --- a/scripts/globals/spells/bluemagic/seedspray.lua +++ b/scripts/globals/spells/bluemagic/seedspray.lua @@ -25,7 +25,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_CRITICAL - params.dmgtype = dsp.damageType.SLASHING + params.damageType = dsp.damageType.SLASHING params.scattr = SC_GRAVITATION params.numhits = 3 params.multiplier = 1.925 diff --git a/scripts/globals/spells/bluemagic/sickle_slash.lua b/scripts/globals/spells/bluemagic/sickle_slash.lua index f251d10e8b0..e131384a923 100644 --- a/scripts/globals/spells/bluemagic/sickle_slash.lua +++ b/scripts/globals/spells/bluemagic/sickle_slash.lua @@ -25,7 +25,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_CRITICAL - params.dmgtype = dsp.damageType.HTH + params.damageType = dsp.damageType.HTH params.scattr = SC_COMPRESSION params.numhits = 1 params.multiplier = 1.5 diff --git a/scripts/globals/spells/bluemagic/smite_of_rage.lua b/scripts/globals/spells/bluemagic/smite_of_rage.lua index 90655e1d623..4c29be31098 100644 --- a/scripts/globals/spells/bluemagic/smite_of_rage.lua +++ b/scripts/globals/spells/bluemagic/smite_of_rage.lua @@ -25,7 +25,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_DAMAGE - params.dmgtype = dsp.damageType.SLASHING + params.damageType = dsp.damageType.SLASHING params.scattr = SC_DETONATION params.numhits = 1 params.multiplier = 1.5 diff --git a/scripts/globals/spells/bluemagic/spinal_cleave.lua b/scripts/globals/spells/bluemagic/spinal_cleave.lua index 3c3aa42565d..06533cb70f6 100644 --- a/scripts/globals/spells/bluemagic/spinal_cleave.lua +++ b/scripts/globals/spells/bluemagic/spinal_cleave.lua @@ -25,7 +25,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_ACC - params.dmgtype = dsp.damageType.SLASHING + params.damageType = dsp.damageType.SLASHING params.scattr = SC_SCISSION params.scattr2 = SC_DETONATION params.numhits = 1 diff --git a/scripts/globals/spells/bluemagic/spiral_spin.lua b/scripts/globals/spells/bluemagic/spiral_spin.lua index 454a469cc17..adf40043b55 100644 --- a/scripts/globals/spells/bluemagic/spiral_spin.lua +++ b/scripts/globals/spells/bluemagic/spiral_spin.lua @@ -25,7 +25,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_CRITICAL - params.dmgtype = dsp.damageType.SLASHING + params.damageType = dsp.damageType.SLASHING params.scattr = SC_TRANSFIXION params.numhits = 1 params.multiplier = 1.925 diff --git a/scripts/globals/spells/bluemagic/sprout_smack.lua b/scripts/globals/spells/bluemagic/sprout_smack.lua index b29c11a9fca..01ca00c3d57 100644 --- a/scripts/globals/spells/bluemagic/sprout_smack.lua +++ b/scripts/globals/spells/bluemagic/sprout_smack.lua @@ -27,7 +27,7 @@ function onSpellCast(caster, target, spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_DURATION - params.dmgtype = dsp.damageType.BLUNT + params.damageType = dsp.damageType.BLUNT params.scattr = SC_REVERBERATION params.numhits = 1 params.multiplier = 1.5 diff --git a/scripts/globals/spells/bluemagic/sub-zero_smash.lua b/scripts/globals/spells/bluemagic/sub-zero_smash.lua index f43a2156da7..2c066dbbc1d 100644 --- a/scripts/globals/spells/bluemagic/sub-zero_smash.lua +++ b/scripts/globals/spells/bluemagic/sub-zero_smash.lua @@ -25,7 +25,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_CRITICAL - params.dmgtype = dsp.damageType.BLUNT + params.damageType = dsp.damageType.BLUNT params.scattr = SC_FRAGMENTATION params.numhits = 1 params.multiplier = 1.95 diff --git a/scripts/globals/spells/bluemagic/sudden_lunge.lua b/scripts/globals/spells/bluemagic/sudden_lunge.lua index 2beb9622fc1..33564cf1b87 100644 --- a/scripts/globals/spells/bluemagic/sudden_lunge.lua +++ b/scripts/globals/spells/bluemagic/sudden_lunge.lua @@ -33,7 +33,7 @@ function onSpellCast(caster,target,spell) local params = {} -- Todo: determine if these param values are retail params.tpmod = TPMOD_DAMAGE - params.dmgtype = dsp.damageType.SLASHING + params.damageType = dsp.damageType.SLASHING params.scattr = SC_DETONATION params.numhits = 1 params.multiplier = 1.875 diff --git a/scripts/globals/spells/bluemagic/tail_slap.lua b/scripts/globals/spells/bluemagic/tail_slap.lua index e1d4a842465..f35c75214cd 100644 --- a/scripts/globals/spells/bluemagic/tail_slap.lua +++ b/scripts/globals/spells/bluemagic/tail_slap.lua @@ -33,7 +33,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_ATTACK - params.dmgtype = dsp.damageType.HTH + params.damageType = dsp.damageType.HTH params.scattr = SC_REVERBERATION params.numhits = 1 params.multiplier = 1.625 diff --git a/scripts/globals/spells/bluemagic/terror_touch.lua b/scripts/globals/spells/bluemagic/terror_touch.lua index 29acad9f461..3e7bc267427 100644 --- a/scripts/globals/spells/bluemagic/terror_touch.lua +++ b/scripts/globals/spells/bluemagic/terror_touch.lua @@ -27,7 +27,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_ACC - params.dmgtype = dsp.damageType.HTH + params.damageType = dsp.damageType.HTH params.scattr = SC_COMPRESSION params.numhits = 1 params.multiplier = 1.5 diff --git a/scripts/globals/spells/bluemagic/uppercut.lua b/scripts/globals/spells/bluemagic/uppercut.lua index ac970385be2..c7eb1c9dcd2 100644 --- a/scripts/globals/spells/bluemagic/uppercut.lua +++ b/scripts/globals/spells/bluemagic/uppercut.lua @@ -25,7 +25,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_ATTACK - params.dmgtype = dsp.damageType.HTH + params.damageType = dsp.damageType.HTH params.scattr = SC_LIQUEFACTION params.scattr2 = SC_IMPACTION params.numhits = 1 diff --git a/scripts/globals/spells/bluemagic/vertical_cleave.lua b/scripts/globals/spells/bluemagic/vertical_cleave.lua index ebfceb6cd47..c1bfdc0c2ca 100644 --- a/scripts/globals/spells/bluemagic/vertical_cleave.lua +++ b/scripts/globals/spells/bluemagic/vertical_cleave.lua @@ -25,7 +25,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_ATTACK - params.dmgtype = dsp.damageType.SLASHING + params.damageType = dsp.damageType.SLASHING params.scattr = SC_GRAVITATION params.numhits = 1 params.multiplier = 3.0 diff --git a/scripts/globals/spells/bluemagic/wild_oats.lua b/scripts/globals/spells/bluemagic/wild_oats.lua index a742c0e1323..93ccaed920e 100644 --- a/scripts/globals/spells/bluemagic/wild_oats.lua +++ b/scripts/globals/spells/bluemagic/wild_oats.lua @@ -26,7 +26,7 @@ function onSpellCast(caster,target,spell) local params = {} -- This data should match information on http://wiki.ffxiclopedia.org/wiki/Calculating_Blue_Magic_Damage params.tpmod = TPMOD_DURATION - params.dmgtype = dsp.damageType.PIERCING + params.damageType = dsp.damageType.PIERCING params.scattr = SC_TRANSFIXION params.numhits = 1 params.multiplier = 1.84