target_position = self._get_move_target()
dropped = self.thing.uncarry()
dropped.position = target_position
- if dropped.type_ == 'Bottle' and not dropped.full:
+ over_cookie_spawner = None
+ for t in [t for t in self.thing.game.things
+ if t.type_ == 'CookieSpawner'
+ and t.position == dropped.position]:
+ over_cookie_spawner = t
+ break
+ if over_cookie_spawner:
+ over_cookie_spawner.accept(dropped)
+ self.thing.game.remove_thing(dropped)
+ elif dropped.type_ == 'Bottle' and not dropped.full:
for t in [t for t in self.thing.game.things
if t.type_ == 'BottleDeposit'
and t.position == dropped.position]:
def check(self):
if self.thing.carrying is None:
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:
+ if self.thing.carrying.type_ not in {'Bottle', 'Cookie'}:
+ raise PlayError('cannot consume this kind of thing')
+ if self.thing.carrying.type_ == 'Bottle' and\
+ not self.thing.carrying.full:
raise PlayError('bottle is empty')
def do(self):
- self.thing.carrying.full = False
- self.thing.carrying.empty()
- self.thing.send_msg('RANDOM_COLORS')
- self.thing.send_msg('CHAT "You are drunk now."')
- self.thing.drunk = 10000
- # FIXME: pseudo-FOV-change actually
- self.thing.game.record_fov_change(self.thing.position)
+ if self.thing.carrying.type_ == 'Bottle':
+ self.thing.carrying.full = False
+ self.thing.carrying.empty()
+ self.thing.send_msg('RANDOM_COLORS')
+ self.thing.send_msg('CHAT "You are drunk now."')
+ self.thing.drunk = 10000
+ # FIXME: pseudo-FOV-change actually
+ self.thing.game.record_fov_change(self.thing.position)
+ elif self.thing.carrying.type_ == 'Cookie':
+ self.thing.send_msg('CHAT ' + quote('You eat a cookie and gain the ability to draw the following character: "%s"' % self.thing.carrying.thing_char))
+ self.thing.add_cookie_char(self.thing.carrying.thing_char)
+ eaten = self.thing.uncarry()
+ self.thing.game.remove_thing(eaten)
self.thing.game.hats[self.thing.name] =\
self.thing.carrying.design
self.thing.send_msg('CHAT "You put on a hat."')
- self.thing.game.remove_thing(self.thing.carrying)
- self.thing.carrying = None
+ dropped = self.uncarry()
+ self.thing.game.remove_thing(dropped)
# FIXME: pseudo-FOV-change actually
self.thing.game.record_fov_change(self.thing.position)