Refactor hat editing into general design editing.

[plomrogue2] / rogue_chat.html

diff --git a/rogue_chat.html b/rogue_chat.html
index f7d02348195b169a3fe277bec9140ebc6b037202..304346d5abac55cb796dd04f28ccaaebc61a5381 100644 (file)
--- a/rogue_chat.html
+++ b/rogue_chat.html
@@ -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;
@@ -1638,8 +1629,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],