class Task_PICK_UP(Task):
+ argtypes = 'int:nonneg'
def check(self):
if self.thing.carrying:
raise PlayError('already carrying something')
- nothing_to_pick_up = True
- for t in [t for t in self.thing.game.things
- if t.portable
- and t != self.thing and t.position == self.thing.position and
- t.type_ != 'Player']:
- nothing_to_pick_up = False
- break
- if nothing_to_pick_up:
- raise PlayError('nothing to pick up')
+ to_pick_up = self.thing.game.get_thing(self.args[0])
+ if to_pick_up is None:
+ raise PlayError('no thing of ID %s exists %s' % self.args[0])
+ elif to_pick_up == self.thing:
+ raise PlayError('cannot pick up oneself')
+ elif to_pick_up.type_ == 'Player':
+ raise PlayError('cannot pick up player')
+ elif to_pick_up.position != self.thing.position:
+ raise PlayError('thing of ID %s not in reach' % self.args[0])
+ elif not to_pick_up.portable:
+ raise PlayError('thing of ID %s not portable' % self.args[0])
def do(self):
- to_pick_up = [t for t in self.thing.game.things
- if t.portable
- and t != self.thing and t.position == self.thing.position][0]
+ to_pick_up = self.thing.game.get_thing(self.args[0])
self.thing.carrying = to_pick_up
def check(self):
if not self.thing.carrying:
raise PlayError('nothing to drop')
+ if self.thing.carrying.type_ == 'Bottle' and self.thing.carrying.full:
+ for t in [t for t in self.thing.game.things
+ if t.type_ == 'BottleDeposit'
+ and t.position == self.thing.position]:
+ raise PlayError('cannot drop full bottle into bottle deposit')
def do(self):
+ if self.thing.carrying.type_ == 'Bottle' and not self.thing.carrying.full:
+ for t in [t for t in self.thing.game.things
+ if t.type_ == 'BottleDeposit'
+ and t.position == self.thing.position]:
+ t.accept()
+ self.thing.game.things.remove(self.thing.carrying)
+ break
self.thing.carrying = None
def do(self):
self.thing.carrying.full = False
+ self.thing.carrying.empty()
for c_id in self.thing.game.sessions:
if self.thing.game.sessions[c_id]['thing_id'] == self.thing.id_:
self.thing.game.io.send('RANDOM_COLORS', c_id)