Commit 9cc99edf authored by Ralf's avatar Ralf
Browse files

Merge branch 'master' of https://git.hacksaar.de/hacksaar/haxotel

parents 1d1086b4 bd114a25
......@@ -113,7 +113,7 @@ class Labyrinth:
for direction, (dy,dx) in directions.items():
field = player.field.neighbor(dx=dx, dy=dy)
if field is None:
descr += "In the "+direction+", you see a weird kind of void. What could that be? Only time will tell...\n"
descr += "In the "+direction+", there is a very hard wall\n"
elif field.things:
descr += "In the "+direction+", "+describeThings(field.things)+".\n"
if not descr:
......
......@@ -9,7 +9,7 @@ goVerbs = ['go', 'walk', 'run', 'stroll']
sayVerbs = ['say', 'talk', 'scream', 'whisper']
announceVerbs = ['announce']
leaveVerbs = ['leave', 'quit', 'exit', 'suicide']
grabVerbs = ['grab', 'get', 'investigate', 'examine', 'check']
grabVerbs = ['grab', 'get', 'investigate', 'examine', 'check', 'pick', 'pickup']
lookVerbs = ['look']
obstinacyTable = [
......@@ -104,14 +104,11 @@ class Player(Thing):
if not words:
self.send("What did you mean?")
return
try:
words.remove("to")
except ValueError:
pass
try:
words.remove("the")
except ValueError:
pass
for w in ["to","the","up"]:
try:
words.remove(w)
except ValueError:
pass
verb = words[0]
if verb in goVerbs:
direction = words[1:]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment