X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomrogue%2Ftasks.py;h=eca94003d6c8a5a52e3b6f15d13464f188c17d86;hb=018bb0242ebd2b7e9fde170fae830376dea55e16;hp=0bc0d9cf23c30c29e0b675f20ba0c77f0debe59f;hpb=e5a83f8987647c3c239e48d5bc1ff939ce531544;p=plomrogue2

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index 0bc0d9c..eca9400 100644
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -128,13 +128,14 @@ class Task_INTOXICATE(Task):
 
     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)