From 8e38b07300d6fc36f201c8a4851e01906b6a2594 Mon Sep 17 00:00:00 2001 From: HoraK-FDF Date: Fri, 16 Sep 2022 15:43:30 +0200 Subject: upmarmu fix --- world/map/npc/magic/level2-magic-knuckles.txt | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/world/map/npc/magic/level2-magic-knuckles.txt b/world/map/npc/magic/level2-magic-knuckles.txt index 12055efb..2063ad12 100644 --- a/world/map/npc/magic/level2-magic-knuckles.txt +++ b/world/map/npc/magic/level2-magic-knuckles.txt @@ -14,10 +14,10 @@ set Sp, Sp - 20; misceffect FX_MAGIC_KNUCKLE_CAST, strcharinfo(0); setarray @upmarmuspell[0], - BASE_ATK, // dmg + 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(300 - (Agi * 2)) + (5/2)), // delay - Agi, // dmg bonus + ((Agi + Int) / 2), // 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; @@ -32,12 +32,6 @@ OnAttack: L_FreeRecast: if (@upmarmuspell[1] > 0) addtimer 0, strnpcinfo(0) + "::OnSetRecast"; - elif (@upmarmuspell[1] == 0) - goto OnEnd; - end; - -OnEnd: - misceffect FX_MAGIC_KNUCKLE_END, strcharinfo(0); end; OnDischarge: -- cgit v1.2.3-60-g2f50