Merge branch 'magic' into 'master'

magic use cooldown symbols

See merge request legacy/serverdata!614

1 files changed, 13 insertions, 4 deletions

diff --git a/world/map/npc/magic/level2-protect.txt b/world/map/npc/magic/level2-protect.txt
index 4e3b9f88..98380d7b 100644
--- a/world/map/npc/magic/level2-protect.txt
+++ b/world/map/npc/magic/level2-protect.txt
@@ -9,21 +9,24 @@
     set @target_id, getcharid(3, @args$);
     if (@target_id < 1 || !(isloggedin(@target_id)) || get(INVISIBLE, @target_id))
         set @target_id, BL_ID; // fallback to self
+    if (distance(BL_ID, @target_id) >= (@spellpower/30)+2) set @target_id, BL_ID;
+    if (BL_ID == @target_id) set @args$, strcharinfo(0);
     if (get(GM, @target_id) == 1) end;
     if (get(Hp, @target_id) < 1) end;
     if (getequipid(equip_head, strcharinfo(0, @target_id)) == 888) end;
-
-    if (distance(BL_ID, @target_id) >= (@spellpower/30)+2) set @target_id, BL_ID;
     if (get(@antiprotect, @target_id) > 0) end;
+    if (getmap() == "033-1") goto L_SpecialRules6;
+    goto L_Pay;
+
+L_Pay:
     if (.@level <= 3) delitem "HardSpike", 1;
     set @_M_BLOCK, 1; // block casting, until the timer clears it
     addtimer 1500, "Magic Timer::OnClear"; // set the new debuff
+    sc_start SC_COOLDOWN, 1500, 0, BL_ID;
     callfunc "adjust_spellpower";
     set Sp, Sp - 14;
     misceffect FX_MAGIC_SHIELD_CAST, strcharinfo(0);
     callfunc "magic_exp";
-
-    if (BL_ID == @target_id) set @args$, strcharinfo(0);
     misceffect FX_MAGIC_SHIELD, @args$;
     set .@time, (@spellpower*1000)+5000;
     set @betsanc_time, .@time, @target_id;
@@ -40,6 +43,12 @@ OnEnd:
     misceffect FX_MAGIC_SHIELD_ENDS, strcharinfo(0);
     end;
 
+L_SpecialRules6:
+    if ($@KIMARR_EVENT < 1) goto L_Pay;
+    if (@target_id == BL_ID) goto L_Pay;
+    message strcharinfo(0), "You can't cast this spell at others here.";
+    end;
+
 OnInit:
     set .school, SKILL_MAGIC_NATURE;
     set .invocation$, chr(MAGIC_SYMBOL) + "betsanc"; // used in npcs that refer to this spell