Never write the input prompt to log files.

[open-adventure.git] / make_dungeon.py

diff --git a/make_dungeon.py b/make_dungeon.py
index 6f4715238a5465c7fe51e2cb32563f3063625a67..b893e4b266cf6c8c862d04db450b8fda5ffcdde3 100755 (executable)
--- a/make_dungeon.py
+++ b/make_dungeon.py
@@ -146,6 +146,7 @@ typedef struct {{
 
 typedef struct {{
   const long motion;
+  const long cond;
   const long dest;
   const bool stop;
 }} travelop_t;
@@ -155,10 +156,9 @@ typedef struct {{
  * inherited from FORTRAN, someday. To understand these, read the
  * encoding description for travel.
  */
-#define T_DESTINATION(entry)   MOD((entry).dest, 1000)
-#define T_CONDITION(entry)     ((entry).dest / 1000)
+#define T_DESTINATION(entry)   (entry).dest
+#define T_CONDITION(entry)     (entry).cond
 #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)
 
@@ -175,6 +175,7 @@ extern const action_t actions[];
 extern const action_t specials[];
 extern const travelop_t travel[];
 extern const long tkey[];
+extern const char *ignore;
 
 #define NLOCATIONS     {}
 #define NOBJECTS       {}
@@ -266,12 +267,14 @@ const action_t specials[] = {{
 {}
 }};
 
-{}
+const long tkey[] = {{{}}};
 
 const travelop_t travel[] = {{
 {}
 }};
 
+const char *ignore = \"{}\";
+
 /* end */
 """
 
@@ -506,18 +509,6 @@ def get_condbits(locations):
         cnd_str += "    " + line + ",\t// " + name + "\n"
     return cnd_str
 
-def recompose(type_word, value):
-    "Compose the internal code for a vocabulary word from its YAML entry"
-    parts = ("motion", "action", "object", "special")
-    try:
-        return value + 1000 * parts.index(type_word)
-    except KeyError:
-        sys.stderr.write("dungeon: %s is not a known word\n" % word)
-        sys.exit(1)
-    except IndexError:
-        sys.stderr.write("%s is not a known word classifier\n" % attrs["type"])
-        sys.exit(1)
-
 def get_motions(motions):
     template = """    {{
         .words = {},
@@ -531,6 +522,11 @@ def get_motions(motions):
         else:
             words_str = get_string_group(contents["words"])
         mot_str += template.format(words_str)
+        global ignore
+        if contents.get("oldstyle", True) == False:
+            for word in contents["words"]:
+                if len(word) == 1:
+                    ignore += word.upper()
     return mot_str
 
 def get_actions(actions):
@@ -554,6 +550,11 @@ def get_actions(actions):
             message = contents["message"]
             
         act_str += template.format(words_str, message)
+        global ignore
+        if contents.get("oldstyle", True) == False:
+            for word in contents["words"]:
+                if len(word) == 1:
+                    ignore += word.upper()
     act_str = act_str[:-1] # trim trailing newline
     return act_str
 
@@ -564,16 +565,19 @@ def bigdump(arr):
             if out and out[-1] == ' ':
                 out = out[:-1]
             out += "\n    "
-        out += str(arr[i]) + ", "
+        out += str(arr[i]).lower() + ", "
     out = out[:-2] + "\n"
     return out
 
-def buildtravel(locs, objs, voc):
+def buildtravel(locs, objs):
     ltravel = []
     verbmap = {}
-    for entry in db["vocabulary"]:
-        if entry["type"] == "motion" and entry["value"] not in verbmap:
-            verbmap[entry["word"]] = entry["value"]
+    for i, motion in enumerate(db["motions"]):
+        try:
+            for word in motion[1]["words"]:
+                verbmap[word.upper()] = i
+        except TypeError:
+            pass
     def dencode(action, name):
         "Decode a destination number"
         if action[0] == "goto":
@@ -666,7 +670,7 @@ def buildtravel(locs, objs, voc):
     #
     # In order to de-crypticize the runtime code, we're going to break these
     # magic numbers up into a struct.
-    travel = [[0, 0, False]]
+    travel = [[0, 0, 0, False]]
     tkey = [0]
     oldloc = 0
     while ltravel:
@@ -677,22 +681,23 @@ def buildtravel(locs, objs, voc):
             tkey.append(len(travel))
             oldloc = loc 
         elif travel:
-            travel[-1][2] = not travel[-1][2]
+            travel[-1][-1] = not travel[-1][-1]
         while rule:
-            travel.append([rule.pop(0), newloc, False])
-        travel[-1][2] = True
+            travel.append([rule.pop(0), newloc // 1000, newloc % 1000, False])
+        travel[-1][-1] = True
     return (travel, tkey)
 
 def get_travel(travel):
     template = """    {{
         .motion = {},
+        .cond = {},
         .dest = {},
         .stop = {},
     }},
 """
     out = ""
     for entry in travel:
-        out += template.format(entry[0], entry[1], entry[2]).lower()
+        out += template.format(entry[0], entry[1], entry[2], entry[3]).lower()
     out = out[:-1] # trim trailing newline
     return out
 
@@ -705,9 +710,8 @@ if __name__ == "__main__":
     objnames = [el[0] for el in db["objects"]]
 
     (travel, tkey) = buildtravel(db["locations"],
-                                 db["objects"],
-                                 db["vocabulary"])
-
+                                 db["objects"])
+    ignore = ""
     c = c_template.format(
         h_name,
         get_arbitrary_messages(db["arbitrary_messages"]),
@@ -721,8 +725,9 @@ if __name__ == "__main__":
         get_motions(db["motions"]),
         get_actions(db["actions"]),
         get_actions(db["specials"]),
-        "const long tkey[] = {%s};" % bigdump(tkey),
+        bigdump(tkey),
         get_travel(travel), 
+        ignore,
     )
 
     h = h_template.format(