X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Bdeck_id%7D%7D/cards/%7B%7Bcard_id%7D%7D/static/git-logo.png?a=blobdiff_plain;f=rogue_chat.html;h=d644d626c960b75df384baa2caaa04106498ccce;hb=03af3ff9e0fe02757b9e20054187c0fbf23566c7;hp=291a98c341431c6c6cedf5bce2c966c2a63c30aa;hpb=15ad903f7da0dd35945f79ff26e4528378eaf31f;p=plomrogue2

diff --git a/rogue_chat.html b/rogue_chat.html
index 291a98c..d644d62 100644
--- a/rogue_chat.html
+++ b/rogue_chat.html
@@ -54,6 +54,7 @@ terminal rows: <input id="n_rows" type="number" step=4 min=24 value=24 />
       <button id="switch_to_drop_thing"></button>
       <button id="door"></button>
       <button id="consume"></button>
+      <button id="dance"></button>
       <button id="switch_to_command_thing"></button>
       <button id="teleport"></button>
       <button id="wear"></button>
@@ -71,7 +72,7 @@ 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>
   <tr>
@@ -101,13 +102,14 @@ terminal rows: <input id="n_rows" type="number" step=4 min=24 value=24 />
 <li>flatten surroundings: <input id="key_flatten" type="text" value="F" />
 <li>teleport: <input id="key_teleport" type="text" value="p" />
 <li>spin: <input id="key_spin" type="text" value="S" />
+<li>dance: <input id="key_dance" type="text" value="T" />
 <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_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" />
 <li><input id="key_switch_to_play" type="text" value="p" />
@@ -129,8 +131,8 @@ terminal rows: <input id="n_rows" type="number" step=4 min=24 value=24 />
 </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': {
@@ -174,13 +176,13 @@ let mode_helps = {
     },
     'enter_face': {
         'short': 'edit face',
-        'intro': '@ enter face line (enter nothing to abort):',
+        'intro': '@ enter face line:',
         '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..'
+    'enter_design': {
+        'short': 'edit design',
+        'intro': '@ enter design:',
+        'long': 'Enter design for carried thing as ASCII art.'
     },
     'write': {
         'short': 'edit tile',
@@ -262,6 +264,7 @@ let key_descriptions = {
     'install': '(un-)install',
     'wear': '(un-)wear',
     'spin': 'spin',
+    'dance': 'dance',
     'toggle_map_mode': 'toggle map view',
     'toggle_tile_draw': 'toggle protection character drawing',
     'hex_move_upleft': 'up-left',
@@ -489,8 +492,9 @@ let server = {
             game.portals_new = {};
             explorer.annotations_new = {};
             game.things_new = [];
-        } else if (tokens[0] === 'BLADDER_PRESSURE') {
+        } 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_temp(tokens[4], true);
             t.position = parser.parse_yx(tokens[1]);
@@ -507,6 +511,9 @@ let server = {
         } else if (tokens[0] === 'THING_HAT') {
             let t = game.get_thing_temp(tokens[1]);
             t.hat = tokens[2];
+        } else if (tokens[0] === 'THING_DESIGN') {
+            let t = game.get_thing_temp(tokens[1]);
+            t.design = [parser.parse_yx(tokens[2]), tokens[3]];
         } else if (tokens[0] === 'THING_CHAR') {
             let t = game.get_thing_temp(tokens[1]);
             t.thing_char = tokens[2];
@@ -548,6 +555,7 @@ let server = {
             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');
@@ -568,6 +576,9 @@ let server = {
         } 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') {
@@ -702,7 +713,7 @@ 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'),
   mode_control_pw_pw: new Mode('control_pw_pw', true),
@@ -719,6 +730,7 @@ let tui = {
       'command': 'COMMAND',
       'consume': 'INTOXICATE',
       'spin': 'SPIN',
+      'dance': 'DANCE',
   },
   offset: [0,0],
   map_lines: [],
@@ -730,18 +742,18 @@ let tui = {
       this.mode_play.available_modes = ["chat", "study", "edit", "admin_enter",
                                         "command_thing", "take_thing", "drop_thing"]
       this.mode_play.available_actions = ["move", "teleport", "door", "consume",
-                                          "wear", "spin"];
+                                          "wear", "spin", "dance"];
       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",
                                          "control_tile_type", "chat",
                                          "study", "play", "edit"]
-      this.mode_admin.available_actions = ["move"];
+      this.mode_admin.available_actions = ["move", "toggle_map_mode"];
       this.mode_control_tile_draw.available_modes = ["admin_enter"]
       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", "enter_hat"]
+                                        "enter_design", "password", "chat", "study",
+                                        "play", "admin_enter", "enter_face"]
       this.mode_edit.available_actions = ["move", "flatten", "install",
                                           "toggle_map_mode"]
       this.inputEl = document.getElementById("input");
@@ -804,15 +816,16 @@ let tui = {
                                          || !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');
+        return fail('not carrying anything to re-name', 'edit');
     } 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');
+    } else if (mode_name == 'enter_design' && (!game.player.carrying
+                                               || !game.player.carrying.design)) {
+        return fail('not carrying designable to edit', 'edit');
     }
     if (mode_name == 'admin_enter' && this.is_admin) {
         mode_name = 'admin';
@@ -882,7 +895,6 @@ let tui = {
                 directed_moves['DOWNRIGHT'] = [1, 0];
             }
         }
-        console.log(directed_moves);
         let select_range = {};
         for (const direction in directed_moves) {
             const move = directed_moves[direction];
@@ -920,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') {
@@ -962,14 +980,15 @@ 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;
+          const end = (this.ascii_draw_stage + 1) * width;
+          this.inputEl.value = game.player.carrying.design[1].slice(start, end);
       }
   },
   recalc_input_lines: function() {
@@ -1059,18 +1078,26 @@ let tui = {
       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');
+  enter_ascii_art: function(command, height, width, with_pw=false) {
+      if (this.inputEl.value.length > width) {
+          this.log_msg('? wrong input length, must be max ' + width + '; try again');
           return;
+      } else if (this.inputEl.value.length < width) {
+          while (this.inputEl.value.length < width) {
+              this.inputEl.value += ' ';
+          }
       }
       this.log_msg('  ' + this.inputEl.value);
       this.full_ascii_draw += this.inputEl.value;
       this.ascii_draw_stage += 1;
-      if (this.ascii_draw_stage < 3) {
+      if (this.ascii_draw_stage < height) {
           this.restore_input_values();
       } else {
-          server.send([command, this.full_ascii_draw]);
+          if (with_pw) {
+              server.send([command, this.full_ascii_draw, this.password]);
+          } else {
+              server.send([command, this.full_ascii_draw]);
+          }
           this.full_ascii_draw = '';
           this.ascii_draw_stage = 0;
           this.inputEl.value = '';
@@ -1210,10 +1237,12 @@ let tui = {
       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, 'BLADDER: ' + game.bladder_pressure);
+      terminal.write(0, this.window_width,
+                     'ENERGY: ' + game.energy +
+                     ' BLADDER: ' + game.bladder_pressure);
   },
   draw_history: function() {
       let log_display_lines = [];
@@ -1487,6 +1516,21 @@ let explorer = {
                          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';
+                         }
+                     }
                  }
             }
             let terrain_char = game.map[position_i]
@@ -1584,9 +1628,11 @@ tui.inputEl.addEventListener('keydown', (event) => {
         server.send(['LOGIN', tui.inputEl.value]);
         tui.inputEl.value = "";
     } else if (tui.mode.name == 'enter_face' && event.key == 'Enter') {
-        tui.enter_ascii_art('PLAYER_FACE');
-    } else if (tui.mode.name == 'enter_hat' && event.key == 'Enter') {
-        tui.enter_ascii_art('PLAYER_HAT');
+        tui.enter_ascii_art('PLAYER_FACE', 3, 6);
+    } else if (tui.mode.name == 'enter_design' && event.key == 'Enter') {
+        tui.enter_ascii_art('THING_DESIGN',
+                            game.player.carrying.design[0][0],
+                            game.player.carrying.design[0][1], true);
     } else if (tui.mode.name == 'command_thing' && event.key == 'Enter') {
         server.send(['TASK:COMMAND', tui.inputEl.value]);
         tui.inputEl.value = "";
@@ -1679,6 +1725,8 @@ tui.inputEl.addEventListener('keydown', (event) => {
               server.send(["TASK:WEAR"]);
           } else if (event.key === tui.keys.spin && tui.task_action_on('spin')) {
               server.send(["TASK:SPIN"]);
+          } else if (event.key === tui.keys.dance && tui.task_action_on('dance')) {
+              server.send(["TASK:DANCE"]);
           } 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) {
@@ -1703,6 +1751,8 @@ tui.inputEl.addEventListener('keydown', (event) => {
     } else if (tui.mode.name == 'admin') {
         if (tui.mode.mode_switch_on_key(event)) {
               null;
+        } else if (event.key == tui.keys.toggle_map_mode) {
+            tui.toggle_map_mode();
         } else if (event.key in tui.movement_keys && tui.task_action_on('move')) {
             server.send(['TASK:MOVE', tui.movement_keys[event.key]]);
         };
@@ -1755,7 +1805,10 @@ window.setInterval(function() {
 }, 1000);
 window.setInterval(function() {
     if (document.activeElement.tagName.toLowerCase() != 'input') {
+        const scroll_x = window.scrollX;
+        const scroll_y = window.scrollY;
         tui.inputEl.focus();
+        window.scrollTo(scroll_x, scroll_y);
     };
 }, 100);
 document.getElementById("help").onclick = function() {
@@ -1794,6 +1847,9 @@ document.getElementById("wear").onclick = function() {
 document.getElementById("spin").onclick = function() {
     server.send(['TASK:SPIN']);
 };
+document.getElementById("dance").onclick = function() {
+    server.send(['TASK:DANCE']);
+};
 document.getElementById("teleport").onclick = function() {
     game.teleport();
 };