Abstract out some state arithmetic.

[open-adventure.git] / make_dungeon.py

diff --git a/make_dungeon.py b/make_dungeon.py
index 5618e631c9f34098e7de2fbfa80b5d9d85311b54..576601d675f3ee4142ef37962082e306e1d40c11 100755 (executable)
--- a/make_dungeon.py
+++ b/make_dungeon.py
@@ -144,9 +144,16 @@ typedef struct {{
   const long message;
 }} action_t;
 
+typedef struct {{
+  const string_group_t words;
+  const char* message;
+}} special_t;
+
 typedef struct {{
   const long motion;
+  const long cond;
   const long dest;
+  const bool nodwarves;
   const bool stop;
 }} travelop_t;
 
@@ -155,10 +162,6 @@ 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_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)
 
@@ -172,7 +175,7 @@ extern const hint_t hints[];
 extern long conditions[];
 extern const motion_t motions[];
 extern const action_t actions[];
-extern const action_t specials[];
+extern const special_t specials[];
 extern const travelop_t travel[];
 extern const long tkey[];
 extern const char *ignore;
@@ -263,7 +266,7 @@ const action_t actions[] = {{
 {}
 }};
 
-const action_t specials[] = {{
+const special_t specials[] = {{
 {}
 }};
 
@@ -404,18 +407,15 @@ def get_objects(obj):
         else:
             labels = []
             for l_msg in attr["descriptions"]:
-                if not isinstance(l_msg, str):
-                    labels.append(l_msg)
-                    l_msg = l_msg[1]
                 descriptions_str += " " * 12 + make_c_string(l_msg) + ",\n"
+            for label in attr.get("states", []):
+                labels.append(label)
             descriptions_str = descriptions_str[:-1] # trim trailing newline
             if labels:
                 global statedefines
                 statedefines += "/* States for %s */\n" % item[0]
-                for (i, (label, message)) in enumerate(labels):
-                    if len(message) >= 45:
-                        message = message[:45] + "..."
-                    statedefines += "#define %s\t%d /* %s */\n" % (label, i, message)
+                for (i, label) in enumerate(labels):
+                    statedefines += "#define %s\t%d\n" % (label, i)
                 statedefines += "\n"
         sounds_str = ""
         if attr.get("sounds") == None:
@@ -558,6 +558,35 @@ def get_actions(actions):
     act_str = act_str[:-1] # trim trailing newline
     return act_str
 
+def get_specials(specials):
+    template = """    {{
+        .words = {},
+        .message = {},
+    }},
+"""
+    spc_str = ""
+    for special in specials:
+        contents = special[1]
+
+        if contents["words"] == None:
+            words_str = get_string_group([])
+        else:
+            words_str = get_string_group(contents["words"])
+
+        if contents["message"] == None:
+            message = "NULL"
+        else:
+            message = make_c_string(contents["message"])
+
+        spc_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()
+    spc_str = spc_str[:-1] # trim trailing newline
+    return spc_str
+
 def bigdump(arr):
     out = ""
     for (i, entry) in enumerate(arr):
@@ -597,7 +626,9 @@ def buildtravel(locs, objs):
             raise ValueError
     def cencode(cond, name):
         if cond is None:
-            return 0;
+            return 0
+        elif cond == ["nodwarves"]:
+            return 100
         elif cond[0] == "pct":
             return cond[1]
         elif cond[0] == "carry":
@@ -613,11 +644,12 @@ def buildtravel(locs, objs):
                 sys.stderr.write("dungeon: unknown object name %s in with clause of \n" % (cond[1], name))
                 sys.exit(1)
         elif cond[0] == "not":
-            # FIXME: Allow named as well as numbered states
             try:
                 obj = objnames.index(cond[1])
                 if type(cond[2]) == int:
                     state = cond[2]
+                elif cond[2] in objs[obj][1].get("states", []):
+                    state = objs[obj][1].get("states").index(cond[2])
                 else:
                     for (i, stateclause) in enumerate(objs[obj][1]["descriptions"]):
                         if type(stateclause) == list:
@@ -670,7 +702,7 @@ def buildtravel(locs, objs):
     #
     # 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, False]]
     tkey = [0]
     oldloc = 0
     while ltravel:
@@ -681,22 +713,29 @@ def buildtravel(locs, objs):
             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
+            cond = newloc // 1000
+            travel.append([rule.pop(0),
+                           cond,
+                           newloc % 1000,
+                           cond==100,
+                           False])
+        travel[-1][-1] = True
     return (travel, tkey)
 
 def get_travel(travel):
     template = """    {{
         .motion = {},
+        .cond = {},
         .dest = {},
+        .nodwarves = {},
         .stop = {},
     }},
 """
     out = ""
     for entry in travel:
-        out += template.format(entry[0], entry[1], entry[2]).lower()
+        out += template.format(*entry).lower()
     out = out[:-1] # trim trailing newline
     return out
 
@@ -723,7 +762,7 @@ if __name__ == "__main__":
         get_condbits(db["locations"]),
         get_motions(db["motions"]),
         get_actions(db["actions"]),
-        get_actions(db["specials"]),
+        get_specials(db["specials"]),
         bigdump(tkey),
         get_travel(travel), 
         ignore,