X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=newdungeon.py;h=3b801da6d50ba0df2e554a971f86837a3b81a981;hb=25077d0b4eb1d6a85140c01092be7203ca64a49c;hp=f8ef9571abd0bc897aa2145041c3d3f646e49f2c;hpb=f6373dd32e4ed75b18c9c6fb7dfa103d4ef68891;p=open-adventure.git diff --git a/newdungeon.py b/newdungeon.py index f8ef957..3b801da 100755 --- a/newdungeon.py +++ b/newdungeon.py @@ -8,11 +8,22 @@ yaml_name = "adventure.yaml" h_name = "newdb.h" c_name = "newdb.c" -h_template = """#include +statedefines = "" + +h_template = """/* Generated from adventure.yaml - do not hand-hack! */ +#ifndef NEWDB_H +#define NEWDB_H + +#include +#include + +#define SILENT -1 /* no sound */ typedef struct {{ const char* inventory; const char** longs; + const char** sounds; + const char** texts; }} object_description_t; typedef struct {{ @@ -22,6 +33,8 @@ typedef struct {{ typedef struct {{ descriptions_t description; + const long sound; + const bool loud; }} location_t; typedef struct {{ @@ -40,16 +53,29 @@ typedef struct {{ const char* message; }} class_t; +typedef struct {{ + const int number; + const int turns; + const int penalty; + const char* question; + 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 long conditions[]; -extern size_t CLSSES; -extern int maximum_deaths; -extern int turn_threshold_count; +#define NLOCATIONS {} +#define NOBJECTS {} +#define NHINTS {} +#define NCLASSES {} +#define NDEATHS {} +#define NTHRESHOLDS {} enum arbitrary_messages_refs {{ {} @@ -62,9 +88,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[] = {{ {} @@ -90,9 +124,15 @@ obituary_t obituaries[] = {{ {} }}; -size_t CLSSES = {}; -int maximum_deaths = {}; -int turn_threshold_count = {}; +hint_t hints[] = {{ +{} +}}; + +long conditions[] = {{ +{} +}}; + +/* end */ """ def make_c_string(string): @@ -159,13 +199,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 @@ -173,6 +217,12 @@ def get_object_descriptions(obj): template = """ {{ .inventory = {}, .longs = (const char* []) {{ +{} + }}, + .sounds = (const char* []) {{ +{} + }}, + .texts = (const char* []) {{ {} }}, }}, @@ -184,10 +234,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 @@ -205,30 +281,81 @@ def get_obituaries(obit): obit_str = obit_str[:-1] # trim trailing newline return obit_str -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"]), - get_class_messages(db["classes"]), - get_turn_thresholds(db["turn_thresholds"]), - get_locations(db["locations"]), - get_object_descriptions(db["object_descriptions"]), - get_obituaries(db["obituaries"]), - len(db["classes"]), - len(db["obituaries"]), - len(db["turn_thresholds"]), -) - -with open(h_name, "w") as hf: - hf.write(h) - -with open(c_name, "w") as cf: - cf.write(c) +def get_hints(hnt, arb): + template = """ {{ + .number = {}, + .penalty = {}, + .turns = {}, + .question = {}, + .hint = {}, + }}, +""" + hnt_str = "" + md = dict(arb) + for member in hnt: + item = member["hint"] + number = item["number"] + penalty = item["penalty"] + turns = item["turns"] + question = make_c_string(md[item["question"]]) + hint = make_c_string(md[item["hint"]]) + hnt_str += template.format(number, penalty, turns, question, hint) + 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<