X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=newdungeon.py;h=136d941f9f9f28de3ff264ab5c337df84d7ec28f;hb=ddb0df85b315cf60c529d0566254beb2c42cab2b;hp=d16dc5608511c5b08df43f988e18d162c8a4573c;hpb=d029b08ad136ceab3a30236f22433022834f0d71;p=open-adventure.git

diff --git a/newdungeon.py b/newdungeon.py
index d16dc56..136d941 100755
--- a/newdungeon.py
+++ b/newdungeon.py
@@ -35,12 +35,26 @@ typedef struct {{
   const char* message;
 }} turn_threshold_t;
 
+typedef struct {{
+  const int threshold;
+  const char* message;
+}} class_t;
+
+typedef struct {{
+  const int number;
+  const int turns;
+  const int penalty;
+  const char* question;
+  const char* hint;
+}} hint_t;
+
 extern location_t locations[];
 extern object_description_t object_descriptions[];
 extern const char* arbitrary_messages[];
-extern const char* class_messages[];
+extern const class_t classes[];
 extern turn_threshold_t turn_thresholds[];
 extern obituary_t obituaries[];
+extern hint_t hints[];
 
 extern size_t CLSSES;
 extern int maximum_deaths;
@@ -50,10 +64,6 @@ enum arbitrary_messages_refs {{
 {}
 }};
 
-enum class_messages_refs {{
-{}
-}};
-
 enum locations_refs {{
 {}
 }};
@@ -69,7 +79,7 @@ const char* arbitrary_messages[] = {{
 {}
 }};
 
-const char* class_messages[] = {{
+const class_t classes[] = {{
 {}
 }};
 
@@ -89,6 +99,10 @@ obituary_t obituaries[] = {{
 {}
 }};
 
+hint_t hints[] = {{
+{}
+}};
+
 size_t CLSSES = {};
 int maximum_deaths = {};
 int turn_threshold_count = {};
@@ -123,20 +137,25 @@ def get_arbitrary_messages(arb):
     return arb_str
 
 def get_class_messages(cls):
-    template = """    {},
+    template = """    {{
+        .threshold = {},
+        .message = {},
+    }},
 """
     cls_str = ""
     for item in cls:
-        cls_str += template.format(make_c_string(item[1]))
+        threshold = item["threshold"]
+        message = make_c_string(item["message"])
+        cls_str += template.format(threshold, message)
     cls_str = cls_str[:-1] # trim trailing newline
-    return cls_str    
+    return cls_str
 
 def get_turn_thresholds(trn):
     template = """    {{
         .threshold = {},
         .point_loss = {},
         .message = {},
-}},
+    }},
 """
     trn_str = ""
     for item in trn:
@@ -199,31 +218,54 @@ def get_obituaries(obit):
     obit_str = obit_str[:-1] # trim trailing newline
     return obit_str
 
-with open(yaml_name, "r") as f:
-    db = yaml.load(f)
-
-h = h_template.format(
-    get_refs(db["arbitrary_messages"]),
-    get_refs(db["class_messages"]),
-    get_refs(db["locations"]),
-    get_refs(db["object_descriptions"]),
-)
-
-c = c_template.format(
-    h_name,
-    get_arbitrary_messages(db["arbitrary_messages"]),
-    get_class_messages(db["class_messages"]),
-    get_turn_thresholds(db["turn_thresholds"]),
-    get_locations(db["locations"]),
-    get_object_descriptions(db["object_descriptions"]),
-    get_obituaries(db["obituaries"]),
-    len(db["class_messages"]),
-    len(db["obituaries"]),
-    len(db["turn_thresholds"]),
-)
-
-with open(h_name, "w") as hf:
-    hf.write(h)
-
-with open(c_name, "w") as cf:
-    cf.write(c)
+def get_hints(hnt, arb):
+    template = """    {{
+        .number = {},
+        .penalty = {},
+        .turns = {},
+        .question = {},
+        .hint = {},
+    }},
+"""
+    hnt_str = ""
+    md = dict(arb)
+    for item in hnt:
+        number = item["number"]
+        penalty = item["penalty"]
+        turns = item["turns"]
+        question = make_c_string(md[item["question"]])
+        hint = make_c_string(md[item["hint"]])
+        hnt_str += template.format(number, penalty, turns, question, hint)
+    hnt_str = hnt_str[:-1] # trim trailing newline
+    return hnt_str
+
+
+if __name__ == "__main__":
+    with open(yaml_name, "r") as f:
+        db = yaml.load(f)
+
+    h = h_template.format(
+        get_refs(db["arbitrary_messages"]),
+        get_refs(db["locations"]),
+        get_refs(db["object_descriptions"]),
+    )
+
+    c = c_template.format(
+        h_name,
+        get_arbitrary_messages(db["arbitrary_messages"]),
+        get_class_messages(db["classes"]),
+        get_turn_thresholds(db["turn_thresholds"]),
+        get_locations(db["locations"]),
+        get_object_descriptions(db["object_descriptions"]),
+        get_obituaries(db["obituaries"]),
+        get_hints(db["hints"], db["arbitrary_messages"]),
+        len(db["classes"]),
+        len(db["obituaries"]),
+        len(db["turn_thresholds"]),
+    )
+
+    with open(h_name, "w") as hf:
+        hf.write(h)
+
+    with open(c_name, "w") as cf:
+        cf.write(c)