1 files changed, 71 insertions, 4 deletions

diff --git a/world/map/npc/magic/level2-magic-knuckles.txt b/world/map/npc/magic/level2-magic-knuckles.txt
index 2063ad12..c072671a 100644
--- a/world/map/npc/magic/level2-magic-knuckles.txt
+++ b/world/map/npc/magic/level2-magic-knuckles.txt
@@ -1,23 +1,34 @@
 -|script|magic-knuckles|32767
 {
+    if @_U_BLOCK >= 1 goto L_Still_Exhausted;
     if (call("magic_checks")) end;
     if (Sp < 20) end;
     if (getskilllv(SKILL_MAGIC) < .level) end;
     set .@level, getskilllv(.school);
     if (.@level < .level) end;
     if (getequipid(equip_hand1) != -1 || getequipid(equip_hand2) != -1) end;
-    if (.@level <= 3 && countitem("Beer") >= 1) delitem "Beer", 1;
+    if (.@level <= 3 && countitem("Beer") >= 1) goto L_Continue;
     elif (.@level <= 3) end;
+    goto L_Continue;
+
+L_Continue:
+    if (getmap() == "033-1") goto L_SpecialRules6;
+    goto L_Pay;
+
+L_Pay:
+    delitem "Beer", 1;
     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;
     callfunc "adjust_spellpower";
     set Sp, Sp - 20;
+    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(300 - (Agi * 2)) + (5/2)), // delay
-        ((Agi + Int) / 2), // dmg bonus
+        (sqrt(190) * 25 / 20), // delay - see conf/battle_athena.conf @ max_aspd
+        ((Agi + Int) * 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;
@@ -26,7 +37,20 @@ OnAttack:
     if (getequipid(equip_hand1) != -1 || getequipid(equip_hand2) != -1) goto OnDischarge;
     if (target(BL_ID, @target_id, 22) != 22) goto L_FreeRecast; // 0x10 | 0x02 | 0x04
     void call("elt_damage", @upmarmuspell[0], (@upmarmuspell[3] + @upmarmuspell[4]), ELT_WATER, ELT_FIRE, FX_NONE);
+
+    // This timer is if you stopped somewhere below max hits then after 25sec you recover fully and start at 0 hits again
+    stopnpctimer;
+    // to get this work stoptimer must be executed here or after setnpctimer and then started again else
+    // a timer somehow detaches that cant be set anymore, startnpctimer then attaches it again somehow
+    // i think the problem is in npc_timerevent_calc_next somewhere
+    if (@num_upmarmu_hits < 1) initnpctimer;
+    setnpctimer 0;
+    startnpctimer;
+
     set @upmarmuspell[1], @upmarmuspell[1] - 1;
+    set @num_upmarmu_hits, @num_upmarmu_hits + 1;
+
+    if @num_upmarmu_hits > UPMARMU_HITS_TILL_EXHAUST goto L_Exhausted;
     goto L_FreeRecast;
 
 L_FreeRecast:
@@ -34,17 +58,50 @@ L_FreeRecast:
         addtimer 0, strnpcinfo(0) + "::OnSetRecast";
     end;
 
+L_Exhausted:
+    set @_U_BLOCK, 1;
+    set @upmarmuspell[1], 0;
+    misceffect FX_MAGIC_DISCHARGE, strcharinfo(0);
+    overrideattack;
+    addtimer UPMARMU_EXHAUST_DURATION, "Upmarmu Exhaust Timer::OnClear"; // set the exhaustion time
+    sc_start SC_COOLDOWN_UPMARMU, UPMARMU_EXHAUST_DURATION, 0, BL_ID;
+    smsg SMSG_FAILURE, "Magic: You are too exhausted to use this spell for a while!";
+    goto L_StopTimer;
+
+L_Still_Exhausted:
+    smsg SMSG_FAILURE, "Magic: You are still too exhausted to use this spell for a while!";
+    end;
+
+L_StopTimer:
+    stopnpctimer;
+    setnpctimer 0;
+    end;
+
 OnDischarge:
     if (@upmarmuspell[1] < 1) end;
     set @upmarmuspell[1], 0;
     misceffect FX_MAGIC_DISCHARGE, strcharinfo(0);
     overrideattack;
-    end;
+    goto L_StopTimer;
 
 OnSetRecast:
     overrideattack (@upmarmuspell[2] * @upmarmuspell[2]), 1, ATTACK_ICON_GENERIC, OVERRIDE_KNUCKLES, strnpcinfo(0)+"::OnAttack", @upmarmuspell[1]; // delay needs to be squared
     end;
 
+OnTimer25000:
+    if (attachrid(.caster) < 1) end;
+    smsg SMSG_FAILURE, "Magic: You fully recovered and can use max hits again.";
+    set @num_upmarmu_hits, 0;
+    detachrid;
+    goto L_StopTimer;
+
+L_SpecialRules6:
+    if ($@KIMARR_EVENT < 1) goto L_Pay;
+    //if ($@Fluffy_FighterID == BL_ID) goto L_Pay;
+    //message strcharinfo(0), "You can't use this spell here unless hunting fluffies.";
+    message strcharinfo(0), "You can't use this spell here.";
+    end;
+
 OnInit:
     set .school, SKILL_MAGIC_WAR;
     set .invocation$, chr(MAGIC_SYMBOL) + "upmarmu"; // used in npcs that refer to this spell
@@ -53,3 +110,13 @@ OnInit:
     set .exp_gain, 1;
     end;
 }
+
+-|script|Upmarmu Exhaust Timer|32767
+{
+    end;
+
+OnClear:
+    set @_U_BLOCK, 0;
+    set @num_upmarmu_hits, 0;
+    end;
+}