Merge branch 'upmarmu_speed_fix' into 'master'

An attempt to keep upmarmu DPS close to the same, while cutting its speed in...

See merge request legacy/serverdata!691

3 files changed, 3 insertions, 3 deletions

diff --git a/client-data b/client-data
-Subproject 2d4241d0e1e715fb7f6bef15752c2a16fa35ff2
+Subproject 2fbfe721bd69d3ef30c9ee8f3caf7e178a434a7
diff --git a/tools b/tools
-Subproject 22ce3fd72b46c4675d82fa4b35fa24b8f22bd2d
+Subproject 6984735e4ee369544147c3458759d6863763ea0
diff --git a/world/map/npc/magic/level2-magic-knuckles.txt b/world/map/npc/magic/level2-magic-knuckles.txt
index 8bc3e849..d674c621 100644
--- a/world/map/npc/magic/level2-magic-knuckles.txt
+++ b/world/map/npc/magic/level2-magic-knuckles.txt
@@ -19,10 +19,10 @@
     set .caster, getcharid(3);
     misceffect FX_MAGIC_KNUCKLE_CAST, strcharinfo(0);
     setarray @upmarmuspell[0],
-        max(1, BASE_ATK - 100 + min(100, (Int+Int2))), // dmg
+        max(1, BASE_ATK - 100 + min(100, (Int+Int2) * 2)), // 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
+        (sqrt((300 - ((Agi+Agi2) * 2)) + (5/2) * 4)), // delay
+        (((Agi+Agi2) + (Int+Int2)) / 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;