In info view, show protection level.

[plomrogue2] / rogue_chat_curses.py

diff --git a/rogue_chat_curses.py b/rogue_chat_curses.py
index 203f3eaefec758c879b3b7bc9edc451f2e385113..99a7e88bc94b0f0bccf81c0bd3228335226765fe 100755 (executable)
--- a/rogue_chat_curses.py
+++ b/rogue_chat_curses.py
@@ -51,6 +51,8 @@ class PlomSocketClient(PlomSocket):
             pass  # we assume socket will be known as dead by now
 
 def cmd_TURN(game, n):
             pass  # we assume socket will be known as dead by now
 
 def cmd_TURN(game, n):

+    game.info_db = {}
+    game.info_hints = []

     game.turn = n
     game.things = []
     game.portals = {}
     game.turn = n
     game.things = []
     game.portals = {}


@@ -72,16 +74,27 @@ def cmd_PLAYER_ID(game, player_id):
     game.player_id = player_id
 cmd_PLAYER_ID.argtypes = 'int:nonneg'
 
     game.player_id = player_id
 cmd_PLAYER_ID.argtypes = 'int:nonneg'
 

-def cmd_THING_POS(game, thing_id, position):
-    t = game.get_thing(thing_id, True)
-    t.position = position
-cmd_THING_POS.argtypes = 'int:nonneg yx_tuple:nonneg'
+def cmd_THING(game, yx, thing_type, thing_id):
+    t = game.get_thing(thing_id)
+    if not t:
+        t = ThingBase(game, thing_id)
+        game.things += [t]
+    t.position = yx
+    t.type_ = thing_type
+cmd_THING.argtypes = 'yx_tuple:nonneg string:thing_type int:nonneg'

 
 def cmd_THING_NAME(game, thing_id, name):
 
 def cmd_THING_NAME(game, thing_id, name):

-    t = game.get_thing(thing_id, True)
-    t.name = name
+    t = game.get_thing(thing_id)
+    if t:
+        t.name = name

 cmd_THING_NAME.argtypes = 'int:nonneg string'
 
 cmd_THING_NAME.argtypes = 'int:nonneg string'
 

+def cmd_THING_CHAR(game, thing_id, c):
+    t = game.get_thing(thing_id)
+    if t:
+        t.player_char = c
+cmd_THING_CHAR.argtypes = 'int:nonneg char'
+

 def cmd_MAP(game, geometry, size, content):
     map_geometry_class = globals()['MapGeometry' + geometry]
     game.map_geometry = map_geometry_class(size)
 def cmd_MAP(game, geometry, size, content):
     map_geometry_class = globals()['MapGeometry' + geometry]
     game.map_geometry = map_geometry_class(size)


@@ -104,20 +117,19 @@ def cmd_MAP(game, geometry, size, content):
         }
 cmd_MAP.argtypes = 'string:map_geometry yx_tuple:pos string'
 
         }
 cmd_MAP.argtypes = 'string:map_geometry yx_tuple:pos string'
 

+def cmd_FOV(game, content):
+    game.fov = content
+cmd_FOV.argtypes = 'string'
+

 def cmd_MAP_CONTROL(game, content):
     game.map_control_content = content
 cmd_MAP_CONTROL.argtypes = 'string'
 
 def cmd_GAME_STATE_COMPLETE(game):
 def cmd_MAP_CONTROL(game, content):
     game.map_control_content = content
 cmd_MAP_CONTROL.argtypes = 'string'
 
 def cmd_GAME_STATE_COMPLETE(game):

-    game.info_db = {}

     if game.tui.mode.name == 'post_login_wait':
         game.tui.switch_mode('play')
     if game.tui.mode.shows_info:
         game.tui.query_info()
     if game.tui.mode.name == 'post_login_wait':
         game.tui.switch_mode('play')
     if game.tui.mode.shows_info:
         game.tui.query_info()

-    player = game.get_thing(game.player_id, False)
-    if player.position in game.portals:
-        game.tui.teleport_target_host = game.portals[player.position]
-        game.tui.switch_mode('teleport')

     game.turn_complete = True
     game.tui.do_refresh = True
 cmd_GAME_STATE_COMPLETE.argtypes = ''
     game.turn_complete = True
     game.tui.do_refresh = True
 cmd_GAME_STATE_COMPLETE.argtypes = ''


@@ -127,7 +139,8 @@ def cmd_PORTAL(game, position, msg):
 cmd_PORTAL.argtypes = 'yx_tuple:nonneg string'
 
 def cmd_PLAY_ERROR(game, msg):
 cmd_PORTAL.argtypes = 'yx_tuple:nonneg string'
 
 def cmd_PLAY_ERROR(game, msg):

-    game.tui.flash()
+    game.tui.log_msg('? ' + msg)
+    game.tui.flash = True

     game.tui.do_refresh = True
 cmd_PLAY_ERROR.argtypes = 'string'
 
     game.tui.do_refresh = True
 cmd_PLAY_ERROR.argtypes = 'string'
 


@@ -141,8 +154,13 @@ def cmd_ARGUMENT_ERROR(game, msg):
     game.tui.do_refresh = True
 cmd_ARGUMENT_ERROR.argtypes = 'string'
 
     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
 def cmd_ANNOTATION(game, position, msg):
     game.info_db[position] = msg

+    game.tui.restore_input_values()

     if game.tui.mode.shows_info:
         game.tui.do_refresh = True
 cmd_ANNOTATION.argtypes = 'yx_tuple:nonneg string'
     if game.tui.mode.shows_info:
         game.tui.do_refresh = True
 cmd_ANNOTATION.argtypes = 'yx_tuple:nonneg string'


@@ -151,14 +169,22 @@ def cmd_TASKS(game, tasks_comma_separated):
     game.tasks = tasks_comma_separated.split(',')
 cmd_TASKS.argtypes = 'string'
 
     game.tasks = tasks_comma_separated.split(',')
 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_TERRAIN(game, terrain_char, terrain_desc):
+    game.terrains[terrain_char] = terrain_desc
+cmd_TERRAIN.argtypes = 'char string'
+

 def cmd_PONG(game):
     pass
 cmd_PONG.argtypes = ''
 
 class Game(GameBase):
 def cmd_PONG(game):
     pass
 cmd_PONG.argtypes = ''
 
 class Game(GameBase):

-    thing_type = ThingBase

     turn_complete = False
     tasks = {}
     turn_complete = False
     tasks = {}

+    thing_types = {}

 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)


@@ -167,25 +193,34 @@ class Game(GameBase):
         self.register_command(cmd_CHAT)
         self.register_command(cmd_PLAYER_ID)
         self.register_command(cmd_TURN)
         self.register_command(cmd_CHAT)
         self.register_command(cmd_PLAYER_ID)
         self.register_command(cmd_TURN)

-        self.register_command(cmd_THING_POS)
+        self.register_command(cmd_THING)
+        self.register_command(cmd_THING_TYPE)

         self.register_command(cmd_THING_NAME)
         self.register_command(cmd_THING_NAME)

+        self.register_command(cmd_THING_CHAR)
+        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_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)
         self.register_command(cmd_PLAY_ERROR)
         self.register_command(cmd_TASKS)
         self.register_command(cmd_GAME_STATE_COMPLETE)
         self.register_command(cmd_ARGUMENT_ERROR)
         self.register_command(cmd_GAME_ERROR)
         self.register_command(cmd_PLAY_ERROR)
         self.register_command(cmd_TASKS)

+        self.register_command(cmd_FOV)

         self.map_content = ''
         self.player_id = -1
         self.info_db = {}
         self.map_content = ''
         self.player_id = -1
         self.info_db = {}

+        self.info_hints = []

         self.portals = {}
         self.portals = {}

+        self.terrains = {}

 
     def get_string_options(self, string_option_type):
         if string_option_type == 'map_geometry':
             return ['Hex', 'Square']
 
     def get_string_options(self, string_option_type):
         if string_option_type == 'map_geometry':
             return ['Hex', 'Square']

+        elif string_option_type == 'thing_type':
+            return self.thing_types.keys()

         return None
 
     def get_command(self, command_name):
         return None
 
     def get_command(self, command_name):


@@ -215,11 +250,10 @@ class TUI:
         self.mode_edit = self.Mode('edit', 'This mode allows you to change the map tile you currently stand on (if your map editing password authorizes you so).  Just enter any printable ASCII character to imprint it on the ground below you.')
         self.mode_annotate = self.Mode('annotate', 'This mode allows you to add/edit a comment on the tile you are currently standing on (provided your map editing password authorizes you so).  Hit Return to leave.', has_input_prompt=True, shows_info=True)
         self.mode_portal = self.Mode('portal', 'This mode allows you to imprint/edit/remove a teleportation target on the ground you are currently standing on (provided your map 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.', has_input_prompt=True, shows_info=True)
         self.mode_edit = self.Mode('edit', 'This mode allows you to change the map tile you currently stand on (if your map editing password authorizes you so).  Just enter any printable ASCII character to imprint it on the ground below you.')
         self.mode_annotate = self.Mode('annotate', 'This mode allows you to add/edit a comment on the tile you are currently standing on (provided your map editing password authorizes you so).  Hit Return to leave.', has_input_prompt=True, shows_info=True)
         self.mode_portal = self.Mode('portal', 'This mode allows you to imprint/edit/remove a teleportation target on the ground you are currently standing on (provided your map 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.', has_input_prompt=True, shows_info=True)

-        self.mode_chat = self.Mode('chat', '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 to all users.  Lines that start with a "/" are used for commands like:', has_input_prompt=True)
+        self.mode_chat = self.Mode('chat', '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:', has_input_prompt=True)

         self.mode_waiting_for_server = self.Mode('waiting_for_server', 'Waiting for a server response.', is_intro=True)
         self.mode_login = self.Mode('login', 'Pick your player name.', has_input_prompt=True, is_intro=True)
         self.mode_post_login_wait = self.Mode('post_login_wait', 'Waiting for a server response.', is_intro=True)
         self.mode_waiting_for_server = self.Mode('waiting_for_server', 'Waiting for a server response.', is_intro=True)
         self.mode_login = self.Mode('login', 'Pick your player name.', has_input_prompt=True, is_intro=True)
         self.mode_post_login_wait = self.Mode('post_login_wait', 'Waiting for a server response.', is_intro=True)

-        self.mode_teleport = self.Mode('teleport', 'Follow the instructions to re-connect and log-in to another server, or enter anything else to abort.', has_input_prompt=True)

         self.mode_password = self.Mode('password', 'This mode allows you to change the password that you send to authorize yourself for editing password-protected map tiles.  Hit return to confirm and leave.', has_input_prompt=True)
         self.game = Game()
         self.game.tui = self
         self.mode_password = self.Mode('password', 'This mode allows you to change the password that you send to authorize yourself for editing password-protected map tiles.  Hit return to confirm and leave.', has_input_prompt=True)
         self.game = Game()
         self.game.tui = self


@@ -240,6 +274,9 @@ class TUI:
             'switch_to_study': '?',
             'switch_to_edit': 'm',
             'flatten': 'F',
             'switch_to_study': '?',
             'switch_to_edit': 'm',
             'flatten': 'F',

+            'take_thing': 'z',
+            'drop_thing': 'u',
+            'teleport': 'p',

             'toggle_map_mode': 'M',
             'hex_move_upleft': 'w',
             'hex_move_upright': 'e',
             'toggle_map_mode': 'M',
             'hex_move_upleft': 'w',
             'hex_move_upright': 'e',


@@ -261,11 +298,10 @@ class TUI:
         self.disconnected = True
         self.force_instant_connect = True
         self.input_lines = []
         self.disconnected = True
         self.force_instant_connect = True
         self.input_lines = []

+        self.fov = ''
+        self.flash = False

         curses.wrapper(self.loop)
 
         curses.wrapper(self.loop)
 

-    def flash(self):
-        curses.flash()
-

     def connect(self):
 
         def handle_recv(msg):
     def connect(self):
 
         def handle_recv(msg):


@@ -283,7 +319,11 @@ class TUI:
             self.socket_thread = threading.Thread(target=self.socket.run)
             self.socket_thread.start()
             self.disconnected = False
             self.socket_thread = threading.Thread(target=self.socket.run)
             self.socket_thread.start()
             self.disconnected = False

+            self.game.thing_types = {}
+            self.game.terrains = {}

             self.socket.send('TASKS')
             self.socket.send('TASKS')

+            self.socket.send('TERRAINS')
+            self.socket.send('THING_TYPES')

             self.switch_mode('login')
         except ConnectionRefusedError:
             self.log_msg('@ server connect failure')
             self.switch_mode('login')
         except ConnectionRefusedError:
             self.log_msg('@ server connect failure')


@@ -332,8 +372,9 @@ class TUI:
         self.map_mode = 'terrain'
         self.mode = getattr(self, 'mode_' + mode_name)
         if self.mode.shows_info:
         self.map_mode = 'terrain'
         self.mode = getattr(self, 'mode_' + mode_name)
         if self.mode.shows_info:

-            player = self.game.get_thing(self.game.player_id, False)
+            player = self.game.get_thing(self.game.player_id)

             self.explorer = YX(player.position.y, player.position.x)
             self.explorer = YX(player.position.y, player.position.x)

+            self.query_info()

         if self.mode.name == 'waiting_for_server':
             self.log_msg('@ waiting for server …')
         if self.mode.name == 'edit':
         if self.mode.name == 'waiting_for_server':
             self.log_msg('@ waiting for server …')
         if self.mode.name == 'edit':


@@ -343,9 +384,6 @@ class TUI:
                 self.send('LOGIN ' + quote(self.login_name))
             else:
                 self.log_msg('@ enter username')
                 self.send('LOGIN ' + quote(self.login_name))
             else:
                 self.log_msg('@ enter username')

-        elif self.mode.name == 'teleport':
-            self.log_msg("@ May teleport to %s" % (self.teleport_target_host)),
-            self.log_msg("@ Enter 'YES!' to enthusiastically affirm.");

         self.restore_input_values()
 
     def loop(self, stdscr):
         self.restore_input_values()
 
     def loop(self, stdscr):


@@ -395,12 +433,12 @@ class TUI:
                                                            self.window_width)
 
         def move_explorer(direction):
                                                            self.window_width)
 
         def move_explorer(direction):

-            target = self.game.map_geometry.move(self.explorer, direction)
+            target = self.game.map_geometry.move_yx(self.explorer, direction)

             if target:
                 self.explorer = target
                 self.query_info()
             else:
             if target:
                 self.explorer = target
                 self.query_info()
             else:

-                self.flash()
+                self.flash = True

 
         def draw_history():
             lines = []
 
         def draw_history():
             lines = []


@@ -418,18 +456,34 @@ class TUI:
             if not self.game.turn_complete:
                 return
             pos_i = self.explorer.y * self.game.map_geometry.size.x + self.explorer.x
             if not self.game.turn_complete:
                 return
             pos_i = self.explorer.y * self.game.map_geometry.size.x + self.explorer.x

-            info = 'TERRAIN: %s\n' % self.game.map_content[pos_i]
-            for t in self.game.things:
-                if t.position == self.explorer:
-                    info += 'PLAYER @: %s\n' % t.name
-            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 = 'outside field of view'
+            if self.game.fov[pos_i] == '.':
+                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:
+                        info += 'THING: %s / %s' % (t.type_,
+                                                    self.game.thing_types[t.type_])
+                        if hasattr(t, 'player_char'):
+                            info += t.player_char
+                        if hasattr(t, 'name'):
+                            info += ' (%s)' % t.name
+                        info += '\n'
+                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 …'

             lines = msg_into_lines_of_width(info, self.window_width)
             height_header = 2
             for i in range(len(lines)):
             lines = msg_into_lines_of_width(info, self.window_width)
             height_header = 2
             for i in range(len(lines)):


@@ -465,24 +519,37 @@ class TUI:
             for y in range(self.game.map_geometry.size.y):
                 start = self.game.map_geometry.size.x * y
                 end = start + self.game.map_geometry.size.x
             for y in range(self.game.map_geometry.size.y):
                 start = self.game.map_geometry.size.x * y
                 end = start + self.game.map_geometry.size.x

-                map_lines_split += [list(map_content[start:end])]
-            if self.map_mode == 'terrain':
+                map_lines_split += [[c + ' ' for c in map_content[start:end]]]
+            if self.map_mode == 'annotations':
+                for p in self.game.info_hints:
+                    map_lines_split[p.y][p.x] = 'A '
+            elif self.map_mode == 'terrain':
+                for p in self.game.portals.keys():
+                    map_lines_split[p.y][p.x] = 'P '
+                used_positions = []

                 for t in self.game.things:
                 for t in self.game.things:

-                    map_lines_split[t.position.y][t.position.x] = '@'
+                    symbol = self.game.thing_types[t.type_]
+                    meta_char = ' '
+                    if hasattr(t, 'player_char'):
+                        meta_char = t.player_char
+                    if t.position in used_positions:
+                        meta_char = '+'
+                    map_lines_split[t.position.y][t.position.x] = symbol + meta_char
+                    used_positions += [t.position]

             if self.mode.shows_info:
             if self.mode.shows_info:

-                map_lines_split[self.explorer.y][self.explorer.x] = '?'
+                map_lines_split[self.explorer.y][self.explorer.x] = '??'

             map_lines = []
             if type(self.game.map_geometry) == MapGeometryHex:
                 indent = 0
                 for line in map_lines_split:
             map_lines = []
             if type(self.game.map_geometry) == MapGeometryHex:
                 indent = 0
                 for line in map_lines_split:

-                    map_lines += [indent*' ' + ' '.join(line)]
+                    map_lines += [indent*' ' + ''.join(line)]

                     indent = 0 if indent else 1
             else:
                 for line in map_lines_split:
                     indent = 0 if indent else 1
             else:
                 for line in map_lines_split:

-                    map_lines += [' '.join(line)]
+                    map_lines += [''.join(line)]

             window_center = YX(int(self.size.y / 2),
                                int(self.window_width / 2))
             window_center = YX(int(self.size.y / 2),
                                int(self.window_width / 2))

-            player = self.game.get_thing(self.game.player_id, False)
+            player = self.game.get_thing(self.game.player_id)

             center = player.position
             if self.mode.shows_info:
                 center = self.explorer
             center = player.position
             if self.mode.shows_info:
                 center = self.explorer


@@ -507,8 +574,13 @@ class TUI:
                 content += "Available actions:\n"
                 if 'MOVE' in self.game.tasks:
                     content += "[%s] – move player\n" % ','.join(self.movement_keys)
                 content += "Available actions:\n"
                 if 'MOVE' in self.game.tasks:
                     content += "[%s] – move player\n" % ','.join(self.movement_keys)

+                if 'PICK_UP' in self.game.tasks:
+                    content += "[%s] – take thing under player\n" % self.keys['take_thing']
+                if 'DROP' in self.game.tasks:
+                    content += "[%s] – drop carried thing\n" % self.keys['drop_thing']

                 if 'FLATTEN_SURROUNDINGS' in self.game.tasks:
                     content += "[%s] – flatten player's surroundings\n" % self.keys['flatten']
                 if 'FLATTEN_SURROUNDINGS' in self.game.tasks:
                     content += "[%s] – flatten player's surroundings\n" % self.keys['flatten']

+                content += '[%s] – teleport to other space\n' % self.keys['teleport']

                 content += 'Other modes available from here:\n'
                 content += '[%s] – chat mode\n' % self.keys['switch_to_chat']
                 content += '[%s] – study mode\n' % self.keys['switch_to_study']
                 content += 'Other modes available from here:\n'
                 content += '[%s] – chat mode\n' % self.keys['switch_to_chat']
                 content += '[%s] – study mode\n' % self.keys['switch_to_study']


@@ -519,13 +591,12 @@ class TUI:
             elif self.mode == self.mode_study:
                 content += 'Available actions:\n'
                 content += '[%s] – move question mark\n' % ','.join(self.movement_keys)
             elif self.mode == self.mode_study:
                 content += 'Available actions:\n'
                 content += '[%s] – move question mark\n' % ','.join(self.movement_keys)

-                content += '[%s] – toggle view between terrain, and password protection areas\n' % self.keys['toggle_map_mode']
+                content += '[%s] – toggle view between terrain, annotations, and password protection areas\n' % self.keys['toggle_map_mode']

                 content += '\n\nOther modes available from here:'
                 content += '[%s] – chat mode\n' % self.keys['switch_to_chat']
                 content += '[%s] – play mode\n' % self.keys['switch_to_play']
             elif self.mode == self.mode_chat:
                 content += '/nick NAME – re-name yourself to NAME\n'
                 content += '\n\nOther modes available from here:'
                 content += '[%s] – chat mode\n' % self.keys['switch_to_chat']
                 content += '[%s] – play mode\n' % self.keys['switch_to_play']
             elif self.mode == self.mode_chat:
                 content += '/nick NAME – re-name yourself to NAME\n'

-                content += '/msg USER TEXT – send TEXT to USER\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']
             for i in range(self.size.y):
                 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']
             for i in range(self.size.y):


@@ -578,6 +649,9 @@ class TUI:
                 else:
                     self.send('PING')
                 last_ping = now
                 else:
                     self.send('PING')
                 last_ping = now

+            if self.flash:
+                curses.flash()
+                self.flash = False

             if self.do_refresh:
                 draw_screen()
                 self.do_refresh = False
             if self.do_refresh:
                 draw_screen()
                 self.do_refresh = False


@@ -619,7 +693,9 @@ class TUI:
                 self.input_ = ""
                 self.switch_mode('play')
             elif self.mode == self.mode_chat and key == '\n':
                 self.input_ = ""
                 self.switch_mode('play')
             elif self.mode == self.mode_chat and key == '\n':

-                if self.input_[0] == '/':
+                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'}:
                     if self.input_ in {'/' + self.keys['switch_to_play'], '/play'}:
                         self.switch_mode('play')
                     elif self.input_ in {'/' + self.keys['switch_to_study'], '/study'}:


@@ -630,13 +706,6 @@ class TUI:
                             self.send('NICK ' + quote(tokens[1]))
                         else:
                             self.log_msg('? need login name')
                             self.send('NICK ' + quote(tokens[1]))
                         else:
                             self.log_msg('? need login name')

-                    elif self.input_.startswith('/msg'):
-                        tokens = self.input_.split(maxsplit=2)
-                        if len(tokens) == 3:
-                            self.send('QUERY %s %s' % (quote(tokens[1]),
-                                                              quote(tokens[2])))
-                        else:
-                            self.log_msg('? need message target and message')

                     else:
                         self.log_msg('? unknown command')
                 else:
                     else:
                         self.log_msg('? unknown command')
                 else:


@@ -656,14 +725,6 @@ class TUI:
                                                quote(self.password)))
                 self.input_ = ""
                 self.switch_mode('play')
                                                quote(self.password)))
                 self.input_ = ""
                 self.switch_mode('play')

-            elif self.mode == self.mode_teleport and key == '\n':
-                if self.input_ == 'YES!':
-                    self.host = self.teleport_target_host
-                    self.reconnect()
-                else:
-                    self.log_msg('@ teleport aborted')
-                    self.switch_mode('play')
-                self.input_ = ''

             elif self.mode == self.mode_study:
                 if key == self.keys['switch_to_chat']:
                     self.switch_mode('chat')
             elif self.mode == self.mode_study:
                 if key == self.keys['switch_to_chat']:
                     self.switch_mode('chat')


@@ -671,6 +732,8 @@ class TUI:
                     self.switch_mode('play')
                 elif key == self.keys['toggle_map_mode']:
                     if self.map_mode == 'terrain':
                     self.switch_mode('play')
                 elif key == self.keys['toggle_map_mode']:
                     if self.map_mode == 'terrain':

+                        self.map_mode = 'annotations'
+                    elif self.map_mode == 'annotations':

                         self.map_mode = 'control'
                     else:
                         self.map_mode = 'terrain'
                         self.map_mode = 'control'
                     else:
                         self.map_mode = 'terrain'


@@ -693,10 +756,23 @@ class TUI:
                 elif key == self.keys['flatten'] and\
                      'FLATTEN_SURROUNDINGS' in self.game.tasks:
                     self.send('TASK:FLATTEN_SURROUNDINGS ' + quote(self.password))
                 elif key == self.keys['flatten'] and\
                      'FLATTEN_SURROUNDINGS' in self.game.tasks:
                     self.send('TASK:FLATTEN_SURROUNDINGS ' + quote(self.password))

+                elif key == self.keys['take_thing'] and 'PICK_UP' in self.game.tasks:
+                    self.send('TASK:PICK_UP')
+                elif key == self.keys['drop_thing'] and 'DROP' in self.game.tasks:
+                    self.send('TASK:DROP')
+                elif key == self.keys['teleport']:
+                    player = self.game.get_thing(self.game.player_id)
+                    if player.position in self.game.portals:
+                        self.host = self.game.portals[player.position]
+                        self.reconnect()
+                    else:
+                        self.flash = True
+                        self.log_msg('? not standing on portal')

                 elif key in self.movement_keys and 'MOVE' in self.game.tasks:
                     self.send('TASK:MOVE ' + self.movement_keys[key])
             elif self.mode == self.mode_edit:
                 self.send('TASK:WRITE %s %s' % (key, quote(self.password)))
                 self.switch_mode('play')
 
                 elif key in self.movement_keys and 'MOVE' in self.game.tasks:
                     self.send('TASK:MOVE ' + self.movement_keys[key])
             elif self.mode == self.mode_edit:
                 self.send('TASK:WRITE %s %s' % (key, quote(self.password)))
                 self.switch_mode('play')
 

-TUI('localhost:5000')
+#TUI('localhost:5000')
+TUI('wss://plomlompom.com/rogue_chat/')