X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=newdungeon.py;h=bbfc0c8589e99ea3811e81dceae48bcfaaf7e84e;hb=d6cb6f0d8d258f4125fd3a0cc3899541ea2efd5b;hp=ba89670b3e0224799c0ca755d4d8786db256be32;hpb=1503be75672d4e8401b18332e2cb37cbbfc37f1e;p=open-adventure.git

diff --git a/newdungeon.py b/newdungeon.py
index ba89670..bbfc0c8 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;
@@ -95,7 +95,7 @@ typedef struct {{
 }} vocabulary_t;
 
 extern const location_t locations[];
-extern const object_description_t object_descriptions[];
+extern const object_t objects[];
 extern const char* arbitrary_messages[];
 extern const class_t classes[];
 extern const turn_threshold_t turn_thresholds[];
@@ -103,13 +103,16 @@ 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 {{
 {}
@@ -119,7 +122,7 @@ enum locations_refs {{
 {}
 }};
 
-enum object_descriptions_refs {{
+enum object_refs {{
 {}
 }};
 
@@ -150,7 +153,7 @@ const location_t locations[] = {{
 {}
 }};
 
-const object_description_t object_descriptions[] = {{
+const object_t objects[] = {{
 {}
 }};
 
@@ -170,6 +173,11 @@ const vocabulary_t vocabulary[] = {{
 {}
 }};
 
+const long actspk[] = {{
+    NO_MESSAGE,
+{}
+}};
+
 /* end */
 """
 
@@ -251,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 = {},
@@ -404,6 +412,12 @@ def get_vocabulary(vocabulary):
     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)
@@ -416,23 +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["classes"])-1,
         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,
     )