X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=newdungeon.py;h=28c7b63e4cf8679934464b3892df5cf2d8f68f87;hb=cfb43fcf442f4be94566a28d253e5c14b8921848;hp=1ff4327e486798ec76e300a68859b9fb9ab62372;hpb=39eed7d678588438a7abe97354987816e9305096;p=open-adventure.git

diff --git a/newdungeon.py b/newdungeon.py
index 1ff4327..28c7b63 100755
--- a/newdungeon.py
+++ b/newdungeon.py
@@ -1,6 +1,8 @@
 #!/usr/bin/python3
 
-# This is the new open-adventure dungeon generator. It'll eventually replace the existing dungeon.c It currently outputs a .h and .c pair for C code.
+# This is the new open-adventure dungeon generator. It'll eventually
+# replace the existing dungeon.c It currently outputs a .h and .c pair
+# for C code.
 
 import yaml
 
@@ -44,6 +46,7 @@ h_template = """/* Generated from adventure.yaml - do not hand-hack! */
 
 typedef struct {{
   const char* inventory;
+  int plac, fixd;
   bool is_treasure;
   const char** longs;
   const char** sounds;
@@ -240,6 +243,8 @@ def get_locations(loc):
 def get_object_descriptions(obj):
     template = """    {{
         .inventory = {},
+        .plac = {},
+        .fixd = {},
         .is_treasure = {},
         .longs = (const char* []) {{
 {}
@@ -254,13 +259,14 @@ def get_object_descriptions(obj):
 """
     obj_str = ""
     for item in obj:
-        i_msg = make_c_string(item[1]["inventory"])
+        attr = item[1]
+        i_msg = make_c_string(attr["inventory"])
         longs_str = ""
-        if item[1]["longs"] == None:
+        if attr["longs"] == None:
             longs_str = " " * 12 + "NULL,"
         else:
             labels = []
-            for l_msg in item[1]["longs"]:
+            for l_msg in attr["longs"]:
                 if not isinstance(l_msg, str):
                     labels.append(l_msg)
                     l_msg = l_msg[1]
@@ -275,21 +281,31 @@ def get_object_descriptions(obj):
                     statedefines += "#define %s\t%d /* %s */\n" % (label, i, message)
                 statedefines += "\n"
         sounds_str = ""
-        if item[1].get("sounds") == None:
+        if attr.get("sounds") == None:
             sounds_str = " " * 12 + "NULL,"
         else:
-             for l_msg in item[1]["sounds"]:
+             for l_msg in attr["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:
+        if attr.get("texts") == None:
             texts_str = " " * 12 + "NULL,"
         else:
-             for l_msg in item[1]["texts"]:
+             for l_msg in attr["texts"]:
                  texts_str += " " * 12 + make_c_string(l_msg) + ",\n"
              texts_str = texts_str[:-1] # trim trailing newline
-        treasure = "true" if item[1].get("treasure") else "false"
-        obj_str += template.format(i_msg, treasure, longs_str, sounds_str, texts_str)
+        locs = attr.get("locations", ["LOC_NOWHERE", "LOC_NOWHERE"])
+        immovable = attr.get("immovable", False)
+        try:
+            if type(locs) == str:
+                locs = [locnames.index(locs), -1 if immovable else 0]
+            else:
+                locs = [locnames.index(x) for x in locs]
+        except IndexError:
+            sys.stderr.write("dungeon: unknown object location in %s\n" % locs)
+            sys.exit(1)
+        treasure = "true" if attr.get("treasure") else "false"
+        obj_str += template.format(i_msg, locs[0], locs[1], treasure, longs_str, sounds_str, texts_str)
     obj_str = obj_str[:-1] # trim trailing newline
     return obj_str
 
@@ -349,10 +365,25 @@ def get_condbits(locations):
         cnd_str += "    " + line + ",\t// " + name + "\n"
     return cnd_str
 
+def recompose(word):
+    "Compose the internal code for a vocabulary word from its YAML entry"
+    parts = ("motion", "action", "object", "special")
+    try:
+        attrs = db["vocabulary"][word]
+        return attrs["value"] + 1000 * parts.index(attrs["type"])
+    except KeyError:
+        sys.stderr.write("dungeon: %s is not a known word\n" % word)
+        sys.exit(1)
+    except IndexError:
+        sys.stderr.write("%s is not a known word classifier" % attrs["type"])
+        sys.exit(1)
+
 if __name__ == "__main__":
     with open(yaml_name, "r") as f:
         db = yaml.load(f)
 
+    locnames = [x[0] for x in db["locations"]]
+
     c = c_template.format(
         h_name,
         get_arbitrary_messages(db["arbitrary_messages"]),