X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/balance?a=blobdiff_plain;f=plomrogue%2Ftasks.py;h=d42aa4deb232de0a17dcaebaa838dc20e10a01c9;hb=9f83e41901f23e282737e7344c84e8a692d05ef0;hp=1dec10d7e8b1a639474ba8e07d6e371cf1963185;hpb=08ec4530a77f65da7bee3fd60a1c8ca6d06b8760;p=plomrogue2

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index 1dec10d..d42aa4d 100644
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -47,6 +47,7 @@ class Task_MOVE(Task):
             self.thing.game.record_change(self.thing.position, 'fov')
         self.thing.position = self._get_move_target()
         self.thing.game.record_change(self.thing.position, 'other')
+        self.thing.invalidate('fov')
         if self.thing.blocks_light:
             self.thing.game.record_change(self.thing.position, 'fov')
         if self.thing.carrying:
@@ -182,8 +183,8 @@ class Task_INTOXICATE(Task):
 
     def check(self):
         if self.thing.carrying is None:
-            raise PlayError('carrying nothing to drink from')
-        if self.thing.carrying.type_ not in {'Bottle', 'Cookie'}:
+            raise PlayError('carrying nothing to consume')
+        if self.thing.carrying.type_ not in {'Bottle', 'Cookie', 'Psychedelic'}:
             raise PlayError('cannot consume this kind of thing')
         if self.thing.carrying.type_ == 'Bottle' and\
            not self.thing.carrying.full:
@@ -193,11 +194,16 @@ class Task_INTOXICATE(Task):
         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
             self.thing.invalidate('fov')
             self.thing.game.record_change(self.thing.position, 'other')
+        elif self.thing.carrying.type_ == 'Psychedelic':
+            self.thing.tripping = 10000
+            self.thing.send_msg('CHAT "You start tripping."')
+            self.thing.send_msg('RANDOM_COLORS')
+            eaten = self.thing.uncarry()
+            self.thing.game.remove_thing(eaten)
         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)