summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorjak1 <jak89_1@ftb4u.de>2016-02-16 16:14:21 +0100
committerjak1 <jak89_1@ftb4u.de>2016-02-16 16:14:21 +0100
commita0f2241ba02542b26eaed678fabfe9286c82208e (patch)
tree2c561e432cf073778f91f22815d8a1c51be06c4a /npc
parentbd6eac02a3efb84a85a17153cb5f8b7ecf54c18a (diff)
downloadserverdata-a0f2241ba02542b26eaed678fabfe9286c82208e.tar.gz
serverdata-a0f2241ba02542b26eaed678fabfe9286c82208e.tar.bz2
serverdata-a0f2241ba02542b26eaed678fabfe9286c82208e.tar.xz
serverdata-a0f2241ba02542b26eaed678fabfe9286c82208e.zip
added more checks and imported the npc
Diffstat (limited to 'npc')
-rw-r--r--npc/001-2-34/doors.txt9
-rw-r--r--npc/001-2-36/_import.txt1
2 files changed, 9 insertions, 1 deletions
diff --git a/npc/001-2-34/doors.txt b/npc/001-2-34/doors.txt
index b417675f..b4a483e9 100644
--- a/npc/001-2-34/doors.txt
+++ b/npc/001-2-34/doors.txt
@@ -7,7 +7,14 @@
001-2-34,23,29,0 script ToTrainingRoom#001-2-34 NPC_HIDDEN,0,0,{
OnTouch:
- if (mobcount("001-2-36.gat","all") > 0)
+ if ((getmapusers($@MAP_NAME$) == 0) && ($@FightingIsActive > 0))
+ {
+ set $@FightingIsActive, 0;
+ killmonsterall "001-2-36.gat";
+
+ }
+
+ if (mobcount("001-2-36.gat","all") > 0 && $@FightingIsActive > 0)
{
narrator
l("You hear some sound behind the door."),
diff --git a/npc/001-2-36/_import.txt b/npc/001-2-36/_import.txt
index fc3a9f3f..e2b50e1f 100644
--- a/npc/001-2-36/_import.txt
+++ b/npc/001-2-36/_import.txt
@@ -1,3 +1,4 @@
// Map 001-2-36
npc: npc/001-2-36/_warps.txt
npc: npc/001-2-36/mapflags.txt
+npc: npc/001-2-36/training_room_npc.txt