X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=new%2Fplomrogue%2Ftasks.py;h=c54d0899b98ecb56ec2c4fe422ec357086951df2;hb=f5797c816396a105c0d72cc826c2cc2566f1478c;hp=1be5b6da40b2c757fccd08541fbea6002f6809aa;hpb=65e83c99b95a619afc79e8984e6f5027bc7aac1b;p=plomrogue2-experiments
diff --git a/new/plomrogue/tasks.py b/new/plomrogue/tasks.py
index 1be5b6d..c54d089 100644
--- a/new/plomrogue/tasks.py
+++ b/new/plomrogue/tasks.py
@@ -37,6 +37,8 @@ class Task_MOVE(Task):
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:
@@ -59,9 +61,7 @@ class Task_PICKUP(Task):
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])
@@ -69,6 +69,7 @@ class Task_PICKUP(Task):
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