X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=newdungeon.py;h=89d8db6f794aca63f9e722c1fbc87f04dfdef9c4;hp=52380e6705c55a5774c15055c5d079eca892f084;hb=3a93b2b5f08351c3e87d4f41c5c61273c42e9420;hpb=c3a71f6db6781e40a9e75bb1107c901d791aab04

diff --git a/newdungeon.py b/newdungeon.py
index 52380e6..89d8db6 100755
--- a/newdungeon.py
+++ b/newdungeon.py
@@ -8,13 +8,22 @@ yaml_name = "adventure.yaml"
 h_name = "newdb.h"
 c_name = "newdb.c"
 
+statedefines = ""
+
 h_template = """/* Generated from adventure.yaml - do not hand-hack! */
+#ifndef NEWDB_H
+#define NEWDB_H
 
 #include <stdio.h>
+#include <stdbool.h>
+
+#define SILENT	-1	/* no sound */
 
 typedef struct {{
   const char* inventory;
   const char** longs;
+  const char** sounds;
+  const char** texts;
 }} object_description_t;
 
 typedef struct {{
@@ -24,6 +33,8 @@ typedef struct {{
 
 typedef struct {{
   descriptions_t description;
+  const long sound;
+  const bool loud;
 }} location_t;
 
 typedef struct {{
@@ -57,10 +68,11 @@ extern const class_t classes[];
 extern turn_threshold_t turn_thresholds[];
 extern obituary_t obituaries[];
 extern 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 {}
 
 enum arbitrary_messages_refs {{
 {}
@@ -74,11 +86,15 @@ enum object_descriptions_refs {{
 {}
 }};
 
-/* end */
+/* State definitions */
+
+{}
+#endif /* end NEWDB_H */
 """
 
 c_template = """/* Generated from adventure.yaml - do not hand-hack! */
 
+#include "common.h"
 #include "{}"
 
 const char* arbitrary_messages[] = {{
@@ -109,6 +125,10 @@ hint_t hints[] = {{
 {}
 }};
 
+long conditions[] = {{
+{}
+}};
+
 const size_t CLSSES = {};
 const int maximum_deaths = {};
 const int turn_threshold_count = {};
@@ -180,13 +200,17 @@ def get_locations(loc):
             .small = {},
             .big = {},
         }},
+        .sound = {},
+        .loud = {},
     }},
 """
     loc_str = ""
     for item in loc:
         short_d = make_c_string(item[1]["description"]["short"])
         long_d = make_c_string(item[1]["description"]["long"])
-        loc_str += template.format(short_d, long_d)
+        sound = item[1].get("sound", "SILENT")
+        loud = "true" if item[1].get("loud") else "false"
+        loc_str += template.format(short_d, long_d, sound, loud)
     loc_str = loc_str[:-1] # trim trailing newline
     return loc_str
 
@@ -194,6 +218,12 @@ def get_object_descriptions(obj):
     template = """    {{
         .inventory = {},
         .longs = (const char* []) {{
+{}
+        }},
+        .sounds = (const char* []) {{
+{}
+        }},
+        .texts = (const char* []) {{
 {}
         }},
     }},
@@ -205,10 +235,36 @@ def get_object_descriptions(obj):
         if item[1]["longs"] == None:
             longs_str = " " * 12 + "NULL,"
         else:
+            labels = []
             for l_msg in item[1]["longs"]:
+                if not isinstance(l_msg, str):
+                    labels.append(l_msg)
+                    l_msg = l_msg[1]
                 longs_str += " " * 12 + make_c_string(l_msg) + ",\n"
             longs_str = longs_str[:-1] # trim trailing newline
-        obj_str += template.format(i_msg, longs_str)
+            if labels:
+                global statedefines
+                statedefines += "/* States for %s */\n" % item[0]
+                for (i, (label, message)) in enumerate(labels):
+                    if len(message) >= 45:
+                        message = message[:45] + "..."
+                    statedefines += "#define %s\t%d /* %s */\n" % (label, i, message)
+                statedefines += "\n"
+        sounds_str = ""
+        if item[1].get("sounds") == None:
+            sounds_str = " " * 12 + "NULL,"
+        else:
+             for l_msg in item[1]["sounds"]:
+                 sounds_str += " " * 12 + make_c_string(l_msg) + ",\n"
+             sounds_str = sounds_str[:-1] # trim trailing newline
+        texts_str = ""
+        if item[1].get("texts") == None:
+            texts_str = " " * 12 + "NULL,"
+        else:
+             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)
     obj_str = obj_str[:-1] # trim trailing newline
     return obj_str
 
@@ -237,7 +293,8 @@ def get_hints(hnt, arb):
 """
     hnt_str = ""
     md = dict(arb)
-    for item in hnt:
+    for member in hnt:
+        item = member["hint"]
         number = item["number"]
         penalty = item["penalty"]
         turns = item["turns"]
@@ -247,17 +304,30 @@ def get_hints(hnt, arb):
     hnt_str = hnt_str[:-1] # trim trailing newline
     return hnt_str
 
+def get_condbits(locations):
+    cnd_str = ""
+    for (name, loc) in locations:
+        conditions = loc["conditions"]
+        hints = loc.get("hints") or []
+        flaglist = []
+        for flag in conditions:
+            if conditions[flag]:
+                flaglist.append(flag)
+        line = "|".join([("(1<<COND_%s)" % f) for f in flaglist])
+        trail = "|".join([("(1<<COND_H%s)" % f['name']) for f in hints])
+        if trail:
+            line += "|" + trail
+        if line.startswith("|"):
+            line = line[1:]
+        if not line:
+            line = "0"
+        cnd_str += "    " + line + ",\t// " + name + "\n"
+    return cnd_str
 
 if __name__ == "__main__":
     with open(yaml_name, "r") as f:
         db = yaml.load(f)
 
-    h = h_template.format(
-        get_refs(db["arbitrary_messages"]),
-        get_refs(db["locations"]),
-        get_refs(db["object_descriptions"]),
-    )
-
     c = c_template.format(
         h_name,
         get_arbitrary_messages(db["arbitrary_messages"]),
@@ -267,11 +337,20 @@ if __name__ == "__main__":
         get_object_descriptions(db["object_descriptions"]),
         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["hints"]),
+        get_refs(db["arbitrary_messages"]),
+        get_refs(db["locations"]),
+        get_refs(db["object_descriptions"]),
+        statedefines,
+    )
+
     with open(h_name, "w") as hf:
         hf.write(h)