X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=rogue_chat.html;h=1b5f39d8f732f631f477b5dec8378349a21e8b4b;hb=bf8653594beb9ee94b8e7c4139b2891425a6367b;hp=02fb9a672aac937e4c006f20d5af7c30e5a2687e;hpb=85992bcb503cbe2a7bf7cd2d7ff54ca0ad7032d7;p=plomrogue2

diff --git a/rogue_chat.html b/rogue_chat.html
index 02fb9a6..1b5f39d 100644
--- a/rogue_chat.html
+++ b/rogue_chat.html
@@ -20,58 +20,66 @@ terminal rows: <input id="n_rows" type="number" step=4 min=24 value=24 />
 keyboard input/control: <span id="keyboard_control"></span>
 </div>
 <h3>button controls for mouse players</h3>
-<table style="float: left">
+<table id="move_table" style="float: left">
   <tr>
-    <td style="text-align: right"><button id="move_upleft">up-left</button></td>
-    <td style="text-align: center"><button id="move_up">up</button></td>
-    <td><button id="move_upright">up-right</button></td>
+    <td style="text-align: right"><button id="hex_move_upleft"></button></td>
+    <td style="text-align: center"><button id="square_move_up"></button></td>
+    <td><button id="hex_move_upright"></button></td>
   </tr>
   <tr>
-    <td style="text-align: right;"><button id="move_left">left</button></td>
+    <td style="text-align: right;"><button id="square_move_left"></button><button id="hex_move_left">left</button></td>
     <td stlye="text-align: center;">move</td>
-    <td><button id="move_right">right</button></td>
+    <td><button id="square_move_right"></button><button id="hex_move_right"></button></td>
   </tr>
   <tr>
-    <td><button id="move_downleft">down-left</button></td>
-    <td style="text-align: center"><button id="move_down">down</button></td>
-    <td><button id="move_downright">down-right</button></td>
+    <td><button id="hex_move_downleft"></button></td>
+    <td style="text-align: center"><button id="square_move_down"></button></td>
+    <td><button id="hex_move_downright"></button></td>
   </tr>
 </table>
 <table>
   <tr>
-    <td><button id="help">help</button></td>
+    <td><button id="help"></button></td>
   </tr>
   <tr>
-    <td><button id="switch_to_chat">chat mode</button><br /></td>
+    <td><button id="switch_to_chat"></button><br /></td>
   </tr>
   <tr>
-    <td><button id="switch_to_study">study mode</button></td>
-    <td><button id="toggle_map_mode">toggle map view</button>
+    <td><button id="switch_to_study"></button></td>
+    <td><button id="toggle_map_mode"></button>
   </tr>
   <tr>
-    <td><button id="switch_to_play">play mode</button></td>
+    <td><button id="switch_to_play"></button></td>
     <td>
-      <button id="take_thing">pick up thing</button>
-      <button id="drop_thing">drop thing</button>
-      <button id="teleport">teleport</button>
+      <button id="switch_to_take_thing"></button>
+      <button id="drop_thing"></button>
+      <button id="door"></button>
+      <button id="consume"></button>
+      <button id="switch_to_command_thing"></button>
+      <button id="teleport"></button>
+      <button id="install"></button>
+      <button id="wear"></button>
     </td>
   </tr>
   <tr>
-    <td><button id="switch_to_edit">map edit mode</button></td>
+    <td><button id="switch_to_edit"></button></td>
     <td>
-      <button id="switch_to_write">change terrain</button>
-      <button id="flatten">flatten surroundings</button>
-      <button id="switch_to_annotate">annotate tile</button>
-      <button id="switch_to_portal">edit portal</button>
-      <button id="switch_to_password">enter map edit password</button>
+      <button id="switch_to_write"></button>
+      <button id="flatten"></button>
+      <button id="switch_to_annotate"></button>
+      <button id="switch_to_portal"></button>
+      <button id="switch_to_name_thing"></button>
+      <button id="switch_to_password"></button>
+      <button id="switch_to_enter_face"></button>
     </td>
   </tr>
   <tr>
-    <td><button id="switch_to_admin_enter">admin mode</button></td>
+    <td><button id="switch_to_admin_enter"></button></td>
     <td>
-      <button id="switch_to_control_pw_type">change protection character password</button>
-      <button id="switch_to_control_tile_type">change protection areas</button>
-      <button id="toggle_tile_draw">toggle protection character drawing</button>
+      <button id="switch_to_control_pw_type"></button>
+      <button id="switch_to_control_tile_type"></button>
+      <button id="switch_to_admin_thing_protect"></button>
+      <button id="toggle_tile_draw"></button>
     </td>
   <tr>
   </tr>
@@ -91,97 +99,172 @@ keyboard input/control: <span id="keyboard_control"></span>
 <li>help: <input id="key_help" type="text" value="h" />
 <li>flatten surroundings: <input id="key_flatten" type="text" value="F" />
 <li>teleport: <input id="key_teleport" type="text" value="p" />
-<li>pick up thing: <input id="key_take_thing" type="text" value="z" />
 <li>drop thing: <input id="key_drop_thing" type="text" value="u" />
+<li>open/close: <input id="key_door" type="text" value="D" />
+<li>consume: <input id="key_consume" type="text" value="C" />
+<li>install: <input id="key_install" type="text" value="I" />
+<li>(un-)wear: <input id="key_wear" type="text" value="W" />
+<li><input id="key_switch_to_enter_face" type="text" value="f" />
+<li><input id="key_switch_to_take_thing" type="text" value="z" />
 <li><input id="key_switch_to_chat" type="text" value="t" />
 <li><input id="key_switch_to_play" type="text" value="p" />
 <li><input id="key_switch_to_study" type="text" value="?" />
 <li><input id="key_switch_to_edit" type="text" value="E" />
 <li><input id="key_switch_to_write" type="text" value="m" />
+<li><input id="key_switch_to_name_thing" type="text" value="N" />
+<li><input id="key_switch_to_command_thing" type="text" value="O" />
 <li><input id="key_switch_to_password" type="text" value="P" />
 <li><input id="key_switch_to_admin_enter" type="text" value="A" />
 <li><input id="key_switch_to_control_pw_type" type="text" value="C" />
 <li><input id="key_switch_to_control_tile_type" type="text" value="Q" />
+<li><input id="key_switch_to_admin_thing_protect" type="text" value="T" />
 <li><input id="key_switch_to_annotate" type="text" value="M" />
 <li><input id="key_switch_to_portal" type="text" value="T" />
-<li>toggle map view: <input id="key_toggle_map_mode" type="text" value="M" />
+<li>toggle map view: <input id="key_toggle_map_mode" type="text" value="L" />
 <li>toggle protection character drawing: <input id="key_toggle_tile_draw" type="text" value="m" />
 </ul>
 </div>
 <script>
 "use strict";
 let websocket_location = "wss://plomlompom.com/rogue_chat/";
-//let websocket_location = "ws://localhost:8000/";
+//let websocket_location = "ws://localhost:8001/";
 
 let mode_helps = {
     'play': {
         'short': 'play',
+        'intro': '',
         'long': 'This mode allows you to interact with the map in various ways.'
     },
     'study': {
         'short': 'study',
+        'intro': '',
         'long': 'This mode allows you to study the map and its tiles in detail.  Move the question mark over a tile, and the right half of the screen will show detailed information on it.  Toggle the map view to show or hide different information layers.'},
     'edit': {
-        'short': 'map edit',
-        'long': 'This mode allows you to change the map in various ways.  Individual map tiles are shown together with their "protection characters".  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.'
+        'short': 'world edit',
+        'intro': '',
+        'long': 'This mode allows you to change the game world in various ways.  Individual map tiles can be protected by "protection characters", which you can see by toggling into the protections map view.  You can edit a tile if you set the world edit password that matches its protection character.  The character "." marks the absence of protection:  Such tiles can always be edited.'
+    },
+    'name_thing': {
+        'short': 'name thing',
+        'intro': '',
+        'long': 'Give name to/change name of thing here.'
+    },
+    'command_thing': {
+        'short': 'command thing',
+        'intro': '',
+        'long': 'Enter a command to the thing you carry.  Enter nothing to return to play mode.'
+    },
+    'take_thing': {
+        'short': 'take thing',
+        'intro': 'Pick up a thing in reach by entering its index number.  Enter nothing to abort.',
+        'long': 'You see a list of things which you could pick up.  Enter the target thing\'s index, or, to leave, nothing.'
+    },
+    'admin_thing_protect': {
+        'short': 'change thing protection',
+        'intro': '@ enter thing protection character:',
+        'long': 'Change protection character for thing here.'
+    },
+    'enter_face': {
+        'short': 'enter your face',
+        'intro': '@ enter face line (enter nothing to abort):',
+        'long': 'Draw your face as ASCII art.  The string you enter must be 9 characters long, and will be divided on display into three lines of three characters each, from top to bottom..'
     },
     '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.'
+        'intro': '',
+        'long': 'This mode allows you to change the map tile you currently stand on (if your world editing password authorizes you so).  Just enter any printable ASCII character to imprint it on the ground below you.'
     },
     'control_pw_type': {
         'short': 'change protection character password',
-        '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.'
+        'intro': '@ enter protection character for which you want to change the password:',
+        'long': 'This mode is the first of two steps to change the password for a protection character.  First enter the protection character for which you want to change the password.'
     },
     'control_pw_pw': {
-        'short': 'change tiles protection 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.'
+        'short': 'change protection character password',
+        'intro': '',
+        'long': 'This mode is the second of two steps to change the password for a protection character.  Enter the new password for the protection character you chose.'
     },
     'control_tile_type': {
         'short': 'change tiles protection',
-        '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.'
+        'intro': '@ enter protection character which you want to draw:',
+        'long': 'This mode is the first of two steps to change tile protection areas on the map.  First enter the tile protection character you want to write.'
     },
     'control_tile_draw': {
         'short': 'change tiles protection',
-        '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.'
+        'intro': '',
+        'long': 'This mode is the second of two steps to change tile protection areas on the map.  Toggle tile protection drawing on/off and move the ?? cursor around the map to draw the selected protection character.'
     },
     'annotate': {
         'short': 'annotate tile',
-        '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.'
+        'intro': '',
+        'long': 'This mode allows you to add/edit a comment on the tile you are currently standing on (provided your world editing password authorizes you so).  Hit Return to leave.'
     },
     'portal': {
         'short': 'edit portal',
-        '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.'
+        'intro': '',
+        'long': 'This mode allows you to imprint/edit/remove a teleportation target on the ground you are currently standing on (provided your world editing password authorizes you so).  Enter or edit a URL to imprint a teleportation target; enter emptiness to remove a pre-existing teleportation target.  Hit Return to leave.'
     },
     'chat': {
         'short': 'chat',
-        'long': 'This mode allows you to engage in chit-chat with other users.  Any line you enter into the input prompt that does not start with a "/" will be sent out to nearby players – but barriers and distance will reduce what they can read, so stand close to them to ensure they get your message.  Lines that start with a "/" are used for commands like:'
+        'intro': '',
+        'long': 'This mode allows you to engage in chit-chat with other users.  Any line you enter into the input prompt that does not start with a "/" will be sent out to nearby players – but barriers and distance will reduce what they can read, so stand close to them to ensure they get your message.  Lines that start with a "/" are used for commands like:\n\n/nick NAME – re-name yourself to NAME'
     },
     'login': {
         'short': 'login',
+        'intro': '',
         'long': 'Enter your player name.'
     },
     'waiting_for_server': {
         'short': 'waiting for server response',
+        'intro': '@ waiting for server …',
         'long': 'Waiting for a server response.'
     },
     'post_login_wait': {
         'short': 'waiting for server response',
+        'intro': '',
         'long': 'Waiting for a server response.'
     },
     'password': {
-        'short': 'set 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.'
+        'short': 'set world edit password',
+        'intro': '',
+        'long': 'This mode allows you to change the password that you send to authorize yourself for editing password-protected elements of the world.  Hit return to confirm and leave.'
     },
     'admin_enter': {
         'short': 'become admin',
+        'intro': '@ enter admin password:',
         'long': 'This mode allows you to become admin if you know an admin password.'
     },
     'admin': {
         'short': 'admin',
+        'intro': '',
         'long': 'This mode allows you access to actions limited to administrators.'
     }
 }
+let key_descriptions = {
+    'help': 'help',
+    'flatten': 'flatten surroundings',
+    'teleport': 'teleport',
+    'drop_thing': 'drop thing',
+    'door': 'open/close',
+    'consume': 'consume',
+    'install': '(un-)install',
+    'wear': '(un-)wear',
+    'toggle_map_mode': 'toggle map view',
+    'toggle_tile_draw': 'toggle protection character drawing',
+    'hex_move_upleft': 'up-left',
+    'hex_move_upright': 'up-right',
+    'hex_move_right': 'right',
+    'hex_move_left': 'left',
+    'hex_move_downleft': 'down-left',
+    'hex_move_downright': 'down-right',
+    'square_move_up': 'up',
+    'square_move_left': 'left',
+    'square_move_down': 'down',
+    'square_move_right': 'right',
+};
+for (const mode_name of Object.keys(mode_helps)) {
+    key_descriptions['switch_to_' + mode_name] = mode_helps[mode_name].short;
+};
 
 let rows_selector = document.getElementById("n_rows");
 let cols_selector = document.getElementById("n_cols");
@@ -204,15 +287,22 @@ for (let key_selector of key_selectors) {
     restore_selector_value(key_selector);
 }
 
+function escapeHTML(str) {
+    return str.
+        replace(/&/g, '&amp;').
+        replace(/</g, '&lt;').
+        replace(/>/g, '&gt;').
+        replace(/'/g, '&apos;').
+        replace(/"/g, '&quot;');
+};
+
 let terminal = {
-  foreground: 'white',
-  background: 'black',
   initialize: function() {
     this.rows = rows_selector.value;
     this.cols = cols_selector.value;
     this.pre_el = document.getElementById("terminal");
-    this.pre_el.style.color = this.foreground;
-    this.pre_el.style.backgroundColor = this.background;
+    this.set_default_colors();
+    this.apply_colors();
     this.content = [];
       let line = []
     for (let y = 0, x = 0; y <= this.rows; x++) {
@@ -228,6 +318,23 @@ let terminal = {
         line.push(' ');
     }
   },
+  apply_colors: function() {
+    this.pre_el.style.color = this.foreground;
+    this.pre_el.style.backgroundColor = this.background;
+  },
+  set_default_colors: function() {
+      this.foreground = 'white';
+      this.background = 'black';
+      this.apply_colors();
+  },
+  set_random_colors: function() {
+      function rand(offset) {
+          return Math.floor(offset + Math.random() * 96).toString(16).padStart(2, '0');
+      }
+      this.foreground = '#' + rand(159) + rand(159) + rand(159);
+      this.background = '#' + rand(0) + rand(0) + rand(0);
+      this.apply_colors();
+  },
   blink_screen: function() {
       this.pre_el.style.color = this.background;
       this.pre_el.style.backgroundColor = this.foreground;
@@ -237,14 +344,6 @@ let terminal = {
       }, 100);
   },
   refresh: function() {
-      function escapeHTML(str) {
-          return str.
-              replace(/&/g, '&amp;').
-              replace(/</g, '&lt;').
-              replace(/>/g, '&gt;').
-              replace(/'/g, '&apos;').
-              replace(/"/g, '&quot;');
-      };
       let pre_content = '';
       for (let y = 0; y < this.rows; y++) {
           let line = this.content[y].join('');
@@ -253,7 +352,7 @@ let terminal = {
               let start_x = 0;
               for (let span of tui.links[y]) {
                   chunks.push(escapeHTML(line.slice(start_x, span[0])));
-                  chunks.push('<a href="');
+                  chunks.push('<a target="_blank" href="');
                   chunks.push(escapeHTML(span[2]));
                   chunks.push('">');
                   chunks.push(escapeHTML(line.slice(span[0], span[1])));
@@ -375,29 +474,42 @@ let server = {
         let tokens = parser.tokenize(event.data);
         if (tokens[0] === 'TURN') {
             game.turn_complete = false;
-            explorer.empty_info_db();
+            explorer.empty_annotations();
             game.things = {};
             game.portals = {};
+            game.fov = '';
             game.turn = parseInt(tokens[1]);
         } else if (tokens[0] === 'THING') {
-            let t = game.get_thing(tokens[3], true);
+            let t = game.get_thing(tokens[4], true);
             t.position = parser.parse_yx(tokens[1]);
             t.type_ = tokens[2];
+            t.protection = tokens[3];
+            t.portable = parseInt(tokens[5]);
         } else if (tokens[0] === 'THING_NAME') {
             let t = game.get_thing(tokens[1], false);
-            if (t) {
-                t.name_ = tokens[2];
-            };
+            t.name_ = tokens[2];
+        } else if (tokens[0] === 'THING_FACE') {
+            let t = game.get_thing(tokens[1], false);
+            t.face = tokens[2];
+        } else if (tokens[0] === 'THING_HAT') {
+            let t = game.get_thing(tokens[1], false);
+            t.hat = tokens[2];
         } else if (tokens[0] === 'THING_CHAR') {
             let t = game.get_thing(tokens[1], false);
-            if (t) {
-                t.player_char = tokens[2];
-            };
+            t.thing_char = tokens[2];
         } else if (tokens[0] === 'TASKS') {
             game.tasks = tokens[1].split(',');
             tui.mode_write.legal = game.tasks.includes('WRITE');
+            tui.mode_command_thing.legal = game.tasks.includes('WRITE');
+            tui.mode_take_thing.legal = game.tasks.includes('PICK_UP');
         } else if (tokens[0] === 'THING_TYPE') {
             game.thing_types[tokens[1]] = tokens[2]
+        } else if (tokens[0] === 'THING_CARRYING') {
+            let t = game.get_thing(tokens[1], false);
+            t.carrying = true;
+        } else if (tokens[0] === 'THING_INSTALLED') {
+            let t = game.get_thing(tokens[1], false);
+            t.installed = true;
         } else if (tokens[0] === 'TERRAIN') {
             game.terrains[tokens[1]] = tokens[2]
         } else if (tokens[0] === 'MAP') {
@@ -413,17 +525,22 @@ let server = {
             game.turn_complete = true;
             if (tui.mode.name == 'post_login_wait') {
                 tui.switch_mode('play');
-            } else if (tui.mode.name == 'study') {
-                explorer.query_info();
             }
+            explorer.info_cached = false;
             tui.full_refresh();
         } else if (tokens[0] === 'CHAT') {
              tui.log_msg('# ' + tokens[1], 1);
+        } else if (tokens[0] === 'REPLY') {
+             tui.log_msg('#MUSICPLAYER: ' + tokens[1], 1);
         } else if (tokens[0] === 'PLAYER_ID') {
             game.player_id = parseInt(tokens[1]);
         } else if (tokens[0] === 'LOGIN_OK') {
             this.send(['GET_GAMESTATE']);
             tui.switch_mode('post_login_wait');
+        } else if (tokens[0] === 'DEFAULT_COLORS') {
+            terminal.set_default_colors();
+        } else if (tokens[0] === 'RANDOM_COLORS') {
+            terminal.set_random_colors();
         } else if (tokens[0] === 'ADMIN_OK') {
             tui.is_admin = true;
             tui.log_msg('@ you now have admin rights');
@@ -431,13 +548,9 @@ let server = {
         } else if (tokens[0] === 'PORTAL') {
             let position = parser.parse_yx(tokens[1]);
             game.portals[position] = tokens[2];
-        } else if (tokens[0] === 'ANNOTATION_HINT') {
-            let position = parser.parse_yx(tokens[1]);
-            explorer.info_hints = explorer.info_hints.concat([position]);
         } else if (tokens[0] === 'ANNOTATION') {
             let position = parser.parse_yx(tokens[1]);
-            explorer.update_info_db(position, tokens[2]);
-            tui.restore_input_values();
+            explorer.update_annotations(position, tokens[2]);
             tui.full_refresh();
         } else if (tokens[0] === 'UNHANDLED_INPUT') {
             tui.log_msg('? unknown command');
@@ -487,10 +600,12 @@ class Mode {
         this.name = name;
         this.short_desc = mode_helps[name].short;
         this.available_modes = [];
+        this.available_actions = [];
         this.has_input_prompt = has_input_prompt;
         this.shows_info= shows_info;
         this.is_intro = is_intro;
         this.help_intro = mode_helps[name].long;
+        this.intro_msg = mode_helps[name].intro;
         this.is_single_char_entry = is_single_char_entry;
         this.legal = true;
     }
@@ -549,108 +664,157 @@ let tui = {
   mode_write: new Mode('write', false, false, false, true),
   mode_edit: new Mode('edit'),
   mode_control_pw_type: new Mode('control_pw_type', true),
+  mode_admin_thing_protect: new Mode('admin_thing_protect', true),
   mode_portal: new Mode('portal', true, true),
   mode_password: new Mode('password', true),
+  mode_name_thing: new Mode('name_thing', true, true),
+  mode_command_thing: new Mode('command_thing', true),
+  mode_take_thing: new Mode('take_thing', true),
+  mode_enter_face: new Mode('enter_face', true),
   mode_admin_enter: new Mode('admin_enter', true),
   mode_admin: new Mode('admin'),
   mode_control_pw_pw: new Mode('control_pw_pw', true),
   mode_control_tile_type: new Mode('control_tile_type', true),
   mode_control_tile_draw: new Mode('control_tile_draw'),
+  action_tasks: {
+      'flatten': 'FLATTEN_SURROUNDINGS',
+      'take_thing': 'PICK_UP',
+      'drop_thing': 'DROP',
+      'move': 'MOVE',
+      'door': 'DOOR',
+      'install': 'INSTALL',
+      'wear': 'WEAR',
+      'command': 'COMMAND',
+      'consume': 'INTOXICATE',
+  },
+  offset: [0,0],
+  map_lines: [],
+  selectables: [],
   init: function() {
-      this.mode_play.available_modes = ["chat", "study", "edit", "admin_enter"]
+      this.mode_play.available_modes = ["chat", "study", "edit", "admin_enter",
+                                        "command_thing", "take_thing"]
+      this.mode_play.available_actions = ["move", "drop_thing", "teleport",
+                                          "door", "consume", "install", "wear"];
       this.mode_study.available_modes = ["chat", "play", "admin_enter", "edit"]
-      this.mode_admin.available_modes = ["control_pw_type",
+      this.mode_study.available_actions = ["toggle_map_mode", "move_explorer"];
+      this.mode_admin.available_modes = ["admin_thing_protect", "control_pw_type",
                                          "control_tile_type", "chat",
                                          "study", "play", "edit"]
+      this.mode_admin.available_actions = ["move"];
       this.mode_control_tile_draw.available_modes = ["admin_enter"]
-      this.mode_edit.available_modes = ["write", "annotate", "portal",
+      this.mode_control_tile_draw.available_actions = ["toggle_tile_draw"];
+      this.mode_edit.available_modes = ["write", "annotate", "portal", "name_thing",
                                         "password", "chat", "study", "play",
-                                        "admin_enter"]
-      this.mode = this.mode_waiting_for_server;
+                                        "admin_enter", "enter_face"]
+      this.mode_edit.available_actions = ["move", "flatten", "toggle_map_mode"]
       this.inputEl = document.getElementById("input");
       this.inputEl.focus();
+      this.switch_mode('waiting_for_server');
       this.recalc_input_lines();
       this.height_header = this.height_turn_line + this.height_mode_line;
-      this.log_msg("@ waiting for server connection ...");
       this.init_keys();
   },
   init_keys: function() {
+    document.getElementById("move_table").hidden = true;
     this.keys = {};
     for (let key_selector of key_selectors) {
         this.keys[key_selector.id.slice(4)] = key_selector.value;
     }
-    if (game.map_geometry == 'Square') {
-        this.movement_keys = {
-            [this.keys.square_move_up]: 'UP',
-            [this.keys.square_move_left]: 'LEFT',
-            [this.keys.square_move_down]: 'DOWN',
-            [this.keys.square_move_right]: 'RIGHT'
-        };
-        document.getElementById("move_upright").hidden = true;
-        document.getElementById("move_upleft").hidden = true;
-        document.getElementById("move_downright").hidden = true;
-        document.getElementById("move_downleft").hidden = true;
-        document.getElementById("move_up").hidden = false;
-        document.getElementById("move_down").hidden = false;
-    } else if (game.map_geometry == 'Hex') {
-        document.getElementById("move_upright").hidden = false;
-        document.getElementById("move_upleft").hidden = false;
-        document.getElementById("move_downright").hidden = false;
-        document.getElementById("move_downleft").hidden = false;
-        document.getElementById("move_up").hidden = true;
-        document.getElementById("move_down").hidden = true;
-        this.movement_keys = {
-            [this.keys.hex_move_upleft]: 'UPLEFT',
-            [this.keys.hex_move_upright]: 'UPRIGHT',
-            [this.keys.hex_move_right]: 'RIGHT',
-            [this.keys.hex_move_downright]: 'DOWNRIGHT',
-            [this.keys.hex_move_downleft]: 'DOWNLEFT',
-            [this.keys.hex_move_left]: 'LEFT'
-        };
+    this.movement_keys = {};
+    let geometry_prefix = 'undefinedMapGeometry_';
+    if (game.map_geometry) {
+        geometry_prefix = game.map_geometry.toLowerCase() + '_';
+    }
+    for (const key_name of Object.keys(key_descriptions)) {
+        if (key_name.startsWith(geometry_prefix)) {
+            let direction = key_name.split('_')[2].toUpperCase();
+            let key = this.keys[key_name];
+            this.movement_keys[key] = direction;
+        }
+    };
+    for (const move_button of document.querySelectorAll('[id*="_move_"]')) {
+        if (move_button.id.startsWith('key_')) {
+            continue;
+        }
+        move_button.hidden = true;
+    };
+    for (const move_button of document.querySelectorAll('[id^="' + geometry_prefix + 'move_"]')) {
+        document.getElementById("move_table").hidden = false;
+        move_button.hidden = false;
     };
+    for (let el of document.getElementsByTagName("button")) {
+      let action_desc = key_descriptions[el.id];
+      let action_key = '[' + this.keys[el.id] + ']';
+      el.innerHTML = escapeHTML(action_desc) + '<br /><span class="keyboard_controlled">' + escapeHTML(action_key) + '</span>';
+    }
+  },
+  task_action_on: function(action) {
+      return game.tasks.includes(this.action_tasks[action]);
   },
   switch_mode: function(mode_name) {
-    if (this.mode.name == 'control_tile_draw') {
+    if (this.mode && this.mode.name == 'control_tile_draw') {
         tui.log_msg('@ finished tile protection drawing.')
     }
-    this.inputEl.focus();
-    this.map_mode = 'terrain + things';
     this.tile_draw = false;
     if (mode_name == 'admin_enter' && this.is_admin) {
         mode_name = 'admin';
+    } else if (['name_thing', 'admin_thing_protect'].includes(mode_name)) {
+        let player_position = game.things[game.player_id].position;
+        let thing_id = null;
+        for (let t_id in game.things) {
+            if (t_id == game.player_id) {
+                continue;
+            }
+            let t = game.things[t_id];
+            if (player_position[0] == t.position[0] && player_position[1] == t.position[1]) {
+                thing_id = t_id;
+                break;
+            }
+        }
+        if (!thing_id) {
+            terminal.blink_screen();
+            this.log_msg('? not standing over thing');
+            return;
+        } else {
+            this.selected_thing_id = thing_id;
+        }
     };
     this.mode = this['mode_' + mode_name];
+    if (["control_tile_draw", "control_tile_type", "control_pw_type"].includes(this.mode.name)) {
+        this.map_mode = 'protections';
+    } else if (this.mode.name != "edit") {
+        this.map_mode = 'terrain + things';
+    };
+    if (this.mode.has_input_prompt || this.mode.is_single_char_entry) {
+        this.inputEl.focus();
+    }
     if (game.player_id in game.things && (this.mode.shows_info || this.mode.name == 'control_tile_draw')) {
         explorer.position = game.things[game.player_id].position;
-        if (this.mode.shows_info) {
-            explorer.query_info();
-        }
     }
-    this.empty_input();
+    this.inputEl.value = "";
     this.restore_input_values();
     for (let el of document.getElementsByTagName("button")) {
         el.disabled = true;
     }
     document.getElementById("help").disabled = false;
-    if (this.mode.name == 'play' || this.mode.name == 'study' || this.mode.name == 'control_tile_draw' || this.mode.name == 'edit') {
-        for (const move_key of document.querySelectorAll('[id^="move_"]')) {
-            move_key.disabled = false;
-        }
-    }
-    if (!this.mode.is_intro && this.mode.name != 'play') {
-        document.getElementById("switch_to_play").disabled = false;
-    }
-    if (!this.mode.is_intro && this.mode.name != 'study') {
-        document.getElementById("switch_to_study").disabled = false;
-    }
-    if (!this.mode.is_intro && this.mode.name != 'chat') {
-        document.getElementById("switch_to_chat").disabled = false;
+    for (const action of this.mode.available_actions) {
+        if (["move", "move_explorer"].includes(action)) {
+            for (const move_key of document.querySelectorAll('[id*="_move_"]')) {
+                move_key.disabled = false;
+            }
+        } else if (Object.keys(this.action_tasks).includes(action)) {
+            if (this.task_action_on(action)) {
+                document.getElementById(action).disabled = false;
+            }
+        } else {
+            document.getElementById(action).disabled = false;
+        };
     }
-    if (!this.mode.is_intro && this.mode.name != 'edit') {
-        document.getElementById("switch_to_edit").disabled = false;
+    for (const mode_name of this.mode.available_modes) {
+            document.getElementById('switch_to_' + mode_name).disabled = false;
     }
-    if (!this.mode.is_intro && this.mode.name != 'admin' && this.mode.name != 'admin_enter') {
-        document.getElementById("switch_to_admin_enter").disabled = false;
+    if (this.mode.intro_msg.length > 0) {
+        this.log_msg(this.mode.intro_msg);
     }
     if (this.mode.name == 'login') {
         if (this.login_name) {
@@ -658,42 +822,49 @@ let tui = {
         } else {
             this.log_msg("? need login name");
         }
-    } else if (this.mode.name == 'play') {
-        if (game.tasks.includes('PICK_UP')) {
-            document.getElementById("take_thing").disabled = false;
-        }
-        if (game.tasks.includes('DROP')) {
-            document.getElementById("drop_thing").disabled = false;
-        }
-        if (game.tasks.includes('MOVE')) {
-        }
-        document.getElementById("teleport").disabled = false;
-    } else if (this.mode.name == 'edit') {
-        if (game.tasks.includes('FLATTEN_SURROUNDINGS')) {
-            document.getElementById("flatten").disabled = false;
-        }
-        document.getElementById("switch_to_annotate").disabled = false;
-        document.getElementById("switch_to_write").disabled = false;
-        document.getElementById("switch_to_portal").disabled = false;
-        document.getElementById("switch_to_password").disabled = false;
-    } else if (this.mode.name == 'admin') {
-        document.getElementById("switch_to_control_pw_type").disabled = false;
-        document.getElementById("switch_to_control_tile_type").disabled = false;
-    } else if (this.mode.name == 'study') {
-        document.getElementById("toggle_map_mode").disabled = false;
     } else if (this.mode.is_single_char_entry) {
         this.show_help = true;
-    } else if (this.mode.name == 'admin_enter') {
-        this.log_msg('@ enter admin password:')
-    } else if (this.mode.name == 'control_pw_type') {
-        this.log_msg('@ enter tile protection character for which you want to change the password:')
-    } else if (this.mode.name == 'control_tile_type') {
-        this.log_msg('@ enter tile protection character which you want to draw:')
+    } else if (this.mode.name == 'take_thing') {
+        this.log_msg("Portable things in reach for pick-up:");
+        const player = game.things[game.player_id];
+        const y = player.position[0]
+        const x = player.position[1]
+        let select_range = [y.toString() + ':' + x.toString(),
+                            (y + 0).toString() + ':' + (x - 1).toString(),
+                            (y + 0).toString() + ':' + (x + 1).toString(),
+                            (y - 1).toString() + ':' + (x).toString(),
+                            (y + 1).toString() + ':' + (x).toString()];
+        if (game.map_geometry == 'Hex') {
+            if (y % 2) {
+                select_range.push((y - 1).toString() + ':' + (x + 1).toString());
+                select_range.push((y + 1).toString() + ':' + (x + 1).toString());
+            } else {
+                select_range.push((y - 1).toString() + ':' + (x - 1).toString());
+                select_range.push((y + 1).toString() + ':' + (x - 1).toString());
+            }
+        };
+        this.selectables = [];
+        for (const t_id in game.things) {
+            const t = game.things[t_id];
+            if (select_range.includes(t.position[0].toString()
+                                      + ':' + t.position[1].toString())
+                && t.portable) {
+                this.selectables.push([t_id, t]);
+            }
+        };
+        if (this.selectables.length == 0) {
+            this.log_msg('none')
+        } else {
+            for (let [i, t] of this.selectables.entries()) {
+                this.log_msg(i + ': ' + explorer.get_thing_info(t[1]));
+            }
+        }
+    } else if (this.mode.name == 'command_thing') {
+        server.send(['TASK:COMMAND', 'HELP']);
     } else if (this.mode.name == 'control_pw_pw') {
-        this.log_msg('@ enter tile protection password for "' + this.tile_control_char + '":');
+        this.log_msg('@ enter protection password for "' + this.tile_control_char + '":');
     } else if (this.mode.name == 'control_tile_draw') {
-        document.getElementById("toggle_tile_draw").disabled = false;
-        this.log_msg('@ can draw tile protection character "' + this.tile_control_char + '", turn drawing on/off with [' + this.keys.toggle_tile_draw + '], finish with [' +  this.keys.switch_to_admin_enter + '].')
+        this.log_msg('@ can draw protection character "' + this.tile_control_char + '", turn drawing on/off with [' + this.keys.toggle_tile_draw + '], finish with [' +  this.keys.switch_to_admin_enter + '].')
     }
     this.full_refresh();
   },
@@ -710,32 +881,35 @@ let tui = {
       }
   },
   restore_input_values: function() {
-      if (this.mode.name == 'annotate' && explorer.position in explorer.info_db) {
-          let info = explorer.info_db[explorer.position];
+      if (this.mode.name == 'annotate' && explorer.position in explorer.annotations) {
+          let info = explorer.annotations[explorer.position];
           if (info != "(none)") {
               this.inputEl.value = info;
-              this.recalc_input_lines();
           }
       } else if (this.mode.name == 'portal' && explorer.position in game.portals) {
           let portal = game.portals[explorer.position]
           this.inputEl.value = portal;
-          this.recalc_input_lines();
       } else if (this.mode.name == 'password') {
           this.inputEl.value = this.password;
-          this.recalc_input_lines();
+      } else if (this.mode.name == 'name_thing') {
+          let t = game.get_thing(this.selected_thing_id);
+          if (t && t.name_) {
+              this.inputEl.value = t.name_;
+          }
+      } else if (this.mode.name == 'admin_thing_protect') {
+          let t = game.get_thing(this.selected_thing_id);
+          if (t && t.protection) {
+              this.inputEl.value = t.protection;
+          }
       }
   },
-  empty_input: function(str) {
-      this.inputEl.value = "";
+  recalc_input_lines: function() {
       if (this.mode.has_input_prompt) {
-          this.recalc_input_lines();
+          let _ = null;
+          [this.input_lines, _] = this.msg_into_lines_of_width(this.input_prompt + this.inputEl.value, this.window_width);
       } else {
-          this.height_input = 0;
+          this.input_lines = [];
       }
-  },
-  recalc_input_lines: function() {
-      let _ = null;
-      [this.input_lines, _] = this.msg_into_lines_of_width(this.input_prompt + this.inputEl.value, this.window_width);
       this.height_input = this.input_lines.length;
   },
   msg_into_lines_of_width: function(msg, width) {
@@ -766,6 +940,10 @@ let tui = {
               if (in_link) {
                   push_inner_link(y, chunk.length);
                   url_start_x = 0;
+                  if (url_ends[0] == i) {
+                      in_link = false;
+                      url_ends.shift();
+                  }
               };
               lines.push(chunk);
               chunk = "";
@@ -782,7 +960,8 @@ let tui = {
               url_start_x = x;
               url = link_data[i];
               in_link = true;
-          } else if (url_ends.includes(i)) {
+          } else if (url_ends[0] == i) {
+              url_ends.shift();
               push_inner_link(y, x);
               in_link = false;
           }
@@ -801,84 +980,104 @@ let tui = {
       this.full_refresh();
   },
   draw_map: function() {
-    let map_lines_split = [];
-    let line = [];
-    for (let i = 0, j = 0; i < game.map.length; i++, j++) {
-        if (j == game.map_size[1]) {
-            map_lines_split.push(line);
-            line = [];
-            j = 0;
+    if (!game.turn_complete && this.map_lines.length == 0) {
+        return;
+    }
+    if (game.turn_complete) {
+        let map_lines_split = [];
+        let line = [];
+        for (let i = 0, j = 0; i < game.map.length; i++, j++) {
+            if (j == game.map_size[1]) {
+                map_lines_split.push(line);
+                line = [];
+                j = 0;
+            };
+            if (this.map_mode == 'protections') {
+                line.push(game.map_control[i] + ' ');
+            } else {
+                line.push(game.map[i] + ' ');
+            }
         };
-        if (['edit', 'write', 'control_tile_draw',
-             'control_tile_type'].includes(this.mode.name)) {
-            line.push(game.map[i] + game.map_control[i]);
-        } else {
-            line.push(game.map[i] + ' ');
-        }
-    };
-    map_lines_split.push(line);
-    if (this.map_mode == 'terrain + annotations') {
-        for (const coordinate of explorer.info_hints) {
-            map_lines_split[coordinate[0]][coordinate[1]] = 'A ';
+        map_lines_split.push(line);
+        if (this.map_mode == 'terrain + annotations') {
+            for (const coordinate of explorer.info_hints) {
+                map_lines_split[coordinate[0]][coordinate[1]] = 'A ';
+            }
+        } else if (this.map_mode == 'terrain + things') {
+            for (const p in game.portals) {
+                let coordinate = p.split(',')
+                let original = map_lines_split[coordinate[0]][coordinate[1]];
+                map_lines_split[coordinate[0]][coordinate[1]] = original[0] + 'P';
+            }
+            let used_positions = [];
+            function draw_thing(t, used_positions) {
+                let symbol = game.thing_types[t.type_];
+                let meta_char = ' ';
+                if (t.thing_char) {
+                    meta_char = t.thing_char;
+                }
+                if (used_positions.includes(t.position.toString())) {
+                    meta_char = '+';
+                };
+                if (t.carrying) {
+                    meta_char = '$';
+                }
+                map_lines_split[t.position[0]][t.position[1]] = symbol + meta_char;
+                used_positions.push(t.position.toString());
+            }
+            for (const thing_id in game.things) {
+                let t = game.things[thing_id];
+                if (t.type_ != 'Player') {
+                    draw_thing(t, used_positions);
+                }
+            };
+            for (const thing_id in game.things) {
+                let t = game.things[thing_id];
+                if (t.type_ == 'Player') {
+                    draw_thing(t, used_positions);
+                }
+            };
         }
-    } else if (this.map_mode == 'terrain + things') {
-        for (const p in game.portals) {
-            let coordinate = p.split(',')
-            let original = map_lines_split[coordinate[0]][coordinate[1]];
-            map_lines_split[coordinate[0]][coordinate[1]] = original[0] + 'P';
+        let player = game.things[game.player_id];
+        if (tui.mode.shows_info || tui.mode.name == 'control_tile_draw') {
+            map_lines_split[explorer.position[0]][explorer.position[1]] = '??';
+        } else if (tui.map_mode != 'terrain + things') {
+            map_lines_split[player.position[0]][player.position[1]] = '??';
         }
-        let used_positions = [];
-        for (const thing_id in game.things) {
-            let t = game.things[thing_id];
-            let symbol = game.thing_types[t.type_];
-            let meta_char = ' ';
-            if (t.player_char) {
-                meta_char = t.player_char;
-            }
-            if (used_positions.includes(t.position.toString())) {
-                meta_char = '+';
+        this.map_lines = []
+        if (game.map_geometry == 'Square') {
+            for (let line_split of map_lines_split) {
+                this.map_lines.push(line_split.join(''));
             };
-            map_lines_split[t.position[0]][t.position[1]] = symbol + meta_char;
-            used_positions.push(t.position.toString());
-        };
-    }
-    if (tui.mode.shows_info || tui.mode.name == 'control_tile_draw') {
-        map_lines_split[explorer.position[0]][explorer.position[1]] = '??';
-    }
-    let map_lines = []
-    if (game.map_geometry == 'Square') {
-        for (let line_split of map_lines_split) {
-            map_lines.push(line_split.join(''));
-        };
-    } else if (game.map_geometry == 'Hex') {
-        let indent = 0
-        for (let line_split of map_lines_split) {
-            map_lines.push(' '.repeat(indent) + line_split.join(''));
-            if (indent == 0) {
-                indent = 1;
-            } else {
-                indent = 0;
+        } else if (game.map_geometry == 'Hex') {
+            let indent = 0
+            for (let line_split of map_lines_split) {
+                this.map_lines.push(' '.repeat(indent) + line_split.join(''));
+                if (indent == 0) {
+                    indent = 1;
+                } else {
+                    indent = 0;
+                };
             };
+        }
+        let window_center = [terminal.rows / 2, this.window_width / 2];
+        let center_position = [player.position[0], player.position[1]];
+        if (tui.mode.shows_info || tui.mode.name == 'control_tile_draw') {
+            center_position = [explorer.position[0], explorer.position[1]];
+        }
+        center_position[1] = center_position[1] * 2;
+        this.offset = [center_position[0] - window_center[0],
+                       center_position[1] - window_center[1]]
+        if (game.map_geometry == 'Hex' && this.offset[0] % 2) {
+            this.offset[1] += 1;
         };
-    }
-    let window_center = [terminal.rows / 2, this.window_width / 2];
-    let player = game.things[game.player_id];
-    let center_position = [player.position[0], player.position[1]];
-    if (tui.mode.shows_info) {
-        center_position = [explorer.position[0], explorer.position[1]];
-    }
-    center_position[1] = center_position[1] * 2;
-    let offset = [center_position[0] - window_center[0],
-                  center_position[1] - window_center[1]]
-    if (game.map_geometry == 'Hex' && offset[0] % 2) {
-        offset[1] += 1;
     };
-    let term_y = Math.max(0, -offset[0]);
-    let term_x = Math.max(0, -offset[1]);
-    let map_y = Math.max(0, offset[0]);
-    let map_x = Math.max(0, offset[1]);
-    for (; term_y < terminal.rows && map_y < game.map_size[0]; term_y++, map_y++) {
-        let to_draw = map_lines[map_y].slice(map_x, this.window_width + offset[1]);
+    let term_y = Math.max(0, -this.offset[0]);
+    let term_x = Math.max(0, -this.offset[1]);
+    let map_y = Math.max(0, this.offset[0]);
+    let map_x = Math.max(0, this.offset[1]);
+    for (; term_y < terminal.rows && map_y < this.map_lines.length; term_y++, map_y++) {
+        let to_draw = this.map_lines[map_y].slice(map_x, this.window_width + this.offset[1]);
         terminal.write(term_y, term_x, to_draw);
     }
   },
@@ -890,7 +1089,9 @@ let tui = {
       terminal.write(0, this.window_width, 'MODE: ' + this.mode.short_desc + ' – ' + help);
   },
   draw_turn_line: function(n) {
-    terminal.write(1, this.window_width, 'TURN: ' + game.turn);
+      if (game.turn_complete) {
+          terminal.write(1, this.window_width, 'TURN: ' + game.turn);
+      }
   },
   draw_history: function() {
       let log_display_lines = [];
@@ -925,8 +1126,8 @@ let tui = {
       this.offset_links(offset, log_links);
   },
   draw_info: function() {
-      let [lines, link_data] = this.msg_into_lines_of_width(explorer.get_info(),
-                                                            this.window_width);
+      const info = "MAP VIEW: " + tui.map_mode + "\n" + explorer.get_info();
+      let [lines, link_data] = this.msg_into_lines_of_width(info, this.window_width);
       let offset = [this.height_header, this.window_width];
       for (let y = offset[0], i = 0; y < terminal.rows && i < lines.length; y++, i++) {
         terminal.write(y, offset[1], lines[i]);
@@ -946,40 +1147,24 @@ let tui = {
           movement_keys_desc = Object.keys(this.movement_keys).join(',');
       }
       let content = this.mode.short_desc + " help\n\n" + this.mode.help_intro + "\n\n";
-      if (this.mode.name == 'play') {
+      if (this.mode.available_actions.length > 0) {
           content += "Available actions:\n";
-          if (game.tasks.includes('MOVE')) {
-              content += "[" + movement_keys_desc + "] – move player\n";
-          }
-          if (game.tasks.includes('PICK_UP')) {
-              content += "[" + this.keys.take_thing + "] – pick up thing\n";
-          }
-          if (game.tasks.includes('DROP')) {
-              content += "[" + this.keys.drop_thing + "] – drop thing\n";
-          }
-          content += "[" + tui.keys.teleport + "] – teleport\n";
-          content += '\n';
-      } else if (this.mode.name == 'study') {
-          content += "Available actions:\n";
-          content += '[' + movement_keys_desc + '] – move question mark\n';
-          content += '[' + this.keys.toggle_map_mode + '] – toggle map view\n';
-          content += '\n';
-      } else if (this.mode.name == 'edit') {
-          content += "Available actions:\n";
-          if (game.tasks.includes('FLATTEN_SURROUNDINGS')) {
-              content += "[" + tui.keys.flatten + "] – flatten surroundings\n";
+          for (let action of this.mode.available_actions) {
+              if (Object.keys(this.action_tasks).includes(action)) {
+                  if (!this.task_action_on(action)) {
+                      continue;
+                  }
+              }
+              if (action == 'move_explorer') {
+                  action = 'move';
+              }
+              if (action == 'move') {
+                  content += "[" + movement_keys_desc + "] – move\n"
+              } else {
+                  content += "[" + this.keys[action] + "] – " + key_descriptions[action] + "\n";
+              }
           }
           content += '\n';
-      } else if (this.mode.name == 'control_tile_draw') {
-          content += "Available actions:\n";
-          content += "[" + tui.keys.toggle_tile_draw + "] – toggle protection character drawing\n";
-          content += '\n';
-      } else if (this.mode.name == 'chat') {
-          content += '/nick NAME – re-name yourself to NAME\n';
-          content += '/' + this.keys.switch_to_play + ' or /play – switch to play mode\n';
-          content += '/' + this.keys.switch_to_study + ' or /study – switch to study mode\n';
-          content += '/' + this.keys.switch_to_edit + ' or /edit – switch to map edit mode\n';
-          content += '/' + this.keys.switch_to_admin_enter + ' or /admin – switch to admin mode\n';
       }
       content += this.mode.list_available_modes();
       let start_x = 0;
@@ -1004,21 +1189,22 @@ let tui = {
           tui.map_mode = 'terrain + annotations';
       } else if (tui.map_mode == 'terrain + annotations') {
           tui.map_mode = 'terrain + things';
-      } else {
+      } else if (tui.map_mode == 'terrain + things') {
+          tui.map_mode = 'protections';
+      } else if (tui.map_mode == 'protections') {
           tui.map_mode = 'terrain only';
       }
   },
   full_refresh: function() {
     this.links = {};
     terminal.drawBox(0, 0, terminal.rows, terminal.cols);
+    this.recalc_input_lines();
     if (this.mode.is_intro) {
         this.draw_history();
         this.draw_input();
     } else {
-        if (game.turn_complete) {
-            this.draw_map();
-            this.draw_turn_line();
-        }
+        this.draw_map();
+        this.draw_turn_line();
         this.draw_mode_line();
         if (this.mode.shows_info) {
           this.draw_info();
@@ -1114,75 +1300,94 @@ server.init(websocket_location);
 
 let explorer = {
     position: [0,0],
-    info_db: {},
-    info_hints: [],
+    annotations: {},
+    info_cached: false,
     move: function(direction) {
         let target = game.move(this.position, direction);
         if (target) {
             this.position = target
-            if (tui.mode.shows_info) {
-                this.query_info();
-            } else if (tui.tile_draw) {
+            this.info_cached = false;
+            if (tui.tile_draw) {
                 this.send_tile_control_command();
             }
         } else {
             terminal.blink_screen();
         };
     },
-    update_info_db: function(yx, str) {
-        this.info_db[yx] = str;
+    update_annotations: function(yx, str) {
+        this.annotations[yx] = str;
         if (tui.mode.name == 'study') {
             tui.full_refresh();
         }
     },
-    empty_info_db: function() {
-        this.info_db = {};
-        this.info_hints = [];
+    empty_annotations: function() {
+        this.annotations = {};
         if (tui.mode.name == 'study') {
             tui.full_refresh();
         }
     },
-    query_info: function() {
-        server.send(["GET_ANNOTATION", unparser.to_yx(explorer.position)]);
-    },
     get_info: function() {
-        let info = "MAP VIEW: " + tui.map_mode + "\n";
+        if (this.info_cached) {
+            return this.info_cached;
+        }
+        let info_to_cache = '';
         let position_i = this.position[0] * game.map_size[1] + this.position[1];
         if (game.fov[position_i] != '.') {
-            return info + 'outside field of view';
-        };
-        let terrain_char = game.map[position_i]
-        let terrain_desc = '?'
-        if (game.terrains[terrain_char]) {
-            terrain_desc = game.terrains[terrain_char];
-        };
-        info += 'TERRAIN: "' + terrain_char + '" / ' + terrain_desc + "\n";
-        let protection = game.map_control[position_i];
-        if (protection == '.') {
-            protection = 'unprotected';
-        };
-        info += 'PROTECTION: ' + protection + '\n';
-        for (let t_id in game.things) {
-             let t = game.things[t_id];
-             if (t.position[0] == this.position[0] && t.position[1] == this.position[1]) {
-                 let symbol = game.thing_types[t.type_];
-                 info += "THING: " + t.type_ + " / " + symbol;
-                 if (t.player_char) {
-                     info += t.player_char;
-                 };
-                 if (t.name_) {
-                     info += " (" + t.name_ + ")";
+            info_to_cache += 'outside field of view';
+        } else {
+            for (let t_id in game.things) {
+                 let t = game.things[t_id];
+                 if (t.position[0] == this.position[0] && t.position[1] == this.position[1]) {
+                     info_to_cache += "THING: " + this.get_thing_info(t);
+                     let protection = t.protection;
+                     if (protection == '.') {
+                         protection = 'none';
+                     }
+                     info_to_cache += " / protection: " + protection + "\n";
+                     if (t.hat) {
+                         info_to_cache += t.hat.slice(0, 3) + '\n';
+                         info_to_cache += t.hat.slice(3, 6) + '\n';
+                         info_to_cache += t.hat.slice(6, 9) + '\n';
+                     }
+                     if (t.face) {
+                         info_to_cache += t.face.slice(0, 3) + '\n';
+                         info_to_cache += t.face.slice(3, 6) + '\n';
+                         info_to_cache += t.face.slice(6, 9) + '\n';
+                     }
                  }
-                 info += "\n";
-             }
+            }
+            let terrain_char = game.map[position_i]
+            let terrain_desc = '?'
+            if (game.terrains[terrain_char]) {
+                terrain_desc = game.terrains[terrain_char];
+            };
+            info_to_cache += 'TERRAIN: "' + terrain_char + '" / ' + terrain_desc + "\n";
+            let protection = game.map_control[position_i];
+            if (protection == '.') {
+                protection = 'unprotected';
+            };
+            info_to_cache += 'PROTECTION: ' + protection + '\n';
+            if (this.position in game.portals) {
+                info_to_cache += "PORTAL: " + game.portals[this.position] + "\n";
+            }
+            if (this.position in this.annotations) {
+                info_to_cache += "ANNOTATION: " + this.annotations[this.position];
+            }
         }
-        if (this.position in game.portals) {
-            info += "PORTAL: " + game.portals[this.position] + "\n";
+        this.info_cached = info_to_cache;
+        return this.info_cached;
+    },
+    get_thing_info: function(t) {
+        const symbol = game.thing_types[t.type_];
+        let info = t.type_ + " / " + symbol;
+        if (t.thing_char) {
+            info += t.thing_char;
+        };
+        if (t.name_) {
+            info += " (" + t.name_ + ")";
         }
-        if (this.position in this.info_db) {
-            info += "ANNOTATIONS: " + this.info_db[this.position];
-        } else {
-            info += 'waiting …';
+        if (t.installed) {
+            info += " / installed";
         }
         return info;
     },
@@ -1209,7 +1414,6 @@ tui.inputEl.addEventListener('input', (event) => {
         if (tui.inputEl.value.length > max_length) {
             tui.inputEl.value = tui.inputEl.value.slice(0, max_length);
         };
-        tui.recalc_input_lines();
     } else if (tui.mode.name == 'write' && tui.inputEl.value.length > 0) {
         server.send(["TASK:WRITE", tui.inputEl.value[0], tui.password]);
         tui.switch_mode('edit');
@@ -1224,9 +1428,17 @@ tui.inputEl.addEventListener('keydown', (event) => {
     if (event.key == 'Enter') {
         event.preventDefault();
     }
-    if (tui.mode.has_input_prompt && event.key == 'Enter' && tui.inputEl.value == '/help') {
+    if (tui.mode.has_input_prompt && event.key == 'Enter'
+        && tui.inputEl.value.length == 0
+        && ['chat', 'command_thing', 'take_thing',
+            'admin_enter'].includes(tui.mode.name)) {
+        if (tui.mode.name != 'chat') {
+            tui.log_msg('@ aborted');
+        }
+        tui.switch_mode('play');
+    } else if (tui.mode.has_input_prompt && event.key == 'Enter' && tui.inputEl.value == '/help') {
         tui.show_help = true;
-        tui.empty_input();
+        tui.inputEl.value = "";
         tui.restore_input_values();
     } else if (!tui.mode.has_input_prompt && event.key == tui.keys.help
                && !tui.mode.is_single_char_entry) {
@@ -1234,7 +1446,29 @@ tui.inputEl.addEventListener('keydown', (event) => {
     } else if (tui.mode.name == 'login' && event.key == 'Enter') {
         tui.login_name = tui.inputEl.value;
         server.send(['LOGIN', tui.inputEl.value]);
-        tui.empty_input();
+        tui.inputEl.value = "";
+    } else if (tui.mode.name == 'enter_face' && event.key == 'Enter') {
+        if (tui.inputEl.value.length != 9) {
+            tui.log_msg('? wrong input length, aborting');
+        } else {
+            server.send(['PLAYER_FACE', tui.inputEl.value]);
+        }
+        tui.inputEl.value = "";
+        tui.switch_mode('edit');
+    } else if (tui.mode.name == 'command_thing' && event.key == 'Enter') {
+        if (tui.task_action_on('command')) {
+            server.send(['TASK:COMMAND', tui.inputEl.value]);
+            tui.inputEl.value = "";
+        }
+    } else if (tui.mode.name == 'take_thing' && event.key == 'Enter') {
+        const i = parseInt(tui.inputEl.value);
+        if (isNaN(i) || i < 0 || i >= tui.selectables.length) {
+            tui.log_msg('? invalid index, aborted');
+        } else {
+            server.send(['TASK:PICK_UP', tui.selectables[i][0]]);
+        }
+        tui.inputEl.value = "";
+        tui.switch_mode('play');
     } else if (tui.mode.name == 'control_pw_pw' && event.key == 'Enter') {
         if (tui.inputEl.value.length == 0) {
             tui.log_msg('@ aborted');
@@ -1247,6 +1481,13 @@ tui.inputEl.addEventListener('keydown', (event) => {
     } else if (tui.mode.name == 'portal' && event.key == 'Enter') {
         explorer.set_portal(tui.inputEl.value);
         tui.switch_mode('edit');
+    } else if (tui.mode.name == 'name_thing' && event.key == 'Enter') {
+        if (tui.inputEl.value.length == 0) {
+            tui.inputEl.value = " ";
+        }
+        server.send(["THING_NAME", tui.selected_thing_id, tui.inputEl.value,
+                     tui.password]);
+        tui.switch_mode('edit');
     } else if (tui.mode.name == 'annotate' && event.key == 'Enter') {
         explorer.annotate(tui.inputEl.value);
         tui.switch_mode('edit');
@@ -1275,19 +1516,19 @@ tui.inputEl.addEventListener('keydown', (event) => {
             tui.tile_control_char = tui.inputEl.value[0];
             tui.switch_mode('control_tile_draw');
         }
+    } else if (tui.mode.name == 'admin_thing_protect' && event.key == 'Enter') {
+        if (tui.inputEl.value.length != 1) {
+            tui.log_msg('@ entered non-single-char, therefore aborted');
+        } else {
+            server.send(['THING_PROTECTION', tui.selected_thing_id, tui.inputEl.value])
+            tui.log_msg('@ sent new protection character for thing');
+        }
+        tui.switch_mode('admin');
     } else if (tui.mode.name == 'chat' && event.key == 'Enter') {
         let tokens = parser.tokenize(tui.inputEl.value);
         if (tokens.length > 0 && tokens[0].length > 0) {
             if (tui.inputEl.value[0][0] == '/') {
-                if (tokens[0].slice(1) == 'play' || tokens[0][1] == tui.keys.switch_to_play) {
-                    tui.switch_mode('play');
-                } else if (tokens[0].slice(1) == 'study' || tokens[0][1] == tui.keys.switch_to_study) {
-                    tui.switch_mode('study');
-                } else if (tokens[0].slice(1) == 'edit' || tokens[0][1] == tui.keys.switch_to_edit) {
-                    tui.switch_mode('edit');
-                } else if (tokens[0].slice(1) == 'admin' || tokens[0][1] == tui.keys.switch_to_admin_enter) {
-                    tui.switch_mode('admin_enter');
-                } else if (tokens[0].slice(1) == 'nick') {
+                if (tokens[0].slice(1) == 'nick') {
                     if (tokens.length > 1) {
                         server.send(['NICK', tokens[1]]);
                     } else {
@@ -1302,18 +1543,21 @@ tui.inputEl.addEventListener('keydown', (event) => {
         } else if (tui.inputEl.valuelength > 0) {
 	        server.send(['ALL', tui.inputEl.value]);
         }
-        tui.empty_input();
+        tui.inputEl.value = "";
     } else if (tui.mode.name == 'play') {
           if (tui.mode.mode_switch_on_key(event)) {
               null;
-          } else if (event.key === tui.keys.take_thing
-                     && game.tasks.includes('PICK_UP')) {
-              server.send(["TASK:PICK_UP"]);
-          } else if (event.key === tui.keys.drop_thing
-                     && game.tasks.includes('DROP')) {
+          } else if (event.key === tui.keys.drop_thing && tui.task_action_on('drop_thing')) {
               server.send(["TASK:DROP"]);
-          } else if (event.key in tui.movement_keys
-                     && game.tasks.includes('MOVE')) {
+          } else if (event.key === tui.keys.consume && tui.task_action_on('consume')) {
+              server.send(["TASK:INTOXICATE"]);
+          } else if (event.key === tui.keys.door && tui.task_action_on('door')) {
+              server.send(["TASK:DOOR"]);
+          } else if (event.key === tui.keys.install && tui.task_action_on('install')) {
+              server.send(["TASK:INSTALL"]);
+          } else if (event.key === tui.keys.install && tui.task_action_on('wear')) {
+              server.send(["TASK:WEAR"]);
+          } else if (event.key in tui.movement_keys && tui.task_action_on('move')) {
               server.send(['TASK:MOVE', tui.movement_keys[event.key]]);
           } else if (event.key === tui.keys.teleport) {
               game.teleport();
@@ -1337,16 +1581,18 @@ tui.inputEl.addEventListener('keydown', (event) => {
     } else if (tui.mode.name == 'admin') {
         if (tui.mode.mode_switch_on_key(event)) {
               null;
+        } else if (event.key in tui.movement_keys && tui.task_action_on('move')) {
+            server.send(['TASK:MOVE', tui.movement_keys[event.key]]);
         };
     } else if (tui.mode.name == 'edit') {
         if (tui.mode.mode_switch_on_key(event)) {
               null;
-        } else if (event.key in tui.movement_keys
-                   && game.tasks.includes('MOVE')) {
+        } else if (event.key in tui.movement_keys && tui.task_action_on('move')) {
             server.send(['TASK:MOVE', tui.movement_keys[event.key]]);
-        } else if (event.key === tui.keys.flatten
-                   && game.tasks.includes('FLATTEN_SURROUNDINGS')) {
+        } else if (event.key === tui.keys.flatten && tui.task_action_on('flatten')) {
             server.send(["TASK:FLATTEN_SURROUNDINGS", tui.password]);
+        } else if (event.key == tui.keys.toggle_map_mode) {
+            tui.toggle_map_mode();
         }
     }
     tui.full_refresh();
@@ -1385,12 +1631,17 @@ window.setInterval(function() {
 }, 5000);
 window.setInterval(function() {
     let val = "?";
+    let span_decoration = "none";
     if (document.activeElement == tui.inputEl) {
         val = "on (click outside terminal to change)";
     } else {
         val = "off (click into terminal to change)";
+        span_decoration = "line-through";
     };
     document.getElementById("keyboard_control").textContent = val;
+    for (const span of document.querySelectorAll('.keyboard_controlled')) {
+        span.style.textDecoration = span_decoration;
+    }
 }, 100);
 document.getElementById("terminal").onclick = function() {
     tui.inputEl.focus();
@@ -1413,72 +1664,36 @@ document.getElementById("toggle_map_mode").onclick = function() {
     tui.toggle_map_mode();
     tui.full_refresh();
 };
-document.getElementById("take_thing").onclick = function() {
-        server.send(['TASK:PICK_UP']);
-};
 document.getElementById("drop_thing").onclick = function() {
-        server.send(['TASK:DROP']);
+    server.send(['TASK:DROP']);
 };
 document.getElementById("flatten").onclick = function() {
     server.send(['TASK:FLATTEN_SURROUNDINGS', tui.password]);
 };
-document.getElementById("teleport").onclick = function() {
-    game.teleport();
+document.getElementById("door").onclick = function() {
+    server.send(['TASK:DOOR']);
 };
-document.getElementById("move_upleft").onclick = function() {
-    if (tui.mode.name == 'play' || tui.mode.name == 'edit') {
-        server.send(['TASK:MOVE', 'UPLEFT']);
-    } else {
-        explorer.move('UPLEFT');
-    };
-};
-document.getElementById("move_left").onclick = function() {
-    if (tui.mode.name == 'play' || tui.mode.name == 'edit') {
-        server.send(['TASK:MOVE', 'LEFT']);
-    } else {
-        explorer.move('LEFT');
-    };
-};
-document.getElementById("move_downleft").onclick = function() {
-    if (tui.mode.name == 'play' || tui.mode.name == 'edit') {
-        server.send(['TASK:MOVE', 'DOWNLEFT']);
-    } else {
-        explorer.move('DOWNLEFT');
-    };
-};
-document.getElementById("move_down").onclick = function() {
-    if (tui.mode.name == 'play' || tui.mode.name == 'edit') {
-        server.send(['TASK:MOVE', 'DOWN']);
-    } else {
-        explorer.move('DOWN');
-    };
+document.getElementById("consume").onclick = function() {
+    server.send(['TASK:INTOXICATE']);
 };
-document.getElementById("move_up").onclick = function() {
-    if (tui.mode.name == 'play' || tui.mode.name == 'edit') {
-        server.send(['TASK:MOVE', 'UP']);
-    } else {
-        explorer.move('UP');
-    };
+document.getElementById("install").onclick = function() {
+    server.send(['TASK:INSTALL']);
 };
-document.getElementById("move_upright").onclick = function() {
-    if (tui.mode.name == 'play' || tui.mode.name == 'edit') {
-        server.send(['TASK:MOVE', 'UPRIGHT']);
-    } else {
-        explorer.move('UPRIGHT');
-    };
+document.getElementById("wear").onclick = function() {
+    server.send(['TASK:WEAR']);
 };
-document.getElementById("move_right").onclick = function() {
-    if (tui.mode.name == 'play' || tui.mode.name == 'edit') {
-        server.send(['TASK:MOVE', 'RIGHT']);
-    } else {
-        explorer.move('RIGHT');
-    };
+document.getElementById("teleport").onclick = function() {
+    game.teleport();
 };
-document.getElementById("move_downright").onclick = function() {
-    if (tui.mode.name == 'play' || tui.mode.name == 'edit') {
-        server.send(['TASK:MOVE', 'DOWNRIGHT']);
-    } else {
-        explorer.move('DOWNRIGHT');
+for (const move_button of document.querySelectorAll('[id*="_move_"]')) {
+    let direction = move_button.id.split('_')[2].toUpperCase();
+    move_button.onclick = function() {
+        if (tui.mode.available_actions.includes("move")
+            || tui.mode.available_actions.includes("move_explorer")) {
+            server.send(['TASK:MOVE', direction]);
+        } else {
+            explorer.move(direction);
+        };
     };
 };
 </script>