locbit.py: Can't set a FORCED attribute in the YAML...

...it has to be computed from the travel arrays.

diff --git a/locbit.py b/locbit.py
index b50c7ef0c32baa7d04b4a88b9f9e6470e6071ded..5b3746100aa977c3b4dec06edcf3417800785b3d 100755 (executable)
--- a/locbit.py
+++ b/locbit.py
@@ -8,8 +8,6 @@
 #
 # When in doubt, make the code dumber and the data smarter.
 #
-# It bothers me that I don't know why FORCED is checking the fluid bit.
-#
 import sys, yaml
 
 # This is the original location-attribute data from section 9 of adventure.text
@@ -52,7 +50,7 @@ attrnames = (
     "FLUID",   # 2
     "NOARRR",  # 3
     "NOBACK",  # 4
-    "FORCED",  # 5     # New
+    "",                # 5
     "FOREST",  # 6     # New
     "ABOVE",   # 7     # New
     "DEEP",    # 8     # New
@@ -96,10 +94,7 @@ def genline(loc):
             if props[0] not in attrs:
                 attrs.append(props[0])
     # Adod new attributes.  These are computed the same way as the
-    # INDEEP(), OUTSID(), and FORCED macros in advent.h.
-    # FORCED is on only if COND == 2
-    if attrs == [2]:
-        attrs.append(5)        # FORCED
+    # INDEEP(), OUTSID(), and FOREST() macros in advent.h.
     if "FOREST" in name:
         attrs.append(6)        # FOREST
     # 167 is the sapphire's start location