X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=newdungeon.py;h=0575d2c8b3afad7a03812f1482244d1f11d70077;hb=4f6bc949bd13c8028bad1acec4b17fe189f11872;hp=a981a1db4e0f2f23caa7cf866bee61f622afad70;hpb=2848494a01db9baccf69c9a592ea5a916af84a8a;p=open-adventure.git diff --git a/newdungeon.py b/newdungeon.py index a981a1d..0575d2c 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 @@ -19,9 +21,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 +88,28 @@ 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[]; +typedef struct {{ + const char* word; + const int type; + const int value; +}} vocabulary_t; + +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 {} +extern const vocabulary_t vocabulary[]; + +#define NLOCATIONS {} +#define NOBJECTS {} +#define NHINTS {} +#define NCLASSES {} +#define NDEATHS {} +#define NTHRESHOLDS {} enum arbitrary_messages_refs {{ {} @@ -103,23 +142,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,9 +166,9 @@ long conditions[] = {{ {} }}; -const size_t CLSSES = {}; -const int maximum_deaths = {}; -const int turn_threshold_count = {}; +const vocabulary_t vocabulary[] = {{ +{} +}}; /* end */ """ @@ -193,7 +232,7 @@ def get_turn_thresholds(trn): return trn_str def get_locations(loc): - template = """ {{ + template = """ {{ // {} .description = {{ .small = {}, .big = {}, @@ -203,32 +242,42 @@ def get_locations(loc): }}, """ loc_str = "" - for item in loc: + for (i, item) in enumerate(loc): short_d = make_c_string(item[1]["description"]["short"]) long_d = make_c_string(item[1]["description"]["long"]) 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 += template.format(i, short_d, long_d, sound, loud) loc_str = loc_str[:-1] # trim trailing newline return loc_str def get_object_descriptions(obj): - template = """ {{ + 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"]) + for (i, item) in enumerate(obj): + 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 +291,32 @@ 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) + 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, i_msg, locs[0], locs[1], treasure, longs_str, sounds_str, texts_str) obj_str = obj_str[:-1] # trim trailing newline return obj_str @@ -276,8 +350,8 @@ def get_hints(hnt, arb): number = item["number"] penalty = item["penalty"] turns = item["turns"] - question = make_c_string(md[item["question"]]) - hint = make_c_string(md[item["hint"]]) + question = make_c_string(item["question"]) + hint = make_c_string(item["hint"]) hnt_str += template.format(number, penalty, turns, question, hint) hnt_str = hnt_str[:-1] # trim trailing newline return hnt_str @@ -302,10 +376,40 @@ def get_condbits(locations): cnd_str += " " + line + ",\t// " + name + "\n" return cnd_str +def recompose(type_word, value): + "Compose the internal code for a vocabulary word from its YAML entry" + parts = ("motion", "action", "object", "special") + try: + return value + 1000 * parts.index(type_word) + 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) + +def get_vocabulary(vocabulary): + template = """ {{ + .word = {}, + .type = {}, + .value = {}, + }}, +""" + voc_str = "" + for vocab in vocabulary: + word = make_c_string(vocab["word"]) + type_code = recompose(vocab["type"], vocab["value"]) + value = vocab["value"] + voc_str += template.format(word, type_code, value) + voc_str = voc_str[:-1] # trim trailing newline + return voc_str + 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 +420,16 @@ 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"]), + get_vocabulary(db["vocabulary"]), ) h = h_template.format( + len(db["locations"])-1, + len(db["object_descriptions"])-1, 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"]),