Minor polishing & fix entering on LoF via Mystic Forest ("kinda")

2 files changed, 18 insertions, 8 deletions

diff --git a/npc/017-1/inspector.txt b/npc/017-1/inspector.txt
index ffae2d420..66abd8d4a 100644
--- a/npc/017-1/inspector.txt
+++ b/npc/017-1/inspector.txt
@@ -10,28 +10,33 @@
     .@q = getq(LoFQuest_Inspector);
     mesn;
     mesq l("Hello. My name is Anselmo and I'm investigating a recent string of robberies.");
-    if (BaseLevel < 50) close;
-    if (!is_staff()) close; // FIXME
     next;
+    if (BaseLevel < 50) goto L_Close;
+    if (!is_staff()) goto L_Close; // FIXME
     mesn;
     mesq l("Well... Not robberies per se... Just cheese vanishing and being replaced by %s, which is super weird.", getitemlink(GoldenApple));
     next;
     mesn;
     mesq l("You look capable, will you help me solve these robberies? Of course, not for free.");
     next;
-    if (askyesno() == ASK_NO) {
-        closeclientdialog;
-        close;
-    }
+    if (askyesno() == ASK_NO)
+        goto L_Close;
     mesn;
     mesq l("Excellent. I'd like you to ask around about the recent string of robberies.");
     next;
     mesn;
     mesq l("But remember, they're stealing %s, not shinies, so try to limit your search a bit.", getitemlink(Cheese));
     setq LoFQuest_Inspector, 1, 0;
-    close;
+    next;
+    goto L_Close;
 
-// function script inspector() -> Invokes strnpcinfo() internally
+L_Close:
+    closeclientdialog;
+    if (rand2(100) < 2)
+        npctalk3 l("And remember to never sit on Paxel! He hates that!");
+    else
+        goodbye();
+    close;
 
 OnInit:
     .distance=5;
diff --git a/npc/017-1/town.txt b/npc/017-1/town.txt
index 9856b713f..86afaeecb 100644
--- a/npc/017-1/town.txt
+++ b/npc/017-1/town.txt
@@ -8,3 +8,8 @@
 OnTouch:
     EnterTown("LoF"); end;
 }
+
+017-1,229,86,0 script  #LocLoF2 NPC_HIDDEN,1,3,{
+OnTouch:
+    EnterTown("LoF"); end;
+}