X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=make_dungeon.py;h=7a16970df83ea3b369c920f880d1661172fa03ef;hb=551838cea217e3d9df11dcaea52c42b02449de91;hp=e7e37ae2c6baeaa23177901de65824468e45d0c5;hpb=e05f959974ec2802362d25b8305a26e58d14a753;p=open-adventure.git diff --git a/make_dungeon.py b/make_dungeon.py index e7e37ae..7a16970 100755 --- a/make_dungeon.py +++ b/make_dungeon.py @@ -141,7 +141,7 @@ typedef struct {{ typedef struct {{ const string_group_t words; - const long message; + const char* message; }} action_t; typedef struct {{ @@ -153,6 +153,7 @@ typedef struct {{ const long motion; const long cond; const long dest; + const bool nodwarves; const bool stop; }} travelop_t; @@ -161,9 +162,6 @@ typedef struct {{ * inherited from FORTRAN, someday. To understand these, read the * encoding description for travel. */ -#define T_DESTINATION(entry) (entry).dest -#define T_CONDITION(entry) (entry).cond -#define T_NODWARVES(entry) (T_CONDITION(entry) == 100) #define T_TERMINATE(entry) ((entry).motion == 1) #define L_SPEAK(loc) ((loc) - 500) @@ -194,6 +192,8 @@ extern const char *ignore; #define NTRAVEL {} #define NKEYS {} +#define BIRD_ENDSTATE {} + enum arbitrary_messages_refs {{ {} }}; @@ -355,7 +355,7 @@ def get_turn_thresholds(trn): return trn_str def get_locations(loc): - template = """ {{ // {} + template = """ {{ // {}: {} .description = {{ .small = {}, .big = {}, @@ -370,12 +370,12 @@ def get_locations(loc): 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(i, short_d, long_d, sound, loud) + loc_str += template.format(i, item[0], short_d, long_d, sound, loud) loc_str = loc_str[:-1] # trim trailing newline return loc_str def get_objects(obj): - template = """ {{ // {} + template = """ {{ // {}: {} .words = {}, .inventory = {}, .plac = {}, @@ -409,18 +409,15 @@ def get_objects(obj): else: labels = [] for l_msg in attr["descriptions"]: - if not isinstance(l_msg, str): - labels.append(l_msg) - l_msg = l_msg[1] descriptions_str += " " * 12 + make_c_string(l_msg) + ",\n" + for label in attr.get("states", []): + labels.append(label) descriptions_str = descriptions_str[:-1] # trim trailing newline 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) + for (i, label) in enumerate(labels): + statedefines += "#define %s\t%d\n" % (label, i) statedefines += "\n" sounds_str = "" if attr.get("sounds") == None: @@ -447,14 +444,12 @@ def get_objects(obj): 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] + locs = [locs, -1 if immovable else 0] 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, words_str, i_msg, locs[0], locs[1], treasure, descriptions_str, sounds_str, texts_str, changes_str) + obj_str += template.format(i, item[0], words_str, i_msg, locs[0], locs[1], treasure, descriptions_str, sounds_str, texts_str, changes_str) obj_str = obj_str[:-1] # trim trailing newline return obj_str @@ -631,7 +626,9 @@ def buildtravel(locs, objs): raise ValueError def cencode(cond, name): if cond is None: - return 0; + return 0 + elif cond == ["nodwarves"]: + return 100 elif cond[0] == "pct": return cond[1] elif cond[0] == "carry": @@ -647,11 +644,12 @@ def buildtravel(locs, objs): 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: obj = objnames.index(cond[1]) if type(cond[2]) == int: state = cond[2] + elif cond[2] in objs[obj][1].get("states", []): + state = objs[obj][1].get("states").index(cond[2]) else: for (i, stateclause) in enumerate(objs[obj][1]["descriptions"]): if type(stateclause) == list: @@ -675,7 +673,7 @@ def buildtravel(locs, objs): tt = [i] dest = dencode(rule["action"], name) + 1000 * cencode(rule.get("cond"), name) tt.append(dest) - tt += [verbmap[e] for e in rule["verbs"]] + tt += [motionnames[verbmap[e]].upper() for e in rule["verbs"]] if not rule["verbs"]: tt.append(1) ltravel.append(tuple(tt)) @@ -704,7 +702,7 @@ def buildtravel(locs, objs): # # In order to de-crypticize the runtime code, we're going to break these # magic numbers up into a struct. - travel = [[0, 0, 0, False]] + travel = [[0, "LOC_NOWHERE", 0, 0, 0, "false", "false"]] tkey = [0] oldloc = 0 while ltravel: @@ -715,23 +713,32 @@ def buildtravel(locs, objs): tkey.append(len(travel)) oldloc = loc elif travel: - travel[-1][-1] = not travel[-1][-1] + travel[-1][-1] = "false" if travel[-1][-1] == "true" else "true" while rule: - travel.append([rule.pop(0), newloc // 1000, newloc % 1000, False]) - travel[-1][-1] = True + cond = newloc // 1000 + dest = newloc % 1000 + travel.append([len(tkey)-1, + locnames[len(tkey)-1], + rule.pop(0), + cond, + locnames[dest] if dest <= 300 else dest, + "true" if cond==100 else "false", + "false"]) + travel[-1][-1] = "true" return (travel, tkey) def get_travel(travel): - template = """ {{ + template = """ {{ // from {}: {} .motion = {}, .cond = {}, .dest = {}, + .nodwarves = {}, .stop = {}, }}, """ out = "" for entry in travel: - out += template.format(entry[0], entry[1], entry[2], entry[3]).lower() + out += template.format(*entry) out = out[:-1] # trim trailing newline return out @@ -742,6 +749,7 @@ if __name__ == "__main__": 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"]] + motionnames = [el[0] for el in db["motions"]] (travel, tkey) = buildtravel(db["locations"], db["objects"]) @@ -757,13 +765,17 @@ if __name__ == "__main__": get_hints(db["hints"], db["arbitrary_messages"]), get_condbits(db["locations"]), get_motions(db["motions"]), - get_actions(db["actions"]), + get_specials(db["actions"]), get_specials(db["specials"]), bigdump(tkey), get_travel(travel), ignore, ) + # 0-origin index of birds's last song. Bird should + # die after player hears this. + deathbird = len(dict(db["objects"])["BIRD"]["sounds"]) - 1 + h = h_template.format( len(db["locations"])-1, len(db["objects"])-1, @@ -776,6 +788,7 @@ if __name__ == "__main__": len(db["specials"]), len(travel), len(tkey), + deathbird, get_refs(db["arbitrary_messages"]), get_refs(db["locations"]), get_refs(db["objects"]),