Replace forced map protections view with map mode toggling.

diff --git a/config.json b/config.json
index 164fcee1b5b23cf40fb1eacc50b59bf348bfe15a..0e5c800177df043bca6a25060e96d3cc74117bf7 100644 (file)
--- a/config.json
+++ b/config.json
@@ -15,7 +15,7 @@
     "drop_thing": "u",
     "teleport": "p",
     "help": "h",
     "drop_thing": "u",
     "teleport": "p",
     "help": "h",

-    "toggle_map_mode": "M",
+    "toggle_map_mode": "L",

     "toggle_tile_draw": "m",
     "hex_move_upleft": "w",
     "hex_move_upright": "e",
     "toggle_tile_draw": "m",
     "hex_move_upleft": "w",
     "hex_move_upright": "e",

diff --git a/rogue_chat.html b/rogue_chat.html
index a8b6ba70338b400e94929ee5504e1cc7bbe055f7..701a6db840dd4703b010584256b93f2df34ec638 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><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>
 <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 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',
     },
     'write': {
         'short': 'change terrain',


@@ -613,12 +613,16 @@ let tui = {
     if (this.mode.name == 'control_tile_draw') {
         tui.log_msg('@ finished tile protection drawing.')
     }
     if (this.mode.name == 'control_tile_draw') {
         tui.log_msg('@ finished tile protection drawing.')
     }

-    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];
     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 (this.mode.has_input_prompt || this.mode.is_single_char_entry) {
         this.inputEl.focus();
     }


@@ -678,6 +682,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("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;
     } else if (this.mode.name == 'admin') {
         document.getElementById("switch_to_control_pw_type").disabled = false;
         document.getElementById("switch_to_control_tile_type").disabled = false;


@@ -811,9 +816,8 @@ let tui = {
             line = [];
             j = 0;
         };
             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] + ' ');
         }
         } else {
             line.push(game.map[i] + ' ');
         }


@@ -844,8 +848,11 @@ let tui = {
             used_positions.push(t.position.toString());
         };
     }
             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]] = '??';
     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') {
     }
     let map_lines = []
     if (game.map_geometry == 'Square') {


@@ -864,9 +871,8 @@ let tui = {
         };
     }
     let window_center = [terminal.rows / 2, this.window_width / 2];
         };
     }
     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]];
     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;
         center_position = [explorer.position[0], explorer.position[1]];
     }
     center_position[1] = center_position[1] * 2;


@@ -974,6 +980,7 @@ let tui = {
           if (game.tasks.includes('FLATTEN_SURROUNDINGS')) {
               content += "[" + tui.keys.flatten + "] – flatten surroundings\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";
           content += '\n';
       } else if (this.mode.name == 'control_tile_draw') {
           content += "Available actions:\n";


@@ -1009,7 +1016,9 @@ let tui = {
           tui.map_mode = 'terrain + annotations';
       } else if (tui.map_mode == 'terrain + annotations') {
           tui.map_mode = 'terrain + things';
           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';
       }
   },
           tui.map_mode = 'terrain only';
       }
   },


@@ -1352,6 +1361,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.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();
         }
     }
     tui.full_refresh();

diff --git a/rogue_chat_curses.py b/rogue_chat_curses.py
index 7b9d648e197936b3a756affb3c65dac6f737e7e7..52f2f8c075552ec987037a1426a9c7c32602a659 100755 (executable)
--- a/rogue_chat_curses.py
+++ b/rogue_chat_curses.py
@@ -21,7 +21,7 @@ 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 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',
     },
     'write': {
         'short': 'change terrain',


@@ -408,7 +408,7 @@ class TUI:
             'drop_thing': 'u',
             'teleport': 'p',
             'help': 'h',
             'drop_thing': 'u',
             'teleport': 'p',
             'help': 'h',

-            'toggle_map_mode': 'M',
+            'toggle_map_mode': 'L',

             'toggle_tile_draw': 'm',
             'hex_move_upleft': 'w',
             'hex_move_upright': 'e',
             'toggle_tile_draw': 'm',
             'hex_move_upleft': 'w',
             'hex_move_upright': 'e',


@@ -504,14 +504,28 @@ class TUI:
         self.send('SET_TILE_CONTROL %s %s' %
                   (self.explorer, quote(self.tile_control_char)))
 
         self.send('SET_TILE_CONTROL %s %s' %
                   (self.explorer, quote(self.tile_control_char)))
 

+    def toggle_map_mode(self):
+        if self.map_mode == 'terrain only':
+            self.map_mode = 'terrain + annotations'
+        elif self.map_mode == 'terrain + annotations':
+            self.map_mode = 'terrain + things'
+        elif self.map_mode == 'terrain + things':
+            self.map_mode = 'protections'
+        elif self.map_mode == 'protections':
+            self.map_mode = 'terrain only'
+

     def switch_mode(self, mode_name):
     def switch_mode(self, mode_name):

-        if self.mode and self.mode.name == 'control_tile_draw':
-            self.log_msg('@ finished tile protection drawing.')
-        self.map_mode = 'terrain + things'

         self.tile_draw = False
         if mode_name == 'admin_enter' and self.is_admin:
             mode_name = 'admin'
         self.mode = getattr(self, 'mode_' + mode_name)
         self.tile_draw = False
         if mode_name == 'admin_enter' and self.is_admin:
             mode_name = 'admin'
         self.mode = getattr(self, 'mode_' + mode_name)

+        if self.mode and self.mode.name == 'control_tile_draw':
+            self.log_msg('@ finished tile protection drawing.')
+        if self.mode.name in {'control_tile_draw', 'control_tile_type',
+                              'control_pw_type'}:
+            self.map_mode = 'protections'
+        elif self.mode.name!= 'edit':
+            self.map_mode = 'terrain + things'

         if self.mode.shows_info or self.mode.name == 'control_tile_draw':
             player = self.game.get_thing(self.game.player_id)
             self.explorer = YX(player.position.y, player.position.x)
         if self.mode.shows_info or self.mode.name == 'control_tile_draw':
             player = self.game.get_thing(self.game.player_id)
             self.explorer = YX(player.position.y, player.position.x)


@@ -677,13 +691,9 @@ class TUI:
             for y in range(self.game.map_geometry.size.y):
                 start = self.game.map_geometry.size.x * y
                 end = start + self.game.map_geometry.size.x
             for y in range(self.game.map_geometry.size.y):
                 start = self.game.map_geometry.size.x * y
                 end = start + self.game.map_geometry.size.x

-                if self.mode.name in {'edit', 'write', 'control_tile_draw',
-                                      'control_tile_type'}:
-                    line = []
-                    for i in range(start, end):
-                        line += [self.game.map_content[i]
-                                 + self.game.map_control_content[i]]
-                    map_lines_split += [line]
+                if self.map_mode == 'protections':
+                    map_lines_split += [[c + ' ' for c
+                                         in self.game.map_control_content[start:end]]]

                 else:
                     map_lines_split += [[c + ' ' for c
                                          in self.game.map_content[start:end]]]
                 else:
                     map_lines_split += [[c + ' ' for c
                                          in self.game.map_content[start:end]]]


@@ -704,8 +714,11 @@ class TUI:
                         meta_char = '+'
                     map_lines_split[t.position.y][t.position.x] = symbol + meta_char
                     used_positions += [t.position]
                         meta_char = '+'
                     map_lines_split[t.position.y][t.position.x] = symbol + meta_char
                     used_positions += [t.position]

+            player = self.game.get_thing(self.game.player_id)

             if self.mode.shows_info or self.mode.name == 'control_tile_draw':
                 map_lines_split[self.explorer.y][self.explorer.x] = '??'
             if self.mode.shows_info or self.mode.name == 'control_tile_draw':
                 map_lines_split[self.explorer.y][self.explorer.x] = '??'

+            elif self.map_mode != 'terrain + things':
+                map_lines_split[player.position.y][player.position.x] = '??'

             map_lines = []
             if type(self.game.map_geometry) == MapGeometryHex:
                 indent = 0
             map_lines = []
             if type(self.game.map_geometry) == MapGeometryHex:
                 indent = 0


@@ -717,9 +730,8 @@ class TUI:
                     map_lines += [''.join(line)]
             window_center = YX(int(self.size.y / 2),
                                int(self.window_width / 2))
                     map_lines += [''.join(line)]
             window_center = YX(int(self.size.y / 2),
                                int(self.window_width / 2))

-            player = self.game.get_thing(self.game.player_id)

             center = player.position
             center = player.position

-            if self.mode.shows_info:
+            if self.mode.shows_info or self.mode.name == 'control_tile_draw':

                 center = self.explorer
             center = YX(center.y, center.x * 2)
             offset = center - window_center
                 center = self.explorer
             center = YX(center.y, center.x * 2)
             offset = center - window_center


@@ -759,6 +771,7 @@ class TUI:
                     content += "[%s] – move player\n" % ','.join(self.movement_keys)
                 if 'FLATTEN_SURROUNDINGS' in self.game.tasks:
                     content += "[%s] – flatten surroundings\n" % self.keys['flatten']
                     content += "[%s] – move player\n" % ','.join(self.movement_keys)
                 if 'FLATTEN_SURROUNDINGS' in self.game.tasks:
                     content += "[%s] – flatten surroundings\n" % self.keys['flatten']

+                content += '[%s] – toggle map view\n' % self.keys['toggle_map_mode']

                 content += '\n'
             elif self.mode.name == 'control_tile_draw':
                 content += "Available actions:\n"
                 content += '\n'
             elif self.mode.name == 'control_tile_draw':
                 content += "Available actions:\n"


@@ -926,12 +939,7 @@ class TUI:
                 if self.mode.mode_switch_on_key(self, key):
                     continue
                 elif key == self.keys['toggle_map_mode']:
                 if self.mode.mode_switch_on_key(self, key):
                     continue
                 elif key == self.keys['toggle_map_mode']:

-                    if self.map_mode == 'terrain only':
-                        self.map_mode = 'terrain + annotations'
-                    elif self.map_mode == 'terrain + annotations':
-                        self.map_mode = 'terrain + things'
-                    else:
-                        self.map_mode = 'terrain only'
+                    self.toggle_map_mode()

                 elif key in self.movement_keys:
                     move_explorer(self.movement_keys[key])
             elif self.mode.name == 'play':
                 elif key in self.movement_keys:
                     move_explorer(self.movement_keys[key])
             elif self.mode.name == 'play':


@@ -967,9 +975,11 @@ class TUI:
             elif self.mode.name == 'edit':
                 if self.mode.mode_switch_on_key(self, key):
                     continue
             elif self.mode.name == 'edit':
                 if self.mode.mode_switch_on_key(self, key):
                     continue

-                if key == self.keys['flatten'] and\
+                elif key == self.keys['flatten'] and\

                      'FLATTEN_SURROUNDINGS' in self.game.tasks:
                     self.send('TASK:FLATTEN_SURROUNDINGS ' + quote(self.password))
                      'FLATTEN_SURROUNDINGS' in self.game.tasks:
                     self.send('TASK:FLATTEN_SURROUNDINGS ' + quote(self.password))

+                elif key == self.keys['toggle_map_mode']:
+                    self.toggle_map_mode()

                 elif key in self.movement_keys and 'MOVE' in self.game.tasks:
                     self.send('TASK:MOVE ' + self.movement_keys[key])
 
                 elif key in self.movement_keys and 'MOVE' in self.game.tasks:
                     self.send('TASK:MOVE ' + self.movement_keys[key])