stats from equipment

7 files changed, 9 insertions, 9 deletions

diff --git a/world/map/npc/001-2/heathin.txt b/world/map/npc/001-2/heathin.txt
index 53cc8b68..6a10c053 100644
--- a/world/map/npc/001-2/heathin.txt
+++ b/world/map/npc/001-2/heathin.txt
@@ -294,7 +294,7 @@ L_Arrows_Trade_Yes:
     delitem "Coal", @TARROW_REQ_COAL;
     delitem "TerraniteOre", @TARROW_REQ_TERRA_ORE;
     set Zeny, Zeny - @TARROW_REQ_GP;
-    set @lucky, 5 * rand(Luk);
+    set @lucky, 5 * rand((Luk+Luk2));
     set @lucky$, "";
     getitem "TerraniteArrow", 1000 + @lucky;
     mes "[Heathin]";
diff --git a/world/map/npc/magic/level0-wand.txt b/world/map/npc/magic/level0-wand.txt
index b1dfb686..f6584006 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 / 15) + 2), // wand cost
         (.@pwr * (@spellpower / 3)), // 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-lightning-strike.txt b/world/map/npc/magic/level2-lightning-strike.txt
index 19083dfa..226e2fa0 100644
--- a/world/map/npc/magic/level2-lightning-strike.txt
+++ b/world/map/npc/magic/level2-lightning-strike.txt
@@ -17,7 +17,7 @@
         @spellpower,
         Luk,
         ((@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 83d89eeb..08ca75d6 100644
--- a/world/map/npc/magic/level2-magic-knuckles.txt
+++ b/world/map/npc/magic/level2-magic-knuckles.txt
@@ -16,9 +16,9 @@
     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
+        ((@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