X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/ledger2?a=blobdiff_plain;ds=sidebyside;f=plomrogue%2Ftasks.py;h=de9f1c87d1591820f2a405bf97313866e0c90ab5;hb=04fb13f0269b7d77ec178a797599c3d9a54061a6;hp=ca6d4ab99d0922501e767605334c01160415d1ad;hpb=3a63499cf4aaaad8f6bc7be8ee45d1df4725a321;p=plomrogue2

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index ca6d4ab..de9f1c8 100644
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -42,11 +42,22 @@ class Task_MOVE(Task):
             raise PlayError('blocked by impassable tile')
 
     def do(self):
+        if self.thing.type_ == 'Player' and not self.thing.standing:
+            self.thing.standing = True
+            self.thing.send_msg('CHAT "You get up."')
         self.thing.game.record_change(self.thing.position, 'other')
         if self.thing.blocks_light:
             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')
+        terrain = \
+            self.thing.game.maps[self.thing.position[0]][self.thing.position[1]]
+        if terrain in self.thing.game.terrains:
+            terrain_type = self.thing.game.terrains[terrain]
+            if 'sittable' in terrain_type.tags:
+                self.thing.standing = False
+                self.thing.send_msg('CHAT "You sink into the %s."'
+                                    % terrain_type.description)
         self.thing.invalidate('fov')
         if self.thing.blocks_light:
             self.thing.game.record_change(self.thing.position, 'fov')
@@ -184,7 +195,7 @@ class Task_INTOXICATE(Task):
     def check(self):
         if self.thing.carrying is None:
             raise PlayError('carrying nothing to consume')
-        if self.thing.carrying.type_ not in {'Bottle', 'Cookie'}:
+        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:
@@ -194,11 +205,17 @@ 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.need_for_toilet += 10000
             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)