Fix game state change overwriting input fields.

[plomrogue2] / rogue_chat_curses.py

diff --git a/rogue_chat_curses.py b/rogue_chat_curses.py
index acd6fa1719fb05a6329aeda2b81924419f65beb4..2adbe3bb8c3e60cd7b08da5bca2ebbe948f78c8f 100755 (executable)
--- a/rogue_chat_curses.py
+++ b/rogue_chat_curses.py
@@ -3,12 +3,83 @@ import curses
 import queue
 import threading
 import time
 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.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):
 
 from ws4py.client import WebSocketBaseClient
 class WebSocketClient(WebSocketBaseClient):


@@ -51,6 +122,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 = {}


@@ -63,6 +136,13 @@ def cmd_LOGIN_OK(game):
     game.tui.log_msg('@ welcome')
 cmd_LOGIN_OK.argtypes = ''
 
     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
 def cmd_CHAT(game, msg):
     game.tui.log_msg('# ' + msg)
     game.tui.do_refresh = True


@@ -72,16 +152,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)


@@ -113,15 +204,10 @@ def cmd_MAP_CONTROL(game, content):
 cmd_MAP_CONTROL.argtypes = 'string'
 
 def cmd_GAME_STATE_COMPLETE(game):
 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 = ''


@@ -131,7 +217,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'
 


@@ -145,6 +232,10 @@ 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
     if game.tui.mode.shows_info:
 def cmd_ANNOTATION(game, position, msg):
     game.info_db[position] = msg
     if game.tui.mode.shows_info:


@@ -153,30 +244,44 @@ cmd_ANNOTATION.argtypes = 'yx_tuple:nonneg string'
 
 def cmd_TASKS(game, tasks_comma_separated):
     game.tasks = tasks_comma_separated.split(',')
 
 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'
 
 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)
         self.register_command(cmd_LOGIN_OK)
 
     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_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_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_GAME_STATE_COMPLETE)
         self.register_command(cmd_ARGUMENT_ERROR)
         self.register_command(cmd_GAME_ERROR)


@@ -186,11 +291,15 @@ class Game(GameBase):
         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):


@@ -199,33 +308,78 @@ class Game(GameBase):
         f.argtypes = self.commands[command_name].argtypes
         return f
 
         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, help_intro, 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
-            self.help_intro = help_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
 
     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.host = host

-        self.mode_play = self.Mode('play', 'This mode allows you to interact with the map.')
-        self.mode_study = self.Mode('study', '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.', 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_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.parser = Parser(self.game)
         self.game = Game()
         self.game.tui = self
         self.parser = Parser(self.game)


@@ -233,7 +387,7 @@ class TUI:
         self.do_refresh = True
         self.queue = queue.Queue()
         self.login_name = None
         self.do_refresh = True
         self.queue = queue.Queue()
         self.login_name = None

-        self.map_mode = 'terrain'
+        self.map_mode = 'terrain + things'

         self.password = 'foo'
         self.switch_mode('waiting_for_server')
         self.keys = {
         self.password = 'foo'
         self.switch_mode('waiting_for_server')
         self.keys = {


@@ -243,9 +397,18 @@ class TUI:
             'switch_to_annotate': 'M',
             'switch_to_portal': 'T',
             'switch_to_study': '?',
             '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',
             'flatten': 'F',

-            'toggle_map_mode': 'M',
+            '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',
             'hex_move_upleft': 'w',
             'hex_move_upright': 'e',
             'hex_move_right': 'd',


@@ -267,11 +430,9 @@ class TUI:
         self.force_instant_connect = True
         self.input_lines = []
         self.fov = ''
         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):


@@ -289,7 +450,12 @@ 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 = {}
+            time.sleep(0.1)  # give potential SSL negotation some time …

             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')


@@ -300,8 +466,8 @@ class TUI:
     def reconnect(self):
         self.log_msg('@ attempting reconnect')
         self.send('QUIT')
     def reconnect(self):
         self.log_msg('@ attempting reconnect')
         self.send('QUIT')

-        time.sleep(0.1)  # FIXME necessitated by some some strange SSL race
-                         # conditions with ws4py, find out what exactly
+        # 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()
 
         self.switch_mode('waiting_for_server')
         self.connect()
 


@@ -334,24 +500,57 @@ class TUI:
         elif self.mode.name == 'password':
             self.input_ = self.password
 
         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):
     def switch_mode(self, mode_name):

-        self.map_mode = 'terrain'
+        self.tile_draw = False
+        if mode_name == 'admin_enter' and self.is_admin:
+            mode_name = 'admin'

         self.mode = getattr(self, 'mode_' + mode_name)
         self.mode = getattr(self, 'mode_' + mode_name)

-        if self.mode.shows_info:
-            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)
             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 …')
         if self.mode.name == 'waiting_for_server':
             self.log_msg('@ waiting for server …')

-        if self.mode.name == 'edit':
-            self.show_help = True

         elif 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 == 'login':
             if self.login_name:
                 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 == '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):
         self.restore_input_values()
 
     def loop(self, stdscr):


@@ -381,6 +580,8 @@ class TUI:
                     lines += [chunk]
                     chunk = ''
                     x = 0
                     lines += [chunk]
                     chunk = ''
                     x = 0

+                    if msg[i] == "\n":
+                        x -= 1

                 if msg[i] != "\n":
                     chunk += msg[i]
                 x += 1
                 if msg[i] != "\n":
                     chunk += msg[i]
                 x += 1


@@ -401,12 +602,15 @@ 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
             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:
             else:

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

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


@@ -424,12 +628,28 @@ 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 = 'outside field of view'
-            if self.game.fov[pos_i] == '.':
-                info = 'TERRAIN: %s\n' % self.game.map_content[pos_i]
+            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:
                 for t in self.game.things:
                     if t.position == self.explorer:

-                        info += 'PLAYER @: %s\n' % t.name
+                        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:
                 if self.explorer in self.game.portals:
                     info += 'PORTAL: ' + self.game.portals[self.explorer] + '\n'
                 else:


@@ -461,38 +681,57 @@ class TUI:
             help = "hit [%s] for help" % self.keys['help']
             if self.mode.has_input_prompt:
                 help = "enter /help for help"
             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.name, help))
+            safe_addstr(1, self.window_width,
+                        'MODE: %s – %s' % (self.mode.short_desc, help))

 
         def draw_map():
             if not self.game.turn_complete:
                 return
             map_lines_split = []
 
         def draw_map():
             if not self.game.turn_complete:
                 return
             map_lines_split = []

-            map_content = self.game.map_content
-            if self.map_mode == 'control':
-                map_content = self.game.map_control_content

             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':
+                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:
                 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] = '?'
+                    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 = []
             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)

             center = player.position
             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
                 center = self.explorer
             center = YX(center.y, center.x * 2)
             offset = center - window_center


@@ -509,37 +748,46 @@ class TUI:
                 map_y += 1
 
         def draw_help():
                 map_y += 1
 
         def draw_help():

-            content = "%s mode help\n\n%s\n\n" % (self.mode.name,
-                                                  self.mode.help_intro)
-            if self.mode == self.mode_play:
+            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)
                 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 player's surroundings\n" % self.keys['flatten']
-                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 += '[%s] – terrain edit mode\n' % self.keys['switch_to_edit']
-                content += '[%s] – portal edit mode\n' % self.keys['switch_to_portal']
-                content += '[%s] – annotation mode\n' % self.keys['switch_to_annotate']
-                content += '[%s] – password input mode\n' % self.keys['switch_to_password']
-            elif self.mode == self.mode_study:
+                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 += '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 += '\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 += '[%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 += '/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']
                 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),
             for i in range(self.size.y):
                 safe_addstr(i,
                             self.window_width * (not self.mode.has_input_prompt),

-                            ' '*self.window_width)
+                            ' ' * self.window_width)

             lines = []
             for line in content.split('\n'):
                 lines += msg_into_lines_of_width(line, self.window_width)
             lines = []
             for line in content.split('\n'):
                 lines += msg_into_lines_of_width(line, self.window_width)


@@ -567,7 +815,7 @@ class TUI:
                 draw_help()
 
         curses.curs_set(False)  # hide cursor
                 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)
         stdscr.timeout(10)
         reset_screen_size()
         self.explorer = YX(0, 0)


@@ -586,6 +834,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


@@ -614,19 +865,42 @@ class TUI:
                 max_length = self.window_width * self.size.y - len(input_prompt) - 1
                 if len(self.input_) > max_length:
                     self.input_ = self.input_[:max_length]
                 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 key == self.keys['help'] and self.mode != self.mode_edit:
+            elif key == self.keys['help'] and not self.mode.is_single_char_entry:

                 self.show_help = True
                 self.show_help = True

-            elif self.mode == self.mode_login and key == '\n':
+            elif self.mode.name == 'login' and key == '\n':

                 self.login_name = self.input_
                 self.send('LOGIN ' + quote(self.input_))
                 self.input_ = ""
                 self.login_name = self.input_
                 self.send('LOGIN ' + quote(self.input_))
                 self.input_ = ""

-            elif self.mode == self.mode_password and key == '\n':
+            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_
                 if self.input_ == '':
                     self.input_ = ' '
                 self.password = self.input_

-                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')
                 self.switch_mode('play')

-            elif self.mode == self.mode_chat and key == '\n':
+            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_ == '':
                     continue
                 if self.input_[0] == '/':  # FIXME fails on empty input


@@ -634,79 +908,82 @@ class TUI:
                         self.switch_mode('play')
                     elif self.input_ in {'/' + self.keys['switch_to_study'], '/study'}:
                         self.switch_mode('study')
                         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'):
                         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('/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_ = ""
                     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 %s' % (self.explorer, quote(self.input_),
                                                  quote(self.password)))
                 if self.input_ == '':
                     self.input_ = ' '
                 self.send('ANNOTATE %s %s %s' % (self.explorer, quote(self.input_),
                                                  quote(self.password)))

-                self.input_ = ""
-                self.switch_mode('play')
-            elif self.mode == self.mode_portal and key == '\n':
+                self.switch_mode('edit')
+            elif self.mode.name == 'portal' and key == '\n':

                 if self.input_ == '':
                     self.input_ = ' '
                 self.send('PORTAL %s %s %s' % (self.explorer, quote(self.input_),
                                                quote(self.password)))
                 if self.input_ == '':
                     self.input_ = ' '
                 self.send('PORTAL %s %s %s' % (self.explorer, quote(self.input_),
                                                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 key == self.keys['switch_to_play']:
-                    self.switch_mode('play')
+                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']:
                 elif key == self.keys['toggle_map_mode']:

-                    if self.map_mode == 'terrain':
-                        self.map_mode = 'control'
+                    self.toggle_map_mode()
+                elif key in self.movement_keys:
+                    move_explorer(self.movement_keys[key])
+            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:
                     else:

-                        self.map_mode = 'terrain'
+                        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 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')
-                elif key == self.keys['switch_to_annotate']:
-                    self.switch_mode('annotate')
-                elif key == self.keys['switch_to_portal']:
-                    self.switch_mode('portal')
-                elif key == self.keys['switch_to_password']:
-                    self.switch_mode('password')
-                if key == self.keys['switch_to_edit'] and\
-                   'WRITE' in self.game.tasks:
-                    self.switch_mode('edit')
+                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\
                 elif key == self.keys['flatten'] and\

-                     'FLATTEN_SURROUNDINGS' in self.game.tasks:
+                    'FLATTEN_SURROUNDINGS' in self.game.tasks:

                     self.send('TASK:FLATTEN_SURROUNDINGS ' + quote(self.password))
                     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 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')
+if len(sys.argv) != 2:
+    raise ArgError('wrong number of arguments, need game host')
+host = sys.argv[1]
+TUI(host)