X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=newdungeon.py;h=41645f2ac1472cb38edccb0fdc79facf568a623b;hb=7ee571d8326cd3166841f0872f528626a31ca0e7;hp=21ac9e64aa223cb1030b1a153dd5875c62ea72d0;hpb=c3a2816821512b59a09866a594a9bec699193271;p=open-adventure.git diff --git a/newdungeon.py b/newdungeon.py index 21ac9e6..41645f2 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,8 +21,32 @@ 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; @@ -62,13 +88,13 @@ 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[]; #define NLOCATIONS {} @@ -109,23 +135,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[] = {{ {} }}; @@ -195,7 +221,7 @@ def get_turn_thresholds(trn): return trn_str def get_locations(loc): - template = """ {{ + template = """ {{ // {} .description = {{ .small = {}, .big = {}, @@ -205,18 +231,20 @@ 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* []) {{ {} @@ -230,14 +258,15 @@ def get_object_descriptions(obj): }}, """ 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] @@ -252,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, i_msg, locs[0], locs[1], treasure, longs_str, sounds_str, texts_str) obj_str = obj_str[:-1] # trim trailing newline return obj_str @@ -300,8 +339,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 @@ -326,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"]), @@ -343,8 +397,8 @@ if __name__ == "__main__": ) h = h_template.format( - len(db["locations"]), - len(db["object_descriptions"]), + len(db["locations"])-1, + len(db["object_descriptions"])-1, len(db["hints"]), len(db["classes"]), len(db["obituaries"]),