From dc2d7158f90ace751fa08def872299e0514dded0 Mon Sep 17 00:00:00 2001
From: Jessica Tölke <jtoelke@mail.upb.de>
Date: Tue, 7 Feb 2012 14:44:46 +0100
Subject: North Tulimshar: quest about businessman who wants to open a shop in
 Tulimshar

---
 world/map/npc/021-2/yanis.txt | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

(limited to 'world/map/npc/021-2/yanis.txt')

diff --git a/world/map/npc/021-2/yanis.txt b/world/map/npc/021-2/yanis.txt
index 0add08cf..6b47b599 100644
--- a/world/map/npc/021-2/yanis.txt
+++ b/world/map/npc/021-2/yanis.txt
@@ -1,26 +1,39 @@
+// Government official taking care about shop licenses
+// involved in quest given by 021-1/imec.txt and 021-2/kylian.txt
+
 021-2.gat,33,17,0|script|Yanis|107,{
 
-    set @state, ((QUEST_NorthTulimshar & $@ImecShopNT_MASK) >> $@ImecShopNT_SHIFT);
+    set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@knowYanisNT;
+    set @kylian, ((QUEST_NorthTulimshar & $@businessmanNT_MASK) >> $@businessmanNT_SHIFT);
+    set @imec, ((QUEST_NorthTulimshar & $@ImecShopNT_MASK) >> $@ImecShopNT_SHIFT);
 
     mes "[Yanis]";
     mes "\"Welcome. I'm handling issues with trading licenses for the shop owners in Tulimshar. Can I help you?\"";
-    if (@state != 1)
+    if (@imec != 1)
         menu
-            "Nothing right now.",L_Close;
+            "Nothing right now.",L_BeforeClose;
     menu
         "Imec asked me to bring this petition.",-,
-        "Nothing right now.",L_Close;
+        "Nothing right now.",L_BeforeClose;
     mes "[Yanis]";
     mes "\"Imec? I see. Give it to me.\"";
     mes "Yanis has a disapprovingly look on his face. He takes the letter and writes something on another paper.";
     next;
     mes "[Yanis]";
     mes "\"Here you have a letter of acknowledgement. You can bring that back to Imec. We will have a look at his case.\"";
-    set @state, 2;
-    set QUEST_NorthTulimshar, (QUEST_NorthTulimshar & ~($@ImecShopNT_MASK)) | (@state << $@ImecShopNT_SHIFT);
+    set @imec, 2;
+    set QUEST_NorthTulimshar, (QUEST_NorthTulimshar & ~($@ImecShopNT_MASK)) | (@imec << $@ImecShopNT_SHIFT);
+    goto L_BeforeClose;
+
+L_BeforeClose:
+    if (@kylian != 3)
+        goto L_Close;
+    next;
+    mes "You think that this is the person Kylian needs to talk to. You should tell him.";
     goto L_Close;
 
 L_Close:
-    set @state, 0;
+    set @imec, 0;
+    set @kylian, 0;
     close;
 }
-- 
cgit v1.2.3-70-g09d2