diff options
Diffstat (limited to 'world/map/npc/magic')
-rw-r--r-- | world/map/npc/magic/level1-lesser-heal.txt | 1 | ||||
-rw-r--r-- | world/map/npc/magic/level2-barrier.txt | 1 | ||||
-rw-r--r-- | world/map/npc/magic/level2-flying-backpack.txt | 1 | ||||
-rw-r--r-- | world/map/npc/magic/level2-hide.txt | 2 | ||||
-rw-r--r-- | world/map/npc/magic/level2-lay-on-hands.txt | 1 | ||||
-rw-r--r-- | world/map/npc/magic/level2-protect.txt | 1 |
6 files changed, 6 insertions, 1 deletions
diff --git a/world/map/npc/magic/level1-lesser-heal.txt b/world/map/npc/magic/level1-lesser-heal.txt index bc031cb1..3f312566 100644 --- a/world/map/npc/magic/level1-lesser-heal.txt +++ b/world/map/npc/magic/level1-lesser-heal.txt @@ -6,6 +6,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 + if (get(GM, @target_id) == 1) end; if (@args$ == "Mouboo" || @args$ == "mouboo") goto L_Mouboo; set .@range, (((MATK1 + getskilllv(SKILL_MAGIC) + getskilllv(.school) + 10) / 100) + 2); if (distance(BL_ID, @target_id) >= .@range) end; diff --git a/world/map/npc/magic/level2-barrier.txt b/world/map/npc/magic/level2-barrier.txt index 020e670a..2b55992d 100644 --- a/world/map/npc/magic/level2-barrier.txt +++ b/world/map/npc/magic/level2-barrier.txt @@ -10,6 +10,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 + if (get(GM, @target_id) == 1) end; if (get(Hp, @target_id) < 1) end; if (getequipid(equip_head, strcharinfo(0, @target_id)) == 888) end; diff --git a/world/map/npc/magic/level2-flying-backpack.txt b/world/map/npc/magic/level2-flying-backpack.txt index 36e936fd..444fe710 100644 --- a/world/map/npc/magic/level2-flying-backpack.txt +++ b/world/map/npc/magic/level2-flying-backpack.txt @@ -17,6 +17,7 @@ if (@target_id < 1 || !(isloggedin(@target_id)) || get(INVISIBLE, @target_id) == 1) set @target_id, BL_ID; // fallback to self if (distance(BL_ID, @target_id) >= (@spellpower/30)+2) set @target_id, BL_ID; + if (get(GM, @target_id) == 1) end; if (BL_ID != @target_id) misceffect FX_MAGIC_GENERIC, @args$; if (BL_ID == @target_id) set @args$, strcharinfo(0); set @plugh_time, (@spellpower*500)+5000, @target_id; diff --git a/world/map/npc/magic/level2-hide.txt b/world/map/npc/magic/level2-hide.txt index f720dd43..85c5c40a 100644 --- a/world/map/npc/magic/level2-hide.txt +++ b/world/map/npc/magic/level2-hide.txt @@ -10,7 +10,7 @@ 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 - + if (get(GM, @target_id) == 1) end; set @_M_BLOCK, 1; // block casting, until the timer clears it addtimer 1000, "Magic Timer::OnClear"; // set the new debuff callfunc "adjust_spellpower"; diff --git a/world/map/npc/magic/level2-lay-on-hands.txt b/world/map/npc/magic/level2-lay-on-hands.txt index 69a7d725..13875381 100644 --- a/world/map/npc/magic/level2-lay-on-hands.txt +++ b/world/map/npc/magic/level2-lay-on-hands.txt @@ -7,6 +7,7 @@ if (@args$ == "Mouboo" || @args$ == "mouboo") goto L_Mouboo; set @target_id, getcharid(3, @args$); if (@target_id < 1 || !(isloggedin(@target_id)) || get(INVISIBLE, @target_id) || BL_ID == @target_id) end; + if (get(GM, @target_id) == 1) end; if (Hp <= get(MaxHp, @target_id) / 20) end; // hp needs to be > 1/20 * target hp callfunc "adjust_spellpower"; if (distance(BL_ID, @target_id) >= (((sqrt(@spellpower)*12)+@spellpower)/100)+2) end; diff --git a/world/map/npc/magic/level2-protect.txt b/world/map/npc/magic/level2-protect.txt index 27eae516..1a7718e5 100644 --- a/world/map/npc/magic/level2-protect.txt +++ b/world/map/npc/magic/level2-protect.txt @@ -9,6 +9,7 @@ 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 + if (get(GM, @target_id) == 1) end; if (get(Hp, @target_id) < 1) end; if (getequipid(equip_head, strcharinfo(0, @target_id)) == 888) end; |