diff options
author | Led Mitz <smoothshifter@tuta.io> | 2023-08-28 23:47:22 +0000 |
---|---|---|
committer | Led Mitz <smoothshifter@tuta.io> | 2023-08-28 23:47:22 +0000 |
commit | f9d91f2ce41c971fbe70d91e983193867cce742a (patch) | |
tree | 7e9042063c620f5b6e9c4bae98236a8cb07e6ebd /world/map/npc/magic/level2-barrier.txt | |
parent | 00177e5144edc700489a510c57b2dea87bd6856d (diff) | |
parent | b10524face925526ebc59c07b1697a5eb038d332 (diff) | |
download | serverdata-f9d91f2ce41c971fbe70d91e983193867cce742a.tar.gz serverdata-f9d91f2ce41c971fbe70d91e983193867cce742a.tar.bz2 serverdata-f9d91f2ce41c971fbe70d91e983193867cce742a.tar.xz serverdata-f9d91f2ce41c971fbe70d91e983193867cce742a.zip |
Merge branch 'asorm_betsanc_plugh_fix' into 'master'
asorm betsanc plugh fix
See merge request legacy/serverdata!676
Diffstat (limited to 'world/map/npc/magic/level2-barrier.txt')
-rw-r--r-- | world/map/npc/magic/level2-barrier.txt | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/world/map/npc/magic/level2-barrier.txt b/world/map/npc/magic/level2-barrier.txt index def8856e..2c170ae4 100644 --- a/world/map/npc/magic/level2-barrier.txt +++ b/world/map/npc/magic/level2-barrier.txt @@ -9,6 +9,7 @@ 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 + callfunc "adjust_spellpower"; 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; @@ -22,19 +23,15 @@ L_Pay: 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 (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; - // FIXME: max(30,(@spellpower/8))+20 - sc_start SC_MBARRIER, .@time, max(30,(@spellpower/7))+22, @target_id; + set .@asorm_time, (@spellpower*200)+2000; + sc_start SC_MBARRIER, .@asorm_time, max(30,(@spellpower/8))+20, @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; + set @asorm_future, gettimetick(0) + .@asorm_time - 100, @target_id; + addtimer .@asorm_time - 100, strnpcinfo(0)+"::OnEnd", @target_id; end; OnEnd: |