home · contact · privacy
Fix game state change overwriting input fields.
[plomrogue2] / rogue_chat_curses.py
index 64eaf03959436cc768af00c0b323a7ab66f41259..2adbe3bb8c3e60cd7b08da5bca2ebbe948f78c8f 100755 (executable)
@@ -2,12 +2,84 @@
 import curses
 import queue
 import threading
+import time
+import sys
 from plomrogue.game import GameBase
 from plomrogue.parser import Parser
 from plomrogue.mapping import YX, MapGeometrySquare, MapGeometryHex
 from plomrogue.things import ThingBase
 from plomrogue.misc import quote
-from plomrogue.errors import BrokenSocketConnection
+from plomrogue.errors import BrokenSocketConnection, ArgError
+
+mode_helps = {
+    'play': {
+        'short': 'play',
+        'long': 'This mode allows you to interact with the map in various ways.'
+    },
+    'study': {
+        'short': 'study',
+        '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': 'map edit',
+        'long': 'This mode allows you to change the map 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 map edit password that matches its protection character.  The character "." marks the absence of protection:  Such tiles can always be edited.'
+    },
+    'write': {
+        'short': 'change terrain',
+        'long': '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.'
+    },
+    'control_pw_type': {
+        'short': 'change protection character password',
+        'long': 'This mode is the first of two steps to change the password for a tile protection character.  First enter the tile protection character for which you want to change the password.'
+    },
+    'control_pw_pw': {
+        'short': 'change protection character password',
+        'long': 'This mode is the second of two steps to change the password for a tile protection character.  Enter the new password for the tile protection character you chose.'
+    },
+    'control_tile_type': {
+        'short': 'change tiles protection',
+        'long': 'This mode is the first of two steps to change tile protection areas on the map.  First enter the tile tile protection character you want to write.'
+    },
+    'control_tile_draw': {
+        'short': 'change tiles protection',
+        '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 tile protection character.'
+    },
+    'annotate': {
+        'short': 'annotate tile',
+        'long': '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.'
+    },
+    'portal': {
+        'short': 'edit portal',
+        'long': '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.'
+    },
+    '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:'
+    },
+    'login': {
+        'short': 'login',
+        'long': 'Enter your player name.'
+    },
+    'waiting_for_server': {
+        'short': 'waiting for server response',
+        'long': 'Waiting for a server response.'
+    },
+    'post_login_wait': {
+        'short': 'waiting for server response',
+        'long': 'Waiting for a server response.'
+    },
+    'password': {
+        'short': 'set map edit password',
+        'long': '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.'
+    },
+    'admin_enter': {
+        'short': 'become admin',
+        'long': 'This mode allows you to become admin if you know an admin password.'
+    },
+    'admin': {
+        'short': 'admin',
+        'long': 'This mode allows you access to actions limited to administrators.'
+    }
+}
 
 from ws4py.client import WebSocketBaseClient
 class WebSocketClient(WebSocketBaseClient):
@@ -50,6 +122,8 @@ 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.turn = n
     game.things = []
     game.portals = {}
@@ -62,6 +136,13 @@ def cmd_LOGIN_OK(game):
     game.tui.log_msg('@ welcome')
 cmd_LOGIN_OK.argtypes = ''
 
+def cmd_ADMIN_OK(game):
+    game.tui.is_admin = True
+    game.tui.log_msg('@ you now have admin rights')
+    game.tui.switch_mode('admin')
+    game.tui.do_refresh = True
+cmd_ADMIN_OK.argtypes = ''
+
 def cmd_CHAT(game, msg):
     game.tui.log_msg('# ' + msg)
     game.tui.do_refresh = True
@@ -71,16 +152,27 @@ def cmd_PLAYER_ID(game, player_id):
     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):
-    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'
 
+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)
@@ -103,17 +195,19 @@ def cmd_MAP(game, geometry, size, content):
         }
 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):
-    game.info_db = {}
     if game.tui.mode.name == 'post_login_wait':
         game.tui.switch_mode('play')
-        game.tui.help()
     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 = ''
@@ -123,7 +217,8 @@ def cmd_PORTAL(game, position, 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'
 
@@ -137,6 +232,10 @@ 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
     if game.tui.mode.shows_info:
@@ -145,42 +244,62 @@ 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
 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):
-    thing_type = ThingBase
     turn_complete = False
     tasks = {}
+    thing_types = {}
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.register_command(cmd_LOGIN_OK)
+        self.register_command(cmd_ADMIN_OK)
         self.register_command(cmd_PONG)
         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_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_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_FOV)
         self.map_content = ''
         self.player_id = -1
         self.info_db = {}
+        self.info_hints = []
         self.portals = {}
+        self.terrains = {}
 
     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):
@@ -189,31 +308,78 @@ class Game(GameBase):
         f.argtypes = self.commands[command_name].argtypes
         return f
 
-class TUI:
-
-    class Mode:
+class Mode:
+
+    def __init__(self, name, has_input_prompt=False, shows_info=False,
+                 is_intro=False, is_single_char_entry=False):
+        self.name = name
+        self.short_desc = mode_helps[name]['short']
+        self.available_modes = []
+        self.has_input_prompt = has_input_prompt
+        self.shows_info = shows_info
+        self.is_intro = is_intro
+        self.help_intro = mode_helps[name]['long']
+        self.is_single_char_entry = is_single_char_entry
+        self.legal = True
+
+    def iter_available_modes(self, tui):
+        for mode_name in self.available_modes:
+            mode = getattr(tui, 'mode_' + mode_name)
+            if not mode.legal:
+                continue
+            key = tui.keys['switch_to_' + mode.name]
+            yield mode, key
+
+    def list_available_modes(self, tui):
+        msg = ''
+        if len(self.available_modes) > 0:
+            msg = 'Other modes available from here:\n'
+            for mode, key in self.iter_available_modes(tui):
+                msg += '[%s] – %s\n' % (key, mode.short_desc)
+        return msg
+
+    def mode_switch_on_key(self, tui, key_pressed):
+        for mode, key in self.iter_available_modes(tui):
+            if key_pressed == key:
+                tui.switch_mode(mode.name)
+                return True
+        return False
 
-        def __init__(self, name, has_input_prompt=False, shows_info=False,
-                     is_intro = False):
-            self.name = name
-            self.has_input_prompt = has_input_prompt
-            self.shows_info = shows_info
-            self.is_intro = is_intro
+class TUI:
+    mode_admin_enter = Mode('admin_enter', has_input_prompt=True)
+    mode_admin = Mode('admin')
+    mode_play = Mode('play')
+    mode_study = Mode('study', shows_info=True)
+    mode_write = Mode('write', is_single_char_entry=True)
+    mode_edit = Mode('edit')
+    mode_control_pw_type = Mode('control_pw_type', has_input_prompt=True)
+    mode_control_pw_pw = Mode('control_pw_pw', has_input_prompt=True)
+    mode_control_tile_type = Mode('control_tile_type', has_input_prompt=True)
+    mode_control_tile_draw = Mode('control_tile_draw')
+    mode_annotate = Mode('annotate', has_input_prompt=True, shows_info=True)
+    mode_portal = Mode('portal', has_input_prompt=True, shows_info=True)
+    mode_chat = Mode('chat', has_input_prompt=True)
+    mode_waiting_for_server = Mode('waiting_for_server', is_intro=True)
+    mode_login = Mode('login', has_input_prompt=True, is_intro=True)
+    mode_post_login_wait = Mode('post_login_wait', is_intro=True)
+    mode_password = Mode('password', 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_study.available_modes = ["chat", "play", "admin_enter", "edit"]
+        self.mode_admin.available_modes = ["control_pw_type",
+                                           "control_tile_type", "chat",
+                                           "study", "play", "edit"]
+        self.mode_control_tile_draw.available_modes = ["admin_enter"]
+        self.mode_edit.available_modes = ["write", "annotate", "portal",
+                                          "password", "chat", "study", "play",
+                                          "admin_enter"]
+        self.mode = None
         self.host = host
-        self.mode_play = self.Mode('play')
-        self.mode_study = self.Mode('study', shows_info=True)
-        self.mode_edit = self.Mode('edit')
-        self.mode_annotate = self.Mode('annotate', has_input_prompt=True, shows_info=True)
-        self.mode_portal = self.Mode('portal', has_input_prompt=True, shows_info=True)
-        self.mode_chat = self.Mode('chat', has_input_prompt=True)
-        self.mode_waiting_for_server = self.Mode('waiting_for_server', is_intro=True)
-        self.mode_login = self.Mode('login', has_input_prompt=True, is_intro=True)
-        self.mode_post_login_wait = self.Mode('post_login_wait', is_intro=True)
-        self.mode_teleport = self.Mode('teleport', has_input_prompt=True)
         self.game = Game()
         self.game.tui = self
         self.parser = Parser(self.game)
@@ -221,15 +387,28 @@ class TUI:
         self.do_refresh = True
         self.queue = queue.Queue()
         self.login_name = None
+        self.map_mode = 'terrain + things'
+        self.password = 'foo'
         self.switch_mode('waiting_for_server')
         self.keys = {
             'switch_to_chat': 't',
             'switch_to_play': 'p',
-            'switch_to_annotate': 'm',
-            'switch_to_portal': 'P',
+            'switch_to_password': 'P',
+            'switch_to_annotate': 'M',
+            'switch_to_portal': 'T',
             'switch_to_study': '?',
-            'switch_to_edit': 'm',
+            'switch_to_edit': 'E',
+            'switch_to_write': 'm',
+            'switch_to_admin_enter': 'A',
+            'switch_to_control_pw_type': 'C',
+            'switch_to_control_tile_type': 'Q',
             'flatten': 'F',
+            'take_thing': 'z',
+            'drop_thing': 'u',
+            'teleport': 'p',
+            'help': 'h',
+            'toggle_map_mode': 'L',
+            'toggle_tile_draw': 'm',
             'hex_move_upleft': 'w',
             'hex_move_upright': 'e',
             'hex_move_right': 'd',
@@ -246,10 +425,51 @@ class TUI:
                 keys_conf = json.loads(f.read())
             for k in keys_conf:
                 self.keys[k] = keys_conf[k]
+        self.show_help = False
+        self.disconnected = True
+        self.force_instant_connect = True
+        self.input_lines = []
+        self.fov = ''
+        self.flash = False
         curses.wrapper(self.loop)
 
-    def flash(self):
-        curses.flash()
+    def connect(self):
+
+        def handle_recv(msg):
+            if msg == 'BYE':
+                self.socket.close()
+            else:
+                self.queue.put(msg)
+
+        self.log_msg('@ attempting connect')
+        socket_client_class = PlomSocketClient
+        if self.host.startswith('ws://') or self.host.startswith('wss://'):
+            socket_client_class = WebSocketClient
+        try:
+            self.socket = socket_client_class(handle_recv, self.host)
+            self.socket_thread = threading.Thread(target=self.socket.run)
+            self.socket_thread.start()
+            self.disconnected = False
+            self.game.thing_types = {}
+            self.game.terrains = {}
+            time.sleep(0.1)  # give potential SSL negotation some time …
+            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.disconnected = True
+            self.switch_mode('waiting_for_server')
+        self.do_refresh = True
+
+    def reconnect(self):
+        self.log_msg('@ attempting reconnect')
+        self.send('QUIT')
+        # necessitated by some strange SSL race conditions with ws4py
+        time.sleep(0.1)  # FIXME find out why exactly necessary
+        self.switch_mode('waiting_for_server')
+        self.connect()
 
     def send(self, msg):
         try:
@@ -258,6 +478,8 @@ class TUI:
             self.socket.send(msg)
         except (BrokenPipeError, BrokenSocketConnection):
             self.log_msg('@ server disconnected :(')
+            self.disconnected = True
+            self.force_instant_connect = True
             self.do_refresh = True
 
     def log_msg(self, msg):
@@ -268,11 +490,49 @@ class TUI:
     def query_info(self):
         self.send('GET_ANNOTATION ' + str(self.explorer))
 
-    def switch_mode(self, mode_name, keep_position = False):
+    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
+        elif self.mode.name == 'portal' and self.explorer in self.game.portals:
+            self.input_ = self.game.portals[self.explorer]
+        elif self.mode.name == 'password':
+            self.input_ = self.password
+
+    def send_tile_control_command(self):
+        self.send('SET_TILE_CONTROL %s %s' %
+                  (self.explorer, quote(self.tile_control_char)))
+
+    def toggle_map_mode(self):
+        if self.map_mode == 'terrain only':
+            self.map_mode = 'terrain + annotations'
+        elif self.map_mode == 'terrain + annotations':
+            self.map_mode = 'terrain + things'
+        elif self.map_mode == 'terrain + things':
+            self.map_mode = 'protections'
+        elif self.map_mode == 'protections':
+            self.map_mode = 'terrain only'
+
+    def switch_mode(self, mode_name):
+        self.tile_draw = False
+        if mode_name == 'admin_enter' and self.is_admin:
+            mode_name = 'admin'
         self.mode = getattr(self, 'mode_' + mode_name)
-        if self.mode.shows_info and not keep_position:
-            player = self.game.get_thing(self.game.player_id, False)
+        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'
+        elif self.mode.name != 'edit':
+            self.map_mode = 'terrain + things'
+        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':
@@ -280,42 +540,20 @@ class TUI:
                 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.");
-        elif 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
-        elif self.mode.name == 'portal' and self.explorer in self.game.portals:
-            self.input_ = self.game.portals[self.explorer]
-
-    def help(self):
-        self.log_msg("HELP:");
-        self.log_msg("chat mode commands:");
-        self.log_msg("  /nick NAME - re-name yourself to NAME");
-        self.log_msg("  /msg USER TEXT - send TEXT to USER");
-        self.log_msg("  /help - show this help");
-        self.log_msg("  /%s or /play - switch to play mode" % self.keys['switch_to_play']);
-        self.log_msg("  /%s or /study - switch to study mode" % self.keys['switch_to_study']);
-        self.log_msg("commands common to study and play mode:");
-        if 'MOVE' in self.game.tasks:
-            self.log_msg("  %s - move" % ','.join(self.movement_keys));
-        self.log_msg("  %s - switch to chat mode" % self.keys['switch_to_chat']);
-        self.log_msg("commands specific to play mode:");
-        if 'WRITE' in self.game.tasks:
-            self.log_msg("  %s - write following ASCII character" % self.keys['switch_to_edit']);
-        if 'FLATTEN_SURROUNDINGS' in self.game.tasks:
-            self.log_msg("  %s - flatten surroundings" % self.keys['flatten']);
-        self.log_msg("  %s - switch to study mode" % self.keys['switch_to_study']);
-        self.log_msg("commands specific to study mode:");
-        if 'MOVE' not in self.game.tasks:
-            self.log_msg("  %s - move" % ','.join(self.movement_keys));
-        self.log_msg("  %s - annotate terrain" % self.keys['switch_to_annotate']);
-        self.log_msg("  %s - switch to play mode" % self.keys['switch_to_play']);
+        elif self.mode.name == 'admin_enter':
+            self.log_msg('@ enter admin password:')
+        elif self.mode.name == 'control_pw_type':
+            self.log_msg('@ enter tile protection character for which you want to change the password:')
+        elif self.mode.name == 'control_tile_type':
+            self.log_msg('@ enter tile protection character which you want to draw:')
+        elif self.mode.name == 'control_pw_pw':
+            self.log_msg('@ enter tile protection password for "%s":' % self.tile_control_char)
+        elif self.mode.name == 'control_tile_draw':
+            self.log_msg('@ can draw tile protection character "%s", turn drawing on/off with [%s], finish with [%s].' % (self.tile_control_char, self.keys['toggle_tile_draw'], self.keys['switch_to_admin_enter']))
+        self.input_ = ""
+        self.restore_input_values()
 
     def loop(self, stdscr):
-        import time
         import datetime
 
         def safe_addstr(y, x, line):
@@ -329,38 +567,6 @@ class TUI:
                 stdscr.insstr(y, self.size.x - 2, ' ')
                 stdscr.addstr(y, x, cut)
 
-        def connect():
-
-            def handle_recv(msg):
-                if msg == 'BYE':
-                    self.socket.close()
-                else:
-                    self.queue.put(msg)
-
-            socket_client_class = PlomSocketClient
-            if self.host.startswith('ws://') or self.host.startswith('wss://'):
-                socket_client_class = WebSocketClient
-            while True:
-                try:
-                    self.socket = socket_client_class(handle_recv, self.host)
-                    self.socket_thread = threading.Thread(target=self.socket.run)
-                    self.socket_thread.start()
-                    self.socket.send('TASKS')
-                    self.switch_mode('login')
-                    return
-                except ConnectionRefusedError:
-                    self.log_msg('@ server connect failure, trying again …')
-                    draw_screen()
-                    stdscr.refresh()
-                    time.sleep(1)
-
-        def reconnect():
-            self.send('QUIT')
-            time.sleep(0.1)  # FIXME necessitated by some some strange SSL race
-                             # conditions with ws4py, find out what exactly
-            self.switch_mode('waiting_for_server')
-            connect()
-
         def handle_input(msg):
             command, args = self.parser.parse(msg)
             command(*args)
@@ -374,6 +580,8 @@ class TUI:
                     lines += [chunk]
                     chunk = ''
                     x = 0
+                    if msg[i] == "\n":
+                        x -= 1
                 if msg[i] != "\n":
                     chunk += msg[i]
                 x += 1
@@ -394,12 +602,15 @@ class TUI:
                                                            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()
+                if self.mode.shows_info:
+                    self.query_info()
+                if self.tile_draw:
+                    self.send_tile_control_command()
             else:
-                self.flash()
+                self.flash = True
 
         def draw_history():
             lines = []
@@ -417,18 +628,36 @@ class TUI:
             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'
+            info = 'MAP VIEW: %s\n' % self.map_mode
+            if self.game.fov[pos_i] != '.':
+                info += 'outside field of view'
             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 …'
+                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)):
@@ -449,7 +678,11 @@ class TUI:
             safe_addstr(0, self.window_width, 'TURN: ' + str(self.game.turn))
 
         def draw_mode():
-            safe_addstr(1, self.window_width, 'MODE: ' + self.mode.name)
+            help = "hit [%s] for help" % self.keys['help']
+            if self.mode.has_input_prompt:
+                help = "enter /help for help"
+            safe_addstr(1, self.window_width,
+                        'MODE: %s – %s' % (self.mode.short_desc, help))
 
         def draw_map():
             if not self.game.turn_complete:
@@ -458,25 +691,47 @@ 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
-                map_lines_split += [list(self.game.map_content[start:end])]
-            for t in self.game.things:
-                map_lines_split[t.position.y][t.position.x] = '@'
-            if self.mode.shows_info:
-                map_lines_split[self.explorer.y][self.explorer.x] = '?'
+                if self.map_mode == 'protections':
+                    map_lines_split += [[c + ' ' for c
+                                         in self.game.map_control_content[start:end]]]
+                else:
+                    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:
+                    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:
+                    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]
+            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] = '??'
+            elif self.map_mode != 'terrain + things':
+                map_lines_split[player.position.y][player.position.x] = '??'
             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:
-                    map_lines += [' '.join(line)]
+                    map_lines += [''.join(line)]
             window_center = YX(int(self.size.y / 2),
                                int(self.window_width / 2))
-            player = self.game.get_thing(self.game.player_id, False)
             center = player.position
-            if self.mode.shows_info:
+            if self.mode.shows_info or self.mode.name == 'control_tile_draw':
                 center = self.explorer
             center = YX(center.y, center.x * 2)
             offset = center - window_center
@@ -492,10 +747,61 @@ class TUI:
                 term_y += 1
                 map_y += 1
 
+        def draw_help():
+            content = "%s help\n\n%s\n\n" % (self.mode.short_desc,
+                                             self.mode.help_intro)
+            if self.mode.name == 'play':
+                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] – pick up thing\n" % self.keys['take_thing']
+                if 'DROP' in self.game.tasks:
+                    content += "[%s] – drop thing\n" % self.keys['drop_thing']
+                content += '[%s] – teleport\n' % self.keys['teleport']
+                content += '\n'
+            elif self.mode.name == 'study':
+                content += 'Available actions:\n'
+                content += '[%s] – move question mark\n' % ','.join(self.movement_keys)
+                content += '[%s] – toggle map view\n' % self.keys['toggle_map_mode']
+                content += '\n'
+            elif self.mode.name == 'edit':
+                content += "Available actions:\n"
+                if 'MOVE' in self.game.tasks:
+                    content += "[%s] – move player\n" % ','.join(self.movement_keys)
+                if 'FLATTEN_SURROUNDINGS' in self.game.tasks:
+                    content += "[%s] – flatten surroundings\n" % self.keys['flatten']
+                content += '[%s] – toggle map view\n' % self.keys['toggle_map_mode']
+                content += '\n'
+            elif self.mode.name == 'control_tile_draw':
+                content += "Available actions:\n"
+                content += "[%s] – toggle tile protection drawing\n" % self.keys['toggle_tile_draw']
+                content += '\n'
+            elif 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 map 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,
+                            self.window_width * (not self.mode.has_input_prompt),
+                            ' ' * self.window_width)
+            lines = []
+            for line in content.split('\n'):
+                lines += msg_into_lines_of_width(line, self.window_width)
+            for i in range(len(lines)):
+                if i >= self.size.y:
+                    break
+                safe_addstr(i,
+                            self.window_width * (not self.mode.has_input_prompt),
+                            lines[i])
+
         def draw_screen():
             stdscr.clear()
-            recalc_input_lines()
             if self.mode.has_input_prompt:
+                recalc_input_lines()
                 draw_input()
             if self.mode.shows_info:
                 draw_info()
@@ -505,22 +811,32 @@ class TUI:
             if not self.mode.is_intro:
                 draw_turn()
                 draw_map()
+            if self.show_help:
+                draw_help()
 
         curses.curs_set(False)  # hide cursor
-        curses.use_default_colors();
+        curses.use_default_colors()
         stdscr.timeout(10)
         reset_screen_size()
         self.explorer = YX(0, 0)
         self.input_ = ''
         input_prompt = '> '
-        connect()
-        last_ping = datetime.datetime.now()
-        interval = datetime.timedelta(seconds=30)
+        interval = datetime.timedelta(seconds=5)
+        last_ping = datetime.datetime.now() - interval
         while True:
+            if self.disconnected and self.force_instant_connect:
+                self.force_instant_connect = False
+                self.connect()
             now = datetime.datetime.now()
             if now - last_ping > interval:
-                self.send('PING')
+                if self.disconnected:
+                    self.connect()
+                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
@@ -535,93 +851,139 @@ class TUI:
                 self.do_refresh = True
             except curses.error:
                 continue
+            self.show_help = False
             if key == 'KEY_RESIZE':
                 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_ == '/help':
+                self.show_help = True
+                self.input_ = ""
+                self.restore_input_values()
             elif self.mode.has_input_prompt and key != '\n':  # Return key
                 self.input_ += key
                 max_length = self.window_width * self.size.y - len(input_prompt) - 1
                 if len(self.input_) > max_length:
                     self.input_ = self.input_[:max_length]
-            elif self.mode == self.mode_login and key == '\n':
+            elif key == self.keys['help'] and not self.mode.is_single_char_entry:
+                self.show_help = True
+            elif self.mode.name == 'login' and key == '\n':
                 self.login_name = self.input_
                 self.send('LOGIN ' + quote(self.input_))
                 self.input_ = ""
-            elif self.mode == self.mode_chat and key == '\n':
-                if self.input_[0] == '/':
+            elif self.mode.name == 'control_pw_pw' and key == '\n':
+                if self.input_ == '':
+                    self.log_msg('@ aborted')
+                else:
+                    self.send('SET_MAP_CONTROL_PASSWORD ' + quote(self.tile_control_char) + ' ' + quote(self.input_))
+                    self.log_msg('@ sent new password for protection character "%s"' % self.tile_control_char)
+                self.switch_mode('admin')
+            elif self.mode.name == 'password' and key == '\n':
+                if self.input_ == '':
+                    self.input_ = ' '
+                self.password = self.input_
+                self.switch_mode('edit')
+            elif self.mode.name == 'admin_enter' and key == '\n':
+                self.send('BECOME_ADMIN ' + quote(self.input_))
+                self.switch_mode('play')
+            elif self.mode.name == 'control_pw_type' and key == '\n':
+                if len(self.input_) != 1:
+                    self.log_msg('@ entered non-single-char, therefore aborted')
+                    self.switch_mode('admin')
+                else:
+                    self.tile_control_char = self.input_
+                    self.switch_mode('control_pw_pw')
+            elif self.mode.name == 'control_tile_type' and key == '\n':
+                if len(self.input_) != 1:
+                    self.log_msg('@ entered non-single-char, therefore aborted')
+                    self.switch_mode('admin')
+                else:
+                    self.tile_control_char = self.input_
+                    self.switch_mode('control_tile_draw')
+            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_ == '/help':
-                        self.help()
-                    elif self.input_ == '/reconnect':
-                        reconnect()
+                    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'):
                         tokens = self.input_.split(maxsplit=1)
                         if len(tokens) == 2:
                             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:
                     self.send('ALL ' + quote(self.input_))
                 self.input_ = ""
-            elif self.mode == self.mode_annotate and key == '\n':
+            elif self.mode.name == 'annotate' and key == '\n':
                 if self.input_ == '':
                     self.input_ = ' '
-                self.send('ANNOTATE %s %s' % (self.explorer, quote(self.input_)))
-                self.input_ = ""
-                self.switch_mode('study', keep_position=True)
-            elif self.mode == self.mode_portal and key == '\n':
+                self.send('ANNOTATE %s %s %s' % (self.explorer, quote(self.input_),
+                                                 quote(self.password)))
+                self.switch_mode('edit')
+            elif self.mode.name == 'portal' and key == '\n':
                 if self.input_ == '':
                     self.input_ = ' '
-                self.send('PORTAL %s %s' % (self.explorer, quote(self.input_)))
-                self.input_ = ""
-                self.switch_mode('study', keep_position=True)
-            elif self.mode == self.mode_teleport and key == '\n':
-                if self.input_ == 'YES!':
-                    self.host = self.teleport_target_host
-                    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 key == self.keys['switch_to_play']:
-                    self.switch_mode('play')
-                elif key == self.keys['switch_to_annotate']:
-                    self.switch_mode('annotate', keep_position=True)
-                elif key == self.keys['switch_to_portal']:
-                    self.switch_mode('portal', keep_position=True)
+                self.send('PORTAL %s %s %s' % (self.explorer, quote(self.input_),
+                                               quote(self.password)))
+                self.switch_mode('edit')
+            elif self.mode.name == 'study':
+                if self.mode.mode_switch_on_key(self, key):
+                    continue
+                elif key == self.keys['toggle_map_mode']:
+                    self.toggle_map_mode()
                 elif key in self.movement_keys:
                     move_explorer(self.movement_keys[key])
-            elif self.mode == self.mode_play:
-                if key == self.keys['switch_to_chat']:
-                    self.switch_mode('chat')
-                elif key == self.keys['switch_to_study']:
-                    self.switch_mode('study')
-                if key == self.keys['switch_to_edit'] and\
-                   'WRITE' in self.game.tasks:
-                    self.switch_mode('edit')
+            elif self.mode.name == 'play':
+                if self.mode.mode_switch_on_key(self, key):
+                    continue
+                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.name == 'write':
+                self.send('TASK:WRITE %s %s' % (key, quote(self.password)))
+                self.switch_mode('edit')
+            elif self.mode.name == 'control_tile_draw':
+                if self.mode.mode_switch_on_key(self, key):
+                    continue
+                elif key in self.movement_keys:
+                    move_explorer(self.movement_keys[key])
+                elif key == self.keys['toggle_tile_draw']:
+                    self.tile_draw = False if self.tile_draw else True
+            elif self.mode.name == 'admin':
+                if self.mode.mode_switch_on_key(self, key):
+                    continue
+            elif self.mode.name == 'edit':
+                if self.mode.mode_switch_on_key(self, key):
+                    continue
                 elif key == self.keys['flatten'] and\
-                     'FLATTEN_SURROUNDINGS' in self.game.tasks:
-                    self.send('TASK:FLATTEN_SURROUNDINGS')
+                    'FLATTEN_SURROUNDINGS' in self.game.tasks:
+                    self.send('TASK:FLATTEN_SURROUNDINGS ' + quote(self.password))
+                elif key == self.keys['toggle_map_mode']:
+                    self.toggle_map_mode()
                 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 ' + key)
-                self.switch_mode('play')
 
-TUI('localhost:5000')
+if len(sys.argv) != 2:
+    raise ArgError('wrong number of arguments, need game host')
+host = sys.argv[1]
+TUI(host)