Commit 0e9065c0 authored by Constantin's avatar Constantin

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

Conflicts:
	player.py
parents 7e65c144 a3564202
......@@ -109,13 +109,13 @@ class Labyrinth:
descr = ""
local = list(filter(lambda thing: thing != player, player.field.things))
if local:
descr += "Next to you, "+describeThings(local)+"\n"
descr += "Next to you, "+describeThings(local)+".\n"
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"
elif field.things:
descr += "In the "+direction+", "+describeThings(field.things)+"\n"
descr += "In the "+direction+", "+describeThings(field.things)+".\n"
return descr
def moveThing (self, thing, newField, beforeFinish=None):
......
......@@ -8,6 +8,7 @@ sayVerbs = ['say', 'talk', 'scream', 'whisper']
announceVerbs = ['announce']
leaveVerbs = ['leave', 'quit', 'exit', 'suicide']
grabVerbs = ['grab', 'get', 'investigate', 'examine', 'check']
lookVerbs = ['look']
obstinacyTable = [
"Sorry, you cannot go there",
......@@ -154,6 +155,10 @@ class Player(Thing):
elif verb in leaveVerbs:
self.send("Good Bye!")
self.game.removePlayer(self)
elif verb in lookVerbs:
desc = self.game.labyrinth.getDescription(self)
self.send(desc, end="")
elif verb == self.game.adminPW:
self.send("Welcome to the vault, my son")
self.game.makeAdmin(self)
......
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