From: Christian Heller Date: Mon, 30 Nov 2020 23:04:14 +0000 (+0100) Subject: Refactor curses client. X-Git-Url: https://plomlompom.com/repos/unset_cookie?a=commitdiff_plain;h=904563ed3077b2ce6cc884c8e1f66b68a0d292b5;p=plomrogue2 Refactor curses client. --- diff --git a/rogue_chat_curses.py b/rogue_chat_curses.py index 1711f64..e5c2dad 100755 --- a/rogue_chat_curses.py +++ b/rogue_chat_curses.py @@ -21,7 +21,7 @@ mode_helps = { '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': 'world edit', - 'long': 'This mode allows you to change the game world 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.' + 'long': 'This mode allows you to change the game world 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 world edit password that matches its protection character. The character "." marks the absence of protection: Such tiles can always be edited.' }, 'name_thing': { 'short': 'name thing', @@ -324,6 +324,7 @@ class Mode: self.name = name self.short_desc = mode_helps[name]['short'] self.available_modes = [] + self.available_actions = [] self.has_input_prompt = has_input_prompt self.shows_info = shows_info self.is_intro = is_intro @@ -381,10 +382,16 @@ class TUI: import os import json self.mode_play.available_modes = ["chat", "study", "edit", "admin_enter"] + self.mode_play.available_actions = ["move", "take_thing", "drop_thing", + "teleport"] self.mode_study.available_modes = ["chat", "play", "admin_enter", "edit"] + self.mode_study.available_actions = ["toggle_map_mode", "move_explorer"] self.mode_admin.available_modes = ["admin_thing_protect", "control_pw_type", "control_tile_type", "chat", "study", "play", "edit"] + self.mode_admin.available_actions = ["move"] + self.mode_edit.available_actions = ["move", "flatten", "toggle_map_mode"] + self.mode_control_tile_draw.available_actions = ["toggle_tile_draw"] self.mode_control_tile_draw.available_modes = ["admin_enter"] self.mode_edit.available_modes = ["write", "annotate", "portal", "name_thing", "password", "chat", "study", "play", @@ -605,6 +612,9 @@ class TUI: command, args = self.parser.parse(msg) command(*args) + def task_action_on(action): + return action_tasks[action] in self.game.tasks + def msg_into_lines_of_width(msg, width): chunk = '' lines = [] @@ -787,44 +797,26 @@ class TUI: def draw_help(): content = "%s help\n\n%s\n\n" % (self.mode.short_desc, self.mode.help_intro) - if self.mode.name == 'play': - content += "Available actions:\n" - if 'MOVE' in self.game.tasks: - content += "[%s] – move player\n" % ','.join(self.movement_keys) - if 'PICK_UP' in self.game.tasks: - content += "[%s] – pick up thing\n" % self.keys['take_thing'] - if 'DROP' in self.game.tasks: - content += "[%s] – drop thing\n" % self.keys['drop_thing'] - content += '[%s] – teleport\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 map view\n' % self.keys['toggle_map_mode'] - 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': + if len(self.mode.available_actions) > 0: content += "Available actions:\n" - content += "[%s] – toggle tile protection drawing\n" % self.keys['toggle_tile_draw'] + for action in self.mode.available_actions: + if action in action_tasks: + if action_tasks[action] not in self.game.tasks: + continue + if action == 'move_explorer': + action = 'move' + if action == 'move': + key = ','.join(self.movement_keys) + else: + key = self.keys[action] + content += '[%s] – %s\n' % (key, action_descriptions[action]) content += '\n' - elif self.mode.name == 'chat': + if 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 /edit – switch to world edit mode\n' % self.keys['switch_to_edit'] content += '/%s or /admin – switch to admin mode\n' % self.keys['switch_to_admin_enter'] - elif self.mode.name == 'admin': - content += "Available actions:\n" - if 'MOVE' in self.game.tasks: - content += "[%s] – move player\n" % ','.join(self.movement_keys) - content += '\n' content += self.mode.list_available_modes(self) for i in range(self.size.y): safe_addstr(i, @@ -856,6 +848,23 @@ class TUI: if self.show_help: draw_help() + action_descriptions = { + 'move': 'move', + 'flatten': 'flatten surroundings', + 'teleport': 'teleport', + 'take_thing': 'pick up thing', + 'drop_thing': 'drop thing', + 'toggle_map_mode': 'toggle map view', + 'toggle_tile_draw': 'toggle protection character drawing', + } + + action_tasks = { + 'flatten': 'FLATTEN_SURROUNDINGS', + 'take_thing': 'PICK_UP', + 'drop_thing': 'DROP', + 'move': 'MOVE' + } + curses.curs_set(False) # hide cursor curses.use_default_colors() stdscr.timeout(10) @@ -1002,9 +1011,9 @@ class TUI: elif self.mode.name == 'play': if self.mode.mode_switch_on_key(self, key): continue - elif key == self.keys['take_thing'] and 'PICK_UP' in self.game.tasks: + elif key == self.keys['take_thing'] and task_action_on('take_thing'): self.send('TASK:PICK_UP') - elif key == self.keys['drop_thing'] and 'DROP' in self.game.tasks: + elif key == self.keys['drop_thing'] and task_action_on('drop_thing'): self.send('TASK:DROP') elif key == self.keys['teleport']: player = self.game.get_thing(self.game.player_id) @@ -1014,7 +1023,7 @@ class TUI: else: self.flash = True self.log_msg('? not standing on portal') - elif key in self.movement_keys and 'MOVE' in self.game.tasks: + elif key in self.movement_keys and task_action_on('move'):# 'MOVE' in self.game.tasks: self.send('TASK:MOVE ' + self.movement_keys[key]) elif self.mode.name == 'write': self.send('TASK:WRITE %s %s' % (key, quote(self.password))) @@ -1029,17 +1038,16 @@ class TUI: elif self.mode.name == 'admin': if self.mode.mode_switch_on_key(self, key): continue - elif key in self.movement_keys and 'MOVE' in self.game.tasks: + elif key in self.movement_keys and task_action_on('move'): self.send('TASK:MOVE ' + self.movement_keys[key]) elif self.mode.name == 'edit': if self.mode.mode_switch_on_key(self, key): continue - elif key == self.keys['flatten'] and\ - 'FLATTEN_SURROUNDINGS' in self.game.tasks: + elif key == self.keys['flatten'] and task_action_on('flatten'): 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: + elif key in self.movement_keys and task_action_on('move'): self.send('TASK:MOVE ' + self.movement_keys[key]) if len(sys.argv) != 2: