X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=newdungeon.py;h=df8b19abbfa6303d7984e54c86dcba4181c859b4;hb=1ec3ef3855632d0c0a5ad7624978bccbb079c380;hp=36144744dae6ac31b1e6d819e4ecc713cd125d8f;hpb=64035d00262d3b10c126748be659d22394b7ed3b;p=open-adventure.git diff --git a/newdungeon.py b/newdungeon.py index 3614474..df8b19a 100755 --- a/newdungeon.py +++ b/newdungeon.py @@ -21,6 +21,7 @@ h_template = """/* Generated from adventure.yaml - do not hand-hack! */ typedef struct {{ const char* inventory; + bool is_treasure; const char** longs; const char** sounds; const char** texts; @@ -61,16 +62,16 @@ typedef struct {{ const char* hint; }} hint_t; -extern location_t locations[]; -extern object_description_t object_descriptions[]; -extern const char* arbitrary_messages[]; -extern const class_t classes[]; -extern turn_threshold_t turn_thresholds[]; -extern obituary_t obituaries[]; -extern hint_t hints[]; +extern const location_t locations[]; +extern const object_description_t object_descriptions[]; +extern const const char* arbitrary_messages[]; +extern const const class_t classes[]; +extern const turn_threshold_t turn_thresholds[]; +extern const obituary_t obituaries[]; +extern const hint_t hints[]; extern long conditions[]; -#define LOCSIZ {} +#define NLOCATIONS {} #define NOBJECTS {} #define NHINTS {} #define NCLASSES {} @@ -108,23 +109,23 @@ const class_t classes[] = {{ {} }}; -turn_threshold_t turn_thresholds[] = {{ +const turn_threshold_t turn_thresholds[] = {{ {} }}; -location_t locations[] = {{ +const location_t locations[] = {{ {} }}; -object_description_t object_descriptions[] = {{ +const object_description_t object_descriptions[] = {{ {} }}; -obituary_t obituaries[] = {{ +const obituary_t obituaries[] = {{ {} }}; -hint_t hints[] = {{ +const hint_t hints[] = {{ {} }}; @@ -216,6 +217,7 @@ def get_locations(loc): def get_object_descriptions(obj): template = """ {{ .inventory = {}, + .is_treasure = {}, .longs = (const char* []) {{ {} }}, @@ -263,7 +265,8 @@ def get_object_descriptions(obj): for l_msg in item[1]["texts"]: texts_str += " " * 12 + make_c_string(l_msg) + ",\n" texts_str = texts_str[:-1] # trim trailing newline - obj_str += template.format(i_msg, longs_str, sounds_str, texts_str) + treasure = "true" if item[1].get("treasure") else "false" + obj_str += template.format(i_msg, treasure, longs_str, sounds_str, texts_str) obj_str = obj_str[:-1] # trim trailing newline return obj_str