home · contact · privacy
Fix bottle fullness indicator in web client.
[plomrogue2] / rogue_chat.html
index f7d02348195b169a3fe277bec9140ebc6b037202..1847c0904ec9f7452efc718fa9265521e0bd7686 100644 (file)
@@ -72,7 +72,6 @@ terminal rows: <input id="n_rows" type="number" step=4 min=24 value=24 />
       <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>
       <button id="switch_to_enter_design"></button>
     </td>
   </tr>
@@ -110,7 +109,6 @@ terminal rows: <input id="n_rows" type="number" step=4 min=24 value=24 />
 <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_enter_design" type="text" value="D" />
 <li><input id="key_switch_to_take_thing" type="text" value="z" />
 <li><input id="key_switch_to_chat" type="text" value="t" />
@@ -186,11 +184,6 @@ let mode_helps = {
         'intro': '@ enter design:',
         'long': 'Enter design for carried thing as ASCII art.'
     },
-    'enter_hat': {
-        'short': 'edit hat',
-        'intro': '@ enter hat line:',
-        '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.  Eat cookies to extend the ASCII characters available for drawing.'
-    },
     'write': {
         'short': 'edit tile',
         'intro': '',
@@ -720,7 +713,6 @@ let tui = {
   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_enter_design: new Mode('enter_design', true),
   mode_admin_enter: new Mode('admin_enter', true),
   mode_admin: new Mode('admin'),
@@ -761,8 +753,7 @@ let tui = {
       this.mode_control_tile_draw.available_actions = ["toggle_tile_draw"];
       this.mode_edit.available_modes = ["write", "annotate", "portal", "name_thing",
                                         "enter_design", "password", "chat", "study",
-                                        "play", "admin_enter", "enter_face",
-                                        "enter_hat"]
+                                        "play", "admin_enter", "enter_face"]
       this.mode_edit.available_actions = ["move", "flatten", "install",
                                           "toggle_map_mode"]
       this.inputEl = document.getElementById("input");
@@ -832,8 +823,6 @@ let tui = {
         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');
     } else if (mode_name == 'enter_design' && (!game.player.carrying
                                                || !game.player.carrying.design)) {
         return fail('not carrying designable to edit', 'edit');
@@ -943,8 +932,14 @@ let tui = {
         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 == 'enter_design') {
+        this.log_msg('@ The design you enter must be '
+                     + game.player.carrying.design[0][0] + ' lines of max '
+                     + game.player.carrying.design[0][1] + ' characters width each');
+        if (game.player.carrying.type_ == 'Hat') {
+            this.log_msg('@ Legal characters: ' + game.players_hat_chars);
+            this.log_msg('@ (Eat cookies to extend the ASCII characters available for drawing.)');
+        }
     } else if (this.mode.name == 'command_thing') {
         server.send(['TASK:COMMAND', 'HELP']);
     } else if (this.mode.name == 'control_pw_pw') {
@@ -985,14 +980,10 @@ let tui = {
           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)) {
+      } else if (this.mode.name == 'enter_face') {
           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);
-          }
+          this.inputEl.value = game.player.face.slice(start, end);
       } else if (this.mode.name == 'enter_design') {
           const width = game.player.carrying.design[0][1];
           const start = this.ascii_draw_stage * width;
@@ -1222,34 +1213,34 @@ let tui = {
           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 - 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);
+          draw_body_part(t.face, terminal.rows - 3);
       }
       if (t.hat) {
-          draw_body_part(t.hat, terminal.rows - 5);
+          draw_body_part(t.hat, terminal.rows - 6);
       }
-      terminal.write(terminal.rows - 1, start_x, '|        |');
+      terminal.write(terminal.rows - 2, start_x, '----------');
+      let name = t.name_;
+      if (name.length > 6) {
+          name = name.slice(0, 6) + '…';
+      }
+      terminal.write(terminal.rows - 1, start_x, '@' + t.thing_char + ':' + name);
   },
   draw_mode_line: function() {
       let help = 'hit [' + this.keys.help + '] for help';
       if (this.mode.has_input_prompt) {
           help = 'enter /help for help';
       }
-      terminal.write(0, this.window_width, 'MODE: ' + this.mode.short_desc + ' – ' + help);
+      terminal.write(1, this.window_width, 'MODE: ' + this.mode.short_desc + ' – ' + help);
   },
   draw_stats_line: function(n) {
-      terminal.write(1, this.window_width,
+      terminal.write(0, this.window_width,
                      'ENERGY: ' + game.energy +
                      ' BLADDER: ' + game.bladder_pressure);
   },
@@ -1509,37 +1500,7 @@ let explorer = {
             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, 6) + '\n';
-                         info_to_cache += t.hat.slice(6, 12) + '\n';
-                         info_to_cache += t.hat.slice(12, 18) + '\n';
-                     }
-                     if (t.face) {
-                         info_to_cache += t.face.slice(0, 6) + '\n';
-                         info_to_cache += t.face.slice(6, 12) + '\n';
-                         info_to_cache += t.face.slice(12, 18) + '\n';
-                     }
-                     if (t.design) {
-                         const line_length = t.design[0][1];
-                         if (t.type_ == 'Sign') {
-                             info_to_cache += '-'.repeat(line_length + 4) + '\n';
-                         }
-                         const regexp = RegExp('.{1,' + line_length + '}', 'g');
-                         const lines = t.design[1].match(regexp);
-                         console.log(lines);
-                         for (const line of lines) {
-                             info_to_cache += '| ' + line + ' |\n';
-                         }
-                         if (t.type_ == 'Sign') {
-                             info_to_cache += '-'.repeat(line_length + 4) + '\n';
-                         }
-                     }
+                     info_to_cache += this.get_thing_info(t, true);
                  }
             }
             let terrain_char = game.map[position_i]
@@ -1547,12 +1508,12 @@ let explorer = {
             if (game.terrains[terrain_char]) {
                 terrain_desc = game.terrains[terrain_char];
             };
-            info_to_cache += 'TERRAIN: "' + terrain_char + '" / ' + terrain_desc + "\n";
+            info_to_cache += 'TERRAIN: "' + terrain_char + '" (' + terrain_desc;
             let protection = game.map_control[position_i];
-            if (protection == '.') {
-                protection = 'unprotected';
+            if (protection != '.') {
+                info_to_cache += '/protection:' + protection;
             };
-            info_to_cache += 'PROTECTION: ' + protection + '\n';
+            info_to_cache += ')\n';
             if (this.position in game.portals) {
                 info_to_cache += "PORTAL: " + game.portals[this.position] + "\n";
             }
@@ -1563,17 +1524,61 @@ 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;
+    get_thing_info: function(t, detailed=false) {
+        let info = '';
+        if (detailed) {
+            info += '- ';
+        }
+        info += game.thing_types[t.type_];
         if (t.thing_char) {
             info += t.thing_char;
         };
         if (t.name_) {
-            info += " (" + t.name_ + ")";
+            info += ": " + t.name_;
         }
+        info += ' (' + t.type_;
         if (t.installed) {
-            info += " / installed";
+            info += "/installed";
+        }
+        if (t.type_ == 'Bottle') {
+            if (t.thing_char == '_') {
+                info += '/empty';
+            } else if (t.thing_char == '~') {
+                info += '/full';
+            }
+        }
+        if (detailed) {
+            const protection = t.protection;
+            if (protection != '.') {
+                info += '/protection:' + protection;
+            }
+            info += ')\n';
+            if (t.hat || t.face) {
+                info += '----------\n';
+            }
+            if (t.hat) {
+                info += '| ' + t.hat.slice(0, 6) + ' |\n';
+                info += '| ' + t.hat.slice(6, 12) + ' |\n';
+                info += '| ' + t.hat.slice(12, 18) + ' |\n';
+            }
+            if (t.face) {
+                info += '| ' + t.face.slice(0, 6) + ' |\n';
+                info += '| ' + t.face.slice(6, 12) + ' |\n';
+                info += '| ' + t.face.slice(12, 18) + ' |\n';
+                info += '----------\n';
+            }
+            if (t.design) {
+                const line_length = t.design[0][1];
+                info += '-'.repeat(line_length + 4) + '\n';
+                const regexp = RegExp('.{1,' + line_length + '}', 'g');
+                const lines = t.design[1].match(regexp);
+                for (const line of lines) {
+                    info += '| ' + line + ' |\n';
+                }
+                info += '-'.repeat(line_length + 4) + '\n';
+            }
+        } else {
+            info += ')';
         }
         return info;
     },
@@ -1638,8 +1643,6 @@ tui.inputEl.addEventListener('keydown', (event) => {
         tui.inputEl.value = "";
     } else if (tui.mode.name == 'enter_face' && event.key == 'Enter') {
         tui.enter_ascii_art('PLAYER_FACE', 3, 6);
-    } else if (tui.mode.name == 'enter_hat' && event.key == 'Enter') {
-        tui.enter_ascii_art('PLAYER_HAT', 3, 6);
     } else if (tui.mode.name == 'enter_design' && event.key == 'Enter') {
         tui.enter_ascii_art('THING_DESIGN',
                             game.player.carrying.design[0][0],