home · contact · privacy
Make thing dropping directional.
[plomrogue2] / rogue_chat_curses.py
index 2783e24087afdc38666504daa59124f0d74c682d..657523fbcf3257aca52daaa749a8ad880ed8906f 100755 (executable)
@@ -14,77 +14,116 @@ from plomrogue.errors import BrokenSocketConnection, ArgError
 mode_helps = {
     'play': {
         'short': 'play',
+        'intro': '',
         'long': 'This mode allows you to interact with the map in various ways.'
     },
     'study': {
         'short': 'study',
+        'intro': '',
         'long': 'This mode allows you to study the map and its tiles in detail.  Move the question mark over a tile, and the right half of the screen will show detailed information on it.  Toggle the map view to show or hide different information layers.'},
     'edit': {
         'short': 'world edit',
+        'intro': '',
         'long': 'This mode allows you to change the game world in various ways.  Individual map tiles can be protected by "protection characters", which you can see by toggling into the protections map view.  You can edit a tile if you set the world edit password that matches its protection character.  The character "." marks the absence of protection:  Such tiles can always be edited.'
     },
     'name_thing': {
         'short': 'name thing',
+        'intro': '',
         'long': 'Give name to/change name of thing here.'
     },
+    'command_thing': {
+        'short': 'command thing',
+        'intro': '',
+        'long': 'Enter a command to the thing you carry.  Enter nothing to return to play mode.'
+    },
+    'take_thing': {
+        'short': 'take thing',
+        'intro': 'Pick up a thing in reach by entering its index number.  Enter nothing to abort.',
+        'long': 'You see a list of things which you could pick up.  Enter the target thing\'s index, or, to leave, nothing.'
+    },
+    'drop_thing': {
+        'short': 'drop thing',
+        'intro': 'Enter number of direction to which you want to drop thing.',
+        'long': 'Drop currently carried thing by entering the target direction index.  Enter nothing to return to play mode..'
+    },
     'admin_thing_protect': {
         'short': 'change thing protection',
+        'intro': '@ enter thing protection character:',
         'long': 'Change protection character for thing here.'
     },
+    'enter_face': {
+        'short': 'enter your face',
+        'intro': '@ enter face line (enter nothing to abort):',
+        'long': 'Draw your face as ASCII art.  The string you enter must be 18 characters long, and will be divided on display into 3 lines of 6 characters each, from top to bottom..'
+    },
     'write': {
         'short': 'change terrain',
+        'intro': '',
         'long': 'This mode allows you to change the map tile you currently stand on (if your world editing password authorizes you so).  Just enter any printable ASCII character to imprint it on the ground below you.'
     },
     'control_pw_type': {
         'short': 'change protection character password',
+        'intro': '@ enter protection character for which you want to change the password:',
         'long': 'This mode is the first of two steps to change the password for a protection character.  First enter the protection character for which you want to change the password.'
     },
     'control_pw_pw': {
         'short': 'change protection character password',
+        'intro': '',
         'long': 'This mode is the second of two steps to change the password for a protection character.  Enter the new password for the protection character you chose.'
     },
     'control_tile_type': {
         'short': 'change tiles protection',
+        'intro': '@ enter protection character which you want to draw:',
         'long': 'This mode is the first of two steps to change tile protection areas on the map.  First enter the tile protection character you want to write.'
     },
     'control_tile_draw': {
         'short': 'change tiles protection',
+        'intro': '',
         'long': 'This mode is the second of two steps to change tile protection areas on the map.  Toggle tile protection drawing on/off and move the ?? cursor around the map to draw the selected protection character.'
     },
     'annotate': {
         'short': 'annotate tile',
+        'intro': '',
         'long': 'This mode allows you to add/edit a comment on the tile you are currently standing on (provided your world editing password authorizes you so).  Hit Return to leave.'
     },
     'portal': {
         'short': 'edit portal',
+        'intro': '',
         'long': 'This mode allows you to imprint/edit/remove a teleportation target on the ground you are currently standing on (provided your world editing password authorizes you so).  Enter or edit a URL to imprint a teleportation target; enter emptiness to remove a pre-existing teleportation target.  Hit Return to leave.'
     },
     'chat': {
         'short': 'chat',
-        'long': 'This mode allows you to engage in chit-chat with other users.  Any line you enter into the input prompt that does not start with a "/" will be sent out to nearby players – but barriers and distance will reduce what they can read, so stand close to them to ensure they get your message.  Lines that start with a "/" are used for commands like:'
+        'intro': '',
+        'long': 'This mode allows you to engage in chit-chat with other users.  Any line you enter into the input prompt that does not start with a "/" will be sent out to nearby players – but barriers and distance will reduce what they can read, so stand close to them to ensure they get your message.  Lines that start with a "/" are used for commands like:\n\n/nick NAME – re-name yourself to NAME'
     },
     'login': {
         'short': 'login',
+        'intro': '',
         'long': 'Enter your player name.'
     },
     'waiting_for_server': {
         'short': 'waiting for server response',
+        'intro': '@ waiting for server …',
         'long': 'Waiting for a server response.'
     },
     'post_login_wait': {
         'short': 'waiting for server response',
+        'intro': '',
         'long': 'Waiting for a server response.'
     },
     'password': {
         'short': 'set world edit password',
+        'intro': '',
         'long': 'This mode allows you to change the password that you send to authorize yourself for editing password-protected elements of the world.  Hit return to confirm and leave.'
     },
     'admin_enter': {
         'short': 'become admin',
+        'intro': '@ enter admin password:',
         'long': 'This mode allows you to become admin if you know an admin password.'
     },
     'admin': {
         'short': 'admin',
+        'intro': '',
         'long': 'This mode allows you access to actions limited to administrators.'
     }
 }
@@ -130,12 +169,12 @@ class PlomSocketClient(PlomSocket):
             pass  # we assume socket will be known as dead by now
 
 def cmd_TURN(game, n):
-    game.info_db = {}
-    game.info_hints = []
+    game.annotations = {}
     game.turn = n
     game.things = []
     game.portals = {}
     game.turn_complete = False
+    game.fov = ''
 cmd_TURN.argtypes = 'int:nonneg'
 
 def cmd_LOGIN_OK(game):
@@ -151,6 +190,11 @@ def cmd_ADMIN_OK(game):
     game.tui.do_refresh = True
 cmd_ADMIN_OK.argtypes = ''
 
+def cmd_REPLY(game, msg):
+    game.tui.log_msg('#MUSICPLAYER: ' + msg)
+    game.tui.do_refresh = True
+cmd_REPLY.argtypes = 'string'
+
 def cmd_CHAT(game, msg):
     game.tui.log_msg('# ' + msg)
     game.tui.do_refresh = True
@@ -160,7 +204,7 @@ def cmd_PLAYER_ID(game, player_id):
     game.player_id = player_id
 cmd_PLAYER_ID.argtypes = 'int:nonneg'
 
-def cmd_THING(game, yx, thing_type, protection, thing_id):
+def cmd_THING(game, yx, thing_type, protection, thing_id, portable, commandable):
     t = game.get_thing(thing_id)
     if not t:
         t = ThingBase(game, thing_id)
@@ -168,19 +212,29 @@ def cmd_THING(game, yx, thing_type, protection, thing_id):
     t.position = yx
     t.type_ = thing_type
     t.protection = protection
-cmd_THING.argtypes = 'yx_tuple:nonneg string:thing_type char int:nonneg'
+    t.portable = portable
+    t.commandable = commandable
+cmd_THING.argtypes = 'yx_tuple:nonneg string:thing_type char int:nonneg bool bool'
 
 def cmd_THING_NAME(game, thing_id, name):
     t = game.get_thing(thing_id)
-    if t:
-        t.name = name
-cmd_THING_NAME.argtypes = 'int:nonneg string'
+    t.name = name
+cmd_THING_NAME.argtypes = 'int:pos string'
+
+def cmd_THING_FACE(game, thing_id, face):
+    t = game.get_thing(thing_id)
+    t.face = face
+cmd_THING_FACE.argtypes = 'int:pos string'
+
+def cmd_THING_HAT(game, thing_id, hat):
+    t = game.get_thing(thing_id)
+    t.hat = hat
+cmd_THING_HAT.argtypes = 'int:pos string'
 
 def cmd_THING_CHAR(game, thing_id, c):
     t = game.get_thing(thing_id)
-    if t:
-        t.thing_char = c
-cmd_THING_CHAR.argtypes = 'int:nonneg char'
+    t.thing_char = c
+cmd_THING_CHAR.argtypes = 'int:pos char'
 
 def cmd_MAP(game, geometry, size, content):
     map_geometry_class = globals()['MapGeometry' + geometry]
@@ -215,10 +269,9 @@ cmd_MAP_CONTROL.argtypes = 'string'
 def cmd_GAME_STATE_COMPLETE(game):
     if game.tui.mode.name == 'post_login_wait':
         game.tui.switch_mode('play')
-    if game.tui.mode.shows_info:
-        game.tui.query_info()
     game.turn_complete = True
     game.tui.do_refresh = True
+    game.tui.info_cached = None
 cmd_GAME_STATE_COMPLETE.argtypes = ''
 
 def cmd_PORTAL(game, position, msg):
@@ -241,12 +294,8 @@ def cmd_ARGUMENT_ERROR(game, msg):
     game.tui.do_refresh = True
 cmd_ARGUMENT_ERROR.argtypes = 'string'
 
-def cmd_ANNOTATION_HINT(game, position):
-    game.info_hints += [position]
-cmd_ANNOTATION_HINT.argtypes = 'yx_tuple:nonneg'
-
 def cmd_ANNOTATION(game, position, msg):
-    game.info_db[position] = msg
+    game.annotations[position] = msg
     if game.tui.mode.shows_info:
         game.tui.do_refresh = True
 cmd_ANNOTATION.argtypes = 'yx_tuple:nonneg string'
@@ -254,12 +303,23 @@ cmd_ANNOTATION.argtypes = 'yx_tuple:nonneg string'
 def cmd_TASKS(game, tasks_comma_separated):
     game.tasks = tasks_comma_separated.split(',')
     game.tui.mode_write.legal = 'WRITE' in game.tasks
+    game.tui.mode_command_thing.legal = 'COMMAND' in game.tasks
+    game.tui.mode_take_thing.legal = 'PICK_UP' in game.tasks
+    game.tui.mode_drop_thing.legal = 'DROP' in game.tasks
 cmd_TASKS.argtypes = 'string'
 
 def cmd_THING_TYPE(game, thing_type, symbol_hint):
     game.thing_types[thing_type] = symbol_hint
 cmd_THING_TYPE.argtypes = 'string char'
 
+def cmd_THING_INSTALLED(game, thing_id):
+    game.get_thing(thing_id).installed = True
+cmd_THING_INSTALLED.argtypes = 'int:pos'
+
+def cmd_THING_CARRYING(game, thing_id, carried_id):
+    game.get_thing(thing_id).carrying = game.get_thing(carried_id)
+cmd_THING_CARRYING.argtypes = 'int:pos int:pos'
+
 def cmd_TERRAIN(game, terrain_char, terrain_desc):
     game.terrains[terrain_char] = terrain_desc
 cmd_TERRAIN.argtypes = 'char string'
@@ -287,18 +347,22 @@ class Game(GameBase):
         self.register_command(cmd_ADMIN_OK)
         self.register_command(cmd_PONG)
         self.register_command(cmd_CHAT)
+        self.register_command(cmd_REPLY)
         self.register_command(cmd_PLAYER_ID)
         self.register_command(cmd_TURN)
         self.register_command(cmd_THING)
         self.register_command(cmd_THING_TYPE)
         self.register_command(cmd_THING_NAME)
         self.register_command(cmd_THING_CHAR)
+        self.register_command(cmd_THING_FACE)
+        self.register_command(cmd_THING_HAT)
+        self.register_command(cmd_THING_CARRYING)
+        self.register_command(cmd_THING_INSTALLED)
         self.register_command(cmd_TERRAIN)
         self.register_command(cmd_MAP)
         self.register_command(cmd_MAP_CONTROL)
         self.register_command(cmd_PORTAL)
         self.register_command(cmd_ANNOTATION)
-        self.register_command(cmd_ANNOTATION_HINT)
         self.register_command(cmd_GAME_STATE_COMPLETE)
         self.register_command(cmd_ARGUMENT_ERROR)
         self.register_command(cmd_GAME_ERROR)
@@ -309,8 +373,7 @@ class Game(GameBase):
         self.register_command(cmd_RANDOM_COLORS)
         self.map_content = ''
         self.player_id = -1
-        self.info_db = {}
-        self.info_hints = []
+        self.annotations = {}
         self.portals = {}
         self.terrains = {}
 
@@ -339,6 +402,7 @@ class Mode:
         self.shows_info = shows_info
         self.is_intro = is_intro
         self.help_intro = mode_helps[name]['long']
+        self.intro_msg = mode_helps[name]['intro']
         self.is_single_char_entry = is_single_char_entry
         self.legal = True
 
@@ -385,15 +449,21 @@ class TUI:
     mode_post_login_wait = Mode('post_login_wait', is_intro=True)
     mode_password = Mode('password', has_input_prompt=True)
     mode_name_thing = Mode('name_thing', has_input_prompt=True, shows_info=True)
+    mode_command_thing = Mode('command_thing', has_input_prompt=True)
+    mode_take_thing = Mode('take_thing', has_input_prompt=True)
+    mode_drop_thing = Mode('drop_thing', has_input_prompt=True)
+    mode_enter_face = Mode('enter_face', has_input_prompt=True)
     is_admin = False
     tile_draw = False
 
     def __init__(self, host):
         import os
         import json
-        self.mode_play.available_modes = ["chat", "study", "edit", "admin_enter"]
-        self.mode_play.available_actions = ["move", "take_thing", "drop_thing",
-                                            "teleport", "door", "consume"]
+        self.mode_play.available_modes = ["chat", "study", "edit", "admin_enter",
+                                          "command_thing", "take_thing",
+                                          "drop_thing"]
+        self.mode_play.available_actions = ["move", "teleport", "door", "consume",
+                                            "install", "wear"]
         self.mode_study.available_modes = ["chat", "play", "admin_enter", "edit"]
         self.mode_study.available_actions = ["toggle_map_mode", "move_explorer"]
         self.mode_admin.available_modes = ["admin_thing_protect", "control_pw_type",
@@ -405,7 +475,7 @@ class TUI:
                                                          "toggle_tile_draw"]
         self.mode_edit.available_modes = ["write", "annotate", "portal", "name_thing",
                                           "password", "chat", "study", "play",
-                                          "admin_enter"]
+                                          "admin_enter", "enter_face"]
         self.mode_edit.available_actions = ["move", "flatten", "toggle_map_mode"]
         self.mode = None
         self.host = host
@@ -429,16 +499,20 @@ class TUI:
             'switch_to_edit': 'E',
             'switch_to_write': 'm',
             'switch_to_name_thing': 'N',
+            'switch_to_command_thing': 'O',
             'switch_to_admin_enter': 'A',
             'switch_to_control_pw_type': 'C',
             'switch_to_control_tile_type': 'Q',
             'switch_to_admin_thing_protect': 'T',
             'flatten': 'F',
-            'take_thing': 'z',
-            'drop_thing': 'u',
+            'switch_to_enter_face': 'f',
+            'switch_to_take_thing': 'z',
+            'switch_to_drop_thing': 'u',
             'teleport': 'p',
             'consume': 'C',
             'door': 'D',
+            'install': 'I',
+            'wear': 'W',
             'help': 'h',
             'toggle_map_mode': 'L',
             'toggle_tile_draw': 'm',
@@ -522,14 +596,9 @@ class TUI:
         if len(self.log) > 100:
             self.log = self.log[-100:]
 
-    def query_info(self):
-        self.send('GET_ANNOTATION ' + str(self.explorer))
-
     def restore_input_values(self):
-        if self.mode.name == 'annotate' and self.explorer in self.game.info_db:
-            info = self.game.info_db[self.explorer]
-            if info != '(none)':
-                self.input_ = info
+        if self.mode.name == 'annotate' and self.explorer in self.game.annotations:
+            self.input_ = self.game.annotations[self.explorer]
         elif self.mode.name == 'portal' and self.explorer in self.game.portals:
             self.input_ = self.game.portals[self.explorer]
         elif self.mode.name == 'password':
@@ -556,11 +625,19 @@ class TUI:
             self.map_mode = 'terrain only'
 
     def switch_mode(self, mode_name):
+        if self.mode and self.mode.name == 'control_tile_draw':
+            self.log_msg('@ finished tile protection drawing.')
         self.tile_draw = False
+        player = self.game.get_thing(self.game.player_id)
+        if mode_name == 'command_thing' and\
+           (not hasattr(player, 'carrying') or not player.carrying.commandable):
+            self.log_msg('? not carrying anything commandable')
+            self.flash = True
+            self.switch_mode('play')
+            return
         if mode_name == 'admin_enter' and self.is_admin:
             mode_name = 'admin'
         elif mode_name in {'name_thing', 'admin_thing_protect'}:
-            player = self.game.get_thing(self.game.player_id)
             thing = None
             for t in [t for t in self.game.things if t.position == player.position
                       and t.id_ != player.id_]:
@@ -573,8 +650,6 @@ class TUI:
             else:
                 self.thing_selected = thing
         self.mode = getattr(self, 'mode_' + mode_name)
-        if self.mode.name == 'control_tile_draw':
-            self.log_msg('@ finished tile protection drawing.')
         if self.mode.name in {'control_tile_draw', 'control_tile_type',
                               'control_pw_type'}:
             self.map_mode = 'protections'
@@ -583,25 +658,49 @@ class TUI:
         if self.mode.shows_info or self.mode.name == 'control_tile_draw':
             player = self.game.get_thing(self.game.player_id)
             self.explorer = YX(player.position.y, player.position.x)
-            if self.mode.shows_info:
-                self.query_info()
         if self.mode.is_single_char_entry:
             self.show_help = True
-        if self.mode.name == 'waiting_for_server':
-            self.log_msg('@ waiting for server …')
-        elif self.mode.name == 'login':
+        if len(self.mode.intro_msg) > 0:
+            self.log_msg(self.mode.intro_msg)
+        if self.mode.name == 'login':
             if self.login_name:
                 self.send('LOGIN ' + quote(self.login_name))
             else:
                 self.log_msg('@ enter username')
-        elif self.mode.name == 'admin_enter':
-            self.log_msg('@ enter admin password:')
-        elif self.mode.name == 'control_pw_type':
-            self.log_msg('@ enter protection character for which you want to change the password:')
-        elif self.mode.name == 'control_tile_type':
-            self.log_msg('@ enter protection character which you want to draw:')
-        elif self.mode.name == 'admin_thing_protect':
-            self.log_msg('@ enter thing protection character:')
+        elif self.mode.name == 'take_thing':
+            self.log_msg('Portable things in reach for pick-up:')
+            player = self.game.get_thing(self.game.player_id)
+            select_range = [player.position,
+                            player.position + YX(0,-1),
+                            player.position + YX(0, 1),
+                            player.position + YX(-1, 0),
+                            player.position + YX(1, 0)]
+            if type(self.game.map_geometry) == MapGeometryHex:
+                if player.position.y % 2:
+                    select_range += [player.position + YX(-1, 1),
+                                     player.position + YX(1, 1)]
+                else:
+                    select_range += [player.position + YX(-1, -1),
+                                     player.position + YX(1, -1)]
+            self.selectables = [t.id_ for t in self.game.things
+                                if t.portable and t.position in select_range]
+            if len(self.selectables) == 0:
+                self.log_msg('none')
+                self.flash = True
+                self.switch_mode('play')
+                return
+            else:
+                for i in range(len(self.selectables)):
+                    t = self.game.get_thing(self.selectables[i])
+                    self.log_msg(str(i) + ': ' + self.get_thing_info(t))
+        elif self.mode.name == 'drop_thing':
+            self.log_msg('Direction to drop thing to:')
+            self.selectables =\
+                ['HERE'] + list(self.game.tui.movement_keys.values())
+            for i in range(len(self.selectables)):
+                self.log_msg(str(i) + ': ' + self.selectables[i])
+        elif self.mode.name == 'command_thing':
+            self.send('TASK:COMMAND ' + quote('HELP'))
         elif self.mode.name == 'control_pw_pw':
             self.log_msg('@ enter protection password for "%s":' % self.tile_control_char)
         elif self.mode.name == 'control_tile_draw':
@@ -624,6 +723,61 @@ class TUI:
         curses.init_color(2, rand(0), rand(0), rand(0))
         self.do_refresh = True
 
+    def get_info(self):
+        if self.info_cached:
+            return self.info_cached
+        pos_i = self.explorer.y * self.game.map_geometry.size.x + self.explorer.x
+        info_to_cache = ''
+        if len(self.game.fov) > pos_i and self.game.fov[pos_i] != '.':
+            info_to_cache += 'outside field of view'
+        else:
+            for t in self.game.things:
+                if t.position == self.explorer:
+                    info_to_cache += 'THING: %s' % self.get_thing_info(t)
+                    protection = t.protection
+                    if protection == '.':
+                        protection = 'none'
+                    info_to_cache += ' / protection: %s\n' % protection
+                    if hasattr(t, 'hat'):
+                        info_to_cache += t.hat[0:6] + '\n'
+                        info_to_cache += t.hat[6:12] + '\n'
+                        info_to_cache += t.hat[12:18] + '\n'
+                    if hasattr(t, 'face'):
+                        info_to_cache += t.face[0:6] + '\n'
+                        info_to_cache += t.face[6:12] + '\n'
+                        info_to_cache += t.face[12:18] + '\n'
+            terrain_char = self.game.map_content[pos_i]
+            terrain_desc = '?'
+            if terrain_char in self.game.terrains:
+                terrain_desc = self.game.terrains[terrain_char]
+            info_to_cache += 'TERRAIN: "%s" / %s\n' % (terrain_char,
+                                                       terrain_desc)
+            protection = self.game.map_control_content[pos_i]
+            if protection == '.':
+                protection = 'unprotected'
+            info_to_cache += 'PROTECTION: %s\n' % protection
+            if self.explorer in self.game.portals:
+                info_to_cache += 'PORTAL: ' +\
+                    self.game.portals[self.explorer] + '\n'
+            else:
+                info_to_cache += 'PORTAL: (none)\n'
+            if self.explorer in self.game.annotations:
+                info_to_cache += 'ANNOTATION: ' +\
+                    self.game.annotations[self.explorer]
+        self.info_cached = info_to_cache
+        return self.info_cached
+
+    def get_thing_info(self, t):
+        info = '%s / %s' %\
+            (t.type_, self.game.thing_types[t.type_])
+        if hasattr(t, 'thing_char'):
+            info += t.thing_char
+        if hasattr(t, 'name'):
+            info += ' (%s)' % t.name
+        if hasattr(t, 'installed'):
+            info += ' / installed'
+        return info
+
     def loop(self, stdscr):
         import datetime
 
@@ -678,9 +832,8 @@ class TUI:
         def move_explorer(direction):
             target = self.game.map_geometry.move_yx(self.explorer, direction)
             if target:
+                self.info_cached = None
                 self.explorer = target
-                if self.mode.shows_info:
-                    self.query_info()
                 if self.tile_draw:
                     self.send_tile_control_command()
             else:
@@ -699,42 +852,7 @@ class TUI:
                 safe_addstr(max_y - i - 1, self.window_width, lines[i])
 
         def draw_info():
-            if not self.game.turn_complete:
-                return
-            pos_i = self.explorer.y * self.game.map_geometry.size.x + self.explorer.x
-            info = 'MAP VIEW: %s\n' % self.map_mode
-            if self.game.fov[pos_i] != '.':
-                info += 'outside field of view'
-            else:
-                terrain_char = self.game.map_content[pos_i]
-                terrain_desc = '?'
-                if terrain_char in self.game.terrains:
-                    terrain_desc = self.game.terrains[terrain_char]
-                info += 'TERRAIN: "%s" / %s\n' % (terrain_char, terrain_desc)
-                protection = self.game.map_control_content[pos_i]
-                if protection == '.':
-                    protection = 'unprotected'
-                info += 'PROTECTION: %s\n' % protection
-                for t in self.game.things:
-                    if t.position == self.explorer:
-                        protection = t.protection
-                        if protection == '.':
-                            protection = 'none'
-                        info += 'THING: %s / %s' % (t.type_,
-                                                    self.game.thing_types[t.type_])
-                        if hasattr(t, 'thing_char'):
-                            info += t.thing_char
-                        if hasattr(t, 'name'):
-                            info += ' (%s)' % t.name
-                        info += ' / protection: %s\n' % protection
-                if self.explorer in self.game.portals:
-                    info += 'PORTAL: ' + self.game.portals[self.explorer] + '\n'
-                else:
-                    info += 'PORTAL: (none)\n'
-                if self.explorer in self.game.info_db:
-                    info += 'ANNOTATION: ' + self.game.info_db[self.explorer]
-                else:
-                    info += 'ANNOTATION: waiting …'
+            info = 'MAP VIEW: %s\n%s' % (self.map_mode, self.get_info())
             lines = msg_into_lines_of_width(info, self.window_width)
             height_header = 2
             for i in range(len(lines)):
@@ -776,22 +894,30 @@ class TUI:
                         map_lines_split += [[c + ' ' for c
                                              in self.game.map_content[start:end]]]
                 if self.map_mode == 'terrain + annotations':
-                    for p in self.game.info_hints:
+                    for p in self.game.annotations:
                         map_lines_split[p.y][p.x] = 'A '
                 elif self.map_mode == 'terrain + things':
                     for p in self.game.portals.keys():
                         original = map_lines_split[p.y][p.x]
                         map_lines_split[p.y][p.x] = original[0] + 'P'
                     used_positions = []
-                    for t in self.game.things:
+
+                    def draw_thing(t, used_positions):
                         symbol = self.game.thing_types[t.type_]
                         meta_char = ' '
                         if hasattr(t, 'thing_char'):
                             meta_char = t.thing_char
                         if t.position in used_positions:
                             meta_char = '+'
+                        if hasattr(t, 'carrying') and t.carrying:
+                            meta_char = '$'
                         map_lines_split[t.position.y][t.position.x] = symbol + meta_char
                         used_positions += [t.position]
+
+                    for t in [t for t in self.game.things if t.type_ != 'Player']:
+                        draw_thing(t, used_positions)
+                    for t in [t for t in self.game.things if t.type_ == 'Player']:
+                        draw_thing(t, used_positions)
                 player = self.game.get_thing(self.game.player_id)
                 if self.mode.shows_info or self.mode.name == 'control_tile_draw':
                     map_lines_split[self.explorer.y][self.explorer.x] = '??'
@@ -819,7 +945,7 @@ class TUI:
             term_x = max(0, -self.offset.x)
             map_y = max(0, self.offset.y)
             map_x = max(0, self.offset.x)
-            while (term_y < self.size.y and map_y < self.game.map_geometry.size.y):
+            while term_y < self.size.y and map_y < len(self.map_lines):
                 to_draw = self.map_lines[map_y][map_x:self.window_width + self.offset.x]
                 safe_addstr(term_y, term_x, to_draw)
                 term_y += 1
@@ -842,12 +968,6 @@ class TUI:
                         key = self.keys[action]
                     content += '[%s] – %s\n' % (key, action_descriptions[action])
                 content += '\n'
-            if self.mode.name == 'chat':
-                content += '/nick NAME – re-name yourself to NAME\n'
-                content += '/%s or /play – switch to play mode\n' % self.keys['switch_to_play']
-                content += '/%s or /study – switch to study mode\n' % self.keys['switch_to_study']
-                content += '/%s or /edit – switch to world edit mode\n' % self.keys['switch_to_edit']
-                content += '/%s or /admin – switch to admin mode\n' % self.keys['switch_to_admin_enter']
             content += self.mode.list_available_modes(self)
             for i in range(self.size.y):
                 safe_addstr(i,
@@ -880,6 +1000,18 @@ class TUI:
             if self.show_help:
                 draw_help()
 
+        def pick_selectable(task_name):
+            try:
+                i = int(self.input_)
+                if i < 0 or i >= len(self.selectables):
+                    self.log_msg('? invalid index, aborted')
+                else:
+                    self.send('TASK:%s %s' % (task_name, self.selectables[i]))
+            except ValueError:
+                self.log_msg('? invalid index, aborted')
+            self.input_ = ''
+            self.switch_mode('play')
+
         action_descriptions = {
             'move': 'move',
             'flatten': 'flatten surroundings',
@@ -888,6 +1020,8 @@ class TUI:
             'drop_thing': 'drop thing',
             'toggle_map_mode': 'toggle map view',
             'toggle_tile_draw': 'toggle protection character drawing',
+            'install': '(un-)install',
+            'wear': '(un-)wear',
             'door': 'open/close',
             'consume': 'consume',
         }
@@ -897,7 +1031,10 @@ class TUI:
             'take_thing': 'PICK_UP',
             'drop_thing': 'DROP',
             'door': 'DOOR',
+            'install': 'INSTALL',
+            'wear': 'WEAR',
             'move': 'MOVE',
+            'command': 'COMMAND',
             'consume': 'INTOXICATE',
         }
 
@@ -945,6 +1082,12 @@ class TUI:
                 reset_screen_size()
             elif self.mode.has_input_prompt and key == 'KEY_BACKSPACE':
                 self.input_ = self.input_[:-1]
+            elif self.mode.has_input_prompt and key == '\n' and self.input_ == ''\
+                 and self.mode.name in {'chat', 'command_thing', 'take_thing',
+                                        'drop_thing', 'admin_enter'}:
+                if self.mode.name != 'chat':
+                    self.log_msg('@ aborted')
+                self.switch_mode('play')
             elif self.mode.has_input_prompt and key == '\n' and self.input_ == '/help':
                 self.show_help = True
                 self.input_ = ""
@@ -960,6 +1103,20 @@ class TUI:
                 self.login_name = self.input_
                 self.send('LOGIN ' + quote(self.input_))
                 self.input_ = ""
+            elif self.mode.name == 'enter_face' and key == '\n':
+                if len(self.input_) != 18:
+                    self.log_msg('? wrong input length, aborting')
+                else:
+                    self.send('PLAYER_FACE %s' % quote(self.input_))
+                self.input_ = ""
+                self.switch_mode('edit')
+            elif self.mode.name == 'take_thing' and key == '\n':
+                pick_selectable('PICK_UP')
+            elif self.mode.name == 'drop_thing' and key == '\n':
+                pick_selectable('DROP')
+            elif self.mode.name == 'command_thing' and key == '\n':
+                self.send('TASK:COMMAND ' + quote(self.input_))
+                self.input_ = ""
             elif self.mode.name == 'control_pw_pw' and key == '\n':
                 if self.input_ == '':
                     self.log_msg('@ aborted')
@@ -1000,16 +1157,8 @@ class TUI:
             elif self.mode.name == 'chat' and key == '\n':
                 if self.input_ == '':
                     continue
-                if self.input_[0] == '/':  # FIXME fails on empty input
-                    if self.input_ in {'/' + self.keys['switch_to_play'], '/play'}:
-                        self.switch_mode('play')
-                    elif self.input_ in {'/' + self.keys['switch_to_study'], '/study'}:
-                        self.switch_mode('study')
-                    elif self.input_ in {'/' + self.keys['switch_to_edit'], '/edit'}:
-                        self.switch_mode('edit')
-                    elif self.input_ in {'/' + self.keys['switch_to_admin_enter'], '/admin'}:
-                        self.switch_mode('admin_enter')
-                    elif self.input_.startswith('/nick'):
+                if self.input_[0] == '/':
+                    if self.input_.startswith('/nick'):
                         tokens = self.input_.split(maxsplit=1)
                         if len(tokens) == 2:
                             self.send('NICK ' + quote(tokens[1]))
@@ -1049,14 +1198,14 @@ class TUI:
             elif self.mode.name == 'play':
                 if self.mode.mode_switch_on_key(self, key):
                     continue
-                elif key == self.keys['take_thing'] and task_action_on('take_thing'):
-                    self.send('TASK:PICK_UP')
-                elif key == self.keys['drop_thing'] and task_action_on('drop_thing'):
-                    self.send('TASK:DROP')
                 elif key == self.keys['door'] and task_action_on('door'):
                     self.send('TASK:DOOR')
                 elif key == self.keys['consume'] and task_action_on('consume'):
                     self.send('TASK:INTOXICATE')
+                elif key == self.keys['install'] and task_action_on('install'):
+                    self.send('TASK:INSTALL')
+                elif key == self.keys['wear'] and task_action_on('wear'):
+                    self.send('TASK:WEAR')
                 elif key == self.keys['teleport']:
                     player = self.game.get_thing(self.game.player_id)
                     if player.position in self.game.portals: