From: Christian Heller Date: Wed, 25 Nov 2020 03:01:32 +0000 (+0100) Subject: In study mode, explicitely name map mode. X-Git-Url: https://plomlompom.com/repos/pick_tasks?a=commitdiff_plain;h=358f28223eb46401333aad09357da80dfcc81552;p=plomrogue2 In study mode, explicitely name map mode. --- diff --git a/rogue_chat.html b/rogue_chat.html index 9342170..71a5065 100644 --- a/rogue_chat.html +++ b/rogue_chat.html @@ -609,7 +609,7 @@ let tui = { }, switch_mode: function(mode_name) { this.inputEl.focus(); - this.map_mode = 'all'; + this.map_mode = 'terrain + things'; this.tile_draw = false; if (mode_name == 'admin_enter' && this.is_admin) { mode_name = 'admin'; @@ -812,11 +812,11 @@ let tui = { } }; map_lines_split.push(line); - if (this.map_mode == 'annotations') { + if (this.map_mode == 'terrain + annotations') { for (const coordinate of explorer.info_hints) { map_lines_split[coordinate[0]][coordinate[1]] = 'A '; } - } else if (this.map_mode == 'all') { + } else if (this.map_mode == 'terrain + things') { for (const p in game.portals) { let coordinate = p.split(',') let original = map_lines_split[coordinate[0]][coordinate[1]]; @@ -992,12 +992,12 @@ let tui = { } }, toggle_map_mode: function() { - if (tui.map_mode == 'terrain') { - tui.map_mode = 'annotations'; - } else if (tui.map_mode == 'annotations') { - tui.map_mode = 'all'; + if (tui.map_mode == 'terrain only') { + tui.map_mode = 'terrain + annotations'; + } else if (tui.map_mode == 'terrain + annotations') { + tui.map_mode = 'terrain + things'; } else { - tui.map_mode = 'terrain'; + tui.map_mode = 'terrain only'; } }, full_refresh: function() { @@ -1138,11 +1138,11 @@ let explorer = { server.send(["GET_ANNOTATION", unparser.to_yx(explorer.position)]); }, get_info: function() { + let info = "MAP VIEW: " + tui.map_mode + "\n"; let position_i = this.position[0] * game.map_size[1] + this.position[1]; if (game.fov[position_i] != '.') { - return 'outside field of view'; + return info + 'outside field of view'; }; - let info = ""; let terrain_char = game.map[position_i] let terrain_desc = '?' if (game.terrains[terrain_char]) { diff --git a/rogue_chat_curses.py b/rogue_chat_curses.py index 562c9c7..c3d2165 100755 --- a/rogue_chat_curses.py +++ b/rogue_chat_curses.py @@ -387,7 +387,7 @@ class TUI: self.do_refresh = True self.queue = queue.Queue() self.login_name = None - self.map_mode = 'all' + self.map_mode = 'terrain + things' self.password = 'foo' self.switch_mode('waiting_for_server') self.keys = { @@ -504,7 +504,7 @@ class TUI: (self.explorer, quote(self.tile_control_char))) def switch_mode(self, mode_name): - self.map_mode = 'all' + self.map_mode = 'terrain + things' self.tile_draw = False if mode_name == 'admin_enter' and self.is_admin: mode_name = 'admin' @@ -611,17 +611,19 @@ class TUI: if not self.game.turn_complete: return pos_i = self.explorer.y * self.game.map_geometry.size.x + self.explorer.x - info = 'outside field of view' - if self.game.fov[pos_i] == '.': + info = 'MAP VIEW: %s\n' % self.map_mode + if self.game.fov[pos_i] != '.': + info += 'outside field of view' + else: terrain_char = self.game.map_content[pos_i] terrain_desc = '?' if terrain_char in self.game.terrains: terrain_desc = self.game.terrains[terrain_char] - info = 'TERRAIN: "%s" / %s\n' % (terrain_char, terrain_desc) + info += 'TERRAIN: "%s" / %s\n' % (terrain_char, terrain_desc) protection = self.game.map_control_content[pos_i] if protection == '.': protection = 'unprotected' - info = 'PROTECTION: %s\n' % protection + info += 'PROTECTION: %s\n' % protection for t in self.game.things: if t.position == self.explorer: info += 'THING: %s / %s' % (t.type_, @@ -682,10 +684,10 @@ class TUI: else: map_lines_split += [[c + ' ' for c in self.game.map_content[start:end]]] - if self.map_mode == 'annotations': + if self.map_mode == 'terrain + annotations': for p in self.game.info_hints: map_lines_split[p.y][p.x] = 'A ' - elif self.map_mode == 'all': + elif self.map_mode == 'terrain + things': for p in self.game.portals.keys(): original = map_lines_split[p.y][p.x] map_lines_split[p.y][p.x] = original[0] + 'P' @@ -918,12 +920,12 @@ class TUI: if self.mode.mode_switch_on_key(self, key): continue elif key == self.keys['toggle_map_mode']: - if self.map_mode == 'terrain': - self.map_mode = 'annotations' - elif self.map_mode == 'annotations': - self.map_mode = 'all' + 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' + self.map_mode = 'terrain only' elif key in self.movement_keys: move_explorer(self.movement_keys[key]) elif self.mode.name == 'play':