1 files changed, 26 insertions, 52 deletions

diff --git a/npc/003-1/lieutenantdausen.txt b/npc/003-1/lieutenantdausen.txt
index bbd343974..8d9462140 100644
--- a/npc/003-1/lieutenantdausen.txt
+++ b/npc/003-1/lieutenantdausen.txt
@@ -15,39 +15,36 @@
 //    3 - Reward given
 
 003-1,111,84,0	script	Lieutenant Dausen	NPC_PLAYER,{
-    // The Monster King guild have a special menu
-    if (strcharinfo(2) == "Monster King") goto L_MKControl;
 
-    .@has = getq(TulimsharQuest_WaterForGuard);
+    .@q = getq(TulimsharQuest_WaterForGuard);
 
-    switch (.@has) {
+    switch (.@q) {
     case 0:
-        callsub(L_Greetings);
+        mesn;
+        mesq l("Greetings, wanderer. I am @@, chief of the Tulimshar guards. My wards are dying from dehydration in the sun. Bring them water and you will earn a reward.", .name$);
         break;
     case 1:
-        callsub(L_InProgress);
+        mesn;
+        mesq l("Please help my wards!");
         break;
     case 2:
-        callsub(L_Reward);
+        goto L_Reward;
         break;
     case 3:
-        callsub(L_QuestDone);
+        mesn;
+        mesq l("Thank you for your help.");
         break;
     default:
         end;
     }
-
-    close;
-
-L_Greetings:
-        speech S_LAST_BLANK_LINE, l("Greetings, wanderer. I am @@, chief of the Tulimshar guards. My wards are dying from dehydration in the sun. Bring them water and you will earn a reward.", .name$);
-
-        select
-            l("Yes sir. I will help them."),
-            rif(getq(TulimsharQuest_Hasan) == 1, l("A guy named Hasan stole me!")),
-            menuaction(l("Quit"));
-
-        switch (@menu) {
+    next;
+    select
+        rif(!.@q, l("Yes sir. I will help them.")),
+        rif(getq(TulimsharQuest_Hasan) == 1, l("A guy named Hasan stole me!")),
+        rif (strcharinfo(2) == "Monster King", l("I'm with the Monster King.")),
+        l("Good bye, sir.");
+    mes "";
+    switch (@menu) {
         case 1:
             setq TulimsharQuest_WaterForGuard, 1;
             mes "";
@@ -62,19 +59,18 @@ L_Greetings:
             speech S_FIRST_BLANK_LINE, lg("Ah, Hasan... Sorry pal, afraid I can't do anything for you. Try talking to his mother Sorfina, she is on Mahoud's house, near the Inn.");
             break;
         case 3:
+            // The Monster King guild have a special menu
+            if (strcharinfo(2) == "Monster King") goto L_MKControl;
+            break;
+        default:
             closedialog;
             goodbye;
             break;
-        }
-    return;
-
-    L_InProgress:
-        mesn;
-        mesq l("Please help my wards!");
-        if (getq(TulimsharQuest_Hasan) == 1) goto L_Hasan;
-    return;
+    }
+    close;
 
-    L_Reward:
+// Reward for quest completion
+L_Reward:
         mesn;
         mesq l("Thank you, here is your reward.");
 
@@ -91,29 +87,7 @@ L_Greetings:
             l("Take this badge, so you can get access to the guard house. You will find more work there. Bye, and good luck!");
     return;
 
-L_QuestDone:
-        mesn;
-        mesq l("Thank you for your help.");
-        if (getq(TulimsharQuest_Hasan) == 1) goto L_Hasan;
-    return;
-
-L_Hasan:
-        select
-            rif(getq(TulimsharQuest_Hasan) == 1, l("A guy named Hasan stole me!")),
-            menuaction(l("Quit"));
-
-        switch (@menu) {
-        case 1:
-            setq TulimsharQuest_Hasan, 2;
-            speech S_FIRST_BLANK_LINE, lg("Ah, Hasan... Sorry pal, afraid I can't do anything for you. Try talking to his mother Sorfina, she is on Mahoud's house, near the Inn.");
-            break;
-        default:
-            closedialog;
-            goodbye;
-            break;
-        }
-    return;
-
+// The Monster King guild have a special menu
 L_MKControl:
     mesn;
     mes l("Oh noes! You've found the Tulimshar control panel!");