diff options
| author | mekolat <mekolat@users.noreply.github.com> | 2016-03-30 19:52:24 -0400 |
|---|---|---|
| committer | mekolat <mekolat@users.noreply.github.com> | 2016-04-07 06:58:14 -0400 |
| commit | 40add9a2181ef5cb2d8804eeb01c0a190d6c8ee5 (patch) | |
| tree | b2fb2774a570950cb6db582da8a25361e8d70249 /world/map/npc/magic/level1-detect-magic.txt | |
| parent | c22162b0a8cd9cceab579548bbc1b68ff67ba4dd (diff) | |
| download | serverdata-40add9a2181ef5cb2d8804eeb01c0a190d6c8ee5.tar.gz serverdata-40add9a2181ef5cb2d8804eeb01c0a190d6c8ee5.tar.bz2 serverdata-40add9a2181ef5cb2d8804eeb01c0a190d6c8ee5.tar.xz serverdata-40add9a2181ef5cb2d8804eeb01c0a190d6c8ee5.zip | |
slowly getting things done
explain the debug spell is deprecated
upmarmu typo
cooldown fix
make maps with updated converter, make nodes
update permissions
Diffstat (limited to 'world/map/npc/magic/level1-detect-magic.txt')
| -rw-r--r-- | world/map/npc/magic/level1-detect-magic.txt | 7 |
1 files changed, 4 insertions, 3 deletions
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; |