X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=newdungeon.py;h=a981a1db4e0f2f23caa7cf866bee61f622afad70;hb=ea70341cfeeae6ca648b8bd0425a564c6ab50975;hp=136d941f9f9f28de3ff264ab5c337df84d7ec28f;hpb=ddb0df85b315cf60c529d0566254beb2c42cab2b;p=open-adventure.git

diff --git a/newdungeon.py b/newdungeon.py
index 136d941..a981a1d 100755
--- a/newdungeon.py
+++ b/newdungeon.py
@@ -8,7 +8,16 @@ yaml_name = "adventure.yaml"
 h_name = "newdb.h"
 c_name = "newdb.c"
 
-h_template = """#include <stdio.h>
+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;
@@ -22,6 +31,8 @@ typedef struct {{
 
 typedef struct {{
   descriptions_t description;
+  const long sound;
+  const bool loud;
 }} location_t;
 
 typedef struct {{
@@ -55,10 +66,11 @@ extern const class_t classes[];
 extern turn_threshold_t turn_thresholds[];
 extern obituary_t obituaries[];
 extern hint_t hints[];
-
-extern size_t CLSSES;
-extern int maximum_deaths;
-extern int turn_threshold_count;
+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 {{
 {}
@@ -71,9 +83,17 @@ enum locations_refs {{
 enum object_descriptions_refs {{
 {}
 }};
+
+/* State definitions */
+
+{}
+#endif /* end NEWDB_H */
 """
 
-c_template = """#include "{}"
+c_template = """/* Generated from adventure.yaml - do not hand-hack! */
+
+#include "common.h"
+#include "{}"
 
 const char* arbitrary_messages[] = {{
 {}
@@ -103,9 +123,15 @@ hint_t hints[] = {{
 {}
 }};
 
-size_t CLSSES = {};
-int maximum_deaths = {};
-int turn_threshold_count = {};
+long conditions[] = {{
+{}
+}};
+
+const size_t CLSSES = {};
+const int maximum_deaths = {};
+const int turn_threshold_count = {};
+
+/* end */
 """
 
 def make_c_string(string):
@@ -172,13 +198,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
 
@@ -197,9 +227,21 @@ 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
+            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"
         obj_str += template.format(i_msg, longs_str)
     obj_str = obj_str[:-1] # trim trailing newline
     return obj_str
@@ -229,7 +271,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"]
@@ -239,17 +282,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"]),
@@ -259,13 +315,24 @@ 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)
 
     with open(c_name, "w") as cf:
         cf.write(c)
+
+# end