From 38d929dd6436004b390cdcc9305f4045c93c7352 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sun, 3 Jun 2018 15:52:24 -0300
Subject: Required for quest log

---
 npc/003-1/lieutenantdausen.txt | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

(limited to 'npc/003-1')

diff --git a/npc/003-1/lieutenantdausen.txt b/npc/003-1/lieutenantdausen.txt
index 72bfcb716..4bd0abcb2 100644
--- a/npc/003-1/lieutenantdausen.txt
+++ b/npc/003-1/lieutenantdausen.txt
@@ -407,12 +407,11 @@ function	script	GuardsGratitude	{
             break;
     }
 
+    // TODO: Maybe we should see the guard gender too, and if it's matching, pat. Otherwise, air kiss.
     if (Sex == SEX_FEMALE)
     {
         .@narrator_message$ = l("The Guard sends an air kiss to you.");
-    }
-    else
-    {
+    } else {
         .@narrator_message$ = l("The Guard patted you on the back.");
     }
 
@@ -436,9 +435,7 @@ function	script	CheckGuard	{
         mesn;
         mesq l("Thanks for help! Other guards may need help too!");
         close;
-    }
-    else
-    {
+    } else {
         while (.@count_tmp < 18)
         {
             if (GUARDS_DONE_BITARRAY & $@GuardBits[.@count_tmp])
@@ -447,12 +444,9 @@ function	script	CheckGuard	{
             .@count_tmp = (.@count_tmp + 1);
         }
 
-        if ( 0 == countitem(BottleOfTonoriWater) )
-        {
+        if ( countitem(BottleOfTonoriWater) == 0 ) {
             legiontalk;
-        }
-        else
-        {
+        } else {
             delitem BottleOfTonoriWater, 1;
             getitem EmptyBottle, 1;
 
@@ -460,9 +454,9 @@ function	script	CheckGuard	{
             Zeny = (Zeny + 30);
 
             GUARDS_DONE_BITARRAY = GUARDS_DONE_BITARRAY | $@GuardBits[.@guard_id];
+            setq2 TulimsharQuest_WaterForGuard, .@guard_count; // Update questlog
 
-            if (.@guard_count >= 17)
-            {
+            if (.@guard_count >= 17) {
                 message strcharinfo(0), "That must have been the last guard.";
                 setq TulimsharQuest_WaterForGuard, 2;
             }
@@ -478,8 +472,7 @@ function	script	CheckGuard	{
 
 // Handle Guard's logic
 function	script	GuardHandler	{
-    if (getq(TulimsharQuest_WaterForGuard) == 1)
-    {
+    if (getq(TulimsharQuest_WaterForGuard) == 1) {
         CheckGuard(getarg(0));
     } else {
         legiontalk;
-- 
cgit v1.2.3-60-g2f50