Remove actspk[].

diff --git a/adventure.yaml b/adventure.yaml
index bebdc8615e2f730f036f28b9a69dcb90d4908dab..a8af6318fdc50ebedf3e1db7e5c1f57aa7c445f5 100644 (file)
--- a/adventure.yaml
+++ b/adventure.yaml
@@ -340,44 +340,6 @@ vocabulary: [
     {word: "NEWS",  type: special, value: 275},
 ]
 
-actspk: {
-    1: ALREADY_CARRYING,
-    2: ARENT_CARRYING,
-    3: NO_MESSAGE,
-    4: NOT_LOCKABLE,
-    5: NO_MESSAGE,
-    6: NOT_LOCKABLE,
-    7: DONT_UNDERSTAND,
-    8: DONT_UNDERSTAND,
-    9: NOTHING_HAPPENS,
-    10: AM_GAME,
-    11: WHERE_QUERY,
-    12: RIDICULOUS_ATTEMPT,
-    13: ARENT_CARRYING,
-    14: RIDICULOUS_ATTEMPT,
-    15: STREAM_WATER,
-    16: RUB_NOGO,
-    17: ARENT_CARRYING,
-    18: HUH_MAN,
-    19: NEARBY,
-    20: NEARBY,
-    21: NO_EDIBLES,
-    22: CANT_FILL,
-    23: REQUIRES_DYNAMITE,
-    24: HUH_MAN,
-    25: NOT_KNOWHOW,
-    26: ON_WHAT,
-    27: DONT_UNDERSTAND,
-    28: BEYOND_POWER,
-    29: RIDICULOUS_ATTEMPT,
-    30: HUH_MAN,
-    31: HUH_MAN,
-    32: AM_GAME,
-    33: DONT_UNDERSTAND,
-    34: NOTHING_HAPPENS,
-    35: HUH_MAN,
-}
-
 motions: !!omap
 - MOT_0:
     words: !!null

diff --git a/newdungeon.py b/newdungeon.py
index 7f37b36f82b2c2af8dfe46be24ac732244588fe7..b27e5c71db6293ff9aa99b3de2bec10130135513 100755 (executable)
--- a/newdungeon.py
+++ b/newdungeon.py
@@ -105,7 +105,6 @@ extern const turn_threshold_t turn_thresholds[];
 extern const obituary_t obituaries[];
 extern const hint_t hints[];
 extern long conditions[];
-extern const long actspk[];
 extern const motion_t motions[];
 extern const action_t actions[];
 
@@ -181,11 +180,6 @@ long conditions[] = {{
 {}
 }};
 
-const long actspk[] = {{
-    NO_MESSAGE,
-{}
-}};
-
 const motion_t motions[] = {{
 {}
 }};
@@ -412,12 +406,6 @@ def recompose(type_word, value):
         sys.stderr.write("%s is not a known word classifier\n" % attrs["type"])
         sys.exit(1)
 
-def get_actspk(actspk):
-    res = ""
-    for (i, word) in actspk.items():
-        res += "    %s,\n" % word
-    return res
-
 def buildtravel(locs, objs, voc):
     ltravel = []
     lkeys = []
@@ -543,7 +531,6 @@ if __name__ == "__main__":
         get_obituaries(db["obituaries"]),
         get_hints(db["hints"], db["arbitrary_messages"]),
         get_condbits(db["locations"]),
-        get_actspk(db["actspk"]),
         get_motions(db["motions"]),
         get_actions(db["actions"]),
     )
@@ -555,7 +542,7 @@ if __name__ == "__main__":
         len(db["classes"])-1,
         len(db["obituaries"]),
         len(db["turn_thresholds"]),
-        len(db["actspk"]),
+        len(db["actions"]),
         len(travel),
         get_refs(db["arbitrary_messages"]),
         get_refs(db["locations"]),