diff options
Diffstat (limited to 'world/map/npc/magic/level2-protect.txt')
-rw-r--r-- | world/map/npc/magic/level2-protect.txt | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/world/map/npc/magic/level2-protect.txt b/world/map/npc/magic/level2-protect.txt index a3096ad7..659efdc1 100644 --- a/world/map/npc/magic/level2-protect.txt +++ b/world/map/npc/magic/level2-protect.txt @@ -5,18 +5,17 @@ set .@level, getskilllv(.school); if (.@level < .level) end; if (getskilllv(SKILL_MAGIC) < .level) end; - if (.@level <= 3 && countitem("HardSpike") >= 1) delitem "HardSpike", 1; + if (.@level <= 3 && countitem("HardSpike") < 1) end; elif (.@level <= 3) end; set @target_id, getcharid(3, @args$); if (@target_id < 1 || !(isloggedin(@target_id)) || get(INVISIBLE, @target_id)) set @target_id, BL_ID; // fallback to self - set @betsanc_caster, BL_ID, @target_id; - if (attachrid(@target_id) != 1) end; - set @target_hat, getequipid(equip_head), @betsanc_caster; - if (attachrid(@betsanc_caster) != 1) end; - if (@target_hat == 888) end; // FIXME: this whole 5 line block could be done with only one line if we modify getequipid + if (getequipid(equip_head, strcharinfo(0, @target_id)) == 888) end; + if (distance(BL_ID, @target_id) >= (@spellpower/30)+2) set @target_id, BL_ID; + if (get(@antiprotect, @target_id) > 0) end; + delitem "HardSpike", 1; set @_M_BLOCK, 1; // block casting, until the timer clears it addtimer 1500, "Magic Timer::OnClear"; // set the new debuff callfunc "adjust_spellpower"; @@ -24,15 +23,13 @@ misceffect FX_MAGIC_GREEN, strcharinfo(0); callfunc "magic_exp"; - if (distance(BL_ID, @target_id) >= (@spellpower/30)+2) set @target_id, BL_ID; if (BL_ID == @target_id) set @args$, strcharinfo(0); misceffect FX_MAGIC_SHIELD, @args$; set .@time, (@spellpower*1000)+5000; set @betsanc_time, .@time, @target_id; sc_start SC_PHYS_SHIELD, .@time, max(15,(@spellpower/20))+5, @target_id; message @args$, "Shield : You feel more protected."; - if (attachrid(@target_id) != 1) end; - addtimer @betsanc_time, strnpcinfo(0)+"::OnEnd"; + addtimer @betsanc_time, strnpcinfo(0)+"::OnEnd", @target_id; end; OnEnd: |