From 40add9a2181ef5cb2d8804eeb01c0a190d6c8ee5 Mon Sep 17 00:00:00 2001
From: mekolat <mekolat@users.noreply.github.com>
Date: Wed, 30 Mar 2016 19:52:24 -0400
Subject: slowly getting things done

explain the debug spell is deprecated

upmarmu typo

cooldown fix

make maps with updated converter, make nodes

update permissions
---
 world/map/npc/magic/level1-detect-magic.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'world/map/npc/magic/level1-detect-magic.txt')

diff --git a/world/map/npc/magic/level1-detect-magic.txt b/world/map/npc/magic/level1-detect-magic.txt
index e64a499a..e975e952 100644
--- a/world/map/npc/magic/level1-detect-magic.txt
+++ b/world/map/npc/magic/level1-detect-magic.txt
@@ -1,9 +1,10 @@
 -|script|detect-magic|32767
 {
-    if(call("magic_checks")) end; // << I wish we had functions that could return >>
+    if(call("magic_checks")) end; 
     if (Sp < 3) end;
     if (getskilllv(.school) < .level) end;
-    set MAGIC_CAST_TICK, gettimetick(2) + 6; // set the new debuff
+    set @_M_BLOCK, 1; // block casting, until the timer clears it
+    addtimer 6000, "Magic Timer::OnClear"; // set the new debuff
     callfunc "adjust_spellpower";
     set Sp, Sp - 3;
     misceffect FX_MAGIC_GENERIC, strcharinfo(0);
@@ -15,7 +16,7 @@
 
 OnNearbyNpc:
     set .@e$, strnpcinfo(2,@target_id);
-    if(.@e$ == "#_M" || .@e$ == "#MAGIC")
+    if(.@e$ == "#_M" || .@e$ == "#MAGIC" || get(.IS_MAGIC, @target_id))
         misceffect FX_MAGIC_DEFAULT, @target_id;
     end;
 
-- 
cgit v1.2.3-60-g2f50