#define COND_HJADE 20 /* Found all treasures except jade */
typedef struct {{
+ const char** strs;
+ const int n;
+}} string_group_t;
+
+typedef struct {{
+ const string_group_t words;
const char* inventory;
int plac, fixd;
bool is_treasure;
}} hint_t;
typedef struct {{
- const char** words;
+ const string_group_t words;
}} motion_t;
typedef struct {{
- const char** words;
+ const string_group_t words;
const long message;
}} action_t;
* encoding description for travel.
*/
#define T_DESTINATION(entry) MOD((entry).dest, 1000)
-#define T_NODWARVES(entry) ((entry).dest / 1000 == 100)
+#define T_CONDITION(entry) ((entry).dest / 1000)
+#define T_NODWARVES(entry) (T_CONDITION(entry) == 100)
#define T_HIGH(entry) ((entry).dest)
#define T_TERMINATE(entry) ((entry).motion == 1)
#define L_SPEAK(loc) ((loc) - 500)
extern long conditions[];
extern const motion_t motions[];
extern const action_t actions[];
+extern const action_t specials[];
extern const travelop_t travel[];
extern const long tkey[];
#define NCLASSES {}
#define NDEATHS {}
#define NTHRESHOLDS {}
+#define NMOTIONS {}
#define NACTIONS {}
+#define NSPECIALS {}
#define NTRAVEL {}
#define NKEYS {}
{}
}};
+enum special_refs {{
+{}
+}};
+
/* State definitions */
{}
c_template = """/* Generated from adventure.yaml - do not hand-hack! */
-#include "common.h"
#include "{}"
const char* arbitrary_messages[] = {{
{}
}};
+const action_t specials[] = {{
+{}
+}};
+
{}
const travelop_t travel[] = {{
ref_str = ref_str[:-1] # trim trailing newline
return ref_str
+def get_string_group(strings):
+ template = """{{
+ .strs = {},
+ .n = {},
+ }}"""
+ if strings == []:
+ strs = "NULL"
+ else:
+ strs = "(const char* []) {" + ", ".join([make_c_string(s) for s in strings]) + "}"
+ n = len(strings)
+ sg_str = template.format(strs, n)
+ return sg_str
+
def get_arbitrary_messages(arb):
template = """ {},
"""
def get_objects(obj):
template = """ {{ // {}
+ .words = {},
.inventory = {},
.plac = {},
.fixd = {},
obj_str = ""
for (i, item) in enumerate(obj):
attr = item[1]
+ try:
+ words_str = get_string_group(attr["words"])
+ except KeyError:
+ words_str = get_string_group([])
i_msg = make_c_string(attr["inventory"])
descriptions_str = ""
if attr["descriptions"] == None:
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, descriptions_str, sounds_str, texts_str, changes_str)
+ obj_str += template.format(i, 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
for motion in motions:
contents = motion[1]
if contents["words"] == None:
- mot_str += template.format("NULL")
- continue
- c_words = [make_c_string(s) for s in contents["words"]]
- words_str = "(const char* []) {" + ", ".join(c_words) + "}"
+ words_str = get_string_group([])
+ else:
+ words_str = get_string_group(contents["words"])
mot_str += template.format(words_str)
return mot_str
contents = action[1]
if contents["words"] == None:
- words_str = "NULL"
+ words_str = get_string_group([])
else:
- c_words = [make_c_string(s) for s in contents["words"]]
- words_str = "(const char* []) {" + ", ".join(c_words) + "}"
+ words_str = get_string_group(contents["words"])
if contents["message"] == None:
message = "NO_MESSAGE"
get_condbits(db["locations"]),
get_motions(db["motions"]),
get_actions(db["actions"]),
+ get_actions(db["specials"]),
"const long tkey[] = {%s};" % bigdump(tkey),
get_travel(travel),
)
len(db["classes"])-1,
len(db["obituaries"]),
len(db["turn_thresholds"]),
+ len(db["motions"]),
len(db["actions"]),
+ len(db["specials"]),
len(travel),
len(tkey),
get_refs(db["arbitrary_messages"]),
get_refs(db["objects"]),
get_refs(db["motions"]),
get_refs(db["actions"]),
+ get_refs(db["specials"]),
statedefines,
)