Add chairs.

[plomrogue2] / plomrogue / tasks.py

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index 4a0e147ee358f7a1623a4adb3844110887bbe4e6..ad8cfc8b648c3a2cfcc53d76166e5d7dc5060395 100644 (file)
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -70,6 +70,11 @@ class Task_MOVE(Task):
                 self.thing.send_msg('CHAT "You sink into the %s. '
                                     'Staying here will replenish your energy."'
                                     % terrain_type.description)
+        for t in [t for t in self.thing.game.things
+                  if t.type_ == 'Chair' and t.position == self.thing.position]:
+            self.thing.standing = False
+            self.thing.send_msg('CHAT "You sink into the Chair. '
+                                'Staying here will replenish your energy."')
         self.thing.invalidate('fov')
         if self.thing.blocks_light:
             self.thing.game.record_change(self.thing.position, 'fov')
@@ -259,23 +264,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)