def check(self):
if self.thing.carrying is None:
- raise PlayError('nothing to consume')
- if self.thing.carrying.type_ != 'Consumable':
- raise PlayError('cannot consume non-consumable')
+ raise PlayError('carrying nothing to drink from')
+ if self.thing.carrying.type_ != 'Bottle':
+ raise PlayError('cannot drink from non-bottle')
+ if not self.thing.carrying.full:
+ raise PlayError('bottle is empty')
def do(self):
- self.thing.game.things.remove(self.thing.carrying)
- self.thing.carrying = None
+ self.thing.carrying.full = False
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)