X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=new%2Fplomrogue%2Ftasks.py;h=c54d0899b98ecb56ec2c4fe422ec357086951df2;hb=6c37a16df7e55754ca89a9de0aaf49c3c778155e;hp=fe41e419ca32fba8961823dcada0572e95a9e651;hpb=ba338f6ed46da5c34fbb7a3e9dac28338a0406a3;p=plomrogue2-experiments
diff --git a/new/plomrogue/tasks.py b/new/plomrogue/tasks.py
index fe41e41..c54d089 100644
--- a/new/plomrogue/tasks.py
+++ b/new/plomrogue/tasks.py
@@ -37,12 +37,54 @@ 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:
- if t.position == test_pos:
+ if t.blocking and t.position == test_pos:
raise GameError('%s would move into other thing' % self.thing.id_)
def do(self):
self.thing.position = self.thing.world.map_.move(self.thing.position,
self.args[0])
+ for id_ in self.thing.inventory:
+ t = self.thing.world.get_thing(id_)
+ t.position = self.thing.position
+
+
+
+class Task_PICKUP(Task):
+ argtypes = 'int:nonneg'
+
+ def check(self):
+ to_pick_up = self.thing.world.get_thing(self.args[0],
+ create_unfound=False)
+ if to_pick_up is None or \
+ 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])
+
+ def do(self):
+ 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
+
+
+
+class Task_DROP(Task):
+ argtypes = 'int:nonneg'
+
+ def check(self):
+ to_drop = self.thing.world.get_thing(self.args[0], create_unfound=False)
+ if to_drop is None:
+ raise GameError('no thing of ID %s to drop' % self.args[0])
+ if to_drop.id_ not in self.thing.inventory:
+ raise GameError('no thing of ID %s to drop in inventory'
+ % self.args[0])
+
+ def do(self):
+ to_drop = self.thing.world.get_thing(self.args[0])
+ del self.thing.inventory[self.thing.inventory.index(to_drop.id_)]
+ to_drop.in_inventory = False