Add verbose optionm to grapher.

[open-adventure.git] / make_graph.py

diff --git a/make_graph.py b/make_graph.py
index 1cb975c1e95e5ad0e72bd9d8f27b126a27f63571..1da5a7619428921d61bf6695fa7bd230d7039db6 100755 (executable)
--- a/make_graph.py
+++ b/make_graph.py
@@ -8,6 +8,7 @@ Make a DOT graph of Colossal Cave.
 -d = emit graoh of mazw all different
 -m = emit graph of maze all alike
 -s = emit graph of surface locations
+-v = include internal sy,no;s in room labels
 """
 # Copyright (c) 2017 by Eric S. Raymond
 # SPDX-License-Identifier: BSD-2-clause
@@ -38,7 +39,9 @@ def abbreviate(d):
 def roomlabel(loc):
     "Generate a room label from the description, if possible"
     loc_descriptions = location_lookup[loc]['description']
-    description = loc[4:]
+    description = ""
+    if debug:
+        description = loc[4:]
     longd = loc_descriptions["long"]
     short = loc_descriptions["maptag"] or loc_descriptions["short"]
     if short is None and longd is not None and len(longd) < 20:
@@ -58,14 +61,18 @@ def roomlabel(loc):
             short = short[:2].upper() + short[2:]
         else:
             short = short[0].upper() + short[1:]
-        description += "\\n" + short
+        if debug:
+            description += "\\n"
+        description += short
+        if loc in startlocs:
+            description += "\\n(" + ",".join(startlocs[loc]).lower() + ")"
     return description
 
 # A forwarder is a location that 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:
+# Here is an example forwarder declaration:
 #
 # - LOC_GRUESOME:
 #    description:
@@ -95,12 +102,13 @@ if __name__ == "__main__":
     location_lookup = dict(db["locations"])
 
     try:
-        (options, arguments) = getopt.getopt(sys.argv[1:], "adms")
+        (options, arguments) = getopt.getopt(sys.argv[1:], "admsv")
     except getopt.GetoptError as e:
         print(e)
         sys.exit(1)
 
     subset = allalike
+    debug = False
     for (switch, val) in options:
         if switch == '-a':
             subset = lambda loc: True
@@ -110,6 +118,8 @@ if __name__ == "__main__":
             subset = allalike
         elif switch == '-s':
             subset = surface
+        elif switch == '-v':
+            debug = True
         else:
             sys.stderr.write(__doc__)
             raise SystemExit(1)
@@ -124,29 +134,13 @@ if __name__ == "__main__":
             else:
                 startlocs[location] = [objname]
 
-    startlocs = {}
-    for obj in db["objects"]:
-        objname = obj[0]
-        location = obj[1].get("locations")
-        if "OBJ" not in objname and location != "LOC_NOWHERE" and ("immovable" not in obj[1] or not obj[1]["immovable"]):
-            if location in startlocs:
-                startlocs[location].append(objname)
-            else:
-                startlocs[location] = [objname]
-
-    print("digraph G {")
-
-    for (loc, attrs) in db["locations"]:
-        if is_forwarder(loc):
-            continue
-        if not subset(loc):
-            continue
-        node_label = roomlabel(loc)
-        if loc in startlocs:
-            node_label += "\\n" + ",".join(startlocs[loc]).lower()
-        print('    %s [shape=box,label="%s"]' % (loc[4:], node_label))
-
+    # Compute reachability, using forwards.
+    # Dictionary ke6y is (from, to) iff its a valid link,
+    # value is correspoinding motion verbs.
+    links = {}
+    nodes = set()
     for (loc, attrs) in db["locations"]:
+        nodes.add(loc)
         travel = attrs["travel"]
         if len(travel) > 0:
             for dest in travel:
@@ -158,11 +152,35 @@ if __name__ == "__main__":
                     dest = forward(action[1])
                     if not (subset(loc) or subset(dest)):
                         continue
-                    arc = "%s -> %s" % (loc[4:], dest[4:])
-                    label=",".join(verbs).lower()
-                    if len(label) > 0:
-                        arc += ' [label="%s"]' % label
-                    print("    " + arc)
+                    links[(loc, dest)] = verbs
+
+    neighbors = set()
+    for loc in nodes:
+        for (f, t) in links:
+            if f == 'LOC_NOWHERE' or t == 'LOC_NOWHERE':
+                continue
+            if (f == loc and subset(t)) or (t == loc and subset(f)):
+                if loc not in neighbors:
+                    neighbors.add(loc)
+
+    print("digraph G {")
+
+    for loc in nodes:
+        if is_forwarder(loc):
+            continue
+        node_label = roomlabel(loc)
+        if subset(loc):
+            print('    %s [shape=box,label="%s"]' % (loc[4:], node_label))
+        elif loc in neighbors:
+            print('    %s [label="%s"]' % (loc[4:], node_label))
+
+    # Draw arcs
+    for (f, t) in links:
+        arc = "%s -> %s" % (f[4:], t[4:])
+        label=",".join(links[(f, t)]).lower()
+        if len(label) > 0:
+            arc += ' [label="%s"]' % label
+        print("    " + arc)
     print("}")
 
 # end