summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2011-06-06 13:30:57 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2011-06-06 13:32:50 +0200
commitead07b277116fb09788d5138c3d6917414ecbe6e (patch)
treea9cfe981066b42e238949cb3473d8a9d87c9e20f /npc
parent3ea3de6a5ad3ade366cc7a0118949b10476b0798 (diff)
downloadserverdata-ead07b277116fb09788d5138c3d6917414ecbe6e.tar.gz
serverdata-ead07b277116fb09788d5138c3d6917414ecbe6e.tar.bz2
serverdata-ead07b277116fb09788d5138c3d6917414ecbe6e.tar.xz
serverdata-ead07b277116fb09788d5138c3d6917414ecbe6e.zip
fix for a problem in maggot fight
Diffstat (limited to 'npc')
-rw-r--r--npc/042-2/mapflags.txt2
-rw-r--r--npc/042-2/tanisha.txt9
2 files changed, 10 insertions, 1 deletions
diff --git a/npc/042-2/mapflags.txt b/npc/042-2/mapflags.txt
index b1cd5ab2..dab75985 100644
--- a/npc/042-2/mapflags.txt
+++ b/npc/042-2/mapflags.txt
@@ -1 +1 @@
-042-2.gat mapflag nosave 042-1,46,26;
+042-2.gat mapflag nosave 042-1,82,78;
diff --git a/npc/042-2/tanisha.txt b/npc/042-2/tanisha.txt
index bbaf4b4b..6cb7f2d4 100644
--- a/npc/042-2/tanisha.txt
+++ b/npc/042-2/tanisha.txt
@@ -1,5 +1,10 @@
042-2.gat,37,90,0 script Tanisha 114,{
+//TODO: fix the mapflag in 042-2
+//TODO: limit number of players for maggot fight
+
+ if ((getx(0) > 29) && (getx(0) < 37) && (gety(0) > 84) && (gety(0) < 90)) goto L_Fighting;
+
if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut_Done;
if (tanisha == 4) goto L_Again;
if (tanisha == 3) goto L_Stats;
@@ -160,6 +165,10 @@ L_Tut_Done:
mes "She sighs.";
close;
+L_Fighting:
+ message strcharinfo(0), "Tanisha: I believe in you!";
+ end;
+
OnTimer1000:
setnpctimer 0;
if (getareausers("042-2.gat", 29, 85, 36, 90) < 1)