summaryrefslogtreecommitdiff
path: root/world/map/npc
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc')
-rw-r--r--world/map/npc/magic/level2-arrow-hail.txt4
-rw-r--r--world/map/npc/magic/level2-rain.txt4
2 files changed, 4 insertions, 4 deletions
diff --git a/world/map/npc/magic/level2-arrow-hail.txt b/world/map/npc/magic/level2-arrow-hail.txt
index 35cd584e..6e317232 100644
--- a/world/map/npc/magic/level2-arrow-hail.txt
+++ b/world/map/npc/magic/level2-arrow-hail.txt
@@ -66,7 +66,7 @@ OnNearbyNpc:
end;
OnLaunch:
- if(get(BL_ID, .caster) != .caster) destroy; // destroy if caster is missing
+ if(get(Hp, .caster) < 1) destroy; // destroy if caster is missing
if(getmap(.caster) != strnpcinfo(3)) destroy; // destroy if caster left the map
set .hit, .hit + 1;
if(.hit > .max_hit) destroy;
@@ -93,7 +93,7 @@ OnTimer30000:
destroy;
OnHit:
- if(get(BL_ID, .caster) != .caster) destroy; // destroy if caster is missing
+ if(get(Hp, .caster) < 1) destroy; // destroy if caster is missing
if(getmap(.caster) != strnpcinfo(3)) destroy; // destroy if caster left the map
if(target(.caster, @target_id, 16) != 16 && .caster != @target_id) end;
diff --git a/world/map/npc/magic/level2-rain.txt b/world/map/npc/magic/level2-rain.txt
index 9e62782d..c088acf4 100644
--- a/world/map/npc/magic/level2-rain.txt
+++ b/world/map/npc/magic/level2-rain.txt
@@ -64,7 +64,7 @@ L_Tree:
close;
OnLaunch:
- if(get(BL_ID, .caster) != .caster) destroy; // destroy if caster is missing
+ if(get(Hp, .caster) < 1) destroy; // destroy if caster is missing
if(getmap(.caster) != strnpcinfo(3)) destroy; // destroy if caster left the map
set .count, .count + 1;
if(.count > .max) destroy;
@@ -82,7 +82,7 @@ S_Launch:
return;
OnHit:
- if(get(BL_ID, .caster) != .caster) destroy; // destroy if caster is missing
+ if(get(Hp, .caster) < 1) destroy; // destroy if caster is missing
if(getmap(.caster) != strnpcinfo(3)) destroy; // destroy if caster left the map
if(target(.caster, @target_id, 16) != 16 && .caster != @target_id) end;
if((get(BL_TYPE, @target_id) & 1) == 0) end; // either mob or pc