},
'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': {
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)
- selectables = [t for t in self.game.things
- if t != player and t.type_ != 'Player'
- and t.position == player.position]
- if len(selectables) == 0:
+ 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 in select_range]
+ if len(self.selectables) == 0:
self.log_msg('none')
else:
- for t in selectables:
- self.log_msg(str(t.id_) + ' ' + self.get_thing_info(t))
+ for i in range(len(self.selectables)):
+ t = self.selectables[i]
+ self.log_msg(str(i) + ': ' + self.get_thing_info(t))
elif self.mode.name == 'command_thing':
self.send('TASK:COMMAND ' + quote('HELP'))
elif self.mode.name == 'control_pw_pw':
if self.input_ == '':
self.log_msg('@ aborted')
else:
- self.send('TASK:PICK_UP ' + quote(self.input_))
+ 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':