X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=rogue_chat.html;h=d86eec5ee65d4c3e06f43b55ac351a22cb13f225;hb=0d5dbd69d9e0fb1460a7663b24a6fba8f958ced5;hp=3a636198a9bd69e888bbcad4607ce26f214f5129;hpb=dc2747c7daca975526206bfadecc1dd0ddcc8d67;p=plomrogue2

diff --git a/rogue_chat.html b/rogue_chat.html
index 3a63619..d86eec5 100644
--- a/rogue_chat.html
+++ b/rogue_chat.html
@@ -16,9 +16,6 @@ terminal rows: <input id="n_rows" type="number" step=4 min=24 value=24 />
 </div>
 <pre id="terminal"></pre>
 <textarea id="input" style="opacity: 0; width: 0px;"></textarea>
-<div>
-keyboard input/control: <span id="keyboard_control"></span>
-</div>
 <h3>button controls for hard-to-remember keybindings</h3>
 <table id="move_table" style="float: left">
   <tr>
@@ -72,6 +69,7 @@ keyboard input/control: <span id="keyboard_control"></span>
       <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>
@@ -107,6 +105,7 @@ keyboard input/control: <span id="keyboard_control"></span>
 <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" />
@@ -176,6 +175,11 @@ let mode_helps = {
         '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..'
     },
+    'enter_hat': {
+        'short': 'enter your 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',
         'intro': '',
@@ -479,29 +483,29 @@ 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] === 'PSEUDO_FOV_WIPE') {
+            game.portals_new = {};
+            explorer.annotations_new = {};
+            game.things_new = [];
         } 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(',');
@@ -512,26 +516,35 @@ let server = {
         } 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 = t = game.get_thing(tokens[2], false);
+            let t = game.get_thing_temp(tokens[1]);
+            t.carrying = game.get_thing(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.turn_complete = true;
-            game.player = game.things[game.player_id];
+            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.turn_complete = true;
             if (tui.mode.name == 'post_login_wait') {
                 tui.switch_mode('play');
             } else {
@@ -539,10 +552,15 @@ let server = {
             }
         } 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');
@@ -556,11 +574,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') {
@@ -681,6 +698,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_admin_enter: new Mode('admin_enter', true),
   mode_admin: new Mode('admin'),
   mode_control_pw_pw: new Mode('control_pw_pw', true),
@@ -701,6 +719,7 @@ let tui = {
   offset: [0,0],
   map_lines: [],
   selectables: [],
+  draw_face: false,
   init: function() {
       this.mode_play.available_modes = ["chat", "study", "edit", "admin_enter",
                                         "command_thing", "take_thing", "drop_thing"]
@@ -716,11 +735,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"]
+                                        "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;
@@ -768,22 +786,23 @@ let tui = {
     function fail(msg, return_mode) {
         tui.log_msg('? ' + msg);
         terminal.blink_screen();
-        this.switch_mode(return_mode);
+        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)) {
+    if (mode_name == 'command_thing' && (!game.player.carrying
+                                         || !game.player.carrying.commandable)) {
         return fail('not carrying anything commandable', 'play');
-    };
-    if (mode_name == 'take_thing' && game.player.carrying) {
+    } else if (mode_name == 'take_thing' && game.player.carrying) {
         return fail('already carrying something', 'play');
-    };
-    if (mode_name == 'drop_thing' && !game.player.carrying) {
+    } else if (mode_name == 'drop_thing' && !game.player.carrying) {
         return fail('not carrying anything droppable', 'play');
+    } 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';
@@ -812,9 +831,6 @@ 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.player.position;
     }
@@ -937,6 +953,10 @@ let tui = {
           if (t && t.protection) {
               this.inputEl.value = t.protection;
           }
+      } else if (this.mode.name == 'enter_face' && game.player.face) {
+          this.inputEl.value = game.player.face;
+      } else if (this.mode.name == 'enter_hat' && game.player.hat) {
+          this.inputEl.value = game.player.hat;
       }
   },
   recalc_input_lines: function() {
@@ -1127,6 +1147,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) {
@@ -1215,7 +1261,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);
@@ -1242,6 +1289,7 @@ let tui = {
       }
   },
   full_refresh: function() {
+    this.draw_links = true;
     this.links = {};
     terminal.drawBox(0, 0, terminal.rows, terminal.cols);
     this.recalc_input_lines();
@@ -1262,30 +1310,49 @@ 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 = "";
     },
-    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') {
@@ -1346,6 +1413,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);
@@ -1359,18 +1427,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;
@@ -1466,7 +1522,9 @@ 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;
@@ -1501,6 +1559,14 @@ tui.inputEl.addEventListener('keydown', (event) => {
         }
         tui.inputEl.value = "";
         tui.switch_mode('edit');
+    } else if (tui.mode.name == 'enter_hat' && event.key == 'Enter') {
+        if (tui.inputEl.value.length != 18) {
+            tui.log_msg('? wrong input length, aborting');
+        } else {
+            server.send(['PLAYER_HAT', tui.inputEl.value]);
+        }
+        tui.inputEl.value = "";
+        tui.switch_mode('edit');
     } else if (tui.mode.name == 'command_thing' && event.key == 'Enter') {
         server.send(['TASK:COMMAND', tui.inputEl.value]);
         tui.inputEl.value = "";
@@ -1669,22 +1735,13 @@ window.setInterval(function() {
     }
 }, 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') {
+        const scroll_x = window.scrollX;
+        const scroll_y = window.scrollY;
+        tui.inputEl.focus();
+        window.scrollTo(scroll_x, scroll_y);
     };
-    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();
@@ -1729,14 +1786,20 @@ for (const move_button of document.querySelectorAll('[id*="_move_"]')) {
         continue;
     };
     let direction = move_button.id.split('_')[2].toUpperCase();
-    move_button.onclick = function() {
-        if (tui.mode.available_actions.includes("move")) {
-            server.send(['TASK:MOVE', direction]);
-        } else if (tui.mode.available_actions.includes("move_explorer")) {
-            explorer.move(direction);
-            tui.full_refresh();
-        };
+    let move_repeat;
+    move_button.onmousedown = function() {
+        move_repeat = window.setInterval(function() {
+            if (tui.mode.available_actions.includes("move")) {
+                server.send(['TASK:MOVE', direction]);
+            } else if (tui.mode.available_actions.includes("move_explorer")) {
+                explorer.move(direction);
+                tui.full_refresh();
+            };
+        }, 100);
     };
+    move_button.onmouseup = function() {
+        window.clearInterval(move_repeat);
+    }
 };
 </script>
 </body></html>