},
'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': {
'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',
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:
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,
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_ = ""
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':
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]))
projects / plomrogue2 / blobdiff