},
'control_tile_draw': {
'short': 'change tiles control',
- 'long': 'This mode is the second of two steps to change tile control areas on the map. Move cursor around the map to draw selected tile control character'
+ 'long': 'This mode is the second of two steps to change tile control areas on the map. Toggle tile control drawing on, then move cursor around the map to draw selected tile control character.'
},
'annotate': {
'short': 'annotate tile',
mode_post_login_wait = Mode('post_login_wait', is_intro=True)
mode_password = Mode('password', has_input_prompt=True)
is_admin = False
+ tile_draw = False
def __init__(self, host):
import os
self.mode_admin.available_modes = ["control_pw_type",
"control_tile_type", "chat",
"study", "play", "edit"]
- self.mode_control_tile_draw.available_modes = ["admin"]
+ self.mode_control_tile_draw.available_modes = ["admin_enter"]
self.mode_edit.available_modes = ["write", "annotate", "portal",
"password", "chat", "study", "play",
"admin_enter"]
self.do_refresh = True
self.queue = queue.Queue()
self.login_name = None
- self.map_mode = 'terrain'
+ self.map_mode = 'all'
self.password = 'foo'
self.switch_mode('waiting_for_server')
self.keys = {
'teleport': 'p',
'help': 'h',
'toggle_map_mode': 'M',
+ 'toggle_tile_draw': 'm',
'hex_move_upleft': 'w',
'hex_move_upright': 'e',
'hex_move_right': 'd',
(self.explorer, quote(self.tile_control_char)))
def switch_mode(self, mode_name):
- self.map_mode = 'terrain'
+ self.map_mode = 'all'
+ self.tile_draw = False
if mode_name == 'admin_enter' and self.is_admin:
mode_name = 'admin'
self.mode = getattr(self, 'mode_' + mode_name)
self.explorer = YX(player.position.y, player.position.x)
if self.mode.shows_info:
self.query_info()
- elif self.mode.name == 'control_tile_draw':
- self.send_tile_control_command()
- self.map_mode = 'control'
if self.mode.is_single_char_entry:
self.show_help = True
if self.mode.name == 'waiting_for_server':
self.explorer = target
if self.mode.shows_info:
self.query_info()
- elif self.mode.name == 'control_tile_draw':
+ if self.tile_draw:
self.send_tile_control_command()
else:
self.flash = True
if not self.game.turn_complete:
return
map_lines_split = []
- map_content = self.game.map_content
- if self.map_mode == 'control':
- map_content = self.game.map_control_content
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
- map_lines_split += [[c + ' ' for c in map_content[start:end]]]
+ 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]
+ else:
+ map_lines_split += [[c + ' ' for c
+ in self.game.map_content[start:end]]]
if self.map_mode == 'annotations':
for p in self.game.info_hints:
map_lines_split[p.y][p.x] = 'A '
- elif self.map_mode == 'terrain':
+ elif self.map_mode == 'all':
for p in self.game.portals.keys():
- map_lines_split[p.y][p.x] = 'P '
+ original = map_lines_split[p.y][p.x]
+ map_lines_split[p.y][p.x] = original[0] + 'P'
used_positions = []
for t in self.game.things:
symbol = self.game.thing_types[t.type_]
if 'MOVE' in self.game.tasks:
content += "[%s] – move player\n" % ','.join(self.movement_keys)
if 'PICK_UP' in self.game.tasks:
- content += "[%s] – take thing under player\n" % self.keys['take_thing']
+ content += "[%s] – pick up thing\n" % self.keys['take_thing']
if 'DROP' in self.game.tasks:
- content += "[%s] – drop carried thing\n" % self.keys['drop_thing']
+ content += "[%s] – drop picked up thing\n" % self.keys['drop_thing']
content += '[%s] – teleport to other space\n' % self.keys['teleport']
content += '\n'
elif self.mode.name == 'study':
content += 'Available actions:\n'
content += '[%s] – move question mark\n' % ','.join(self.movement_keys)
- content += '[%s] – toggle view between terrain, annotations, and password protection areas\n' % self.keys['toggle_map_mode']
+ content += '[%s] – toggle view between anything, terrain, and annotations\n' % self.keys['toggle_map_mode']
content += '\n'
elif self.mode.name == 'edit':
content += "Available actions:\n"
if 'FLATTEN_SURROUNDINGS' in self.game.tasks:
content += "[%s] – flatten player's surroundings\n" % self.keys['flatten']
content += '\n'
+ elif self.mode.name == 'control_tile_draw':
+ content += "Available actions:\n"
+ content += "[%s] – toggle tile control drawing\n" % self.keys['toggle_tile_draw']
+ content += '\n'
elif self.mode.name == 'chat':
content += '/nick NAME – re-name yourself to NAME\n'
content += '/%s or /play – switch to play mode\n' % self.keys['switch_to_play']
if self.map_mode == 'terrain':
self.map_mode = 'annotations'
elif self.map_mode == 'annotations':
- self.map_mode = 'control'
+ self.map_mode = 'all'
else:
self.map_mode = 'terrain'
elif key in self.movement_keys:
continue
elif key in self.movement_keys:
move_explorer(self.movement_keys[key])
+ elif key == self.keys['toggle_tile_draw']:
+ self.tile_draw = False if self.tile_draw else True
elif self.mode.name == 'admin':
if self.mode.mode_switch_on_key(self, key):
continue
projects / plomrogue2 / blobdiff