X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=make_graph.py;h=a914204ac8f1702218784c3c3c25ac2ea642035e;hb=f6fc7f244d5bccf2bbc3a51877e65f5ec6654073;hp=facc05ce21836399e07c917dd714310f0af6d913;hpb=ceba6482a19688d6cceb520c60a166cdbb8e1ddc;p=open-adventure.git

diff --git a/make_graph.py b/make_graph.py
index facc05c..a914204 100755
--- a/make_graph.py
+++ b/make_graph.py
@@ -1,10 +1,11 @@
 #!/usr/bin/env python3
 """\
-usage: make-graph.py [-a] [-m] [-s]
+usage: make-graph.py [-a] -d] [-m] [-s]
 
-Make a DOT graph of Colossal Cave
+Make a DOT graph of Colossal Cave.
 
 -a = emit graph of entire dungeon
+-d = emit graoh of mazw all different
 -m = emit graph of maze all alike
 -s = emit graph of surface locations
 """
@@ -17,6 +18,10 @@ 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)
 
+def alldifferent(loc):
+    "Select out loci related to the Maze All Alike"
+    return ("DIFFERENT" in loc) or (loc == "LOC_DEADEND13")
+
 def surface(attrs):
     "Select out surface locations"
     if ("ABOVE" in attrs["conditions"]) and attrs["conditions"]["ABOVE"]:
@@ -31,7 +36,7 @@ def abbreviate(d):
 
 def roomlabel(loc):
     "Generate a room label from the description, if possible"
-    loc_descriptions = dict(db["locations"])[loc]['description']
+    loc_descriptions = location_lookup[loc]['description']
     description = loc[4:]
     short = loc_descriptions["short"]
     maptag = loc_descriptions["maptag"]
@@ -56,12 +61,41 @@ def roomlabel(loc):
         description += "\\n" + short
     return description
 
+# A forwarder is a location tat you can't actually stop in - when you go there
+# it ships some message (which is the point) then shifts you to a nexr location.
+# A forwarder has a zero-length array of notion verbs in its travel section.
+#
+# Here is an examoke forwarder kocation:
+#
+# - LOC_GRUESOME:
+#    description:
+#      long: 'There is now one more gruesome aspect to the spectacular vista.'
+#      short: !!null
+#      maptag: !!null
+#    conditions: {DEEP: true}
+#    travel: [
+#      {verbs: [], action: [goto, LOC_NOWHERE]},
+#    ]
+
+def is_forwarder(loc):
+    "Is a location a forwarder?"
+    travel = location_lookup[loc]['travel']
+    return len(travel) == 1 and len(travel[0]['verbs']) == 0
+
+def forward(loc):
+    "Chase a location through forwarding links."
+    while is_forwarder(loc):
+        loc = location_lookup[loc]["travel"][0]["action"][1]
+    return loc
+
 if __name__ == "__main__":
     with open("adventure.yaml", "r") as f:
         db = yaml.safe_load(f)
 
+    location_lookup = dict(db["locations"])
+
     try:
-        (options, arguments) = getopt.getopt(sys.argv[1:], "ams")
+        (options, arguments) = getopt.getopt(sys.argv[1:], "adms")
     except getopt.GetoptError as e:
         print(e)
         sys.exit(1)
@@ -70,6 +104,8 @@ if __name__ == "__main__":
     for (switch, val) in options:
         if switch == '-a':
             subset = "all"
+        elif switch == '-d':
+            subset = "different"
         elif switch == '-m':
             subset = "maze"
         elif switch == '-s':
@@ -100,11 +136,15 @@ if __name__ == "__main__":
 
     print("digraph G {")
     
-    for (loc, attrs) in db["locations"]:        
+    for (loc, attrs) in db["locations"]:
+        if is_forwarder(loc):
+            continue
         if subset == "surface" and not surface(attrs):
             continue
         if subset == "maze" and not allalike(loc):
             continue;
+        if subset == "different" and not alldifferent(loc):
+            continue;
         node_label = roomlabel(loc)
         if loc in startlocs:
             node_label += "\\n" + ",".join(startlocs[loc]).lower()
@@ -121,12 +161,16 @@ if __name__ == "__main__":
                     continue
                 action = dest["action"]
                 if action[0] == "goto":
-                    dest = action[1]
+                    dest = forward(action[1])
                     if subset == "maze" and not (allalike(loc) or allalike(dest)):
                         continue;
+                    if subset == "different" and not (alldifferent(loc) or alldifferent(dest)):
+                        continue;
                     arc = "%s -> %s" % (loc[4:], dest[4:])
                     label=",".join(verbs).lower()
                     if len(label) > 0:
                         arc += ' [label="%s"]' % label
                     print("    " + arc)
     print("}")
+
+# end