Put Kaan back into service

2 files changed, 31 insertions, 28 deletions

diff --git a/npc/029-1/kaan.txt b/npc/029-1/kaan.txt
index 5684906c..ecfe95d4 100644
--- a/npc/029-1/kaan.txt
+++ b/npc/029-1/kaan.txt
@@ -3,7 +3,7 @@
     callfunc "PCtoNPCRange";
     if(@npc_check) end;
 
-    @kaan_talked = (STARTAREA & $@SpokeToKaan);
+    @kaan_talked = getq(CandorQuest_Harasser);
     if (!(@kaan_talked)) goto L_Tanisha;
     if (QL_BEGIN >= 13) goto L_TutDone;
     if (QL_BEGIN == 12) goto L_Plan;
@@ -13,21 +13,23 @@
     goto L_Out;
 
 L_Tanisha:
-    STARTAREA = STARTAREA | $@SpokeToKaan;
-    mes "[Young Man]";
-    mes "\"You're the person I brought here, right?";
-    mes "My name is Kaan, I'm Tanisha's brother.\"";
-    mes "\"She was babbling at me about it all the morning until I sent her to take care of the maggots in the cafe.\"";
-    mes "Kaan grins mischieviously.";
-    mes "[Kaan]";
-    mes "\"She hates maggots.\"";
-    mes "\"Did you already talk to Tanisha?\"";
+    mesn l("Young Man");
+    mes l("\"You're the person I brought here, right?");
+    mes l("My name is Kaan, I'm Tanisha's brother.\"");
+    next;
+    mesn;
+    mesq l("She was babbling at me about it all the morning until I sent her to take care of the maggots in the cafe.");
+    mesc l("Kaan grins mischieviously.");
+    next;
+    mesn;
+    mes l("\"She hates maggots.");
+    mes l("Did you already talk to Tanisha?\"");
     menu
-        "Yes, I helped her with the maggots.",L_Tanisha1,
-        "Yeah, and she's done with the maggots.",L_Tanisha1;
+        l("Yes, I helped her with the maggots."), L_Tanisha1,
+        l("Yeah, and she's done with the maggots."), L_Tanisha1;
 
 L_Tanisha1:
-    mes "[Kaan]";
+    mesn;
     mes "\"Ah, that is good news.";
     mes "You know, we have a lot of problems with bugs here.\"";
     mes "\"I've slain many bugs here to keep them out of our fields.\"";
@@ -37,18 +39,20 @@ L_Tanisha1:
     mes "Hurnscald is a wondeful place! Traders, entertainers, adventurers - it's very exciting.\"";
     mes "\"And Ian the trainer is hanging around there often. You should talk to him, he's a smart guy.\"";
     mes "\"The ferry to the south takes your there for free.\"";
+    setq CandorQuest_Harasser, 1;
     goto L_close;
 
 L_Out:
-    mes "[Kaan]";
-    mes "\"Hello! How are you? Did you already visit Hurnscald?\"";
-    menu
-        "Yes.", L_close,
-        "Not yet.",L_close;
+    mesn;
+    mesq l("Hello! How are you? Did you already visit Hurnscald?");
+    select
+        l("Yes."),
+        l("Not yet.");
+    close;
 
 L_Hasan:
-    mes "[Kaan]";
-    mes "\"Hello! How are you? Did you already visit Hurnscald?\"";
+    mesn;
+    mesq l("Hello! How are you? Did you already visit Hurnscald?");
     menu
         "A guy named Hasan is bullying someone.",L_Next1,
         "Yes.", L_close,
@@ -64,21 +68,21 @@ L_Next1:
     goto L_Trick;
 
 L_Trick:
-    mes "[Kaan]";
+    mesn;
     mes "\"Do you have any idea what Hasan's weakness could be?";
     mes "I wonder if Sorfina know something about him that could help us.\"";
     menu
         "No idea.",L_close;
 
 L_TrickKnown:
-    mes "[Kaan]";
+    mesn;
     mes "\"Do you have any idea what Hasan's weakness could be?";
     menu
         "He's afraid of scorpions.",L_Next2,
         "No idea.",L_close;
 
 L_Next2:
-    mes "[Kaan]";
+    mesn;
     mes "\"Scorpions?! Right! How could I forget?";
     mes "When he was a child, he nearly died because he fell into a scorpion nest.\"";
     QL_BEGIN = 12;
@@ -96,7 +100,7 @@ L_Explain:
     goto L_close;
 
 L_Plan:
-    mes "[Kaan]";
+    mesn;
     mes "\"I'm ready. Just give me the sign when you're down there.";
     mes "Or do you want me to explain the plan again?\"";
     menu
@@ -104,7 +108,7 @@ L_Plan:
         "No, everything's alright.",L_close;
 
 L_TutDone:
-    mes "[Kaan]";
+    mesn;
     mes "\"Hi there. I hope you enjoy your time in Hurnscald.";
     mes "Hasan can be a real troublemaker, but it seems like he has calmed down for now.\"";
     goto L_close;
diff --git a/npc/029-1/tutorial.txt b/npc/029-1/tutorial.txt
index d6d05463..77ebf3e5 100644
--- a/npc/029-1/tutorial.txt
+++ b/npc/029-1/tutorial.txt
@@ -5,7 +5,6 @@ OnInit:
     $@ScorpionFighter = 0;
     $@ScorpionTimer = 0;
     set $@ScorpDeath, 0; 
-    $@SpokeToKaan = false;//(1 << 31); FIXME
     end;
 }
 029-2,21,26,0	script	TutDebug	NPC154,{
@@ -18,14 +17,14 @@ OnInit:
 
 L_Kaan:
     QL_BEGIN = 8;
-    STARTAREA = STARTAREA &~ $@SpokeToKaan;
+    setq CandorQuest_Harasser, 0;
     mes "Reset!";
     goto L_close;
 
 L_Reset:
     TUT_var = 0;
     QL_BEGIN = 0;
-    STARTAREA = STARTAREA &~ $@SpokeToKaan;
+    setq CandorQuest_Harasser, 0;
     mes "Reset!";
     goto L_close;