X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=newdungeon.py;h=e5169219404fe06992ca82ff0e4fa225e01d1178;hp=41645f2ac1472cb38edccb0fdc79facf568a623b;hb=2fac8d1aefb3526618ba0f1e7d25c7c7c81dddf4;hpb=7ee571d8326cd3166841f0872f528626a31ca0e7

diff --git a/newdungeon.py b/newdungeon.py
index 41645f2..e516921 100755
--- a/newdungeon.py
+++ b/newdungeon.py
@@ -51,7 +51,7 @@ typedef struct {{
   const char** longs;
   const char** sounds;
   const char** texts;
-}} object_description_t;
+}} object_t;
 
 typedef struct {{
   const char* small;
@@ -88,21 +88,31 @@ 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[];
-extern const const class_t classes[];
+extern const object_t objects[];
+extern const char* arbitrary_messages[];
+extern const class_t classes[];
 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[];
+extern const long actspk[];
 
-#define NLOCATIONS		{}
+#define NLOCATIONS	{}
 #define NOBJECTS	{}
 #define NHINTS		{}
 #define NCLASSES	{}
 #define NDEATHS		{}
 #define NTHRESHOLDS	{}
+#define NVERBS  	{}
+#define NVOCAB          {}
 
 enum arbitrary_messages_refs {{
 {}
@@ -112,7 +122,7 @@ enum locations_refs {{
 {}
 }};
 
-enum object_descriptions_refs {{
+enum object_refs {{
 {}
 }};
 
@@ -143,7 +153,7 @@ const location_t locations[] = {{
 {}
 }};
 
-const object_description_t object_descriptions[] = {{
+const object_t objects[] = {{
 {}
 }};
 
@@ -159,6 +169,15 @@ long conditions[] = {{
 {}
 }};
 
+const vocabulary_t vocabulary[] = {{
+{}
+}};
+
+const long actspk[] = {{
+    NO_MESSAGE,
+{}
+}};
+
 /* end */
 """
 
@@ -240,7 +259,7 @@ def get_locations(loc):
     loc_str = loc_str[:-1] # trim trailing newline
     return loc_str
 
-def get_object_descriptions(obj):
+def get_objects(obj):
     template = """    {{ // {}
         .inventory = {},
         .plac = {},
@@ -365,12 +384,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 +396,28 @@ 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
+
+def get_actspk(actspk):
+    res = ""
+    for (i, word) in actspk.items():
+        res += "    %s,\n" % word
+    return res
+
 if __name__ == "__main__":
     with open(yaml_name, "r") as f:
         db = yaml.load(f)
@@ -390,22 +430,26 @@ if __name__ == "__main__":
         get_class_messages(db["classes"]),
         get_turn_thresholds(db["turn_thresholds"]),
         get_locations(db["locations"]),
-        get_object_descriptions(db["object_descriptions"]),
+        get_objects(db["objects"]),
         get_obituaries(db["obituaries"]),
         get_hints(db["hints"], db["arbitrary_messages"]),
         get_condbits(db["locations"]),
+        get_vocabulary(db["vocabulary"]),
+        get_actspk(db["actspk"]),
     )
 
     h = h_template.format(
         len(db["locations"])-1,
-        len(db["object_descriptions"])-1,
+        len(db["objects"])-1,
         len(db["hints"]),
         len(db["classes"]),
         len(db["obituaries"]),
         len(db["turn_thresholds"]),
+        len(db["actspk"]),
+        len(db["vocabulary"]),
         get_refs(db["arbitrary_messages"]),
         get_refs(db["locations"]),
-        get_refs(db["object_descriptions"]),
+        get_refs(db["objects"]),
         statedefines,
     )