summaryrefslogtreecommitdiff
path: root/world/map/npc/magic/level2-barrier.txt
diff options
context:
space:
mode:
authorWushin <pasekei@gmail.com>2016-05-11 16:50:15 -0500
committerWushin <pasekei@gmail.com>2016-05-11 16:50:15 -0500
commit6fb28669713684116e3598cbfad078bffb7f0531 (patch)
treed478ccf6e0ed83ab1e6aa59f09b74f14c55dd0cc /world/map/npc/magic/level2-barrier.txt
parent9218cfaba1337e0098f147cd58d0496bdaf14728 (diff)
parenta25fa832a47e27a56be017bbb58b85ba7f072507 (diff)
downloadserverdata-6fb28669713684116e3598cbfad078bffb7f0531.tar.gz
serverdata-6fb28669713684116e3598cbfad078bffb7f0531.tar.bz2
serverdata-6fb28669713684116e3598cbfad078bffb7f0531.tar.xz
serverdata-6fb28669713684116e3598cbfad078bffb7f0531.zip
Merge pull request #496 from mekolat/end-message
a bit of everything
Diffstat (limited to 'world/map/npc/magic/level2-barrier.txt')
-rw-r--r--world/map/npc/magic/level2-barrier.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/world/map/npc/magic/level2-barrier.txt b/world/map/npc/magic/level2-barrier.txt
index 9526ee5a..3b7ffb77 100644
--- a/world/map/npc/magic/level2-barrier.txt
+++ b/world/map/npc/magic/level2-barrier.txt
@@ -27,10 +27,12 @@
set @asorm_time, .@time, @target_id;
sc_start SC_MBARRIER, .@time, max(30,(@spellpower/8))+20, @target_id;
message @args$, "Barrier : You are surrounded by a magical barrier.";
- addtimer @asorm_time, strnpcinfo(0)+"::OnEnd", @target_id;
+ set @asorm_future, gettimetick(0) + @asorm_time - 100, @target_id;
+ addtimer @asorm_time - 100, strnpcinfo(0)+"::OnEnd", @target_id;
end;
OnEnd:
+ if (gettimetick(0) - @asorm_future < 0) end;
if (sc_check(SC_MBARRIER) != 1) end;
message strcharinfo(0), "Barrier : Your magical barrier dissipates.";
misceffect FX_MAGIC_DEFAULT, strcharinfo(0);