Fix typo and type mismatch.

[open-adventure.git] / newdungeon.py

diff --git a/newdungeon.py b/newdungeon.py
index 28c7b63e4cf8679934464b3892df5cf2d8f68f87..0575d2c8b3afad7a03812f1482244d1f11d70077 100755 (executable)
--- a/newdungeon.py
+++ b/newdungeon.py
@@ -88,6 +88,12 @@ typedef struct {{
   const char* hint;
 }} hint_t;
 
+typedef struct {{
+  const char* word;
+  const int type;
+  const int value;
+}} vocabulary_t;
+
 extern const location_t locations[];
 extern const object_description_t object_descriptions[];
 extern const const char* arbitrary_messages[];
@@ -96,6 +102,7 @@ extern const turn_threshold_t turn_thresholds[];
 extern const obituary_t obituaries[];
 extern const hint_t hints[];
 extern long conditions[];
+extern const vocabulary_t vocabulary[];
 
 #define NLOCATIONS             {}
 #define NOBJECTS       {}
@@ -159,6 +166,10 @@ long conditions[] = {{
 {}
 }};
 
+const vocabulary_t vocabulary[] = {{
+{}
+}};
+
 /* end */
 """
 
@@ -221,7 +232,7 @@ def get_turn_thresholds(trn):
     return trn_str
 
 def get_locations(loc):
-    template = """    {{
+    template = """    {{ // {}
         .description = {{
             .small = {},
             .big = {},
@@ -231,17 +242,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 = {},
@@ -258,7 +269,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 = ""
@@ -305,7 +316,7 @@ def get_object_descriptions(obj):
             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
 
@@ -339,8 +350,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
@@ -365,12 +376,11 @@ def get_condbits(locations):
         cnd_str += "    " + line + ",\t// " + name + "\n"
     return cnd_str
 
-def recompose(word):
+def recompose(type_word, value):
     "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"])
+        return value + 1000 * parts.index(type_word)
     except KeyError:
         sys.stderr.write("dungeon: %s is not a known word\n" % word)
         sys.exit(1)
@@ -378,6 +388,22 @@ def recompose(word):
         sys.stderr.write("%s is not a known word classifier" % attrs["type"])
         sys.exit(1)
 
+def get_vocabulary(vocabulary):
+    template = """    {{
+        .word = {},
+        .type = {},
+        .value = {},
+    }},
+"""
+    voc_str = ""
+    for vocab in vocabulary:
+        word = make_c_string(vocab["word"])
+        type_code = recompose(vocab["type"], vocab["value"])
+        value = vocab["value"]
+        voc_str += template.format(word, type_code, value)
+    voc_str = voc_str[:-1] # trim trailing newline
+    return voc_str
+
 if __name__ == "__main__":
     with open(yaml_name, "r") as f:
         db = yaml.load(f)
@@ -394,11 +420,12 @@ if __name__ == "__main__":
         get_obituaries(db["obituaries"]),
         get_hints(db["hints"], db["arbitrary_messages"]),
         get_condbits(db["locations"]),
+        get_vocabulary(db["vocabulary"]),
     )
 
     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"]),