Section 13 is now all YAML, so objsound.py can go.

[open-adventure.git] / newdungeon.py

diff --git a/newdungeon.py b/newdungeon.py
index 89d8db6f794aca63f9e722c1fbc87f04dfdef9c4..df8b19abbfa6303d7984e54c86dcba4181c859b4 100755 (executable)
--- a/newdungeon.py
+++ b/newdungeon.py
@@ -21,6 +21,7 @@ h_template = """/* Generated from adventure.yaml - do not hand-hack! */
 
 typedef struct {{
   const char* inventory;
+  bool is_treasure;
   const char** longs;
   const char** sounds;
   const char** texts;
@@ -61,18 +62,21 @@ typedef struct {{
   const char* hint;
 }} hint_t;
 
-extern location_t locations[];
-extern object_description_t object_descriptions[];
-extern const char* arbitrary_messages[];
-extern const class_t classes[];
-extern turn_threshold_t turn_thresholds[];
-extern obituary_t obituaries[];
-extern hint_t hints[];
+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 turn_threshold_t turn_thresholds[];
+extern const obituary_t obituaries[];
+extern const hint_t hints[];
 extern long conditions[];
-extern const size_t CLSSES;
-extern const int maximum_deaths;
-extern const int turn_threshold_count;
-#define HINT_COUNT {}
+
+#define NLOCATIONS             {}
+#define NOBJECTS       {}
+#define NHINTS         {}
+#define NCLASSES       {}
+#define NDEATHS                {}
+#define NTHRESHOLDS    {}
 
 enum arbitrary_messages_refs {{
 {}
@@ -105,23 +109,23 @@ const class_t classes[] = {{
 {}
 }};
 
-turn_threshold_t turn_thresholds[] = {{
+const turn_threshold_t turn_thresholds[] = {{
 {}
 }};
 
-location_t locations[] = {{
+const location_t locations[] = {{
 {}
 }};
 
-object_description_t object_descriptions[] = {{
+const object_description_t object_descriptions[] = {{
 {}
 }};
 
-obituary_t obituaries[] = {{
+const obituary_t obituaries[] = {{
 {}
 }};
 
-hint_t hints[] = {{
+const hint_t hints[] = {{
 {}
 }};
 
@@ -129,10 +133,6 @@ long conditions[] = {{
 {}
 }};
 
-const size_t CLSSES = {};
-const int maximum_deaths = {};
-const int turn_threshold_count = {};
-
 /* end */
 """
 
@@ -217,6 +217,7 @@ def get_locations(loc):
 def get_object_descriptions(obj):
     template = """    {{
         .inventory = {},
+        .is_treasure = {},
         .longs = (const char* []) {{
 {}
         }},
@@ -264,7 +265,8 @@ def get_object_descriptions(obj):
              for l_msg in item[1]["texts"]:
                  texts_str += " " * 12 + make_c_string(l_msg) + ",\n"
              texts_str = texts_str[:-1] # trim trailing newline
-        obj_str += template.format(i_msg, longs_str, sounds_str, texts_str)
+        treasure = "true" if item[1].get("treasure") else "false"
+        obj_str += template.format(i_msg, treasure, longs_str, sounds_str, texts_str)
     obj_str = obj_str[:-1] # trim trailing newline
     return obj_str
 
@@ -338,13 +340,15 @@ if __name__ == "__main__":
         get_obituaries(db["obituaries"]),
         get_hints(db["hints"], db["arbitrary_messages"]),
         get_condbits(db["locations"]),
-        len(db["classes"]),
-        len(db["obituaries"]),
-        len(db["turn_thresholds"]),
     )
 
     h = h_template.format(
+        len(db["locations"]),
+        len(db["object_descriptions"]),
         len(db["hints"]),
+        len(db["classes"]),
+        len(db["obituaries"]),
+        len(db["turn_thresholds"]),
         get_refs(db["arbitrary_messages"]),
         get_refs(db["locations"]),
         get_refs(db["object_descriptions"]),