diff options
author | HoraK-FDF <horak-fdf@web.de> | 2022-11-11 18:25:19 +0000 |
---|---|---|
committer | HoraK-FDF <horak-fdf@web.de> | 2022-11-11 18:25:19 +0000 |
commit | f6256f240c2fabe5d26efa7e88e69c2de19a6786 (patch) | |
tree | e832fa79f8fe9a78085e0b14b35f2bac5afe3006 /world/map/npc/magic/level2-barrier.txt | |
parent | 9ad304f22b698d69e7d41cc4cdfe53bf16d5d552 (diff) | |
parent | c62e768cc51f9607b85642c78d32cbcbc519f880 (diff) | |
download | serverdata-f6256f240c2fabe5d26efa7e88e69c2de19a6786.tar.gz serverdata-f6256f240c2fabe5d26efa7e88e69c2de19a6786.tar.bz2 serverdata-f6256f240c2fabe5d26efa7e88e69c2de19a6786.tar.xz serverdata-f6256f240c2fabe5d26efa7e88e69c2de19a6786.zip |
Merge branch 'master' into 'magic'magic
# Conflicts:
# world/map/db/const.txt
# world/map/npc/magic/event-summon-managuardian.txt
Diffstat (limited to 'world/map/npc/magic/level2-barrier.txt')
-rw-r--r-- | world/map/npc/magic/level2-barrier.txt | 4 |
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 284209c0..def8856e 100644 --- a/world/map/npc/magic/level2-barrier.txt +++ b/world/map/npc/magic/level2-barrier.txt @@ -28,8 +28,10 @@ L_Pay: callfunc "magic_exp"; if (BL_ID != @target_id) misceffect FX_MAGIC_BARRIER_HIT, @args$; set .@time, (@spellpower*200)+2000; + set .@time, .@time+5000; // FIXME: Temporary Boost! set @asorm_time, .@time, @target_id; - sc_start SC_MBARRIER, .@time, max(30,(@spellpower/8))+20, @target_id; + // FIXME: max(30,(@spellpower/8))+20 + sc_start SC_MBARRIER, .@time, max(30,(@spellpower/7))+22, @target_id; message @args$, "Barrier : You are surrounded by a magical barrier."; set @asorm_future, gettimetick(0) + @asorm_time - 100, @target_id; addtimer @asorm_time - 100, strnpcinfo(0)+"::OnEnd", @target_id; |