o11c's review of inspector

3 files changed, 23 insertions, 20 deletions

diff --git a/world/map/npc/009-1/jack.txt b/world/map/npc/009-1/jack.txt
index 4ccc5d82..9e1ebbe1 100644
--- a/world/map/npc/009-1/jack.txt
+++ b/world/map/npc/009-1/jack.txt
@@ -144,12 +144,13 @@ L_Shield_state_1:
     if (@inspector == 1)
         menu
             "No thanks.", L_Close,
-            "Yes, please!", -,
+            "Yes, please!", L_Yes,
             "Actually, I'd like to know if you've seen any strange happenings in town.", L_NohMask_Answer;
-    if (@inspector != 1)
-        menu
-            "No thanks.", L_Close,
-            "Yes, please!", -;
+    menu
+        "No thanks.", L_Close,
+        "Yes, please!", L_Yes;
+
+L_Yes:
     mes "[Jack Lumber]";
     mes "\"All I need is " + @RAWLOGS_AMOUNT + " raw logs.  This needn't be highest-quality wood; pretty much any log you can find should work.   Oh, and I'll also need " + @SHIELD_COST + " GP for other materials.\"";
     next;
@@ -211,12 +212,15 @@ L_TooMany:
 L_Shield_state_3:
     mes "[Jack Lumber]";
     mes "\"I hope that my shield will serve you well!\"";
+    if (@inspector != 1)
+        goto L_Close;
     next;
-    if (@inspector == 1)
-        menu
-            "Me too.", L_Close,
-            "Have you seen anything that might be connected to the recent robberies in town?", L_NohMask_Answer;
+    menu
+        "Me too.", L_Close,
+        "Have you seen anything that might be connected to the recent robberies in town?", L_NohMask_Answer;
 
+// This is an ugly violation of the scripting standards,
+// but it's somewhat complicated to fix.
 S_NohMask_Ask:
     next;
     menu
diff --git a/world/map/npc/009-2/alan.txt b/world/map/npc/009-2/alan.txt
index 65a36c0d..53715527 100644
--- a/world/map/npc/009-2/alan.txt
+++ b/world/map/npc/009-2/alan.txt
@@ -202,11 +202,12 @@ L_State_4_TooMany:
 L_State_5:
     mes "[Alan]";
     mes "\"I hope you are satisfied with your forest bow. It is one of my best works.\"";
+    if (@inspector != 1)
+        goto L_Close;
     next;
-    if (@inspector == 1)
-        menu
-            "I am!", L_Close,
-            "Have you seen anything strange recently that might be connected to the robberies?", L_NohMask_Answer;
+    menu
+        "I am!", L_Close,
+        "Have you seen anything strange recently that might be connected to the robberies?", L_NohMask_Answer;
 
 L_NohMask_Answer:
     mes "[Alan]";
diff --git a/world/map/npc/018-2/receptionist.txt b/world/map/npc/018-2/receptionist.txt
index e36fe0c4..5f03c4b1 100644
--- a/world/map/npc/018-2/receptionist.txt
+++ b/world/map/npc/018-2/receptionist.txt
@@ -18,13 +18,11 @@ L_Menu:
             "Did the company build this building?", L_Building,
             "Did you hear a commotion here the other night?", L_NohMask,
             "Thank you, no.", L_Close;
-    if (@inspector != 10)
-        menu
-            "Why was a mine setup here?", L_Mine,
-            "Can I go into the mine?", L_Enter,
-            "Did the company build this building?", L_Building,
-            "Thank you, no.", L_Close;
-    goto L_Close;
+    menu
+        "Why was a mine setup here?", L_Mine,
+        "Can I go into the mine?", L_Enter,
+        "Did the company build this building?", L_Building,
+        "Thank you, no.", L_Close;
 
 L_Mine:
     mes "[Receptionist]";