Replace magic MINTRS/MAXTRS with a treasure attribute in YAML.

[open-adventure.git] / newdungeon.py

diff --git a/newdungeon.py b/newdungeon.py
index 7f70741d331f62aebe962f47a8e09434db3dbf6b..21ac9e64aa223cb1030b1a153dd5875c62ea72d0 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;
@@ -70,6 +71,8 @@ extern obituary_t obituaries[];
 extern hint_t hints[];
 extern long conditions[];
 
+#define NLOCATIONS             {}
+#define NOBJECTS       {}
 #define NHINTS         {}
 #define NCLASSES       {}
 #define NDEATHS                {}
@@ -214,6 +217,7 @@ def get_locations(loc):
 def get_object_descriptions(obj):
     template = """    {{
         .inventory = {},
+        .is_treasure = {},
         .longs = (const char* []) {{
 {}
         }},
@@ -261,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,6 +343,8 @@ if __name__ == "__main__":
     )
 
     h = h_template.format(
+        len(db["locations"]),
+        len(db["object_descriptions"]),
         len(db["hints"]),
         len(db["classes"]),
         len(db["obituaries"]),