X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=newdungeon.py;h=7467475de1391217fe3c87d99a06025c942f7ea6;hp=39998e7c1bf2369f2579ddc4de08c1d8de10ebfb;hb=4b2472fb16d6af6d8513630be8df89c69402ce8b;hpb=d8099744796d5ca1a80b2db5be6374cc8db830d0 diff --git a/newdungeon.py b/newdungeon.py index 39998e7..7467475 100755 --- a/newdungeon.py +++ b/newdungeon.py @@ -4,7 +4,7 @@ # replace the existing dungeon.c It currently outputs a .h and .c pair # for C code. -import yaml +import sys, yaml yaml_name = "adventure.yaml" h_name = "newdb.h" @@ -51,7 +51,7 @@ typedef struct {{ const char** longs; const char** sounds; const char** texts; -}} object_description_t; +}} object_t; typedef struct {{ const char* small; @@ -88,21 +88,32 @@ typedef struct {{ const char* hint; }} hint_t; +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 object_t objects[]; +extern const char* arbitrary_messages[]; +extern 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 vocabulary_t vocabulary[]; +extern const long actspk[]; -#define NLOCATIONS {} +#define NLOCATIONS {} #define NOBJECTS {} #define NHINTS {} #define NCLASSES {} #define NDEATHS {} #define NTHRESHOLDS {} +#define NVERBS {} +#define NVOCAB {} +#define NTRAVEL {} enum arbitrary_messages_refs {{ {} @@ -112,7 +123,7 @@ enum locations_refs {{ {} }}; -enum object_descriptions_refs {{ +enum object_refs {{ {} }}; @@ -143,7 +154,7 @@ const location_t locations[] = {{ {} }}; -const object_description_t object_descriptions[] = {{ +const object_t objects[] = {{ {} }}; @@ -159,6 +170,15 @@ long conditions[] = {{ {} }}; +const vocabulary_t vocabulary[] = {{ +{} +}}; + +const long actspk[] = {{ + NO_MESSAGE, +{} +}}; + /* end */ """ @@ -240,7 +260,7 @@ def get_locations(loc): loc_str = loc_str[:-1] # trim trailing newline return loc_str -def get_object_descriptions(obj): +def get_objects(obj): template = """ {{ // {} .inventory = {}, .plac = {}, @@ -339,8 +359,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 @@ -365,24 +385,112 @@ def get_condbits(locations): cnd_str += " " + line + ",\t// " + name + "\n" return cnd_str -def recompose(word): +def recompose(type_word, value): "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"]) + 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.stderr.write("%s is not a known word classifier\n" % 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 + +def get_actspk(actspk): + res = "" + for (i, word) in actspk.items(): + res += " %s,\n" % word + return res + +def buildtravel(locs, objs, voc): + ltravel = [] + lkeys = [] + verbmap = {} + for entry in db["vocabulary"]: + if entry["type"] == "motion" and entry["value"] not in verbmap: + verbmap[entry["word"]] = entry["value"] + def dencode(action, name): + "Decode a destination number" + if action[0] == "goto": + try: + return locnames.index(action[1]) + except ValueError: + sys.stderr.write("dungeon: unknown location %s in goto clause of %s\n" % (cond[1], name)) + elif action[0] == "special": + return 300 + action[1] + elif action[0] == "speak": + try: + return 500 + msgnames.index(action[1]) + except ValueError: + sys.stderr.write("dungeon: unknown location %s in carry clause of %s\n" % (cond[1], name)) + else: + print(cond) + raise ValueError + def cencode(cond, name): + if cond is None: + return 0; + elif cond[0] == "pct": + return cond[1] + elif cond[0] == "carry": + try: + return 100 + objnames.index(cond[1]) + except ValueError: + sys.stderr.write("dungeon: unknown object name %s in carry clause of %s\n" % (cond[1], name)) + sys.exit(1) + elif cond[0] == "with": + try: + return 200 + objnames.index(cond[1]) + except IndexError: + sys.stderr.write("dungeon: unknown object name %s in with clause of \n" % (cond[1], name)) + sys.exit(1) + elif cond[0] == "not": + # FIXME: Allow named as well as numbered states + try: + return 300 + objnames.index(cond[1]) + 100 * cond[2] + except ValueError: + sys.stderr.write("dungeon: unknown object name %s in not clause of %s\n" % (cond[1], name)) + sys.exit(1) + else: + print(cond) + raise ValueError + # Much more to be done here + for (i, (name, loc)) in enumerate(locs): + if "travel" in loc: + for rule in loc["travel"]: + tt = [i] + dest = dencode(rule["action"], name) + 1000 * cencode(rule.get("cond"), name) + tt.append(dest) + tt += [verbmap[e] for e in rule["verbs"]] + if not rule["verbs"]: + tt.append(1) + #print(tuple(tt)) + return (ltravel, lkeys) + if __name__ == "__main__": with open(yaml_name, "r") as f: db = yaml.load(f) locnames = [x[0] for x in db["locations"]] + msgnames = [el[0] for el in db["arbitrary_messages"]] + objnames = [el[0] for el in db["objects"]] + (travel, key) = buildtravel(db["locations"], db["objects"], db["vocabulary"]) c = c_template.format( h_name, @@ -390,22 +498,27 @@ if __name__ == "__main__": get_class_messages(db["classes"]), get_turn_thresholds(db["turn_thresholds"]), get_locations(db["locations"]), - get_object_descriptions(db["object_descriptions"]), + get_objects(db["objects"]), get_obituaries(db["obituaries"]), get_hints(db["hints"], db["arbitrary_messages"]), get_condbits(db["locations"]), + get_vocabulary(db["vocabulary"]), + get_actspk(db["actspk"]), ) h = h_template.format( len(db["locations"])-1, - len(db["object_descriptions"])-1, + len(db["objects"])-1, len(db["hints"]), - len(db["classes"]), + len(db["classes"])-1, len(db["obituaries"]), len(db["turn_thresholds"]), + len(db["actspk"]), + len(db["vocabulary"]), + len(travel), get_refs(db["arbitrary_messages"]), get_refs(db["locations"]), - get_refs(db["object_descriptions"]), + get_refs(db["objects"]), statedefines, )