summaryrefslogtreecommitdiff
path: root/world/map/npc/042-1/kaan.txt
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2012-01-22 13:34:03 +0100
committerJessica Tölke <jtoelke@mail.upb.de>2012-01-22 14:49:00 +0100
commitdd8b29c1df562250d116965e626c2d40eed04bbe (patch)
treea63f6daba888ffdd81c371cc395a4e7776d8e4ca /world/map/npc/042-1/kaan.txt
parenta9afda64574b9a9e13cc6528d8d68f658e994aab (diff)
downloadserverdata-dd8b29c1df562250d116965e626c2d40eed04bbe.tar.gz
serverdata-dd8b29c1df562250d116965e626c2d40eed04bbe.tar.bz2
serverdata-dd8b29c1df562250d116965e626c2d40eed04bbe.tar.xz
serverdata-dd8b29c1df562250d116965e626c2d40eed04bbe.zip
Some cleanup in tutorial NPCs.
Diffstat (limited to 'world/map/npc/042-1/kaan.txt')
-rw-r--r--world/map/npc/042-1/kaan.txt23
1 files changed, 10 insertions, 13 deletions
diff --git a/world/map/npc/042-1/kaan.txt b/world/map/npc/042-1/kaan.txt
index ca35843f..d80721c9 100644
--- a/world/map/npc/042-1/kaan.txt
+++ b/world/map/npc/042-1/kaan.txt
@@ -5,7 +5,7 @@
if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut_Done;
if (hasan == 4) goto L_Hasan_Saved;
- if ($@ScorpionFighter$ == strcharinfo(0)) goto L_Run;
+ if ($@ScorpionFighter == getcharid(3)) goto L_Run;
if (kaan == 4) goto L_Plan;
if (kaan == 3) goto L_Trick;
if (kaan == 2) goto L_Out;
@@ -25,7 +25,7 @@
set kaan, 1;
if (tanisha >= 3)
goto L_Tanisha2;
- close;
+ goto L_Close;
L_Tanisha2:
menu
@@ -36,7 +36,7 @@ L_Tanisha:
mes "[Kaan]";
mes "\"Did you already talk to Tanisha?\"";
if (tanisha < 3)
- close;
+ goto L_Close;
next;
menu
"Yes, I helped her with the maggots.",-,
@@ -74,7 +74,6 @@ L_Tanisha3:
menu
"A guy named Hasan won't let me enter Tulimshar.",L_Hasan,
"Thanks for the advice.",L_Close;
- close;
L_Out:
mes "[Kaan]";
@@ -86,7 +85,6 @@ L_Out:
"Not yet.",L_Close;
menu
"Not yet.",L_Close;
- close;
L_Hasan:
mes "[Kaan]";
@@ -104,7 +102,7 @@ L_Trick:
mes "[Kaan]";
mes "\"Do you have any idea what Hasans weakness could be?";
if (hasan < 2)
- close;
+ goto L_Close;
next;
menu
"He's afraid of scorpions.",-,
@@ -128,8 +126,8 @@ L_Explain:
mes "\"How's that? We can start as soon as you're ready.\"";
if (kaan == 3)
set kaan, 4;
- set hasan, 3;
- close;
+ set hasan, 3;
+ goto L_Close;
L_Plan:
mes "[Kaan]";
@@ -138,8 +136,7 @@ L_Plan:
next;
menu
"Yes please.",L_Explain,
- "No, everything's alright.",-;
- close;
+ "No, everything's alright.",L_Close;
L_Hasan_Saved:
mes "[Kaan]";
@@ -147,18 +144,18 @@ L_Hasan_Saved:
mes "But maybe Hasan is thankful now?\"";
next;
mes "\"Why don't you talk to him again and see what he says.\"";
- close;
+ goto L_Close;
L_Tut_Done:
mes "[Kaan]";
mes "\"Hi there. I hope you enjoy your time in Tulimshar.";
mes "Hasan can be a real troublemaker, but it seems like he has calmed down for now.\"";
- close;
+ goto L_Close;
L_Run:
mes "[Kaan]";
mes "\"He's distracted! What are you waiting for?\"";
- close;
+ goto L_Close;
L_Close:
close;