Add to Zegas a small pointer about Saxso quest, and talk a bit about Candor lore

2 files changed, 24 insertions, 9 deletions

diff --git a/npc/005-1/zegas.txt b/npc/005-1/zegas.txt
index 72d3a6b57..d3797269a 100644
--- a/npc/005-1/zegas.txt
+++ b/npc/005-1/zegas.txt
@@ -51,12 +51,12 @@ L_Start:
     mesn;
     mesq l("Thanks, come back and see me once you found the bug bomb and set it off.");
     setq CandorQuest_Barrel, 2;
-    goto L_Close;
+    close;
 
 L_Looking:
     mesn;
     mesq l("Still haven't found it? Well, keep looking the barrels at this storehouse. I know it's in there, somewhere.");
-    goto L_Close;
+    close;
 
 L_QuestEnd:
     mesn;
@@ -66,14 +66,27 @@ L_QuestEnd:
     getitem .ItemCreate, 1;
     Zeny = (Zeny + 350);
     setq CandorQuest_Barrel, 4;
-    goto L_Close;
+    close;
 
 L_Thanks:
     mesn;
     mesq l("Thanks for Helping with clear out the store room!");
-    goto L_Close;
+    if (!getq(CandorQuest_Chest)) {
+        next;
+        mesn;
+        mesq l("Do you see that fancy house over there? My husband, @@, used to live there.", b(l("Saxso")));
+        next;
+        mesn;
+        mesq l("Strangely enough, when he died, he became a ghost. This shouldn't happen, but yet...");
+        next;
+        mesn;
+        mesq l("Anyway, conspiratory theories aside, his ghost is a powerful boss. I would not attack him if I were you!");
+    }
+    close;
 
 L_Close:
+    closedialog;
+    goodbye;
     close;
 
 OnInit:
@@ -102,7 +115,7 @@ L_Reset:
     STARTAREA = STARTAREA &~ (1 << 8);
     STARTAREA = STARTAREA &~ (1 << 9);
     mes l("Reset!");
-    goto L_Close;
+    close;
 
 L_Close:
     //showavatar;  // Use this to hide the showavatar
diff --git a/npc/005-2/saxsochest.txt b/npc/005-2/saxsochest.txt
index 6aaad374f..ddc9672c6 100644
--- a/npc/005-2/saxsochest.txt
+++ b/npc/005-2/saxsochest.txt
@@ -1,11 +1,10 @@
 // TMW2 Script
 // Author:
 //    Crazyfefe
+// Description:
+//    Minor quest for a necklace
 
 005-2,44,41,0	script	Saxso Chest	NPC_NO_SPRITE,{
-
-    .key = SaxsoKey;
-    .reward = ToothNecklace;
     
     function quest_completed {
         speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
@@ -54,7 +53,7 @@
         if (.@chest == 1)
             goto quest_completed;
         select
-            rif(.@chest == 0,l("There are a dusty chest.")),
+            rif(.@chest == 0,l("There is a dusty chest.")),
             menuaction(l("Quit"));
 
         switch (@menu) {
@@ -69,6 +68,9 @@
     close;
 
 OnInit:
+    .key = SaxsoKey;
+    .reward = ToothNecklace;
+
     .sex = G_MALE;
     .distance = 3;
     end;