8 files changed, 13 insertions, 13 deletions
diff --git a/world/map/npc/magic/_procedures.txt b/world/map/npc/magic/_procedures.txt
index 66f356c7..eaacd774 100644
--- a/world/map/npc/magic/_procedures.txt
+++ b/world/map/npc/magic/_procedures.txt
@@ -127,7 +127,7 @@ function|script|magic_create_item
     set @create_params[2], 1; // success flag
     if (.@score >= @create_params[1]) goto L_Perfect;
     set @create_params[2], 0; // success flag
-    set .@score, .@score + rand(Luk) + rand(Luk);
+    set .@score, .@score + rand((Luk+Luk2)) + rand((Luk+Luk2));
     if (.@score < (@create_params[1] / 3)) goto L_Backfire;
     if (.@score < ((@create_params[1] * 2) / 3)) goto L_Iten;
     message strcharinfo(0), "Magic : ##3##BYour spell takes on a mind of its own!";
@@ -146,7 +146,7 @@ L_Escape:
 
 L_Backfire:
     message strcharinfo(0), "Magic : ##3##BYour spell backfires!";
-    if (rand(110) < Luk) heal 0 - ((BaseLevel+1)*(BaseLevel+2)*(rand(28)+3)), 0;
+    if (rand(110) < (Luk+Luk2)) heal 0 - ((BaseLevel+1)*(BaseLevel+2)*(rand(28)+3)), 0;
     else                 heal 0 - (BaseLevel + 1), 0;
     return;
 
diff --git a/world/map/npc/magic/level0-wand.txt b/world/map/npc/magic/level0-wand.txt
index b12bc649..7a0f6c25 100644
--- a/world/map/npc/magic/level0-wand.txt
+++ b/world/map/npc/magic/level0-wand.txt
@@ -55,7 +55,7 @@ S_SetWand:
         .WandsAnim[.@wand_loop], // wand anim/id
         ((.@pwr * BaseLevel * 2 / 3) / 15 + 2), // wand cost
         (.@pwr * (@spellpower * (11-.@pwr) / 30)), // wand dmg
-        (((200 - Agi) * 1200) / 200), //delay
+        (((200 - (Agi+Agi2)) * 1200) / 200), //delay
         (.@pwr + (@spellpower / 10)); // charges
     return;
 
diff --git a/world/map/npc/magic/level1-flare-dart.txt b/world/map/npc/magic/level1-flare-dart.txt
index 1f23ec4f..d7d387cd 100644
--- a/world/map/npc/magic/level1-flare-dart.txt
+++ b/world/map/npc/magic/level1-flare-dart.txt
@@ -16,7 +16,7 @@
         sqrt(@spellpower) * 5, //dmg
         (BaseLevel/3) + 5, // dmg bonus
         (@spellpower/50) + 3, // charges
-        (((200 - Agi) * 1200) / 200); // delay
+        (((200 - (Agi+Agi2)) * 1200) / 200); // delay
     callfunc "magic_exp";
     goto L_FreeRecast;
 
diff --git a/world/map/npc/magic/level1-magic-blade.txt b/world/map/npc/magic/level1-magic-blade.txt
index 377cdd2d..91ff5967 100644
--- a/world/map/npc/magic/level1-magic-blade.txt
+++ b/world/map/npc/magic/level1-magic-blade.txt
@@ -18,7 +18,7 @@
         if_then_else(.@component$ == "Knife", 40, 60), // dmg
         Str, // do not allow to equip light armor, cast, and then switch to heavy armor to get bonus str
         (@spellpower/15) + 10, // charges
-        (((200 - Agi) * 1200) / 200), // delay
+        (((200 - (Agi+Agi2)) * 1200) / 200), // delay
         @spellpower;
 
     callfunc "magic_exp";
diff --git a/world/map/npc/magic/level2-lay-on-hands.txt b/world/map/npc/magic/level2-lay-on-hands.txt
index 744d145e..8feb9107 100644
--- a/world/map/npc/magic/level2-lay-on-hands.txt
+++ b/world/map/npc/magic/level2-lay-on-hands.txt
@@ -29,7 +29,7 @@ L_Pay:
 
     if (get(Hp, @target_id) < 1) end;
 
-    set .@fraction, max(80, 200 - (Vit + (@spellpower/10))); // pay at least 40%
+    set .@fraction, max(80, 200 - ((Vit+Vit2) + (@spellpower/10))); // pay at least 40%
     set .@payment, (@needed * .@fraction) / 200;
     set .@available, Hp - (MaxHp / 20);
     set @heal_value, if_then_else(.@payment < .@available, @needed+1-1, (.@available * 200) / .@fraction); // FIXME / XXX why the f do I need to do +1-1 ?
diff --git a/world/map/npc/magic/level2-lightning-strike.txt b/world/map/npc/magic/level2-lightning-strike.txt
index 19083dfa..ce89652c 100644
--- a/world/map/npc/magic/level2-lightning-strike.txt
+++ b/world/map/npc/magic/level2-lightning-strike.txt
@@ -15,9 +15,9 @@
     misceffect FX_MAGIC_BOLT_CAST, strcharinfo(0);
     setarray @ingravspell[0],
         @spellpower,
-        Luk,
+        (Luk+Luk2),
         ((@spellpower/90)+1), // charges
-        (((200 - Agi) * 3000) / 200), // delay
+        (((200 - (Agi+Agi2)) * 3000) / 200), // delay
         0, // in_rain
         0; // target id (tmp)
     if (getequipid(equip_misc1) == 5253 || getequipid(equip_misc2) == 5253)
diff --git a/world/map/npc/magic/level2-magic-knuckles.txt b/world/map/npc/magic/level2-magic-knuckles.txt
index 1dd5d792..c16485bb 100644
--- a/world/map/npc/magic/level2-magic-knuckles.txt
+++ b/world/map/npc/magic/level2-magic-knuckles.txt
@@ -17,10 +17,10 @@
     set .caster, getcharid(3);
     misceffect FX_MAGIC_KNUCKLE_CAST, strcharinfo(0);
     setarray @upmarmuspell[0],
-        max(1, BASE_ATK - 100 + min(100, Int)), // dmg
-        ((@spellpower/10) + ((Dex * 8)/(sqrt(BaseLevel + 34)) + 20)), // charges (you get more at lower levels)
-        (sqrt(190) * 25 / 20), // delay - see conf/battle_athena.conf @ max_aspd
-        ((Agi + Int) * 2 / 5), // dmg bonus
+        max(1, BASE_ATK - 100 + min(100, (Int+Int2))), // dmg
+        ((@spellpower/10) + (((Dex+Dex2) * 8)/(sqrt(BaseLevel + 34)) + 20)), // charges (you get more at lower levels)
+        (sqrt(300 - ((Agi+Agi2) * 2)) + (5/2)), // delay
+        (((Agi+Agi2) + (Int+Int2)) * 2 / 5), // dmg bonus
         (((BaseLevel/5) + Str) * 2); // do not allow to equip light armor, cast, and then switch to heavy armor to get bonus str
     callfunc "magic_exp";
     goto L_FreeRecast;
diff --git a/world/map/npc/magic/level2-toxic-dart.txt b/world/map/npc/magic/level2-toxic-dart.txt
index 6f5e6da9..6fde4545 100644
--- a/world/map/npc/magic/level2-toxic-dart.txt
+++ b/world/map/npc/magic/level2-toxic-dart.txt
@@ -16,7 +16,7 @@
     setarray @phlexspell[0],
         (sqrt(@spellpower) * 5), // elt damage
         ((BaseLevel/3) + 5), // elt damage bonus
-        (((200 - Agi) * 1200) / 200), // delay
+        (((200 - (Agi+Agi2)) * 1200) / 200), // delay
         ((@spellpower/75) + 3), // charges
         (5000+(@spellpower*1200)), // poison duration
         (max(15,@spellpower/15)+5); // poison strength