Fix "nothing is in FOV" study mode error in web client.

[plomrogue2] / rogue_chat.html

diff --git a/rogue_chat.html b/rogue_chat.html
index f47cf129c70bd522f7ae4f84e0e96c6ca350e405..6738e40755be0cd82ce284532dd8535c63672e5f 100644 (file)
--- 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>
@@ -480,6 +477,10 @@ let server = {
         if (tokens[0] === 'TURN') {
             game.turn_complete = false;
             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_temp(tokens[4], true);
             t.position = parser.parse_yx(tokens[1]);
@@ -517,7 +518,6 @@ let server = {
             game.terrains[tokens[1]] = tokens[2]
         } else if (tokens[0] === 'MAP') {
             game.map_geometry_new = tokens[1];
-            tui.init_keys();
             game.map_size_new = parser.parse_yx(tokens[2]);
             game.map_new = tokens[3]
         } else if (tokens[0] === 'FOV') {
@@ -525,19 +525,18 @@ let server = {
         } else if (tokens[0] === 'MAP_CONTROL') {
             game.map_control_new = tokens[1]
         } else if (tokens[0] === 'GAME_STATE_COMPLETE') {
-            game.turn_complete = true;
             game.portals = game.portals_new;
-            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.annotations_new = {};
             explorer.info_cached = false;
             game.things = game.things_new;
-            game.things_new = [];
             game.player = game.things[game.player_id];
+            game.turn_complete = true;
             if (tui.mode.name == 'post_login_wait') {
                 tui.switch_mode('play');
             } else {
@@ -1511,7 +1510,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;
@@ -1714,18 +1715,9 @@ 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') {
+        tui.inputEl.focus();
     };
-    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();
@@ -1774,14 +1766,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>