Merge branch 'variables'

Several older scripts were changed to use bitmasking for the player variables.
Variables that are or became unused were added to the clear_vars function.

1 files changed, 15 insertions, 9 deletions

diff --git a/world/map/npc/018-2/receptionist.txt b/world/map/npc/018-2/receptionist.txt
index f49f68db..5f03c4b1 100644
--- a/world/map/npc/018-2/receptionist.txt
+++ b/world/map/npc/018-2/receptionist.txt
@@ -1,26 +1,28 @@
 //
 
 018-2.gat,50,24,0|script|Receptionist|108,{
+    callfunc "ClearVariables";
+
+    set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
+
     mes "[Receptionist]";
     mes "\"Welcome to the mining camp!";
     mes "Do you need anything?\"";
     next;
 
 L_Menu:
-    if (Inspector == 10)
+    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,
             "Did you hear a commotion here the other night?", L_NohMask,
-            "Thank you, no.", -;
-    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.", -;
-    close;
+            "Thank you, no.", 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]";
@@ -57,4 +59,8 @@ L_Question_End:
     mes "\"Do you need anything else?\"";
     next;
     goto L_Menu;
+
+L_Close:
+    set @inspector, 0;
+    close;
 }