From f1b37ea1636d84fb253648b71fb2eca4b2b13ea9 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Sat, 1 Jul 2017 18:56:46 -0400
Subject: [PATCH] Supply missing implementation of nodwarf bit in travel rules.

---
 adventure.yaml  |  3 ++-
 main.c          |  2 +-
 make_dungeon.py | 18 ++++++++++++------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/adventure.yaml b/adventure.yaml
index a30a369..9fcec39 100644
--- a/adventure.yaml
+++ b/adventure.yaml
@@ -56,6 +56,7 @@
 #                      [with, OBJ]    Must be carrying or in room with
 #                      [not, OBJ N]   Property of named OBJ must not be N.
 #                                     N may be numeric or a state label.
+#                      [nodwarves]    Dwarves must skip this rule.
 #    All attributes are optional except the long description and
 #    travel. Order of locations is not significant.
 #
@@ -1244,7 +1245,7 @@ locations: !!omap
     travel: [
       {verbs: ['EAST'], action: [goto, LOC_LONGEAST]},
       {verbs: ['NORTH'], action: [goto, LOC_CROSSOVER]},
-      {verbs: ['SOUTH'], cond: [carry, OBJ_0], action: [goto, LOC_DIFFERENT1]},
+      {verbs: ['SOUTH'], cond: ["nodwarves"], action: [goto, LOC_DIFFERENT1]},
     ]
 - LOC_CROSSOVER:
     description:
diff --git a/main.c b/main.c
index 86e738a..9e08f9f 100644
--- a/main.c
+++ b/main.c
@@ -389,7 +389,7 @@ static bool dwarfmove(void)
                                 game.newloc == game.dloc[i] ||
                                 FORCED(game.newloc) ||
                                 (i == PIRATE && CNDBIT(game.newloc, COND_NOARRR)) ||
-                                T_NODWARVES(travel[kk]));
+                                travel[kk].nodwarves);
                 if (!avoided) {
                     tk[j++] = game.newloc;
                 }
diff --git a/make_dungeon.py b/make_dungeon.py
index bc8751d..c394b5f 100755
--- a/make_dungeon.py
+++ b/make_dungeon.py
@@ -153,6 +153,7 @@ typedef struct {{
   const long motion;
   const long cond;
   const long dest;
+  const bool nodwarves;
   const bool stop;
 }} travelop_t;
 
@@ -161,7 +162,6 @@ typedef struct {{
  * inherited from FORTRAN, someday. To understand these, read the
  * encoding description for travel.
  */
-#define T_NODWARVES(entry)	(T_CONDITION(entry) == 100)
 #define T_TERMINATE(entry)	((entry).motion == 1)
 #define L_SPEAK(loc)		((loc) - 500)
 
@@ -629,7 +629,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":
@@ -645,7 +647,6 @@ 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:
@@ -702,7 +703,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, 0, False]]
+    travel = [[0, 0, 0, False, False]]
     tkey = [0]
     oldloc = 0
     while ltravel:
@@ -715,7 +716,11 @@ def buildtravel(locs, objs):
         elif travel:
             travel[-1][-1] = not travel[-1][-1]
         while rule:
-            travel.append([rule.pop(0), newloc // 1000, newloc % 1000, False])
+            travel.append([rule.pop(0),
+                           newloc // 1000,
+                           newloc % 1000,
+                           (newloc//1000)==100,
+                           False])
         travel[-1][-1] = True
     return (travel, tkey)
 
@@ -724,12 +729,13 @@ def get_travel(travel):
         .motion = {},
         .cond = {},
         .dest = {},
+        .nodwarves = {},
         .stop = {},
     }},
 """
     out = ""
     for entry in travel:
-        out += template.format(entry[0], entry[1], entry[2], entry[3]).lower()
+        out += template.format(*entry).lower()
     out = out[:-1] # trim trailing newline
     return out
 
-- 
2.31.1