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, 12 insertions, 3 deletions

diff --git a/world/map/npc/018-2/books.txt b/world/map/npc/018-2/books.txt
index 260b670d..81b439da 100644
--- a/world/map/npc/018-2/books.txt
+++ b/world/map/npc/018-2/books.txt
@@ -1,15 +1,24 @@
 //
 
 018-2.gat,112,19,0|script|#Bookcase38|127,0,1{
-    if (Inspector == 11) goto L_NohMask;
+    callfunc "ClearVariables";
+
+    set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
+
+    if (@inspector == 11) goto L_NohMask;
     mes "Looking over the bookcase, you find nothing strange or out of order.";
-    close;
+    goto L_Close;
 
 L_NohMask:
     mes "Looking over the bookcase closely, you find a book is upside down.";
     next;
     mes "The book has been hollowed out. Inside is a theater mask and a note that you cannot even begin to read.";
     next;
-    set Inspector, 12;
+    set @inspector, 12;
+    set QUEST_Hurnscald, (QUEST_Hurnscald & ~(NIBBLE_3_MASK)) | (@inspector << NIBBLE_3_SHIFT);
+    goto L_Close;
+
+L_Close:
+    set @inspector, 0;
     close;
 }