X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=newdungeon.py;h=0575d2c8b3afad7a03812f1482244d1f11d70077;hb=4f6bc949bd13c8028bad1acec4b17fe189f11872;hp=39998e7c1bf2369f2579ddc4de08c1d8de10ebfb;hpb=d8099744796d5ca1a80b2db5be6374cc8db830d0;p=open-adventure.git

diff --git a/newdungeon.py b/newdungeon.py
index 39998e7..0575d2c 100755
--- 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 */
 """
 
@@ -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,6 +420,7 @@ 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(