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 = {
(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'
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_,
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'
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':