Inline the hint messages.

[open-adventure.git] / newdungeon.py

diff --git a/newdungeon.py b/newdungeon.py
index c16f9999165eb26f5208a1627b5d4485c45dde2a..41645f2ac1472cb38edccb0fdc79facf568a623b 100755 (executable)
--- a/newdungeon.py
+++ b/newdungeon.py
@@ -1,6 +1,8 @@
 #!/usr/bin/python3
 
-# This is the new open-adventure dungeon generator. It'll eventually replace the existing dungeon.c It currently outputs a .h and .c pair for C code.
+# This is the new open-adventure dungeon generator. It'll eventually
+# replace the existing dungeon.c It currently outputs a .h and .c pair
+# for C code.
 
 import yaml
 
@@ -219,7 +221,7 @@ def get_turn_thresholds(trn):
     return trn_str
 
 def get_locations(loc):
-    template = """    {{
+    template = """    {{ // {}
         .description = {{
             .small = {},
             .big = {},
@@ -229,17 +231,17 @@ def get_locations(loc):
     }},
 """
     loc_str = ""
-    for item in loc:
+    for (i, item) in enumerate(loc):
         short_d = make_c_string(item[1]["description"]["short"])
         long_d = make_c_string(item[1]["description"]["long"])
         sound = item[1].get("sound", "SILENT")
         loud = "true" if item[1].get("loud") else "false"
-        loc_str += template.format(short_d, long_d, sound, loud)
+        loc_str += template.format(i, short_d, long_d, sound, loud)
     loc_str = loc_str[:-1] # trim trailing newline
     return loc_str
 
 def get_object_descriptions(obj):
-    template = """    {{
+    template = """    {{ // {}
         .inventory = {},
         .plac = {},
         .fixd = {},
@@ -256,7 +258,7 @@ def get_object_descriptions(obj):
     }},
 """
     obj_str = ""
-    for item in obj:
+    for (i, item) in enumerate(obj):
         attr = item[1]
         i_msg = make_c_string(attr["inventory"])
         longs_str = ""
@@ -294,12 +296,16 @@ def get_object_descriptions(obj):
              texts_str = texts_str[:-1] # trim trailing newline
         locs = attr.get("locations", ["LOC_NOWHERE", "LOC_NOWHERE"])
         immovable = attr.get("immovable", False)
-        if type(locs) == str:
-            locs = [locnames.index(locs), -1 if immovable else 0]
-        else:
-            locs = [locnames.index(x) for x in locs]
+        try:
+            if type(locs) == str:
+                locs = [locnames.index(locs), -1 if immovable else 0]
+            else:
+                locs = [locnames.index(x) for x in locs]
+        except IndexError:
+            sys.stderr.write("dungeon: unknown object location in %s\n" % locs)
+            sys.exit(1)
         treasure = "true" if attr.get("treasure") else "false"
-        obj_str += template.format(i_msg, locs[0], locs[1], treasure, longs_str, sounds_str, texts_str)
+        obj_str += template.format(i, i_msg, locs[0], locs[1], treasure, longs_str, sounds_str, texts_str)
     obj_str = obj_str[:-1] # trim trailing newline
     return obj_str
 
@@ -333,8 +339,8 @@ def get_hints(hnt, arb):
         number = item["number"]
         penalty = item["penalty"]
         turns = item["turns"]
-        question = make_c_string(md[item["question"]])
-        hint = make_c_string(md[item["hint"]])
+        question = make_c_string(item["question"])
+        hint = make_c_string(item["hint"])
         hnt_str += template.format(number, penalty, turns, question, hint)
     hnt_str = hnt_str[:-1] # trim trailing newline
     return hnt_str
@@ -359,6 +365,19 @@ def get_condbits(locations):
         cnd_str += "    " + line + ",\t// " + name + "\n"
     return cnd_str
 
+def recompose(word):
+    "Compose the internal code for a vocabulary word from its YAML entry"
+    parts = ("motion", "action", "object", "special")
+    try:
+        attrs = db["vocabulary"][word]
+        return attrs["value"] + 1000 * parts.index(attrs["type"])
+    except KeyError:
+        sys.stderr.write("dungeon: %s is not a known word\n" % word)
+        sys.exit(1)
+    except IndexError:
+        sys.stderr.write("%s is not a known word classifier" % attrs["type"])
+        sys.exit(1)
+
 if __name__ == "__main__":
     with open(yaml_name, "r") as f:
         db = yaml.load(f)
@@ -378,8 +397,8 @@ if __name__ == "__main__":
     )
 
     h = h_template.format(
-        len(db["locations"]),
-        len(db["object_descriptions"]),
+        len(db["locations"])-1,
+        len(db["object_descriptions"])-1,
         len(db["hints"]),
         len(db["classes"]),
         len(db["obituaries"]),