archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow state labels in not clauses.

Browse source
This commit is contained in:
Eric S. Raymond 2017-06-27 16:54:58 -04:00
parent 6fe8f98b35
commit ed4e6ad422
2 changed files with 31 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

14
newdungeon.py
View file

@ -548,7 +548,19 @@ def buildtravel(locs, objs, voc):
elif cond[0] == "not":
# FIXME: Allow named as well as numbered states
try:
return 300 + objnames.index(cond[1]) + 100 * cond[2]
obj = objnames.index(cond[1])
if type(cond[2]) == int:
state = cond[2]
else:
for (i, stateclause) in enumerate(objs[obj][1]["longs"]):
if type(stateclause) == list:
if stateclause[0] == cond[2]:
state = i
break
else:
sys.stderr.write("dungeon: unmatched state symbol %s in not caluase of %s\n" % (cond[2], name))
sys.exit(0);
return 300 + obj + 100 * state
except ValueError:
sys.stderr.write("dungeon: unknown object name %s in not clause of %s\n" % (cond[1], name))
sys.exit(1)