projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add make target for coverage
[open-adventure.git]
/
newdungeon.py
diff --git
a/newdungeon.py
b/newdungeon.py
index 60625997f907ddc4976fd39b1ce406f5d546637f..d1ea21c8f04c696429960ddb3ccd74107885f624 100755
(executable)
--- a/
newdungeon.py
+++ b/
newdungeon.py
@@
-85,12
+85,19
@@
h_template = """/* Generated from adventure.yaml - do not hand-hack! */
#define COND_HJADE 20 /* Found all treasures except jade */
typedef struct {{
#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;
const char* inventory;
int plac, fixd;
bool is_treasure;
- const char**
long
s;
+ const char**
description
s;
const char** sounds;
const char** texts;
const char** sounds;
const char** texts;
+ const char** changes;
}} object_t;
typedef struct {{
}} object_t;
typedef struct {{
@@
-129,11
+136,11
@@
typedef struct {{
}} hint_t;
typedef struct {{
}} hint_t;
typedef struct {{
- const
char**
words;
+ const
string_group_t
words;
}} motion_t;
typedef struct {{
}} motion_t;
typedef struct {{
- const
char**
words;
+ const
string_group_t
words;
const long message;
}} action_t;
const long message;
}} action_t;
@@
-149,7
+156,8
@@
typedef struct {{
* encoding description for travel.
*/
#define T_DESTINATION(entry) MOD((entry).dest, 1000)
* 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)
#define T_HIGH(entry) ((entry).dest)
#define T_TERMINATE(entry) ((entry).motion == 1)
#define L_SPEAK(loc) ((loc) - 500)
@@
-164,6
+172,7
@@
extern const hint_t hints[];
extern long conditions[];
extern const motion_t motions[];
extern const action_t actions[];
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[];
extern const travelop_t travel[];
extern const long tkey[];
@@
-173,7
+182,9
@@
extern const long tkey[];
#define NCLASSES {}
#define NDEATHS {}
#define NTHRESHOLDS {}
#define NCLASSES {}
#define NDEATHS {}
#define NTHRESHOLDS {}
+#define NMOTIONS {}
#define NACTIONS {}
#define NACTIONS {}
+#define NSPECIALS {}
#define NTRAVEL {}
#define NKEYS {}
#define NTRAVEL {}
#define NKEYS {}
@@
-197,6
+208,10
@@
enum action_refs {{
{}
}};
{}
}};
+enum special_refs {{
+{}
+}};
+
/* State definitions */
{}
/* State definitions */
{}
@@
-248,6
+263,10
@@
const action_t actions[] = {{
{}
}};
{}
}};
+const action_t specials[] = {{
+{}
+}};
+
{}
const travelop_t travel[] = {{
{}
const travelop_t travel[] = {{
@@
-276,6
+295,19
@@
def get_refs(l):
ref_str = ref_str[:-1] # trim trailing newline
return ref_str
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_arbitrary_messages(arb):
template = """ {},
"""
@@
-337,17
+369,21
@@
def get_locations(loc):
def get_objects(obj):
template = """ {{ // {}
def get_objects(obj):
template = """ {{ // {}
+ .words = {},
.inventory = {},
.plac = {},
.fixd = {},
.is_treasure = {},
.inventory = {},
.plac = {},
.fixd = {},
.is_treasure = {},
- .
long
s = (const char* []) {{
+ .
description
s = (const char* []) {{
{}
}},
.sounds = (const char* []) {{
{}
}},
.texts = (const char* []) {{
{}
}},
.sounds = (const char* []) {{
{}
}},
.texts = (const char* []) {{
+{}
+ }},
+ .changes = (const char* []) {{
{}
}},
}},
{}
}},
}},
@@
-355,18
+391,22
@@
def get_objects(obj):
obj_str = ""
for (i, item) in enumerate(obj):
attr = item[1]
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"])
i_msg = make_c_string(attr["inventory"])
-
long
s_str = ""
- if attr["
long
s"] == None:
-
long
s_str = " " * 12 + "NULL,"
+
description
s_str = ""
+ if attr["
description
s"] == None:
+
description
s_str = " " * 12 + "NULL,"
else:
labels = []
else:
labels = []
- for l_msg in attr["
long
s"]:
+ for l_msg in attr["
description
s"]:
if not isinstance(l_msg, str):
labels.append(l_msg)
l_msg = l_msg[1]
if not isinstance(l_msg, str):
labels.append(l_msg)
l_msg = l_msg[1]
-
long
s_str += " " * 12 + make_c_string(l_msg) + ",\n"
-
longs_str = long
s_str[:-1] # trim trailing newline
+
description
s_str += " " * 12 + make_c_string(l_msg) + ",\n"
+
descriptions_str = description
s_str[:-1] # trim trailing newline
if labels:
global statedefines
statedefines += "/* States for %s */\n" % item[0]
if labels:
global statedefines
statedefines += "/* States for %s */\n" % item[0]
@@
-389,6
+429,13
@@
def get_objects(obj):
for l_msg in attr["texts"]:
texts_str += " " * 12 + make_c_string(l_msg) + ",\n"
texts_str = texts_str[:-1] # trim trailing newline
for l_msg in attr["texts"]:
texts_str += " " * 12 + make_c_string(l_msg) + ",\n"
texts_str = texts_str[:-1] # trim trailing newline
+ changes_str = ""
+ if attr.get("changes") == None:
+ changes_str = " " * 12 + "NULL,"
+ else:
+ for l_msg in attr["changes"]:
+ changes_str += " " * 12 + make_c_string(l_msg) + ",\n"
+ changes_str = changes_str[:-1] # trim trailing newline
locs = attr.get("locations", ["LOC_NOWHERE", "LOC_NOWHERE"])
immovable = attr.get("immovable", False)
try:
locs = attr.get("locations", ["LOC_NOWHERE", "LOC_NOWHERE"])
immovable = attr.get("immovable", False)
try:
@@
-400,7
+447,7
@@
def get_objects(obj):
sys.stderr.write("dungeon: unknown object location in %s\n" % locs)
sys.exit(1)
treasure = "true" if attr.get("treasure") else "false"
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, longs_str, sounds_str, text
s_str)
+ obj_str += template.format(i,
words_str, i_msg, locs[0], locs[1], treasure, descriptions_str, sounds_str, texts_str, change
s_str)
obj_str = obj_str[:-1] # trim trailing newline
return obj_str
obj_str = obj_str[:-1] # trim trailing newline
return obj_str
@@
-481,10
+528,9
@@
def get_motions(motions):
for motion in motions:
contents = motion[1]
if contents["words"] == None:
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
mot_str += template.format(words_str)
return mot_str
@@
-499,10
+545,9
@@
def get_actions(actions):
contents = action[1]
if contents["words"] == None:
contents = action[1]
if contents["words"] == None:
- words_str =
"NULL"
+ words_str =
get_string_group([])
else:
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"
if contents["message"] == None:
message = "NO_MESSAGE"
@@
-571,7
+616,7
@@
def buildtravel(locs, objs, voc):
if type(cond[2]) == int:
state = cond[2]
else:
if type(cond[2]) == int:
state = cond[2]
else:
- for (i, stateclause) in enumerate(objs[obj][1]["
long
s"]):
+ for (i, stateclause) in enumerate(objs[obj][1]["
description
s"]):
if type(stateclause) == list:
if stateclause[0] == cond[2]:
state = i
if type(stateclause) == list:
if stateclause[0] == cond[2]:
state = i
@@
-676,6
+721,7
@@
if __name__ == "__main__":
get_condbits(db["locations"]),
get_motions(db["motions"]),
get_actions(db["actions"]),
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),
)
"const long tkey[] = {%s};" % bigdump(tkey),
get_travel(travel),
)
@@
-687,7
+733,9
@@
if __name__ == "__main__":
len(db["classes"])-1,
len(db["obituaries"]),
len(db["turn_thresholds"]),
len(db["classes"])-1,
len(db["obituaries"]),
len(db["turn_thresholds"]),
+ len(db["motions"]),
len(db["actions"]),
len(db["actions"]),
+ len(db["specials"]),
len(travel),
len(tkey),
get_refs(db["arbitrary_messages"]),
len(travel),
len(tkey),
get_refs(db["arbitrary_messages"]),
@@
-695,6
+743,7
@@
if __name__ == "__main__":
get_refs(db["objects"]),
get_refs(db["motions"]),
get_refs(db["actions"]),
get_refs(db["objects"]),
get_refs(db["motions"]),
get_refs(db["actions"]),
+ get_refs(db["specials"]),
statedefines,
)
statedefines,
)