X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=make_graph.py;h=92655e5e354d4060a9f5982dfd28be3014d27804;hb=3dcf8449e56fc6a3e792c8694bd390bd2ddd85d3;hp=f4e1b11eb4c9ec81fb01c1244ecebb7c515681c5;hpb=81c7bb6d5bf9f16bcd3a1b456dc2937d27660eee;p=open-adventure.git

diff --git a/make_graph.py b/make_graph.py
index f4e1b11..92655e5 100755
--- a/make_graph.py
+++ b/make_graph.py
@@ -6,8 +6,9 @@ Make a DOT graph of Colossal Cave.
 
 -a = emit graph of entire dungeon
 -d = emit graoh of mazw all different
+-f = emit graph of forest locations
 -m = emit graph of maze all alike
--s = emit graph of surface locations
+-s = emit graph of non-forest surface locations
 -v = include internal sy,no;s in room labels
 """
 # Copyright (c) 2017 by Eric S. Raymond
@@ -17,20 +18,18 @@ import sys, getopt, yaml
 
 def allalike(loc):
     "Select out loci related to the Maze All Alike"
-    return ("ALIKE" in loc) or (loc == "LOC_PITBRINK") or ("MAZEEND" in loc) or ("STALACTITE" in loc)
+    return location_lookup[loc]["conditions"].get("ALLALIKE")
 
 def alldifferent(loc):
     "Select out loci related to the Maze All Alike"
-    return ("DIFFERENT" in loc) or (loc == "LOC_DEADEND13")
+    return location_lookup[loc]["conditions"].get("ALLDIFFERENT")
 
 def surface(loc):
     "Select out surface locations"
-    attrs = location_lookup[loc]
-    if ("ABOVE" in attrs["conditions"]) and attrs["conditions"]["ABOVE"]:
-        return True
-    if ("FOREST" in attrs["conditions"]) and attrs["conditions"]["FOREST"]:
-        return True
-    return False
+    return location_lookup[loc]["conditions"].get("ABOVE")
+
+def forest(loc):
+    return location_lookup[loc]["conditions"].get("FOREST")
 
 def abbreviate(d):
     m = {"NORTH":"N", "EAST":"E", "SOUTH":"S", "WEST":"W", "UPWAR":"U", "DOWN":"D"}
@@ -103,7 +102,7 @@ def reveal(objname):
         return True
     obj = object_lookup[objname]
     return not obj.get("immovable")
-    
+
 if __name__ == "__main__":
     with open("adventure.yaml", "r") as f:
         db = yaml.safe_load(f)
@@ -112,7 +111,7 @@ if __name__ == "__main__":
     object_lookup = dict(db["objects"])
 
     try:
-        (options, arguments) = getopt.getopt(sys.argv[1:], "admsv")
+        (options, arguments) = getopt.getopt(sys.argv[1:], "adfmsv")
     except getopt.GetoptError as e:
         print(e)
         sys.exit(1)
@@ -124,6 +123,8 @@ if __name__ == "__main__":
             subset = lambda loc: True
         elif switch == '-d':
             subset = alldifferent
+        elif switch == '-f':
+            subset = forest
         elif switch == '-m':
             subset = allalike
         elif switch == '-s':