X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=newdungeon.py;h=c16f9999165eb26f5208a1627b5d4485c45dde2a;hb=f8b30c1ec6e8d8a6a4b322a2ee19521b4d5d0c70;hp=a981a1db4e0f2f23caa7cf866bee61f622afad70;hpb=2848494a01db9baccf69c9a592ea5a916af84a8a;p=open-adventure.git diff --git a/newdungeon.py b/newdungeon.py index a981a1d..c16f999 100755 --- a/newdungeon.py +++ b/newdungeon.py @@ -19,9 +19,36 @@ h_template = """/* Generated from adventure.yaml - do not hand-hack! */ #define SILENT -1 /* no sound */ +/* Symbols for cond bits */ +#define COND_LIT 0 /* Light */ +#define COND_OILY 1 /* If bit 2 is on: on for oil, off for water */ +#define COND_FLUID 2 /* Liquid asset, see bit 1 */ +#define COND_NOARRR 3 /* Pirate doesn't go here unless following */ +#define COND_NOBACK 4 /* Cannot use "back" to move away */ +#define COND_ABOVE 5 +#define COND_DEEP 6 /* Deep - e.g where dwarves are active */ +#define COND_FOREST 7 /* In the forest */ +#define COND_FORCED 8 /* Only one way in or out of here */ +/* Bits past 10 indicate areas of interest to "hint" routines */ +#define COND_HBASE 10 /* Base for location hint bits */ +#define COND_HCAVE 11 /* Trying to get into cave */ +#define COND_HBIRD 12 /* Trying to catch bird */ +#define COND_HSNAKE 13 /* Trying to deal with snake */ +#define COND_HMAZE 14 /* Lost in maze */ +#define COND_HDARK 15 /* Pondering dark room */ +#define COND_HWITT 16 /* At Witt's End */ +#define COND_HCLIFF 17 /* Cliff with urn */ +#define COND_HWOODS 18 /* Lost in forest */ +#define COND_HOGRE 19 /* Trying to deal with ogre */ +#define COND_HJADE 20 /* Found all treasures except jade */ + typedef struct {{ const char* inventory; + int plac, fixd; + bool is_treasure; const char** longs; + const char** sounds; + const char** texts; }} object_description_t; typedef struct {{ @@ -59,18 +86,21 @@ typedef struct {{ 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 const location_t locations[]; +extern const object_description_t object_descriptions[]; +extern const const char* arbitrary_messages[]; +extern const const class_t classes[]; +extern const turn_threshold_t turn_thresholds[]; +extern const obituary_t obituaries[]; +extern const 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 {} + +#define NLOCATIONS {} +#define NOBJECTS {} +#define NHINTS {} +#define NCLASSES {} +#define NDEATHS {} +#define NTHRESHOLDS {} enum arbitrary_messages_refs {{ {} @@ -103,23 +133,23 @@ const class_t classes[] = {{ {} }}; -turn_threshold_t turn_thresholds[] = {{ +const turn_threshold_t turn_thresholds[] = {{ {} }}; -location_t locations[] = {{ +const location_t locations[] = {{ {} }}; -object_description_t object_descriptions[] = {{ +const object_description_t object_descriptions[] = {{ {} }}; -obituary_t obituaries[] = {{ +const obituary_t obituaries[] = {{ {} }}; -hint_t hints[] = {{ +const hint_t hints[] = {{ {} }}; @@ -127,10 +157,6 @@ long conditions[] = {{ {} }}; -const size_t CLSSES = {}; -const int maximum_deaths = {}; -const int turn_threshold_count = {}; - /* end */ """ @@ -215,20 +241,30 @@ def get_locations(loc): def get_object_descriptions(obj): template = """ {{ .inventory = {}, + .plac = {}, + .fixd = {}, + .is_treasure = {}, .longs = (const char* []) {{ +{} + }}, + .sounds = (const char* []) {{ +{} + }}, + .texts = (const char* []) {{ {} }}, }}, """ 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] @@ -242,7 +278,28 @@ def get_object_descriptions(obj): message = message[:45] + "..." statedefines += "#define %s\t%d /* %s */\n" % (label, i, message) statedefines += "\n" - obj_str += template.format(i_msg, longs_str) + sounds_str = "" + if attr.get("sounds") == None: + sounds_str = " " * 12 + "NULL," + else: + 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 attr.get("texts") == None: + texts_str = " " * 12 + "NULL," + else: + for l_msg in attr["texts"]: + texts_str += " " * 12 + make_c_string(l_msg) + ",\n" + texts_str = texts_str[:-1] # trim trailing newline + locs = attr.get("locations", ["LOC_NOWHERE", "LOC_NOWHERE"]) + immovable = attr.get("immovable", False) + if type(locs) == str: + locs = [locnames.index(locs), -1 if immovable else 0] + else: + locs = [locnames.index(x) for x in locs] + 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 @@ -306,6 +363,8 @@ 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"]), @@ -316,13 +375,15 @@ if __name__ == "__main__": 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["locations"]), + len(db["object_descriptions"]), len(db["hints"]), + len(db["classes"]), + len(db["obituaries"]), + len(db["turn_thresholds"]), get_refs(db["arbitrary_messages"]), get_refs(db["locations"]), get_refs(db["object_descriptions"]),