projects
/
open-adventure.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Localize scope for restore file pointer in main.
[open-adventure.git]
/
make_dungeon.py
diff --git
a/make_dungeon.py
b/make_dungeon.py
index e7e37ae2c6baeaa23177901de65824468e45d0c5..c394b5f516d20c0b4d74017a17b84d12ce1b21d8 100755
(executable)
--- a/
make_dungeon.py
+++ b/
make_dungeon.py
@@
-153,6
+153,7
@@
typedef struct {{
const long motion;
const long cond;
const long dest;
const long motion;
const long cond;
const long dest;
+ const bool nodwarves;
const bool stop;
}} travelop_t;
const bool stop;
}} travelop_t;
@@
-161,9
+162,6
@@
typedef struct {{
* inherited from FORTRAN, someday. To understand these, read the
* encoding description for travel.
*/
* inherited from FORTRAN, someday. To understand these, read the
* encoding description for travel.
*/
-#define T_DESTINATION(entry) (entry).dest
-#define T_CONDITION(entry) (entry).cond
-#define T_NODWARVES(entry) (T_CONDITION(entry) == 100)
#define T_TERMINATE(entry) ((entry).motion == 1)
#define L_SPEAK(loc) ((loc) - 500)
#define T_TERMINATE(entry) ((entry).motion == 1)
#define L_SPEAK(loc) ((loc) - 500)
@@
-631,7
+629,9
@@
def buildtravel(locs, objs):
raise ValueError
def cencode(cond, name):
if cond is None:
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":
elif cond[0] == "pct":
return cond[1]
elif cond[0] == "carry":
@@
-647,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":
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:
try:
obj = objnames.index(cond[1])
if type(cond[2]) == int:
@@
-704,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.
#
# 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:
tkey = [0]
oldloc = 0
while ltravel:
@@
-717,7
+716,11
@@
def buildtravel(locs, objs):
elif travel:
travel[-1][-1] = not travel[-1][-1]
while rule:
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)
travel[-1][-1] = True
return (travel, tkey)
@@
-726,12
+729,13
@@
def get_travel(travel):
.motion = {},
.cond = {},
.dest = {},
.motion = {},
.cond = {},
.dest = {},
+ .nodwarves = {},
.stop = {},
}},
"""
out = ""
for entry in travel:
.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
out = out[:-1] # trim trailing newline
return out