Combat changes and bug fixes

Added the combo and proc systems
Added scripts for most weaponskill and spells as well as some abilities and status effects
Added support for multihit attacks
Added AbilityState for abilities
Added hiteffects that change based on an attack's parameters
Added positionals

Changed how targeting works for battlecommands

Fixed bug that occurred when moving or swapping hotbar commands
Fixed bug that occurred when losing status effects

data/scripts/commands/magic/aero.lua

@@ -0,0 +1,14 @@
+require("global");
+require("magic");
+
+function onMagicPrepare(caster, target, spell)
+    return 0;
+end;
+
+function onMagicStart(caster, target, spell)
+    return 0;
+end;
+
+function onMagicFinish(caster, target, spell, action)
+    magic.onMagicFinish(caster, target, spell, action)
+end;

data/scripts/commands/magic/aerora.lua

@@ -0,0 +1,27 @@
+require("global");
+require("magic");
+
+function onMagicPrepare(caster, target, spell)
+    return 0;
+end;
+
+function onMagicStart(caster, target, spell)
+    return 0;
+end;
+
+--Increased damage and conversion to single target
+function onCombo(caster, target, spell)
+    spell.aoeType = 0;
+    spell.potency = spell.potency * 1.5;
+end;
+
+function onMagicFinish(caster, target, spell, action)
+    local damage = math.random(10, 100);
+    
+    --Dispels an effect on each target.
+    local effects = target.statusEffects.GetStatusEffectsByFlag(16); --lose on dispel
+    if effects != nil then
+        target.statusEffects.RemoveStatusEffect(effects[0]);
+    end;
+    return damage;
+end;

data/scripts/commands/magic/ballad_of_magi.lua

@@ -0,0 +1,14 @@
+require("global");
+require("magic");
+
+function onMagicPrepare(caster, target, spell)
+    return 0;
+end;
+
+function onMagicStart(caster, target, spell)
+    return 0;
+end;
+
+function onMagicFinish(caster, target, spell, action)
+    magic.onBuffMagicFinish(caster, target, spell, action)
+end;

data/scripts/commands/magic/blizzara.lua

@@ -10,15 +10,5 @@ function onMagicStart(caster, target, spell)
 end;
 
 function onMagicFinish(caster, target, spell, action)
-    local damage = math.random(10, 100);
-    
-    -- todo: populate a global script with statuses and modifiers
-    action.worldMasterTextId = 0x765D;
-    
-    -- todo: populate a global script with statuses and modifiers
-    -- magic.HandleAttackMagic(caster, target, spell, action)
-    -- action.effectId = bit32.bxor(0x8000000, spell.effectAnimation, 15636);
-    action.effectId = bit32.bxor(0x8000000, spell.effectAnimation, 15636);
-
-    return damage;
+    return magic.onMagicFinish(caster, target, spell, action)
 end;

data/scripts/commands/magic/blizzard.lua

@@ -9,13 +9,5 @@ function onMagicStart(caster, target, spell)
 end;
 
 function onMagicFinish(caster, target, spell, action)
-    local damage = math.random(10, 100);
-    
-    action.worldMasterTextId = 0x765D;
-    
-    -- todo: populate a global script with statuses and modifiers
-    -- magic.HandleAttackMagic(caster, target, spell, action)
-    action.effectId = bit32.bxor(0x8000000, spell.effectAnimation, 15636);
-
-    return damage;
+    magic.onMagicFinish(caster, target, spell, action)
 end;

data/scripts/commands/magic/burst.lua

@@ -9,16 +9,11 @@ function onMagicStart(caster, target, spell)
     return 0;
 end;
 
+--Increased damage with lesser current hp
+function onCombo(caster, target, spell)
+
+end;
+    
 function onMagicFinish(caster, target, spell, action)
-    local damage = math.random(1000, 2500);
-    
-    -- todo: populate a global script with statuses and modifiers
-    action.worldMasterTextId = 0x765D;
-    
-    -- todo: populate a global script with statuses and modifiers
-    -- magic.HandleAttackMagic(caster, target, spell, action)
-    -- action.effectId = bit32.bxor(0x8000000, spell.effectAnimation, 15636);
-    action.effectId = bit32.bxor(0x8000000, spell.effectAnimation, 15636);
-    
-    return damage;
+    magic.onMagicFinish(caster, target, spell, action)
 end;

data/scripts/commands/magic/cura.lua

@@ -0,0 +1,14 @@
+require("global");
+require("magic");
+
+function onMagicPrepare(caster, target, spell)
+    return 0;
+end;
+
+function onMagicStart(caster, target, spell)
+    return 0;
+end;
+
+function onMagicFinish(caster, target, spell, action)
+    magic.onCureMagicFinish(caster, target, spell, action)
+end;

data/scripts/commands/magic/curaga.lua

@@ -0,0 +1,15 @@
+require("global");
+require("magic");
+
+function onMagicPrepare(caster, target, spell)
+    return 0;
+end;
+
+function onMagicStart(caster, target, spell)
+    return 0;
+end;
+
+--http://forum.square-enix.com/ffxiv/threads/41900-White-Mage-A-Guide read
+function onMagicFinish(caster, target, spell, action)
+    magic.onCureMagicFinish(caster, target, spell, action)
+end;

data/scripts/commands/magic/cure.lua

@@ -0,0 +1,14 @@
+require("global");
+require("magic");
+
+function onMagicPrepare(caster, target, spell)
+    return 0;
+end;
+
+function onMagicStart(caster, target, spell)
+    return 0;
+end;
+
+function onMagicFinish(caster, target, spell, action)
+    magic.onCureMagicFinish(caster, target, spell, action)
+end;

data/scripts/commands/magic/default.lua

@@ -0,0 +1,14 @@
+require("global");
+require("magic");
+
+function onMagicPrepare(caster, target, spell)
+    return 0;
+end;
+
+function onMagicStart(caster, target, spell)
+    return 0;
+end;
+
+function onMagicFinish(caster, target, spell, action)
+    magic.onCureMagicFinish(caster, target, spell, action)
+end;

data/scripts/commands/magic/fira.lua

@@ -9,16 +9,11 @@ function onMagicStart(caster, target, spell)
     return 0;
 end;
 
-function onMagicFinish(caster, target, spell, action)
-    local damage = math.random(10, 100);
-    
-    -- todo: populate a global script with statuses and modifiers
-    action.worldMasterTextId = 0x765D;
-    
-    -- todo: populate a global script with statuses and modifiers
-    -- magic.HandleAttackMagic(caster, target, spell, action)
-    -- action.effectId = bit32.bxor(0x8000000, spell.effectAnimation, 15636);
-    action.effectId = bit32.bxor(0x8000000, spell.effectAnimation, 15636);
+--Increased Damage and reduced recast time in place of stun
+function onCombo(caster, target, spell)
+    spell.castTimeMs = spell.castTimeMs / 2;
+end;
 
-    return damage;
+function onMagicFinish(caster, target, spell, action)
+    magic.onMagicFinish(caster, target, spell, action)
 end;

data/scripts/commands/magic/firaga.lua

@@ -9,16 +9,11 @@ function onMagicStart(caster, target, spell)
     return 0;
 end;
 
-function onMagicFinish(caster, target, spell, action)
-    local damage = math.random(1000, 2500);
-    
-    -- todo: populate a global script with statuses and modifiers
-    action.worldMasterTextId = 0x765D;
-    
-    -- todo: populate a global script with statuses and modifiers
-    -- magic.HandleAttackMagic(caster, target, spell, action)
-    -- action.effectId = bit32.bxor(0x8000000, spell.effectAnimation, 15636);
-    action.effectId = bit32.bxor(0x8000000, spell.effectAnimation, 15636);
+--Increased critical damage
+function onCombo(caster, target, spell)
+    spell.castTimeMs = spell.castTimeMs / 2;
+end;
 
-    return damage;
+function onMagicFinish(caster, target, spell, action)
+    magic.onMagicFinish(caster, target, spell, action)
 end;

data/scripts/commands/magic/fire.lua

@@ -10,18 +10,5 @@ function onMagicStart(caster, target, spell)
 end;
 
 function onMagicFinish(caster, target, spell, action)
-    local damage = math.random(10, 100);
-    
-    -- todo: populate a global script with statuses and modifiers
-    action.worldMasterTextId = 0x765D;
-    
-    -- todo: populate a global script with statuses and modifiers
-    -- magic.HandleAttackMagic(caster, target, spell, action)
-    -- action.effectId = bit32.bxor(0x8000000, spell.effectAnimation, 15636);
-    action.effectId = bit32.bxor(0x8000000, spell.effectAnimation, 15636);
-    
-    if target.hateContainer then
-        target.hateContainer.UpdateHate(caster, damage);
-    end;
-    return damage;
+    magic.onMagicFinish(caster, target, spell, action)
 end;

data/scripts/commands/magic/flare.lua

@@ -10,15 +10,7 @@ function onMagicStart(caster, target, spell)
 end;
 
 function onMagicFinish(caster, target, spell, action)
-    local damage = math.random(1000, 2500);
-    
-    -- todo: populate a global script with statuses and modifiers
-    action.worldMasterTextId = 0x765D;
-    
-    -- todo: populate a global script with statuses and modifiers
-    -- magic.HandleAttackMagic(caster, target, spell, action)
-    -- action.effectId = bit32.bxor(0x8000000, spell.effectAnimation, 15636);
-    action.effectId = bit32.bxor(0x8000000, spell.effectAnimation, 15636);
-    
-    return damage;
+    --increase potency based on proximity to target
+
+    magic.onMagicFinish(caster, target, spell, action)
 end;

data/scripts/commands/magic/freeze.lua

@@ -10,15 +10,5 @@ function onMagicStart(caster, target, spell)
 end;
 
 function onMagicFinish(caster, target, spell, action)
-    local damage = math.random(10, 100);
-    
-    -- todo: populate a global script with statuses and modifiers
-    action.worldMasterTextId = 0x765D;
-    
-    -- todo: populate a global script with statuses and modifiers
-    -- magic.HandleAttackMagic(caster, target, spell, action)
-    -- action.effectId = bit32.bxor(0x8000000, spell.effectAnimation, 15636);
-    action.effectId = bit32.bxor(0x8000000, spell.effectAnimation, 15636);
-    
-    return damage;
+    magic.onMagicFinish(caster, target, spell, action)
 end;

data/scripts/commands/magic/holy.lua

@@ -10,15 +10,5 @@ function onMagicStart(caster, target, spell)
 end;
 
 function onMagicFinish(caster, target, spell, action)
-    local damage = math.random(1000, 2500);
-    
-    -- todo: populate a global script with statuses and modifiers
-    action.worldMasterTextId = 0x765D;
-    
-    -- todo: populate a global script with statuses and modifiers
-    -- magic.HandleAttackMagic(caster, target, spell, action)
-    -- action.effectId = bit32.bxor(0x8000000, spell.effectAnimation, 15636);
-    action.effectId = bit32.bxor(0x8000000, spell.effectAnimation, 15636);
-
-    return damage;
+    magic.onMagicFinish(caster, target, spell, action)
 end;

data/scripts/commands/magic/holy_succor.lua

@@ -0,0 +1,21 @@
+require("global");
+require("magic");
+
+function onMagicPrepare(caster, target, spell)
+    return 0;
+end;
+
+function onMagicStart(caster, target, spell)
+    return 0;
+end;
+
+function onMagicFinish(caster, target, spell, action)
+    spell.statusId = 228011;
+    spell.statusDuration = 25;
+    spell.statusChance = 1.0;
+    magic.onCureMagicFinish(caster, target, spell, action)
+
+    if caster != target then
+        action.AddHealAction(caster.actorId, (action.amount / 2));
+    end
+end;

data/scripts/commands/magic/minuet_of_rigor.lua

@@ -0,0 +1,14 @@
+require("global");
+require("magic");
+
+function onMagicPrepare(caster, target, spell)
+    return 0;
+end;
+
+function onMagicStart(caster, target, spell)
+    return 0;
+end;
+
+function onMagicFinish(caster, target, spell, action)
+    magic.onBuffMagicFinish(caster, target, spell, action)
+end;

data/scripts/commands/magic/paeon_of_war.lua

@@ -0,0 +1,14 @@
+require("global");
+require("magic");
+
+function onMagicPrepare(caster, target, spell)
+    return 0;
+end;
+
+function onMagicStart(caster, target, spell)
+    return 0;
+end;
+
+function onMagicFinish(caster, target, spell, action)
+    magic.onBuffMagicFinish(caster, target, spell, action)
+end;

data/scripts/commands/magic/protect.lua

@@ -0,0 +1,14 @@
+require("global");
+require("magic");
+
+function onMagicPrepare(caster, target, spell)
+    return 0;
+end;
+
+function onMagicStart(caster, target, spell)
+    return 0;
+end;
+
+function onMagicFinish(caster, target, spell, action)
+    magic.onStatusMagicFinish(caster, target, spell, action)
+end;

data/scripts/commands/magic/repose.lua

@@ -0,0 +1,14 @@
+require("global");
+require("magic");
+
+function onMagicPrepare(caster, target, spell)
+    return 0;
+end;
+
+function onMagicStart(caster, target, spell)
+    return 0;
+end;
+
+function onMagicFinish(caster, target, spell, action)
+    magic.onMagicFinish(caster, target, spell, action)
+end;

data/scripts/commands/magic/sanguine_rite.lua

@@ -0,0 +1,14 @@
+require("global");
+require("magic");
+
+function onMagicPrepare(caster, target, spell)
+    return 0;
+end;
+
+function onMagicStart(caster, target, spell)
+    return 0;
+end;
+
+function onMagicFinish(caster, target, spell, action)
+    magic.onStatusMagicFinish(caster, target, spell, action)
+end;

data/scripts/commands/magic/sleep.lua

@@ -0,0 +1,14 @@
+require("global");
+require("magic");
+
+function onMagicPrepare(caster, target, spell)
+    return 0;
+end;
+
+function onMagicStart(caster, target, spell)
+    return 0;
+end;
+
+function onMagicFinish(caster, target, spell, action)
+    magic.onStatusMagicFinish(caster, target, spell, action)
+end;

data/scripts/commands/magic/stone.lua

@@ -0,0 +1,14 @@
+require("global");
+require("magic");
+
+function onMagicPrepare(caster, target, spell)
+    return 0;
+end;
+
+function onMagicStart(caster, target, spell)
+    return 0;
+end;
+
+function onMagicFinish(caster, target, spell, action)
+    magic.onMagicFinish(caster, target, spell, action)
+end;

data/scripts/commands/magic/stonera.lua

@@ -0,0 +1,20 @@
+require("global");
+require("magic");
+
+function onMagicPrepare(caster, target, spell)
+    return 0;
+end;
+
+function onMagicStart(caster, target, spell)
+    return 0;
+end;
+
+--Increased damage and conversion to single target
+function onCombo(caster, target, spell)
+    spell.aoeType = 0;
+    spell.potency = spell.potency * 1.5;
+end;
+
+function onMagicFinish(caster, target, spell, action)
+    magic.onMagicFinish(caster, target, spell, action)
+end;

data/scripts/commands/magic/stoneskin.lua

@@ -0,0 +1,14 @@
+require("global");
+require("magic");
+
+function onMagicPrepare(caster, target, spell)
+    return 0;
+end;
+
+function onMagicStart(caster, target, spell)
+    return 0;
+end;
+
+function onMagicFinish(caster, target, spell, action)
+    magic.onStatusMagicFinish(caster, target, spell, action)
+end;

data/scripts/commands/magic/thundaga.lua

@@ -8,14 +8,11 @@ function onMagicStart(caster, target, spell)
     return 0;
 end;
 
-function onMagicFinish(caster, target, spell, action)
-    local damage = math.random(10, 100);
-    
-    action.worldMasterTextId = 0x765D;
-    
-    -- todo: populate a global script with statuses and modifiers
-    -- magic.HandleAttackMagic(caster, target, spell, action)
-    action.effectId = bit32.bxor(0x8000000, spell.effectAnimation, 15636);
+--Increased critical damage
+function onCombo(caster, target, spell)
+    spell.critDamageModifier = 1.5;
+end;
 
-    return damage;
+function onMagicFinish(caster, target, spell, action)
+    magic.onMagicFinish(caster, target, spell, action)
 end;

data/scripts/commands/magic/thundara.lua

@@ -8,14 +8,13 @@ function onMagicStart(caster, target, spell)
     return 0;
 end;
 
-function onMagicFinish(caster, target, spell, action)
-    local damage = math.random(10, 100);
-    
-    action.worldMasterTextId = 0x765D;
-    
-    -- todo: populate a global script with statuses and modifiers
-    -- magic.HandleAttackMagic(caster, target, spell, action)
-    action.effectId = bit32.bxor(0x8000000, spell.effectAnimation, 15636);
+--Increased Damage and reduced recast time in place of stun
+function onCombo(caster, target, spell)
+    spell.statusChance = 0;
+    spell.basePotency = spell.basePotency * 1.5;
+    spell.recastTimeMs = spell.recastTimeMs / 2;
+end;
 
-    return damage;
+function onMagicFinish(caster, target, spell, action)
+    magic.onMagicFinish(caster, target, spell, action)
 end;

data/scripts/commands/magic/thunder.lua

@@ -9,13 +9,5 @@ function onMagicStart(caster, target, spell)
 end;
 
 function onMagicFinish(caster, target, spell, action)
-    local damage = math.random(10, 100);
-    
-    action.worldMasterTextId = 0x765D;
-    
-    -- todo: populate a global script with statuses and modifiers
-    -- magic.HandleAttackMagic(caster, target, spell, action)
-    action.effectId = bit32.bxor(0x8000000, spell.effectAnimation, 15636);
-
-    return damage;
+    magic.onMagicFinish(caster, target, spell, action)
 end;