typedef struct {{
const string_group_t words;
- const long message;
+ const char* message;
}} action_t;
typedef struct {{
const long motion;
const long cond;
const long dest;
+ const bool nodwarves;
const bool stop;
}} travelop_t;
* inherited from FORTRAN, someday. To understand these, read the
* encoding description for travel.
*/
-#define T_NODWARVES(entry) (T_CONDITION(entry) == 100)
#define T_TERMINATE(entry) ((entry).motion == 1)
#define L_SPEAK(loc) ((loc) - 500)
#define NTRAVEL {}
#define NKEYS {}
+#define BIRD_ENDSTATE {}
+
enum arbitrary_messages_refs {{
{}
}};
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:
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)
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":
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:
#
# 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, 0, 0, False, False]]
tkey = [0]
oldloc = 0
while ltravel:
elif travel:
travel[-1][-1] = not travel[-1][-1]
while rule:
- travel.append([rule.pop(0), newloc // 1000, newloc % 1000, False])
+ cond = newloc // 1000
+ travel.append([rule.pop(0),
+ cond,
+ newloc % 1000,
+ cond==100,
+ False])
travel[-1][-1] = True
return (travel, tkey)
.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).lower()
out = out[:-1] # trim trailing newline
return out
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,
len(db["specials"]),
len(travel),
len(tkey),
+ deathbird,
get_refs(db["arbitrary_messages"]),
get_refs(db["locations"]),
get_refs(db["objects"]),