Also sit down if spawning over sittable.

[plomrogue2] / plomrogue / tasks.py

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index 83a1b02306c497d2c607ec7a198bb8fdc3b60bab..68ffb09d203055f4e2bd32126d1c609d103517be 100644 (file)
--- 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,11 +251,11 @@ 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()