From dd8b29c1df562250d116965e626c2d40eed04bbe Mon Sep 17 00:00:00 2001
From: Jessica Tölke <jtoelke@mail.upb.de>
Date: Sun, 22 Jan 2012 13:34:03 +0100
Subject: Some cleanup in tutorial NPCs.

---
 world/map/npc/042-2/tanisha.txt | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

(limited to 'world/map/npc/042-2/tanisha.txt')

diff --git a/world/map/npc/042-2/tanisha.txt b/world/map/npc/042-2/tanisha.txt
index d9f60209..9363d1b6 100644
--- a/world/map/npc/042-2/tanisha.txt
+++ b/world/map/npc/042-2/tanisha.txt
@@ -19,8 +19,8 @@
     mes "\"Are you feeling better?\"";
     next;
     menu
-        "Yes, thank you.", -,
-        "Yeah, but all my stuff is gone.", -;
+        "Yes, thank you.",-,
+        "Yeah, but all my stuff is gone.",-;
     mes "[Tanisha]";
     mes "\"I'm glad you're feeling better. It was really bad luck what happened to you.";
     mes "Hey, I have an idea.\"";
@@ -28,6 +28,7 @@
     set tanisha, 1;
 
 L_Maggots:
+    mes "[Tanisha]";
     mes "\"There are some maggots eating the goods and I'm supposed to get rid of them.";
     mes "But they're so yucky!\"";
     next;
@@ -35,8 +36,8 @@ L_Maggots:
     mes "What do you say?\"";
     next;
     menu
-        "Sure!", -,
-        "That's your job.", L_Close;
+        "Sure!",-,
+        "That's your job.",L_Close;
     mes "[Tanisha]";
     mes "\"Wonderful!\"";
     // since the check happens here, it is actually possible to have
@@ -131,20 +132,20 @@ L_Again:
     next;
     if (hasan)
         menu
-            "A guy named Hasan won't let me enter Tulimshar.", L_Hasan,
-            "Yes, could you explain again about...", L_Explain,
-            "No, thanks.", L_Close;
+            "A guy named Hasan won't let me enter Tulimshar.",L_Hasan,
+            "Yes, could you explain again about...",L_Explain,
+            "No, thanks.",L_Close;
     menu
-        "Yes, could you explain again about...", L_Explain,
-        "No, thanks.", L_Close;
+        "Yes, could you explain again about...",L_Explain,
+        "No, thanks.",L_Close;
 
 L_Explain:
     menu
-        "... how to fight?", L_Fight,
-        "... monsters?", L_Mob,
-        "... status points?", L_StatsRe,
-        "... what to do in Tulimshar?", L_Advice,
-        "... nevermind.", L_Close;
+        "... how to fight?",L_Fight,
+        "... monsters?",L_Mob,
+        "... status points?",L_StatsRe,
+        "... what to do in Tulimshar?",L_Advice,
+        "... nevermind.",L_Close;
 
 L_Fight:
     mes "[Tanisha]";
@@ -209,9 +210,10 @@ L_Sleep:
     mes "Come back when you're serious.\"";
     set @Maggot_Kills, 0;
     set @time, 0;
+    close2;
     if (getareausers("042-2.gat", 30, 85, 36, 89) == 0)
         goto L_CleanUp;
-    goto L_Close;
+    end;
 
 L_Fail:
     mes "Tanisha seems to be trying hard to supress laughter.";
-- 
cgit v1.2.3-60-g2f50