from plomrogue.mapping import YX, MapGeometrySquare, MapGeometryHex
from plomrogue.things import ThingBase
from plomrogue.misc import quote
-from plomrogue.errors import BrokenSocketConnection
+from plomrogue.errors import BrokenSocketConnection, ArgError
mode_helps = {
'play': {
'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',
'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',
self.disconnected = False
self.game.thing_types = {}
self.game.terrains = {}
+ time.sleep(0.1) # give potential SSL negotation some time …
self.socket.send('TASKS')
self.socket.send('TERRAINS')
self.socket.send('THING_TYPES')
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):
- 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)
+ 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)
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]]]
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] = '??'
+ 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 += [''.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
- 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
content += '\n'
elif self.mode.name == 'edit':
content += "Available actions:\n"
+ if 'MOVE' in self.game.tasks:
+ 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"
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 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))
+ 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])
projects / plomrogue2 / blobdiff