X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=rogue_chat.html;h=1b5f39d8f732f631f477b5dec8378349a21e8b4b;hb=ed297e4e19f8a83872d6345b86321e10aec019d4;hp=dd037e20997fbd620cd97228d40a94841b8e1d25;hpb=a81ea397900267331c15c1cda5d349b22a49ea16;p=plomrogue2

diff --git a/rogue_chat.html b/rogue_chat.html
index dd037e2..1b5f39d 100644
--- a/rogue_chat.html
+++ b/rogue_chat.html
@@ -51,12 +51,14 @@ keyboard input/control: <span id="keyboard_control"></span>
   <tr>
     <td><button id="switch_to_play"></button></td>
     <td>
-      <button id="take_thing"></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>
@@ -68,6 +70,7 @@ keyboard input/control: <span id="keyboard_control"></span>
       <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>
@@ -96,10 +99,13 @@ 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="?" />
@@ -120,87 +126,117 @@ 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:8001/";
+let websocket_location = "wss://plomlompom.com/rogue_chat/";
+//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': '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',
+        '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',
+        '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 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',
+        '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',
+        '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',
+        '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',
+        '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 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.'
     }
 }
@@ -208,10 +244,11 @@ let key_descriptions = {
     'help': 'help',
     'flatten': 'flatten surroundings',
     'teleport': 'teleport',
-    'take_thing': 'pick up thing',
     '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',
@@ -447,22 +484,32 @@ let server = {
             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.thing_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') {
@@ -558,6 +605,7 @@ class Mode {
         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;
     }
@@ -621,6 +669,8 @@ let tui = {
   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),
@@ -632,17 +682,19 @@ let tui = {
       '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_chat.available_modes = ["play", "study", "edit", "admin_enter"]
       this.mode_play.available_modes = ["chat", "study", "edit", "admin_enter",
-                                        "command_thing"]
-      this.mode_play.available_actions = ["move", "take_thing", "drop_thing",
-                                          "teleport", "door", "consume"];
+                                        "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_study.available_actions = ["toggle_map_mode", "move_explorer"];
       this.mode_admin.available_modes = ["admin_thing_protect", "control_pw_type",
@@ -653,14 +705,13 @@ 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"]
+                                        "admin_enter", "enter_face"]
       this.mode_edit.available_actions = ["move", "flatten", "toggle_map_mode"]
-      this.mode = this.mode_waiting_for_server;
       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() {
@@ -701,7 +752,7 @@ let tui = {
       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.tile_draw = false;
@@ -762,6 +813,9 @@ let tui = {
     for (const mode_name of this.mode.available_modes) {
             document.getElementById('switch_to_' + mode_name).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) {
             server.send(['LOGIN', this.login_name]);
@@ -770,16 +824,43 @@ let tui = {
         }
     } else if (this.mode.is_single_char_entry) {
         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') {
+            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 == 'admin_enter') {
-        this.log_msg('@ enter admin password:')
-    } else if (this.mode.name == 'control_pw_type') {
-        this.log_msg('@ enter protection character for which you want to change the password:')
-    } else if (this.mode.name == 'control_tile_type') {
-        this.log_msg('@ enter protection character which you want to draw:')
-    } else if (this.mode.name == 'admin_thing_protect') {
-        this.log_msg('@ enter thing protection character:')
     } else if (this.mode.name == 'control_pw_pw') {
         this.log_msg('@ enter protection password for "' + this.tile_control_char + '":');
     } else if (this.mode.name == 'control_tile_draw') {
@@ -899,6 +980,9 @@ let tui = {
       this.full_refresh();
   },
   draw_map: function() {
+    if (!game.turn_complete && this.map_lines.length == 0) {
+        return;
+    }
     if (game.turn_complete) {
         let map_lines_split = [];
         let line = [];
@@ -926,8 +1010,7 @@ let tui = {
                 map_lines_split[coordinate[0]][coordinate[1]] = original[0] + 'P';
             }
             let used_positions = [];
-            for (const thing_id in game.things) {
-                let t = game.things[thing_id];
+            function draw_thing(t, used_positions) {
                 let symbol = game.thing_types[t.type_];
                 let meta_char = ' ';
                 if (t.thing_char) {
@@ -936,8 +1019,23 @@ let tui = {
                 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);
+                }
             };
         }
         let player = game.things[game.player_id];
@@ -978,7 +1076,7 @@ let tui = {
     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 < game.map_size[0]; term_y++, map_y++) {
+    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);
     }
@@ -1049,13 +1147,7 @@ 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 == '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 world edit mode\n';
-          content += '/' + this.keys.switch_to_admin_enter + ' or /admin – switch to admin mode\n';
-      } else if (this.mode.available_actions.length > 0) {
+      if (this.mode.available_actions.length > 0) {
           content += "Available actions:\n";
           for (let action of this.mode.available_actions) {
               if (Object.keys(this.action_tasks).includes(action)) {
@@ -1243,6 +1335,27 @@ let explorer = {
         if (game.fov[position_i] != '.') {
             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';
+                     }
+                 }
+            }
             let terrain_char = game.map[position_i]
             let terrain_desc = '?'
             if (game.terrains[terrain_char]) {
@@ -1254,24 +1367,6 @@ let explorer = {
                 protection = 'unprotected';
             };
             info_to_cache += '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_];
-                     let protection = t.protection;
-                     if (protection == '.') {
-                         protection = 'none';
-                     }
-                     info_to_cache += "THING: " + t.type_ + " / " + symbol;
-                     if (t.thing_char) {
-                         info_to_cache += t.thing_char;
-                     };
-                     if (t.name_) {
-                         info_to_cache += " (" + t.name_ + ")";
-                     }
-                     info_to_cache += " / protection: " + protection + "\n";
-                 }
-            }
             if (this.position in game.portals) {
                 info_to_cache += "PORTAL: " + game.portals[this.position] + "\n";
             }
@@ -1282,6 +1377,20 @@ let explorer = {
         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 (t.installed) {
+            info += " / installed";
+        }
+        return info;
+    },
     annotate: function(msg) {
         if (msg.length == 0) {
             msg = " ";  // triggers annotation deletion
@@ -1319,7 +1428,15 @@ 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.inputEl.value = "";
         tui.restore_input_values();
@@ -1330,14 +1447,28 @@ tui.inputEl.addEventListener('keydown', (event) => {
         tui.login_name = tui.inputEl.value;
         server.send(['LOGIN', tui.inputEl.value]);
         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.inputEl.value.length == 0) {
-            tui.log_msg('@ aborted');
-            tui.switch_mode('play');
-        } else if (tui.task_action_on('command')) {
+        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');
@@ -1397,15 +1528,7 @@ tui.inputEl.addEventListener('keydown', (event) => {
         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 {
@@ -1424,14 +1547,16 @@ 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.take_thing && tui.task_action_on('take_thing')) {
-              server.send(["TASK:PICK_UP"]);
           } 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.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) {
@@ -1539,11 +1664,8 @@ 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]);
@@ -1554,6 +1676,12 @@ document.getElementById("door").onclick = function() {
 document.getElementById("consume").onclick = function() {
     server.send(['TASK:INTOXICATE']);
 };
+document.getElementById("install").onclick = function() {
+    server.send(['TASK:INSTALL']);
+};
+document.getElementById("wear").onclick = function() {
+    server.send(['TASK:WEAR']);
+};
 document.getElementById("teleport").onclick = function() {
     game.teleport();
 };