From 1930d9908892b33f2bcf53026f1d797009065867 Mon Sep 17 00:00:00 2001 From: AJK Date: Sun, 7 Jan 2024 18:57:44 -0500 Subject: fix upmarmu server bug --- client-data | 1 - world/map/npc/magic/level2-magic-knuckles.txt | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) delete mode 160000 client-data diff --git a/client-data b/client-data deleted file mode 160000 index c0aa3502..00000000 --- a/client-data +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c0aa3502e8b3d689ae08a20e3c6b6f2200e56e59 diff --git a/world/map/npc/magic/level2-magic-knuckles.txt b/world/map/npc/magic/level2-magic-knuckles.txt index b2c432d6..e0b36983 100644 --- a/world/map/npc/magic/level2-magic-knuckles.txt +++ b/world/map/npc/magic/level2-magic-knuckles.txt @@ -11,17 +11,16 @@ elif (.@level <= 3) end; set @_M_BLOCK, 1; // block casting, until the timer clears it addtimer 500, "Magic Timer::OnClear"; // set the new debuff - sc_start SC_COOLDOWN, 500, 0, BL_ID; + sc_start SC_COOLDOWN, 1000, 0, BL_ID; callfunc "adjust_spellpower"; set Sp, Sp - 20; set CASTS, CASTS + 1; if (CASTS < 0) set CASTS, 1; // overflow - set .caster, getcharid(3); misceffect FX_MAGIC_KNUCKLE_CAST, strcharinfo(0); setarray @upmarmuspell[0], 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) * 4)), // delay + (sqrt((250 - ((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"; @@ -83,7 +82,7 @@ OnSetRecast: end; OnTimer25000: - if (attachrid(.caster) < 1) end; + if (attachrid(getcharid(3)) < 1) end; set @num_upmarmu_hits, 0; detachrid; goto L_StopTimer; -- cgit v1.2.3-60-g2f50