def check(self):
test_pos = self.thing.world.map_.move(self.thing.position, self.args[0])
+ if test_pos is None:
+ raise GameError('would move outside map bounds')
if self.thing.world.map_[test_pos] != '.':
raise GameError('%s would move into illegal terrain' % self.thing.id_)
for t in self.thing.world.things:
to_pick_up = self.thing.world.get_thing(self.args[0],
create_unfound=False)
if to_pick_up is None or \
- to_pick_up.in_inventory or \
- to_pick_up == self.thing or \
- self.thing.position != to_pick_up.position:
+ to_pick_up.id_ not in self.thing.get_pickable_items():
raise GameError('thing of ID %s not in reach to pick up'
% self.args[0])
to_pick_up = self.thing.world.get_thing(self.args[0])
self.thing.inventory += [self.args[0]]
to_pick_up.in_inventory = True
+ to_pick_up.position = self.thing.position