const char* message;
}} special_t;
+enum desttype_t {{dest_goto, dest_special, dest_speak}};
+
typedef struct {{
const long motion;
const long cond;
- const long dest;
+ const enum desttype_t desttype;
+ const long destval;
const bool nodwarves;
const bool stop;
}} travelop_t;
* encoding description for travel.
*/
#define T_TERMINATE(entry) ((entry).motion == 1)
-#define L_SPEAK(loc) ((loc) - 500)
extern const location_t locations[];
extern const object_t objects[];
return trn_str
def get_locations(loc):
- template = """ {{ // {}
+ template = """ {{ // {}: {}
.description = {{
.small = {},
.big = {},
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 = {},
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
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))
#
# 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, False]]
+ travel = [[0, "LOC_NOWHERE", 0, 0, 0, 0, "false", "false"]]
tkey = [0]
oldloc = 0
while ltravel:
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:
cond = newloc // 1000
- travel.append([rule.pop(0),
+ dest = newloc % 1000
+ if dest <= 300:
+ desttype = "dest_goto";
+ destval = locnames[dest]
+ elif dest > 500:
+ desttype = "dest_speak";
+ destval = msgnames[dest - 500]
+ else:
+ desttype = "dest_special";
+ destval = locnames[dest - 300]
+ travel.append([len(tkey)-1,
+ locnames[len(tkey)-1],
+ rule.pop(0),
cond,
- newloc % 1000,
- cond==100,
- False])
- travel[-1][-1] = True
+ desttype,
+ destval,
+ "true" if cond==100 else "false",
+ "false"])
+ travel[-1][-1] = "true"
return (travel, tkey)
def get_travel(travel):
- template = """ {{
+ template = """ {{ // from {}: {}
.motion = {},
.cond = {},
- .dest = {},
+ .desttype = {},
+ .destval = {},
.nodwarves = {},
.stop = {},
}},
"""
out = ""
for entry in travel:
- out += template.format(*entry).lower()
+ out += template.format(*entry)
out = out[:-1] # trim trailing newline
return out
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"])