X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/balance2?a=blobdiff_plain;f=rogue_chat.html;h=47bf58d3aa4c937dfe5b078a6a161c25349ccd16;hb=dfe8541633da35717021f06839d1a386481c95f1;hp=7d2747e75be9fa5478aca4ff461b1c2993efff7e;hpb=88c8acab582aeb25735d86b78defe28441439cba;p=plomrogue2

diff --git a/rogue_chat.html b/rogue_chat.html
index 7d2747e..47bf58d 100644
--- a/rogue_chat.html
+++ b/rogue_chat.html
@@ -14,12 +14,11 @@ terminal rows: <input id="n_rows" type="number" step=4 min=24 value=24 />
 / terminal columns: <input id="n_cols" type="number" step=4 min=80 value=80 />
 / <a href="https://plomlompom.com/repos/?p=plomrogue2;a=summary">source code</a> (includes proper terminal/ncurses client)
 </div>
+<div style="position: relative; display: inline-block;">
 <pre id="terminal"></pre>
-<textarea id="input" style="opacity: 0; width: 0px;"></textarea>
-<div>
-keyboard input/control: <span id="keyboard_control"></span>
+<textarea id="input" style="position: absolute; left: 0; height: 100%; width: 100%; opacity: 0; z-index: -1;"></textarea>
 </div>
-<h3>button controls for mouse players</h3>
+<h3>button controls for hard-to-remember keybindings</h3>
 <table id="move_table" style="float: left">
   <tr>
     <td style="text-align: right"><button id="hex_move_upleft"></button></td>
@@ -52,13 +51,13 @@ keyboard input/control: <span id="keyboard_control"></span>
     <td><button id="switch_to_play"></button></td>
     <td>
       <button id="switch_to_take_thing"></button>
-      <button id="drop_thing"></button>
+      <button id="switch_to_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>
+      <button id="spin"></button>
     </td>
   </tr>
   <tr>
@@ -66,11 +65,13 @@ keyboard input/control: <span id="keyboard_control"></span>
     <td>
       <button id="switch_to_write"></button>
       <button id="flatten"></button>
+      <button id="install"></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>
+      <button id="switch_to_enter_hat"></button>
     </td>
   </tr>
   <tr>
@@ -99,12 +100,14 @@ 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>drop thing: <input id="key_drop_thing" type="text" value="u" />
+<li>spin: <input id="key_spin" type="text" value="S" />
 <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_drop_thing" type="text" value="u" />
 <li><input id="key_switch_to_enter_face" type="text" value="f" />
+<li><input id="key_switch_to_enter_hat" type="text" value="H" />
 <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" />
@@ -126,8 +129,8 @@ keyboard input/control: <span id="keyboard_control"></span>
 </div>
 <script>
 "use strict";
-//let websocket_location = "wss://plomlompom.com/rogue_chat/";
-let websocket_location = "ws://localhost:8000/";
+let websocket_location = "wss://plomlompom.com/rogue_chat/";
+//let websocket_location = "ws://localhost:8000/";
 
 let mode_helps = {
     'play': {
@@ -147,30 +150,40 @@ let mode_helps = {
     'name_thing': {
         'short': 'name thing',
         'intro': '',
-        'long': 'Give name to/change name of thing here.'
+        'long': 'Give name to/change name of carried thing.'
     },
     'command_thing': {
-        'short': 'command thing',
+        'short': 'command',
         'intro': '',
         'long': 'Enter a command to the thing you carry.  Enter nothing to return to play mode.'
     },
     'take_thing': {
-        'short': 'take thing',
+        'short': 'take',
         'intro': 'Pick up a thing in reach by entering its index number.  Enter nothing to abort.',
         'long': 'You see a list of things which you could pick up.  Enter the target thing\'s index, or, to leave, nothing.'
     },
+    'drop_thing': {
+        'short': 'drop',
+        'intro': 'Enter number of direction to which you want to drop thing.',
+        'long': 'Drop currently carried thing by entering the target direction index.  Enter nothing to return to play mode..'
+    },
     'admin_thing_protect': {
         'short': 'change thing protection',
         'intro': '@ enter thing protection character:',
-        'long': 'Change protection character for thing here.'
+        'long': 'Change protection character for carried thing.'
     },
     'enter_face': {
-        'short': 'enter your face',
+        'short': 'edit face',
         'intro': '@ enter face line (enter nothing to abort):',
-        'long': 'Draw your face as ASCII art.  The string you enter must be 18 characters long, and will be divided on display into 3 lines of 6 characters each, from top to bottom..'
+        'long': 'Draw your face as ASCII art.  The string you enter must be 18 characters long, and will be divided on display into 3 lines of 6 characters each, from top to bottom.  Eat cookies to extend the ASCII characters available for drawing.'
+    },
+    'enter_hat': {
+        'short': 'edit hat',
+        'intro': '@ enter hat line (enter nothing to abort):',
+        'long': 'Draw your hat as ASCII art.  The string you enter must be 18 characters long, and will be divided on display into 3 lines of 6 characters each, from top to bottom..'
     },
     'write': {
-        'short': 'change terrain',
+        'short': 'edit tile',
         '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.'
     },
@@ -244,11 +257,11 @@ 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',
+    'spin': 'spin',
     'toggle_map_mode': 'toggle map view',
     'toggle_tile_draw': 'toggle protection character drawing',
     'hex_move_upleft': 'up-left',
@@ -447,7 +460,6 @@ let server = {
         this.url = url;
         this.websocket = new WebSocket(this.url);
         this.websocket.onopen = function(event) {
-            server.connected = true;
             game.thing_types = {};
             game.terrains = {};
             server.send(['TASKS']);
@@ -457,7 +469,6 @@ let server = {
             tui.switch_mode('login');
         };
         this.websocket.onclose = function(event) {
-            server.connected = false;
             tui.switch_mode('waiting_for_server');
             tui.log_msg("@ server disconnected :(");
         };
@@ -474,69 +485,94 @@ let server = {
         let tokens = parser.tokenize(event.data);
         if (tokens[0] === 'TURN') {
             game.turn_complete = false;
-            explorer.empty_annotations();
-            game.things = {};
-            game.portals = {};
-            game.fov = '';
-            game.turn = parseInt(tokens[1]);
+        } else if (tokens[0] === 'OTHER_WIPE') {
+            game.portals_new = {};
+            explorer.annotations_new = {};
+            game.things_new = [];
+        } else if (tokens[0] === 'STATS') {
+            game.bladder_pressure_new = parseInt(tokens[1])
+            game.energy_new = parseInt(tokens[2])
         } else if (tokens[0] === 'THING') {
-            let t = game.get_thing(tokens[4], true);
+            let t = game.get_thing_temp(tokens[4], true);
             t.position = parser.parse_yx(tokens[1]);
             t.type_ = tokens[2];
             t.protection = tokens[3];
             t.portable = parseInt(tokens[5]);
+            t.commandable = parseInt(tokens[6]);
         } else if (tokens[0] === 'THING_NAME') {
-            let t = game.get_thing(tokens[1], false);
+            let t = game.get_thing_temp(tokens[1]);
             t.name_ = tokens[2];
         } else if (tokens[0] === 'THING_FACE') {
-            let t = game.get_thing(tokens[1], false);
+            let t = game.get_thing_temp(tokens[1]);
             t.face = tokens[2];
         } else if (tokens[0] === 'THING_HAT') {
-            let t = game.get_thing(tokens[1], false);
+            let t = game.get_thing_temp(tokens[1]);
             t.hat = tokens[2];
         } else if (tokens[0] === 'THING_CHAR') {
-            let t = game.get_thing(tokens[1], false);
+            let t = game.get_thing_temp(tokens[1]);
             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');
+            tui.mode_drop_thing.legal = game.tasks.includes('DROP');
         } 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;
+            let t = game.get_thing_temp(tokens[1]);
+            t.carrying = game.get_thing_temp(tokens[2], false);
         } else if (tokens[0] === 'THING_INSTALLED') {
-            let t = game.get_thing(tokens[1], false);
+            let t = game.get_thing_temp(tokens[1]);
             t.installed = true;
         } else if (tokens[0] === 'TERRAIN') {
             game.terrains[tokens[1]] = tokens[2]
         } else if (tokens[0] === 'MAP') {
-            game.map_geometry = tokens[1];
-            tui.init_keys();
-            game.map_size = parser.parse_yx(tokens[2]);
-            game.map = tokens[3]
+            game.map_geometry_new = tokens[1];
+            game.map_size_new = parser.parse_yx(tokens[2]);
+            game.map_new = tokens[3]
         } else if (tokens[0] === 'FOV') {
-            game.fov = tokens[1]
+            game.fov_new = tokens[1]
         } else if (tokens[0] === 'MAP_CONTROL') {
-            game.map_control = tokens[1]
+            game.map_control_new = tokens[1]
         } else if (tokens[0] === 'GAME_STATE_COMPLETE') {
+            game.portals = game.portals_new;
+            game.map_geometry = game.map_geometry_new;
+            game.map_size = game.map_size_new;
+            game.map = game.map_new;
+            game.fov = game.fov_new;
+            tui.init_keys();
+            game.map_control = game.map_control_new;
+            explorer.annotations = explorer.annotations_new;
+            explorer.info_cached = false;
+            game.things = game.things_new;
+            game.player = game.things[game.player_id];
+            game.players_hat_chars = game.players_hat_chars_new;
+            game.bladder_pressure = game.bladder_pressure_new
+            game.energy = game.energy_new
             game.turn_complete = true;
             if (tui.mode.name == 'post_login_wait') {
                 tui.switch_mode('play');
+            } else {
+                tui.full_refresh();
             }
-            explorer.info_cached = false;
-            tui.full_refresh();
         } else if (tokens[0] === 'CHAT') {
              tui.log_msg('# ' + tokens[1], 1);
+        } else if (tokens[0] === 'CHATFACE') {
+            tui.draw_face = tokens[1];
+            tui.full_refresh();
         } 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] === 'PLAYERS_HAT_CHARS') {
+            game.players_hat_chars_new = tokens[1];
         } else if (tokens[0] === 'LOGIN_OK') {
             this.send(['GET_GAMESTATE']);
             tui.switch_mode('post_login_wait');
+            tui.log_msg('@ welcome!')
+            tui.log_msg('@ hint: see top of terminal for how to get help.')
+            tui.log_msg('@ hint: enter study mode to understand your environment.')
         } else if (tokens[0] === 'DEFAULT_COLORS') {
             terminal.set_default_colors();
         } else if (tokens[0] === 'RANDOM_COLORS') {
@@ -547,11 +583,10 @@ let server = {
             tui.switch_mode('admin');
         } else if (tokens[0] === 'PORTAL') {
             let position = parser.parse_yx(tokens[1]);
-            game.portals[position] = tokens[2];
+            game.portals_new[position] = tokens[2];
         } else if (tokens[0] === 'ANNOTATION') {
             let position = parser.parse_yx(tokens[1]);
-            explorer.update_annotations(position, tokens[2]);
-            tui.full_refresh();
+            explorer.annotations_new[position] = tokens[2];
         } else if (tokens[0] === 'UNHANDLED_INPUT') {
             tui.log_msg('? unknown command');
         } else if (tokens[0] === 'PLAY_ERROR') {
@@ -670,7 +705,9 @@ let tui = {
   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_drop_thing: new Mode('drop_thing', true),
   mode_enter_face: new Mode('enter_face', true),
+  mode_enter_hat: new Mode('enter_hat', true),
   mode_admin_enter: new Mode('admin_enter', true),
   mode_admin: new Mode('admin'),
   mode_control_pw_pw: new Mode('control_pw_pw', true),
@@ -686,15 +723,19 @@ let tui = {
       'wear': 'WEAR',
       'command': 'COMMAND',
       'consume': 'INTOXICATE',
+      'spin': 'SPIN',
   },
   offset: [0,0],
   map_lines: [],
+  ascii_draw_stage: 0,
+  full_ascii_draw: '',
   selectables: [],
+  draw_face: false,
   init: function() {
       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"];
+                                        "command_thing", "take_thing", "drop_thing"]
+      this.mode_play.available_actions = ["move", "teleport", "door", "consume",
+                                          "wear", "spin"];
       this.mode_study.available_modes = ["chat", "play", "admin_enter", "edit"]
       this.mode_study.available_actions = ["toggle_map_mode", "move_explorer"];
       this.mode_admin.available_modes = ["admin_thing_protect", "control_pw_type",
@@ -705,10 +746,10 @@ let tui = {
       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", "enter_face"]
-      this.mode_edit.available_actions = ["move", "flatten", "toggle_map_mode"]
+                                        "admin_enter", "enter_face", "enter_hat"]
+      this.mode_edit.available_actions = ["move", "flatten", "install",
+                                          "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;
@@ -752,32 +793,34 @@ let tui = {
       return game.tasks.includes(this.action_tasks[action]);
   },
   switch_mode: function(mode_name) {
+
+    function fail(msg, return_mode='play') {
+        tui.log_msg('? ' + msg);
+        terminal.blink_screen();
+        tui.switch_mode(return_mode);
+    }
+
     if (this.mode && this.mode.name == 'control_tile_draw') {
         tui.log_msg('@ finished tile protection drawing.')
     }
+    this.draw_face = false;
     this.tile_draw = false;
+    if (mode_name == 'command_thing' && (!game.player.carrying
+                                         || !game.player.carrying.commandable)) {
+        return fail('not carrying anything commandable');
+    } else if (mode_name == 'name_thing' && !game.player.carrying) {
+        return fail('not carrying anything to re-name');
+    } else if (mode_name == 'admin_thing_protect' && !game.player.carrying) {
+        return fail('not carrying anything to protect')
+    } else if (mode_name == 'take_thing' && game.player.carrying) {
+        return fail('already carrying something');
+    } else if (mode_name == 'drop_thing' && !game.player.carrying) {
+        return fail('not carrying anything droppable');
+    } else if (mode_name == 'enter_hat' && !game.player.hat) {
+        return fail('not wearing hat to edit', 'edit');
+    }
     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)) {
@@ -785,11 +828,8 @@ let tui = {
     } 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;
+        explorer.position = game.player.position;
     }
     this.inputEl.value = "";
     this.restore_input_values();
@@ -826,39 +866,67 @@ let tui = {
         this.show_help = true;
     } 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') {
+        const y = game.player.position[0]
+        const x = game.player.position[1]
+        let directed_moves = {
+            'HERE': [0, 0], 'LEFT': [0, -1], 'RIGHT': [0, 1]
+        }
+        if (game.map_geometry == 'Square') {
+            directed_moves['UP'] = [-1, 0];
+            directed_moves['DOWN'] = [1, 0];
+        } else 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());
+                directed_moves['UPLEFT'] = [-1, 0];
+                directed_moves['UPRIGHT'] = [-1, 1];
+                directed_moves['DOWNLEFT'] = [1, 0];
+                directed_moves['DOWNRIGHT'] = [1, 1];
             } else {
-                select_range.push((y - 1).toString() + ':' + (x - 1).toString());
-                select_range.push((y + 1).toString() + ':' + (x - 1).toString());
+                directed_moves['UPLEFT'] = [-1, -1];
+                directed_moves['UPRIGHT'] = [-1, 0];
+                directed_moves['DOWNLEFT'] = [1, -1];
+                directed_moves['DOWNRIGHT'] = [1, 0];
             }
-        };
+        }
+        console.log(directed_moves);
+        let select_range = {};
+        for (const direction in directed_moves) {
+            const move = directed_moves[direction];
+            select_range[direction] = [y + move[0], x + move[1]];
+        }
         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]);
+        let directions = [];
+        for (const direction in select_range) {
+            for (const t_id in game.things) {
+                const t = game.things[t_id];
+                const position = select_range[direction];
+                if (t.portable
+                    && t.position[0] == position[0]
+                    && t.position[1] == position[1]) {
+                    this.selectables.push(t_id);
+                    directions.push(direction);
+                }
             }
-        };
+        }
         if (this.selectables.length == 0) {
-            this.log_msg('none')
+            this.log_msg('none');
+            terminal.blink_screen();
+            this.switch_mode('play');
+            return;
         } else {
-            for (let [i, t] of this.selectables.entries()) {
-                this.log_msg(i + ': ' + explorer.get_thing_info(t[1]));
+            for (let [i, t_id] of this.selectables.entries()) {
+                const t = game.things[t_id];
+                const direction = directions[i];
+                this.log_msg(i + ' ' + direction + ': ' + explorer.get_thing_info(t));
             }
         }
+    } else if (this.mode.name == 'drop_thing') {
+        this.log_msg('Direction to drop thing to:');
+        this.selectables = ['HERE'].concat(Object.values(this.movement_keys));
+        for (let [i, direction] of this.selectables.entries()) {
+            this.log_msg(i + ': ' + direction);
+        };
+    } else if (this.mode.name == 'enter_hat') {
+        this.log_msg('legal characters: ' + game.players_hat_chars);
     } else if (this.mode.name == 'command_thing') {
         server.send(['TASK:COMMAND', 'HELP']);
     } else if (this.mode.name == 'control_pw_pw') {
@@ -892,21 +960,27 @@ let tui = {
       } else if (this.mode.name == 'password') {
           this.inputEl.value = this.password;
       } 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_;
+          if (game.player.carrying && game.player.carrying.name_) {
+              this.inputEl.value = game.player.carrying.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;
+          if (game.player.carrying && game.player.carrying.protection) {
+              this.inputEl.value = game.player.carrying.protection;
+          }
+      } else if (['enter_face', 'enter_hat'].includes(this.mode.name)) {
+          const start = this.ascii_draw_stage * 6;
+          const end = (this.ascii_draw_stage + 1) * 6;
+          if (this.mode.name == 'enter_face') {
+              this.inputEl.value = game.player.face.slice(start, end);
+          } else if (this.mode.name == 'enter_hat') {
+              this.inputEl.value = game.player.hat.slice(start, end);
           }
       }
   },
   recalc_input_lines: function() {
       if (this.mode.has_input_prompt) {
           let _ = null;
-          [this.input_lines, _] = this.msg_into_lines_of_width(this.input_prompt + this.inputEl.value, this.window_width);
+          [this.input_lines, _] = this.msg_into_lines_of_width(this.input_prompt + this.inputEl.value + '█', this.window_width);
       } else {
           this.input_lines = [];
       }
@@ -919,10 +993,11 @@ let tui = {
           };
           inner_links[y].push([url_start_x, end_x, url]);
       };
-      const matches = msg.matchAll(/https?:\/\/[^\s]+/g)
       let link_data = {};
       let url_ends = [];
-      for (const match of matches) {
+      const regexp = RegExp('https?://[^\\s]+', 'g');
+      let match;
+      while ((match = regexp.exec(msg)) !== null) {
           const url = match[0];
           const url_start = match.index;
           const url_end = match.index + match[0].length;
@@ -979,6 +1054,34 @@ let tui = {
       };
       this.full_refresh();
   },
+  pick_selectable: function(task_name) {
+      const i = parseInt(this.inputEl.value);
+      if (isNaN(this.inputEl.value) || i < 0 || i >= this.selectables.length) {
+          tui.log_msg('? invalid index, aborted');
+      } else {
+          server.send(['TASK:' + task_name, tui.selectables[i]]);
+      }
+      this.inputEl.value = "";
+      this.switch_mode('play');
+  },
+  enter_ascii_art: function(command) {
+      if (this.inputEl.value.length != 6) {
+          this.log_msg('? wrong input length, must be 6; try again');
+          return;
+      }
+      this.log_msg('  ' + this.inputEl.value);
+      this.full_ascii_draw += this.inputEl.value;
+      this.ascii_draw_stage += 1;
+      if (this.ascii_draw_stage < 3) {
+          this.restore_input_values();
+      } else {
+          server.send([command, this.full_ascii_draw]);
+          this.full_ascii_draw = '';
+          this.ascii_draw_stage = 0;
+          this.inputEl.value = '';
+          this.switch_mode('edit');
+      }
+  },
   draw_map: function() {
     if (!game.turn_complete && this.map_lines.length == 0) {
         return;
@@ -1000,8 +1103,9 @@ let tui = {
         };
         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 ';
+            for (const [coordinate, _] of Object.entries(explorer.annotations)) {
+                const yx = coordinate.split(',')
+                map_lines_split[yx[0]][yx[1]] = 'A ';
             }
         } else if (this.map_mode == 'terrain + things') {
             for (const p in game.portals) {
@@ -1038,11 +1142,10 @@ let tui = {
                 }
             };
         }
-        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]] = '??';
+            map_lines_split[game.player.position[0]][game.player.position[1]] = '??';
         }
         this.map_lines = []
         if (game.map_geometry == 'Square') {
@@ -1061,7 +1164,7 @@ let tui = {
             };
         }
         let window_center = [terminal.rows / 2, this.window_width / 2];
-        let center_position = [player.position[0], player.position[1]];
+        let center_position = [game.player.position[0], game.player.position[1]];
         if (tui.mode.shows_info || tui.mode.name == 'control_tile_draw') {
             center_position = [explorer.position[0], explorer.position[1]];
         }
@@ -1081,6 +1184,32 @@ let tui = {
         terminal.write(term_y, term_x, to_draw);
     }
   },
+  draw_face_popup: function() {
+      const t = game.things[this.draw_face];
+      if (!t || !t.face) {
+          this.draw_face = false;
+          return;
+      }
+      const start_x = tui.window_width - 10;
+      let t_char = ' ';
+      if (t.thing_char) {
+          t_char = t.thing_char;
+      }
+      function draw_body_part(body_part, end_y) {
+          terminal.write(end_y - 4, start_x, ' _[ @' + t_char + ' ]_ ');
+          terminal.write(end_y - 3, start_x, '|        |');
+          terminal.write(end_y - 2, start_x, '| ' + body_part.slice(0, 6) + ' |');
+          terminal.write(end_y - 1, start_x, '| ' + body_part.slice(6, 12) + ' |');
+          terminal.write(end_y, start_x, '| ' + body_part.slice(12, 18) + ' |');
+      }
+      if (t.face) {
+          draw_body_part(t.face, terminal.rows - 2);
+      }
+      if (t.hat) {
+          draw_body_part(t.hat, terminal.rows - 5);
+      }
+      terminal.write(terminal.rows - 1, start_x, '|        |');
+  },
   draw_mode_line: function() {
       let help = 'hit [' + this.keys.help + '] for help';
       if (this.mode.has_input_prompt) {
@@ -1088,10 +1217,10 @@ let tui = {
       }
       terminal.write(0, this.window_width, 'MODE: ' + this.mode.short_desc + ' – ' + help);
   },
-  draw_turn_line: function(n) {
-      if (game.turn_complete) {
-          terminal.write(1, this.window_width, 'TURN: ' + game.turn);
-      }
+  draw_stats_line: function(n) {
+      terminal.write(1, this.window_width,
+                     'ENERGY: ' + game.energy +
+                     ' BLADDER: ' + game.bladder_pressure);
   },
   draw_history: function() {
       let log_display_lines = [];
@@ -1169,7 +1298,8 @@ let tui = {
       content += this.mode.list_available_modes();
       let start_x = 0;
       if (!this.mode.has_input_prompt) {
-          start_x = this.window_width
+          start_x = this.window_width;
+          this.draw_links = false;
       }
       terminal.drawBox(0, start_x, terminal.rows, this.window_width);
       let [lines, _] = this.msg_into_lines_of_width(content, this.window_width);
@@ -1196,6 +1326,7 @@ let tui = {
       }
   },
   full_refresh: function() {
+    this.draw_links = true;
     this.links = {};
     terminal.drawBox(0, 0, terminal.rows, terminal.cols);
     this.recalc_input_lines();
@@ -1204,7 +1335,7 @@ let tui = {
         this.draw_input();
     } else {
         this.draw_map();
-        this.draw_turn_line();
+        this.draw_stats_line();
         this.draw_mode_line();
         if (this.mode.shows_info) {
           this.draw_info();
@@ -1216,30 +1347,51 @@ let tui = {
     if (this.show_help) {
         this.draw_help();
     }
+    if (this.draw_face && ['chat', 'play'].includes(this.mode.name)) {
+        this.draw_face_popup();
+    }
+    if (!this.draw_links) {
+        this.links = {};
+    }
     terminal.refresh();
   }
 }
 
 let game = {
     init: function() {
-        this.things = {};
         this.turn = -1;
+        this.player_id = -1;
+        this.tasks = {};
+        this.things = {};
+        this.things_new = {};
+        this.fov = "";
+        this.fov_new = "";
         this.map = "";
+        this.map_new = "";
         this.map_control = "";
+        this.map_control_new = "";
         this.map_size = [0,0];
-        this.player_id = -1;
+        this.map_size_new = [0,0];
         this.portals = {};
-        this.tasks = {};
+        this.portals_new = {};
+        this.players_hat_chars = "";
+        this.bladder_pressure = 0;
+        this.bladder_pressure_new = 0;
     },
-    get_thing: function(id_, create_if_not_found=false) {
-        if (id_ in game.things) {
-            return game.things[id_];
+    get_thing_temp: function(id_, create_if_not_found=false) {
+        if (id_ in game.things_new) {
+            return game.things_new[id_];
         } else if (create_if_not_found) {
             let t = new Thing([0,0]);
-            game.things[id_] = t;
+            game.things_new[id_] = t;
             return t;
         };
     },
+    get_thing: function(id_, create_if_not_found=false) {
+        if (id_ in game.things) {
+            return game.things[id_];
+        };
+    },
     move: function(start_position, direction) {
         let target = [start_position[0], start_position[1]];
         if (direction == 'LEFT') {
@@ -1283,9 +1435,8 @@ let game = {
         return target;
     },
     teleport: function() {
-        let player = this.get_thing(game.player_id);
-        if (player.position in this.portals) {
-            server.reconnect_to(this.portals[player.position]);
+        if (game.player.position in this.portals) {
+            server.reconnect_to(this.portals[game.player.position]);
         } else {
             terminal.blink_screen();
             tui.log_msg('? not standing on portal')
@@ -1301,6 +1452,7 @@ server.init(websocket_location);
 let explorer = {
     position: [0,0],
     annotations: {},
+    annotations_new: {},
     info_cached: false,
     move: function(direction) {
         let target = game.move(this.position, direction);
@@ -1314,18 +1466,6 @@ let explorer = {
             terminal.blink_screen();
         };
     },
-    update_annotations: function(yx, str) {
-        this.annotations[yx] = str;
-        if (tui.mode.name == 'study') {
-            tui.full_refresh();
-        }
-    },
-    empty_annotations: function() {
-        this.annotations = {};
-        if (tui.mode.name == 'study') {
-            tui.full_refresh();
-        }
-    },
     get_info: function() {
         if (this.info_cached) {
             return this.info_cached;
@@ -1421,18 +1561,21 @@ tui.inputEl.addEventListener('input', (event) => {
     tui.full_refresh();
 }, false);
 document.onclick = function() {
-    tui.show_help = false;
+    if (!tui.mode.is_single_char_entry) {
+        tui.show_help = false;
+    }
 };
 tui.inputEl.addEventListener('keydown', (event) => {
     tui.show_help = false;
-    if (event.key == 'Enter') {
+    if (['Enter', 'ArrowLeft', 'ArrowRight'].includes(event.key)) {
         event.preventDefault();
     }
-    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') {
+    if ((!tui.mode.is_intro && event.key == 'Escape')
+        || (tui.mode.has_input_prompt && event.key == 'Enter'
+            && tui.inputEl.value.length == 0
+            && ['chat', 'command_thing', 'take_thing', 'drop_thing',
+                'admin_enter'].includes(tui.mode.name))) {
+        if (!['chat', 'play', 'study', 'edit'].includes(tui.mode.name)) {
             tui.log_msg('@ aborted');
         }
         tui.switch_mode('play');
@@ -1448,27 +1591,16 @@ tui.inputEl.addEventListener('keydown', (event) => {
         server.send(['LOGIN', tui.inputEl.value]);
         tui.inputEl.value = "";
     } else if (tui.mode.name == 'enter_face' && event.key == 'Enter') {
-        if (tui.inputEl.value.length != 18) {
-            tui.log_msg('? wrong input length, aborting');
-        } else {
-            server.send(['PLAYER_FACE', tui.inputEl.value]);
-        }
-        tui.inputEl.value = "";
-        tui.switch_mode('edit');
+        tui.enter_ascii_art('PLAYER_FACE');
+    } else if (tui.mode.name == 'enter_hat' && event.key == 'Enter') {
+        tui.enter_ascii_art('PLAYER_HAT');
     } 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]]);
-        }
+        server.send(['TASK:COMMAND', tui.inputEl.value]);
         tui.inputEl.value = "";
-        tui.switch_mode('play');
+    } else if (tui.mode.name == 'take_thing' && event.key == 'Enter') {
+        tui.pick_selectable('PICK_UP');
+    } else if (tui.mode.name == 'drop_thing' && event.key == 'Enter') {
+        tui.pick_selectable('DROP');
     } else if (tui.mode.name == 'control_pw_pw' && event.key == 'Enter') {
         if (tui.inputEl.value.length == 0) {
             tui.log_msg('@ aborted');
@@ -1485,8 +1617,7 @@ tui.inputEl.addEventListener('keydown', (event) => {
         if (tui.inputEl.value.length == 0) {
             tui.inputEl.value = " ";
         }
-        server.send(["THING_NAME", tui.selected_thing_id, tui.inputEl.value,
-                     tui.password]);
+        server.send(["THING_NAME", tui.inputEl.value, tui.password]);
         tui.switch_mode('edit');
     } else if (tui.mode.name == 'annotate' && event.key == 'Enter') {
         explorer.annotate(tui.inputEl.value);
@@ -1520,7 +1651,7 @@ tui.inputEl.addEventListener('keydown', (event) => {
         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])
+            server.send(['THING_PROTECTION', tui.inputEl.value])
             tui.log_msg('@ sent new protection character for thing');
         }
         tui.switch_mode('admin');
@@ -1547,16 +1678,14 @@ tui.inputEl.addEventListener('keydown', (event) => {
     } else if (tui.mode.name == 'play') {
           if (tui.mode.mode_switch_on_key(event)) {
               null;
-          } else if (event.key === tui.keys.drop_thing && tui.task_action_on('drop_thing')) {
-              server.send(["TASK:DROP"]);
           } 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.wear && tui.task_action_on('wear')) {
               server.send(["TASK:WEAR"]);
+          } else if (event.key === tui.keys.spin && tui.task_action_on('spin')) {
+              server.send(["TASK:SPIN"]);
           } 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) {
@@ -1591,6 +1720,8 @@ tui.inputEl.addEventListener('keydown', (event) => {
             server.send(['TASK:MOVE', tui.movement_keys[event.key]]);
         } 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.install && tui.task_action_on('install')) {
+              server.send(["TASK:INSTALL", tui.password]);
         } else if (event.key == tui.keys.toggle_map_mode) {
             tui.toggle_map_mode();
         }
@@ -1622,30 +1753,18 @@ for (let key_selector of key_selectors) {
     }, false);
 }
 window.setInterval(function() {
-    if (server.connected) {
+    if (server.websocket.readyState == 1) {
         server.send(['PING']);
-    } else {
+    } else if (server.websocket.readyState != 0) {
         server.reconnect_to(server.url);
         tui.log_msg('@ attempting reconnect …')
     }
-}, 5000);
+}, 1000);
 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";
+    if (document.activeElement.tagName.toLowerCase() != 'input') {
+        tui.inputEl.focus();
     };
-    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();
-};
 document.getElementById("help").onclick = function() {
     tui.show_help = true;
     tui.full_refresh();
@@ -1664,9 +1783,6 @@ document.getElementById("toggle_map_mode").onclick = function() {
     tui.toggle_map_mode();
     tui.full_refresh();
 };
-document.getElementById("drop_thing").onclick = function() {
-    server.send(['TASK:DROP']);
-};
 document.getElementById("flatten").onclick = function() {
     server.send(['TASK:FLATTEN_SURROUNDINGS', tui.password]);
 };
@@ -1677,24 +1793,38 @@ document.getElementById("consume").onclick = function() {
     server.send(['TASK:INTOXICATE']);
 };
 document.getElementById("install").onclick = function() {
-    server.send(['TASK:INSTALL']);
+    server.send(['TASK:INSTALL', tui.password]);
 };
 document.getElementById("wear").onclick = function() {
     server.send(['TASK:WEAR']);
 };
+document.getElementById("spin").onclick = function() {
+    server.send(['TASK:SPIN']);
+};
 document.getElementById("teleport").onclick = function() {
     game.teleport();
 };
 for (const move_button of document.querySelectorAll('[id*="_move_"]')) {
+    if (move_button.id.startsWith('key_')) {  // not a move button
+        continue;
+    };
     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")) {
+    let move_repeat;
+    function move() {
+        if (tui.mode.available_actions.includes("move")) {
             server.send(['TASK:MOVE', direction]);
-        } else {
+        } else if (tui.mode.available_actions.includes("move_explorer")) {
             explorer.move(direction);
+            tui.full_refresh();
         };
+    }
+    move_button.onmousedown = function() {
+        move();
+        move_repeat = window.setInterval(move, 100);
     };
+    move_button.onmouseup = function() {
+        window.clearInterval(move_repeat);
+    }
 };
 </script>
 </body></html>