summaryrefslogtreecommitdiff
path: root/world/map/npc/magic/level2-summon-wickedmushroom.txt
diff options
context:
space:
mode:
authormekolat <mekolat@users.noreply.github.com>2016-05-13 19:31:58 -0400
committermekolat <mekolat@users.noreply.github.com>2016-05-13 19:31:58 -0400
commit4ea513a57ecc0ebb6b82e6dbdd7070acb2928f11 (patch)
tree3a3fa3e06e5816c68ddc71d941ed40084d0ac1fb /world/map/npc/magic/level2-summon-wickedmushroom.txt
parenteae9517e65cd67d48d085e4fdccf0c61547fec8a (diff)
parent45e754a89296edcca0b77e2a7c7e7fdeb19ef853 (diff)
downloadserverdata-4ea513a57ecc0ebb6b82e6dbdd7070acb2928f11.tar.gz
serverdata-4ea513a57ecc0ebb6b82e6dbdd7070acb2928f11.tar.bz2
serverdata-4ea513a57ecc0ebb6b82e6dbdd7070acb2928f11.tar.xz
serverdata-4ea513a57ecc0ebb6b82e6dbdd7070acb2928f11.zip
Merge pull request #510 from mekolat/kaflosh
wedding
Diffstat (limited to 'world/map/npc/magic/level2-summon-wickedmushroom.txt')
-rw-r--r--world/map/npc/magic/level2-summon-wickedmushroom.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/world/map/npc/magic/level2-summon-wickedmushroom.txt b/world/map/npc/magic/level2-summon-wickedmushroom.txt
index 02442c6b..3b8b9cfc 100644
--- a/world/map/npc/magic/level2-summon-wickedmushroom.txt
+++ b/world/map/npc/magic/level2-summon-wickedmushroom.txt
@@ -29,6 +29,8 @@ OnCast:
end;
OnSummon:
+ if(get(Hp, .master) < 1) destroy; // destroy if master is missing
+ if(getmap(.master) != strnpcinfo(3)) destroy; // destroy if master left the map
specialeffect FX_PENTAGRAM_BURST;
set .@i, 0;
set .@x, getnpcx();
@@ -44,7 +46,7 @@ S_SummonAll:
summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, 1106, 2, .lifetime;
set .@i, .@i + 1;
if (.@i < .count) goto S_SummonAll;
- return;
+ destroy;
OnInit:
set .school, SKILL_MAGIC_DARK;