Fix game state change overwriting input fields.

[plomrogue2] / rogue_chat.html

diff --git a/rogue_chat.html b/rogue_chat.html
index 02fb9a672aac937e4c006f20d5af7c30e5a2687e..68646f96a46f6b4f79df25f6acfd4197e6cf2d37 100644 (file)
--- a/rogue_chat.html
+++ b/rogue_chat.html
@@ -104,7 +104,7 @@ keyboard input/control: <span id="keyboard_control"></span>
 <li><input id="key_switch_to_control_tile_type" type="text" value="Q" />
 <li><input id="key_switch_to_annotate" type="text" value="M" />
 <li><input id="key_switch_to_portal" type="text" value="T" />
-<li>toggle map view: <input id="key_toggle_map_mode" type="text" value="M" />
+<li>toggle map view: <input id="key_toggle_map_mode" type="text" value="L" />
 <li>toggle protection character drawing: <input id="key_toggle_tile_draw" type="text" value="m" />
 </ul>
 </div>
@@ -123,7 +123,7 @@ let mode_helps = {
         'long': 'This mode allows you to study the map and its tiles in detail.  Move the question mark over a tile, and the right half of the screen will show detailed information on it.  Toggle the map view to show or hide different information layers.'},
     'edit': {
         'short': 'map edit',
-        'long': 'This mode allows you to change the map in various ways.  Individual map tiles are shown together with their "protection characters".  You can edit a tile if you set the map edit password that matches its protection character.  The character "." marks the absence of protection:  Such tiles can always be edited.'
+        'long': 'This mode allows you to change the map in various ways.  Individual map tiles can be protected by "protection characters", which you can see by toggling into the protections map view.  You can edit a tile if you set the map edit password that matches its protection character.  The character "." marks the absence of protection:  Such tiles can always be edited.'
     },
     'write': {
         'short': 'change terrain',
@@ -253,7 +253,7 @@ let terminal = {
               let start_x = 0;
               for (let span of tui.links[y]) {
                   chunks.push(escapeHTML(line.slice(start_x, span[0])));
-                  chunks.push('<a href="');
+                  chunks.push('<a target="_blank" href="');
                   chunks.push(escapeHTML(span[2]));
                   chunks.push('">');
                   chunks.push(escapeHTML(line.slice(span[0], span[1])));
@@ -437,7 +437,6 @@ let server = {
         } else if (tokens[0] === 'ANNOTATION') {
             let position = parser.parse_yx(tokens[1]);
             explorer.update_info_db(position, tokens[2]);
-            tui.restore_input_values();
             tui.full_refresh();
         } else if (tokens[0] === 'UNHANDLED_INPUT') {
             tui.log_msg('? unknown command');
@@ -613,13 +612,19 @@ let tui = {
     if (this.mode.name == 'control_tile_draw') {
         tui.log_msg('@ finished tile protection drawing.')
     }
-    this.inputEl.focus();
-    this.map_mode = 'terrain + things';
     this.tile_draw = false;
     if (mode_name == 'admin_enter' && this.is_admin) {
         mode_name = 'admin';
     };
     this.mode = this['mode_' + mode_name];
+    if (["control_tile_draw", "control_tile_type", "control_pw_type"].includes(this.mode.name)) {
+        this.map_mode = 'protections';
+    } 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.things[game.player_id].position;
         if (this.mode.shows_info) {
@@ -676,6 +681,7 @@ let tui = {
         document.getElementById("switch_to_write").disabled = false;
         document.getElementById("switch_to_portal").disabled = false;
         document.getElementById("switch_to_password").disabled = false;
+        document.getElementById("toggle_map_mode").disabled = false;
     } else if (this.mode.name == 'admin') {
         document.getElementById("switch_to_control_pw_type").disabled = false;
         document.getElementById("switch_to_control_tile_type").disabled = false;
@@ -809,9 +815,8 @@ let tui = {
             line = [];
             j = 0;
         };
-        if (['edit', 'write', 'control_tile_draw',
-             'control_tile_type'].includes(this.mode.name)) {
-            line.push(game.map[i] + game.map_control[i]);
+        if (this.map_mode == 'protections') {
+            line.push(game.map_control[i] + ' ');
         } else {
             line.push(game.map[i] + ' ');
         }
@@ -842,8 +847,11 @@ let tui = {
             used_positions.push(t.position.toString());
         };
     }
+    let player = game.things[game.player_id];
     if (tui.mode.shows_info || tui.mode.name == 'control_tile_draw') {
         map_lines_split[explorer.position[0]][explorer.position[1]] = '??';
+    } else if (tui.map_mode != 'terrain + things') {
+        map_lines_split[player.position[0]][player.position[1]] = '??';
     }
     let map_lines = []
     if (game.map_geometry == 'Square') {
@@ -862,9 +870,8 @@ let tui = {
         };
     }
     let window_center = [terminal.rows / 2, this.window_width / 2];
-    let player = game.things[game.player_id];
     let center_position = [player.position[0], player.position[1]];
-    if (tui.mode.shows_info) {
+    if (tui.mode.shows_info || tui.mode.name == 'control_tile_draw') {
         center_position = [explorer.position[0], explorer.position[1]];
     }
     center_position[1] = center_position[1] * 2;
@@ -966,9 +973,13 @@ let tui = {
           content += '\n';
       } else if (this.mode.name == 'edit') {
           content += "Available actions:\n";
+          if (game.tasks.includes('MOVE')) {
+              content += "[" + movement_keys_desc + "] – move player\n";
+          }
           if (game.tasks.includes('FLATTEN_SURROUNDINGS')) {
               content += "[" + tui.keys.flatten + "] – flatten surroundings\n";
           }
+          content += '[' + this.keys.toggle_map_mode + '] – toggle map view\n';
           content += '\n';
       } else if (this.mode.name == 'control_tile_draw') {
           content += "Available actions:\n";
@@ -1004,7 +1015,9 @@ let tui = {
           tui.map_mode = 'terrain + annotations';
       } else if (tui.map_mode == 'terrain + annotations') {
           tui.map_mode = 'terrain + things';
-      } else {
+      } else if (tui.map_mode == 'terrain + things') {
+          tui.map_mode = 'protections';
+      } else if (tui.map_mode == 'protections') {
           tui.map_mode = 'terrain only';
       }
   },
@@ -1347,6 +1360,8 @@ tui.inputEl.addEventListener('keydown', (event) => {
         } else if (event.key === tui.keys.flatten
                    && game.tasks.includes('FLATTEN_SURROUNDINGS')) {
             server.send(["TASK:FLATTEN_SURROUNDINGS", tui.password]);
+        } else if (event.key == tui.keys.toggle_map_mode) {
+            tui.toggle_map_mode();
         }
     }
     tui.full_refresh();