Combat additions

Added formulas for base EXP gain and chain experience
Added basic scripts for most player abilities and effects
Added stat gains for some abilities
Changed status flags
Fixed bug with player death
Fixed bug where auto attacks didnt work when not locked on
Added traits

data/scripts/commands/weaponskill/aura_pulse.lua

@@ -14,6 +14,13 @@ function onCombo(caster, target, skill)
     skill.statusChance = 0.50;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
+
+    --Try to apply status effect
+    action.TryStatus(caster, target, skill, actionContainer, true);
 end;

data/scripts/commands/weaponskill/bloodletter.lua

@@ -9,12 +9,18 @@ function onSkillStart(caster, target, skill)
     return 0;
 end;
 
---Inflicts additional damage when bleed ends
---Note for later, going to set bleed tier to 2, when bleed get scripted, check if tier is 2 and add additional damage at the end
+--Changes status to Bloodletter from Bloodletter2. Changes icon of dot and adds additional damage at the end.
 function onCombo(caster, target, skill)
-    skill.statusTier = 2;
+    skill.statusId = 223127;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
+
+    --Try to apply status effect
+    action.TryStatus(caster, target, skill, actionContainer, true);
 end;

data/scripts/commands/weaponskill/brutal_swing.lua

@@ -14,6 +14,10 @@ function onPositional(caster, target, skill)
     skill.basePotency = skill.basePotency * 1.5;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
 end;

data/scripts/commands/weaponskill/chaos_thrust.lua

@@ -11,9 +11,16 @@ end;
 
 --Increased crit hit rating
 function onCombo(caster, target, skill)
-    skill.critRateModifier = 1.5;
+    skill.bonusCritRate = 100;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
+
+    --Try to apply status effect
+    action.TryStatus(caster, target, skill, actionContainer, true);
 end;

data/scripts/commands/weaponskill/concussive_blow.lua

@@ -11,8 +11,7 @@ end;
 
 --Chance to inflict blind on flank
 function onPositional(caster, target, skill)
-    skill.statusChance = 0.50;
-    skill.statusDuration = 10;
+    skill.statusChance = 0.75;
 end;
 
 function onCombo(caster, target, skill)
@@ -20,6 +19,13 @@ function onCombo(caster, target, skill)
 end;
 
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
+
+    --Try to apply status effect
+    action.TryStatus(caster, target, skill, actionContainer, true);
 end;

data/scripts/commands/weaponskill/default.lua

@@ -9,6 +9,13 @@ function onSkillStart(caster, target, skill)
     return 0;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
+
+    --Try to apply status effect
+    action.TryStatus(caster, target, skill, actionContainer, true);
 end;

data/scripts/commands/weaponskill/demolish.lua

@@ -18,6 +18,13 @@ function onCombo(caster, target, skill)
     end;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
+
+    --Try to apply status effect
+    action.TryStatus(caster, target, skill, actionContainer, true);
 end;

data/scripts/commands/weaponskill/disembowel.lua

@@ -14,6 +14,13 @@ function onCombo(caster, target, skill)
     skill.statusDuration = skill.statusDuration * 2;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
+
+    --Try to apply status effect
+    action.TryStatus(caster, target, skill, actionContainer, true);
 end;

data/scripts/commands/weaponskill/doom_spike.lua

@@ -11,9 +11,13 @@ end;
 
 --Increased accuracy
 function onCombo(caster, target, skill)
-    skill.accuracyModifier = 1.25;
+    skill.accuracyModifier = 50;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
 end;

data/scripts/commands/weaponskill/dragon_kick.lua

@@ -14,6 +14,13 @@ function onPositional(caster, target, skill)
     skill.statusChance = 0.50;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
+
+    --Try to apply status effect
+    action.TryStatus(caster, target, skill, actionContainer, true);
 end;

data/scripts/commands/weaponskill/fast_blade.lua

@@ -13,6 +13,10 @@ function onPositional(caster, target, skill)
     skill.basePotency = skill.basePotency * 1.25;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
 end;

data/scripts/commands/weaponskill/feint.lua

@@ -9,6 +9,10 @@ function onSkillStart(caster, target, skill)
     return 0;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
 end;

data/scripts/commands/weaponskill/flat_blade.lua

@@ -10,9 +10,16 @@ function onSkillStart(caster, target, skill)
 end;
 
 function onCombo(caster, target, skill)
-    skill.enmityModifier = skill.enmityModifier * 2
+    --http://forum.square-enix.com/ffxiv/threads/50479-Gladiator-Paladin-STR-MND-Stat-Caps/page7
+    --4.5 is a bonus on top of the 1x of normal flat blade
+    --This is modified by MND and dlvl and caps at 4.5, dont know the values used though
+    skill.enmityModifier = 5.5;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
 end;

data/scripts/commands/weaponskill/fracture.lua

@@ -9,6 +9,13 @@ function onSkillStart(caster, target, spell)
     return 0;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
+
+    --Try to apply status effect
+    action.TryStatus(caster, target, skill, actionContainer, true);
 end;

data/scripts/commands/weaponskill/full_thrust.lua

@@ -9,7 +9,12 @@ function onSkillStart(caster, target, skill)
     return 0;
 end;
 
-function onSkillFinish(caster, target, skill, action)    
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
+
     caster.AddTP(1000);
-    return weaponskill.onSkillFinish(caster, target, skill, action);
 end;

data/scripts/commands/weaponskill/gloom_arrow.lua

@@ -11,9 +11,16 @@ end;
 
 --Chance to inflict blind
 function onCombo(caster, target, skill)
-    skill.statusChance = 0.90;
+    skill.statusChance = 0.75;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
+
+    --Try to apply status effect
+    action.TryStatus(caster, target, skill, actionContainer, true);
 end;

data/scripts/commands/weaponskill/godsbane.lua

@@ -12,9 +12,34 @@ end;
 --Increased crit rate
 function onCombo(caster, target, skill)
     --Get Berserk statuseffect
-    skill.critRateModifier = 1.5;
+    local berserk = caster.statusEffects.GetStatusEffectById(223160);
+
+    --if it isn't nil, remove the AP and Defense mods and reset extra to 0, increase potency
+    if berserk != nil then
+        local apPerHit = 20;
+        local defPerHit = 20;
+
+        if berserk.GetTier() == 2 then
+            apPerHit = 24;
+        end
+
+        attacker.SubtractMod(modifiersGlobal.Attack, apPerHit * berserk.GetExtra());
+        attacker.Add(modifiersGlobal.Defense, defPerHit * berserk.GetExtra());
+
+        berserk.SetExtra(0);
+
+        --This is about 50% crit. Don't know if that's what it gave on retail but seems kind of reasonable
+        skill.critRateBonus = 300;
+    end;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
+
+    --Try to apply status effect
+    action.TryStatus(caster, target, skill, actionContainer, true);
 end;

data/scripts/commands/weaponskill/goring_blade.lua

@@ -6,6 +6,7 @@ function onSkillPrepare(caster, target, skill)
 end;
 
 function onSkillStart(caster, target, skill)
+    skill.statusMagnitude = 25;--could probalby have a status magnitude value
     return 0;
 end;
 
@@ -15,10 +16,18 @@ function onPositional(caster, target, skill)
 end;
 
 --Increases bleed damage
+--Bleed damage seems like it's 25 with comboed being 38  (25 * 1.5 rounded up)
 function onCombo(caster, target, skill)
-    skill.statusTier = 2;
+    skill.statusMagnitude = 38;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
+
+    --Try to apply status effect
+    action.TryStatus(caster, target, skill, actionContainer, true);
 end;

data/scripts/commands/weaponskill/haymaker.lua

@@ -9,6 +9,13 @@ function onSkillStart(caster, target, skill)
     return 0;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
+
+    --Try to apply status effect
+    action.TryStatus(caster, target, skill, actionContainer, true);
 end;

data/scripts/commands/weaponskill/heavy_shot.lua

@@ -9,6 +9,10 @@ function onSkillStart(caster, target, skill)
     return 0;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
 end;

data/scripts/commands/weaponskill/heavy_swing.lua

@@ -11,10 +11,14 @@ end;
 
 --Increased accuracy
 function onCombo(caster, target, skill)
-    skill.accuracyModifier = 1.5;
+    skill.accuracyModifier = 50;
 end;
 
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
 end;

data/scripts/commands/weaponskill/heavy_thrust.lua

@@ -14,6 +14,13 @@ function onCombo(caster, target, skill)
     skill.statusDuration = 10;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
+
+    --Try to apply status effect
+    action.TryStatus(caster, target, skill, actionContainer, true);
 end;

data/scripts/commands/weaponskill/howling_fist.lua

@@ -10,15 +10,19 @@ function onSkillStart(caster, target, skill)
 end;
 
 --Increased accuracy
-function onCombo(caster, target, skill)
-    skill.accuracyModifier = 1;
+function onPositional(caster, target, skill)
+    skill.accuracyModifier = 50;
 end;
     
 --Increased damage
 function onCombo(caster, target, skill)
-    skill.potency = skill.potency * 1.5;
+    skill.basePotency = skill.basePotency * 1.5;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
 end;

data/scripts/commands/weaponskill/impulse_drive.lua

@@ -11,14 +11,18 @@ end;
 
 --Increased damage
 function onPositional(caster, target, skill)
-    skill.potency = skill.potency * 1.25
+    skill.basePotency = skill.basePotency * 1.25
 end;
 
 --Increased crit hit rating
 function onCombo(caster, target, skill)
-    skill.critRateModifier = 1.25;
+    skill.bonusCritRate = 200;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
 end;

data/scripts/commands/weaponskill/leaden_arrow.lua

@@ -14,6 +14,13 @@ function onCombo(caster, target, skill)
     skill.statusDuration = 60;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
+
+    --Try to apply status effect
+    action.TryStatus(caster, target, skill, actionContainer, true);
 end;

data/scripts/commands/weaponskill/leg_sweep.lua

@@ -14,6 +14,13 @@ function onCombo(caster, target, skill)
     skill.statusChance = 0.50;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
+
+    --Try to apply status effect
+    action.TryStatus(caster, target, skill, actionContainer, true);
 end;

data/scripts/commands/weaponskill/maim.lua

@@ -10,9 +10,13 @@ function onSkillStart(caster, target, skill)
 end;
 
 function onCombo(caster, target, skill)
-    skill.accuracyModifier = 1.5;
+    skill.accuracyModifier = 50;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    skill.Potency = 100;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
 end;

data/scripts/commands/weaponskill/overpower.lua

@@ -0,0 +1,18 @@
+require("global");
+require("weaponskill");
+
+function onSkillPrepare(caster, target, skill)
+    return 0;
+end;
+
+function onSkillStart(caster, target, skill)
+    return 0;
+end;
+
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
+end;

data/scripts/commands/weaponskill/path_of_the_storm.lua

@@ -12,9 +12,15 @@ end;
 --Chance to inflict heavy when executed from behind
 function onPositional(caster, target, skill)
     skill.statusChance = 0.50;
-    skill.statusDuration = 5;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
+
+    --Try to apply status effect
+    action.TryStatus(caster, target, skill, actionContainer, true);
 end;

data/scripts/commands/weaponskill/phalanx.lua

@@ -0,0 +1,18 @@
+require("global");
+require("weaponskill");
+
+function onSkillPrepare(caster, target, skill)
+    return 0;
+end;
+
+function onSkillStart(caster, target, skill)
+    return 0;
+end;
+
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
+end;

data/scripts/commands/weaponskill/piercing_arrow.lua

@@ -9,6 +9,10 @@ function onSkillStart(caster, target, skill)
     return 0;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
 end;

data/scripts/commands/weaponskill/pounce.lua

@@ -11,9 +11,15 @@ end;
 
 function onPositional(caster, target, skill)
     skill.statusChance = 0.50;
-    skill.statusDuration = 5;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
+
+    --Try to apply status effect
+    action.TryStatus(caster, target, skill, actionContainer, true);
 end;

data/scripts/commands/weaponskill/pummel.lua

@@ -13,6 +13,10 @@ function onPositional(caster, target, skill)
     skill.basePotency = skill.basePotency * 1.25;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action)
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
 end;

data/scripts/commands/weaponskill/quick_nock.lua

@@ -17,6 +17,10 @@ function onCombo(caster, target, skill)
     --animation change?
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
 end;

data/scripts/commands/weaponskill/rage_of_halone.lua

@@ -11,9 +11,15 @@ end;
 
 --Accuracy increase
 function onCombo(caster, target, skill)
-    skill.accuracyModifier = 1;
+    --Rage of Halone normally has a -40% hit rate modifier.
+    --Does the combo negate that, or does it make it even more accurate than if it didnt have the modifier?
+    skill.accuracyModifier = 0;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
 end;

data/scripts/commands/weaponskill/rain_of_death.lua

@@ -11,9 +11,16 @@ end;
 
 --Chance to inflict stun
 function onCombo(caster, target, skill)
-    skill.statusChance = 0.90
+    skill.statusChance = 0.75
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
+
+    --Try to apply status effect
+    action.TryStatus(caster, target, skill, actionContainer, true);
 end;

data/scripts/commands/weaponskill/ring_of_talons.lua

@@ -11,9 +11,13 @@ end;
 
 --Increased critical hit rate
 function onCombo(caster, target, skill)
-    skill.critRateModifier = 1.5;
+    skill.bonusCritRate = 100;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
 end;

data/scripts/commands/weaponskill/riot_blade.lua

@@ -12,8 +12,16 @@ end;
 --Chance to decrease defense when executed from behind the target
 function onPositional(caster, target, skill)
     skill.statusChance = 0.75;
+    skill.statusMagnitude = 100;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
+
+    --Try to apply status effect
+    action.TryStatus(caster, target, skill, actionContainer, true);
 end;

data/scripts/commands/weaponskill/savage_blade.lua

@@ -13,7 +13,10 @@ function onCombo(caster, target, skill)
     skill.basePotency = skill.basePotency * 1.25;
 end;
 
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
 end;

data/scripts/commands/weaponskill/shadowbind.lua

@@ -11,10 +11,16 @@ end;
 
 --Increased Bind duration
 function onCombo(caster, target, skill)
-    skill.statusDuration = 10;
+    skill.statusDuration = 30;
 end;
 
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
+
+    --Try to apply status effect
+    action.TryStatus(caster, target, skill, actionContainer, true);
 end;

data/scripts/commands/weaponskill/shield_bash.lua

@@ -9,7 +9,13 @@ function onSkillStart(caster, target, skill)
     return 0;
 end;
 
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
+
+    --Try to apply status effect
+    action.TryStatus(caster, target, skill, actionContainer, true);
 end;

data/scripts/commands/weaponskill/shoulder_tackle.lua

@@ -8,11 +8,19 @@ end;
 function onSkillStart(caster, target, skill)
     return 0;
 end;
-    
-function onSkillFinish(caster, target, skill, action)
+
+function onSkillFinish(caster, target, skill, action, actionContainer)
     --chance to influct stun only when target has no enmity towards you
-    if !(target.hateContainer.HasHateForTarget(caster)) then
+    if not (target.hateContainer.HasHateForTarget(caster)) then
         skill.statusChance = 0.50;
     end
-    return weaponskill.onSkillFinish(caster, target, skill, action);
-end;
+
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
+
+    --Try to apply status effect
+    action.TryStatus(caster, target, skill, actionContainer, true);
+end;

data/scripts/commands/weaponskill/simian_thrash.lua

@@ -9,11 +9,15 @@ function onSkillStart(caster, target, skill)
     return 0;
 end;
 
---Increased accuracy
+--Increased damage
 function onCombo(caster, target, skill)
     skill.basePotency = skill.basePotency * 1.5;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
 end;

data/scripts/commands/weaponskill/skull_sunder.lua

@@ -11,9 +11,14 @@ end;
 
 --Increased enmity
 function onCombo(caster, target, skill)
-    skill.enmityModifier = 1.5;
+    --https://www.bluegartr.com/threads/107403-Stats-and-how-they-work/page17
+    skill.enmityModifier = 2.75;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
 end;

data/scripts/commands/weaponskill/spirits_within.lua

@@ -11,13 +11,19 @@ end;
 
 --Increased enmity
 function onCombo(caster, target, skill)
-    skill.enmityModifier = 1.5;
+    skill.enmityModifier = 2.5;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    local damage = math.random(10, 100);
+function onSkillFinish(caster, target, skill, action, actionContainer)
     --Increased damage with higher hp
+    --random guess
     local potencyModifier = caster:GetHPP() + 25;
-    skill.basePotency = skill.basePotency * (potencyModifier / 100);
-    return weaponskill.onSkillFinish(caster, target, skill, action)
+
+    skill.basePotency = skill.basePotency * potencyModifier;
+
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
 end;

data/scripts/commands/weaponskill/steel_cyclone.lua

@@ -11,10 +11,16 @@ end;
 
 --Increased critical hit rate
 function onCombo(caster, target, skill)
-    skill.critRateModifier = 1.5;
+    skill.bonusCritRate = 200;
 end;
     
-    
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
+
+    --Try to apply status effect
+    action.TryStatus(caster, target, skill, actionContainer, true);
 end;

data/scripts/commands/weaponskill/sucker_punch.lua

@@ -0,0 +1,44 @@
+require("global");
+require("weaponskill");
+require("battleutils");
+require("hiteffect");
+
+function onSkillPrepare(caster, target, skill)
+    return 0;
+end;
+
+function onSkillStart(caster, target, skill)
+    return 0;
+end;
+
+--
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, action);
+
+    --additional effect
+    --Restores MP
+    --Comboed formula seems to be (0.40 * damage) + 180
+    --Uncomboed formula seems to be 0.30 * damage
+    --These may be wrong. It seems like max mp might influence the slope
+
+    --1.21: Equation used to calculate amount of MP adjusted.
+    --fug
+    --This might mean max MP isn't involved and the difference was between patches. need to recheck videos
+    if action.GetHitType() > HitType.Evade and (action.param == HitDirection.Right or action.param == HitDirection.Left) then
+        local mpToReturn = 0;
+
+        if skill.isCombo then
+            mpToReturn = (0.40 * action.amount) + 180;
+        else
+            mpToReturn = (0.30 * action.amount);
+        end
+
+        caster.AddMP(mpToReturn);
+        --30452: You recover x MP.
+        actionContainer.AddMPAction(caster.actorId, 30452, mpToReturn);
+    end
+end;

data/scripts/commands/weaponskill/true_thrust.lua

@@ -11,9 +11,13 @@ end;
 
 --Increased accuracy from in front
 function onPositional(caster, target, skill)
-    skill.accuracyModifier = 1.25;
+    skill.accuracyModifier = 50;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
 end;

data/scripts/commands/weaponskill/vorpal_thrust.lua

@@ -11,9 +11,16 @@ end;
 
 --Increased crit rating from behind
 function onPositional(caster, target, skill)
-    skill.critRateModifier = 1.25;
+    skill.bonusCritRate = 200;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
+
+    --Try to apply status effect
+    action.TryStatus(caster, target, skill, actionContainer, true);
 end;

data/scripts/commands/weaponskill/war_drum.lua

@@ -0,0 +1,20 @@
+require("global");
+require("weaponskill");
+
+function onSkillPrepare(caster, target, skill)
+    return 0;
+end;
+
+function onSkillStart(caster, target, skill)
+    return 0;
+end;
+
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --might be wrong
+    action.enmity = action.enmity + 400;
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
+end;

data/scripts/commands/weaponskill/whirlwind.lua

@@ -14,15 +14,27 @@ function onCombo(caster, target, skill)
     --Get Berserk statuseffect
     local berserk = caster.statusEffects.GetStatusEffectById(223160);
 
-    --if it isn't nil
+    --if it isn't nil, remove the AP and Defense mods and reset extra to 0, increase potency
     if berserk != nil then
-        berserk.SetTier(1);
+        local apPerHit = 20;
+        local defPerHit = 20;
+
+        if berserk.GetTier() == 2 then
+            apPerHit = 24;
+        end
+
+        attacker.SubtractMod(modifiersGlobal.Attack, apPerHit * berserk.GetExtra());
+        attacker.Add(modifiersGlobal.Defense, defPerHit * berserk.GetExtra());
+
+        berserk.SetExtra(0);
         skill.basePotency = skill.basePotency * 1.5;
     end;
-
-    
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
-end;
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
+end;

data/scripts/commands/weaponskill/wide_volley.lua

@@ -11,9 +11,13 @@ end;
 
 --Increased Accuracy
 function onCombo(caster, target, skill)
-    skill.accuracyModifier = 1.25;
+    skill.accuracyModifier = 40;
 end;
 
-function onSkillFinish(caster, target, skill, action)
-    return weaponskill.onSkillFinish(caster, target, skill, action);
+function onSkillFinish(caster, target, skill, action, actionContainer)
+    --calculate ws damage
+    action.amount = skill.basePotency;
+
+    --DoAction handles rates, buffs, dealing damage
+    action.DoAction(caster, target, skill, actionContainer);
 end;