From 58e4b21b96d2bc4dae2c7132ec675faef0538bee Mon Sep 17 00:00:00 2001
From: HoraK-FDF <horak-fdf@web.de>
Date: Mon, 24 Oct 2022 23:39:58 +0000
Subject: magic use cooldown symbols. Also, restrict magic on Kimarr.

---
 world/map/npc/magic/level2-barrier.txt | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'world/map/npc/magic/level2-barrier.txt')

diff --git a/world/map/npc/magic/level2-barrier.txt b/world/map/npc/magic/level2-barrier.txt
index ed695b77..284209c0 100644
--- a/world/map/npc/magic/level2-barrier.txt
+++ b/world/map/npc/magic/level2-barrier.txt
@@ -5,24 +5,27 @@
     set .@level, getskilllv(.school);
     if (.@level < .level) end;
     if (getskilllv(SKILL_MAGIC) < .level) end;
-    if (.@level <= 3 && countitem("SmallMushroom") >= 1) delitem "SmallMushroom", 1;
-    elif (.@level <= 3) end;
+    if (.@level <= 3 && countitem("SmallMushroom") < 1) end;
     set @target_id, getcharid(3, @args$);
     if (@target_id < 1 || !(isloggedin(@target_id)) || get(INVISIBLE, @target_id) == 1)
         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 (getmap() == "033-1") goto L_SpecialRules6;
+    goto L_Pay;
 
+L_Pay:
+    if (.@level <= 3) delitem "SmallMushroom", 1;
     set @_M_BLOCK, 1; // block casting, until the timer clears it
     addtimer 1000, "Magic Timer::OnClear"; // set the new debuff
+    sc_start SC_COOLDOWN, 1000, 0, BL_ID;
     callfunc "adjust_spellpower";
     set Sp, Sp - 15;
     misceffect FX_MAGIC_BARRIER_CAST, strcharinfo(0);
     callfunc "magic_exp";
-
-    if (distance(BL_ID, @target_id) >= (@spellpower/30)+2) set @target_id, BL_ID;
-    if (BL_ID == @target_id) set @args$, strcharinfo(0);
     if (BL_ID != @target_id) misceffect FX_MAGIC_BARRIER_HIT, @args$;
     set .@time, (@spellpower*200)+2000;
     set @asorm_time, .@time, @target_id;
@@ -39,6 +42,12 @@ OnEnd:
     misceffect FX_MAGIC_BARRIER_END, 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_ASTRAL;
     set .invocation$, chr(MAGIC_SYMBOL) + "asorm"; // used in npcs that refer to this spell
-- 
cgit v1.2.3-60-g2f50