X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=rogue_chat_curses.py;h=67f63a1cd09dd9980f9783a5e737ce79f5f4ad39;hb=c0d6e23c363b9cf91a3a028305a1b01440454d7d;hp=3cd5914c217f2ea4a710413f587292592f63fc7f;hpb=1f65215b70d2a8a255aa9327497b88b94c4b1f17;p=plomrogue2 diff --git a/rogue_chat_curses.py b/rogue_chat_curses.py index 3cd5914..67f63a1 100755 --- a/rogue_chat_curses.py +++ b/rogue_chat_curses.py @@ -20,7 +20,11 @@ mode_helps = { 'short': 'study', '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.'}, 'edit': { - 'short': 'terrain edit', + 'short': 'map edit', + 'long': 'This mode allows you to change the map in various ways.' + }, + 'write': { + 'short': 'terrain write', 'long': 'This mode allows you to change the map tile you currently stand on (if your map editing password authorizes you so). Just enter any printable ASCII character to imprint it on the ground below you.' }, 'control_pw_type': { @@ -241,7 +245,7 @@ cmd_ANNOTATION.argtypes = 'yx_tuple:nonneg string' def cmd_TASKS(game, tasks_comma_separated): game.tasks = tasks_comma_separated.split(',') - game.tui.mode_edit.legal = 'WRITE' in game.tasks + game.tui.mode_write.legal = 'WRITE' in game.tasks cmd_TASKS.argtypes = 'string' def cmd_THING_TYPE(game, thing_type, symbol_hint): @@ -347,7 +351,8 @@ class TUI: mode_admin = Mode('admin') mode_play = Mode('play') mode_study = Mode('study', shows_info=True) - mode_edit = Mode('edit', is_single_char_entry=True) + mode_write = Mode('write', is_single_char_entry=True) + mode_edit = Mode('edit') mode_control_pw_type = Mode('control_pw_type', is_single_char_entry=True) mode_control_pw_pw = Mode('control_pw_pw', has_input_prompt=True) mode_control_tile_type = Mode('control_tile_type', is_single_char_entry=True) @@ -364,14 +369,15 @@ class TUI: def __init__(self, host): import os import json - self.mode_play.available_modes = ["chat", "study", "edit", - "annotate", "portal", - "password", "admin_enter"] - self.mode_study.available_modes = ["chat", "play", "admin_enter"] - self.mode_admin.available_modes = ["chat", "play", "study", - "control_pw_type", - "control_tile_type"] - self.mode_control_tile_draw.available_modes = ["admin"] + self.mode_play.available_modes = ["chat", "study", "edit", "admin_enter"] + self.mode_study.available_modes = ["chat", "play", "admin_enter", "edit"] + self.mode_admin.available_modes = ["control_pw_type", + "control_tile_type", "chat", + "study", "play", "edit"] + self.mode_control_tile_draw.available_modes = ["admin_enter"] + self.mode_edit.available_modes = ["write", "annotate", "portal", + "password", "chat", "study", "play", + "admin_enter"] self.host = host self.game = Game() self.game.tui = self @@ -380,7 +386,7 @@ class TUI: 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 = { @@ -390,7 +396,8 @@ class TUI: 'switch_to_annotate': 'M', 'switch_to_portal': 'T', 'switch_to_study': '?', - 'switch_to_edit': 'm', + 'switch_to_edit': 'E', + 'switch_to_write': 'm', 'switch_to_admin_enter': 'A', 'switch_to_control_pw_type': 'C', 'switch_to_control_tile_type': 'Q', @@ -495,7 +502,7 @@ class TUI: (self.explorer, quote(self.tile_control_char))) def switch_mode(self, mode_name): - self.map_mode = 'terrain' + self.map_mode = 'all' if mode_name == 'admin_enter' and self.is_admin: mode_name = 'admin' self.mode = getattr(self, 'mode_' + mode_name) @@ -655,19 +662,26 @@ class TUI: 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_] @@ -717,22 +731,26 @@ class TUI: 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'] - if 'FLATTEN_SURROUNDINGS' in self.game.tasks: - content += "[%s] – flatten player's surroundings\n" % self.keys['flatten'] + 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 == 'chat': content += '/nick NAME – re-name yourself to NAME\n' content += '/%s or /play – switch to play mode\n' % self.keys['switch_to_play'] content += '/%s or /study – switch to study mode\n' % self.keys['switch_to_study'] + content += '/%s or /edit – switch to map edit mode\n' % self.keys['switch_to_edit'] content += '/%s or /admin – switch to admin mode\n' % self.keys['switch_to_admin_enter'] content += self.mode.list_available_modes(self) for i in range(self.size.y): @@ -834,7 +852,7 @@ class TUI: self.input_ = ' ' self.password = self.input_ self.input_ = "" - self.switch_mode('play') + self.switch_mode('edit') elif self.mode.name == 'admin_enter' and key == '\n': self.send('BECOME_ADMIN ' + quote(self.input_)) self.input_ = "" @@ -847,6 +865,8 @@ class TUI: self.switch_mode('play') elif self.input_ in {'/' + self.keys['switch_to_study'], '/study'}: self.switch_mode('study') + elif self.input_ in {'/' + self.keys['switch_to_edit'], '/edit'}: + self.switch_mode('edit') elif self.input_ in {'/' + self.keys['switch_to_admin_enter'], '/admin'}: self.switch_mode('admin_enter') elif self.input_.startswith('/nick'): @@ -866,14 +886,14 @@ class TUI: self.send('ANNOTATE %s %s %s' % (self.explorer, quote(self.input_), quote(self.password))) self.input_ = "" - self.switch_mode('play') + self.switch_mode('edit') elif self.mode.name == 'portal' and key == '\n': if self.input_ == '': self.input_ = ' ' self.send('PORTAL %s %s %s' % (self.explorer, quote(self.input_), quote(self.password))) self.input_ = "" - self.switch_mode('play') + self.switch_mode('edit') elif self.mode.name == 'study': if self.mode.mode_switch_on_key(self, key): continue @@ -881,7 +901,7 @@ class TUI: 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: @@ -889,9 +909,6 @@ class TUI: elif self.mode.name == 'play': if self.mode.mode_switch_on_key(self, key): continue - if key == self.keys['flatten'] and\ - 'FLATTEN_SURROUNDINGS' in self.game.tasks: - self.send('TASK:FLATTEN_SURROUNDINGS ' + quote(self.password)) elif key == self.keys['take_thing'] and 'PICK_UP' in self.game.tasks: self.send('TASK:PICK_UP') elif key == self.keys['drop_thing'] and 'DROP' in self.game.tasks: @@ -906,9 +923,9 @@ class TUI: self.log_msg('? not standing on portal') elif key in self.movement_keys and 'MOVE' in self.game.tasks: self.send('TASK:MOVE ' + self.movement_keys[key]) - elif self.mode.name == 'edit': + elif self.mode.name == 'write': self.send('TASK:WRITE %s %s' % (key, quote(self.password))) - self.switch_mode('play') + self.switch_mode('edit') elif self.mode.name == 'control_pw_type': self.tile_control_char = key self.switch_mode('control_pw_pw') @@ -923,6 +940,14 @@ class TUI: elif self.mode.name == 'admin': 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\ + 'FLATTEN_SURROUNDINGS' in self.game.tasks: + self.send('TASK:FLATTEN_SURROUNDINGS ' + quote(self.password)) + elif key in self.movement_keys and 'MOVE' in self.game.tasks: + self.send('TASK:MOVE ' + self.movement_keys[key]) if len(sys.argv) != 2: raise ArgError('wrong number of arguments, need game host')