X-Git-Url: https://plomlompom.com/repos//%22https:/validator.w3.org/check?a=blobdiff_plain;f=plomrogue%2Ftasks.py;h=68ffb09d203055f4e2bd32126d1c609d103517be;hb=5d3c2a69f040a8e4e0538a1fe7f64948aede0e0a;hp=4a0e147ee358f7a1623a4adb3844110887bbe4e6;hpb=cf2a7a164c24e82a5efc4cfe9c56c4b4f2c442df;p=plomrogue2

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index 4a0e147..68ffb09 100644
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -61,15 +61,7 @@ class Task_MOVE(Task):
                                      self.thing.name))
                     break
         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. '
-                                    'Staying here will replenish your energy."'
-                                    % terrain_type.description)
+        self.thing.try_to_sit()
         self.thing.invalidate('fov')
         if self.thing.blocks_light:
             self.thing.game.record_change(self.thing.position, 'fov')
@@ -259,23 +251,23 @@ class Task_INTOXICATE(Task):
             self.thing.carrying.empty()
             self.thing.send_msg('CHAT "You are drunk now."')
             self.thing.need_for_toilet += 1
-            self.thing.drunk += 10000
+            self.thing.drunk += 100000
             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.tripping += 100000
             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.send_msg('CHAT ' + quote('You eat a cookie that grants 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)
         elif self.thing.carrying.type_ == 'Stimulant':
             self.thing.send_msg('CHAT "You feel a flash of energy."')
-            self.thing.energy += 100
+            self.thing.energy += 50
             eaten = self.thing.uncarry()
             self.thing.game.remove_thing(eaten)