X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=rogue_chat_curses.py;h=6a30f746f8cdc86e7fc787dfc676c1f3955a59e1;hb=51addf32b5a876c47325fb55756aacaea65ed0da;hp=1f93dd808b690d488b0cf9f93fd3ed80a72fa50e;hpb=0f1e35f5f1a318d6e3e610085babd46946ad3600;p=plomrogue2 diff --git a/rogue_chat_curses.py b/rogue_chat_curses.py index 1f93dd8..6a30f74 100755 --- a/rogue_chat_curses.py +++ b/rogue_chat_curses.py @@ -38,7 +38,7 @@ mode_helps = { }, 'take_thing': { 'short': 'take thing', - 'intro': '', + 'intro': 'Pick up a thing in reach by entering its index number. Enter nothing to abort.', 'long': 'You see a list of things which you could pick up. Enter the target thing\'s index, or, to leave, nothing.' }, 'admin_thing_protect': { @@ -84,7 +84,7 @@ mode_helps = { 'chat': { 'short': 'chat', 'intro': '', - 'long': 'This mode allows you to engage in chit-chat with other users. Any line you enter into the input prompt that does not start with a "/" will be sent out to nearby players – but barriers and distance will reduce what they can read, so stand close to them to ensure they get your message. Lines that start with a "/" are used for commands like:' + 'long': 'This mode allows you to engage in chit-chat with other users. Any line you enter into the input prompt that does not start with a "/" will be sent out to nearby players – but barriers and distance will reduce what they can read, so stand close to them to ensure they get your message. Lines that start with a "/" are used for commands like:\n\n/nick NAME – re-name yourself to NAME' }, 'login': { 'short': 'login', @@ -291,6 +291,10 @@ def cmd_THING_TYPE(game, thing_type, symbol_hint): game.thing_types[thing_type] = symbol_hint cmd_THING_TYPE.argtypes = 'string char' +def cmd_THING_CARRYING(game, thing_id): + game.get_thing(thing_id).carrying = True +cmd_THING_CARRYING.argtypes = 'int:nonneg' + def cmd_TERRAIN(game, terrain_char, terrain_desc): game.terrains[terrain_char] = terrain_desc cmd_TERRAIN.argtypes = 'char string' @@ -325,6 +329,7 @@ class Game(GameBase): self.register_command(cmd_THING_TYPE) self.register_command(cmd_THING_NAME) self.register_command(cmd_THING_CHAR) + self.register_command(cmd_THING_CARRYING) self.register_command(cmd_TERRAIN) self.register_command(cmd_MAP) self.register_command(cmd_MAP_CONTROL) @@ -623,11 +628,23 @@ class TUI: else: self.log_msg('@ enter username') elif self.mode.name == 'take_thing': - self.log_msg('selectable things:') + self.log_msg('Things in reach for pick-up:') player = self.game.get_thing(self.game.player_id) + select_range = [player.position, + player.position + YX(0,-1), + player.position + YX(0, 1), + player.position + YX(-1, 0), + player.position + YX(1, 0)] + if type(self.game.map_geometry) == MapGeometryHex: + if player.position.y % 2: + select_range += [player.position + YX(-1, 1), + player.position + YX(1, 1)] + else: + select_range += [player.position + YX(-1, -1), + player.position + YX(1, -1)] self.selectables = [t for t in self.game.things if t != player and t.type_ != 'Player' - and t.position == player.position] + and t.position in select_range] if len(self.selectables) == 0: self.log_msg('none') else: @@ -834,6 +851,8 @@ class TUI: meta_char = t.thing_char if t.position in used_positions: meta_char = '+' + if hasattr(t, 'carrying') and t.carrying: + meta_char = '$' map_lines_split[t.position.y][t.position.x] = symbol + meta_char used_positions += [t.position] @@ -891,12 +910,6 @@ class TUI: key = self.keys[action] content += '[%s] – %s\n' % (key, action_descriptions[action]) content += '\n' - 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 world 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): safe_addstr(i, @@ -995,6 +1008,12 @@ class TUI: reset_screen_size() elif self.mode.has_input_prompt and key == 'KEY_BACKSPACE': self.input_ = self.input_[:-1] + elif self.mode.has_input_prompt and key == '\n' and self.input_ == ''\ + and self.mode.name in {'chat', 'command_thing', 'take_thing', + 'admin_enter'}: + if self.mode.name != 'chat': + self.log_msg('@ aborted') + self.switch_mode('play') elif self.mode.has_input_prompt and key == '\n' and self.input_ == '/help': self.show_help = True self.input_ = "" @@ -1011,24 +1030,18 @@ class TUI: self.send('LOGIN ' + quote(self.input_)) self.input_ = "" elif self.mode.name == 'take_thing' and key == '\n': - if self.input_ == '': - self.log_msg('@ aborted') - else: - try: - i = int(self.input_) - if i < 0 or i >= len(self.selectables): - self.log_msg('? invalid index, aborted') - else: - self.send('TASK:PICK_UP %s' % self.selectables[i].id_) - except ValueError: + try: + i = int(self.input_) + if i < 0 or i >= len(self.selectables): self.log_msg('? invalid index, aborted') + else: + self.send('TASK:PICK_UP %s' % self.selectables[i].id_) + except ValueError: + self.log_msg('? invalid index, aborted') self.input_ = '' self.switch_mode('play') elif self.mode.name == 'command_thing' and key == '\n': - if self.input_ == '': - self.log_msg('@ aborted') - self.switch_mode('play') - elif task_action_on('command'): + if task_action_on('command'): self.send('TASK:COMMAND ' + quote(self.input_)) self.input_ = "" elif self.mode.name == 'control_pw_pw' and key == '\n': @@ -1071,16 +1084,8 @@ class TUI: elif self.mode.name == 'chat' and key == '\n': if self.input_ == '': continue - if self.input_[0] == '/': # FIXME fails on empty input - if self.input_ in {'/' + self.keys['switch_to_play'], '/play'}: - 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'): + if self.input_[0] == '/': + if self.input_.startswith('/nick'): tokens = self.input_.split(maxsplit=1) if len(tokens) == 2: self.send('NICK ' + quote(tokens[1]))