X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=plomrogue%2Ftasks.py;h=ad8cfc8b648c3a2cfcc53d76166e5d7dc5060395;hb=2df42b53c56bd32dc445df532b4c42c53d97b767;hp=95945055e0f7e15923bc34780a985c2b3a5ea556;hpb=509d9ca8e54529b5d728b1635df4ba4bbb0bcc23;p=plomrogue2

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index 9594505..ad8cfc8 100644
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -68,8 +68,13 @@ class Task_MOVE(Task):
             if 'sittable' in terrain_type.tags:
                 self.thing.standing = False
                 self.thing.send_msg('CHAT "You sink into the %s. '
-                                    'Staying here will reduce your weariness."'
+                                    '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')
@@ -179,6 +184,9 @@ class Task_DROP(Task):
         target_position = self._get_move_target()
         dropped = self.thing.uncarry()
         dropped.position = target_position
+        if dropped.type_ == 'Crate':
+            for item in dropped.content:
+                item.position = target_position
         targets = [t for t in self.thing.game.things
                    if t.position == dropped.position and not t == dropped]
         for target in targets:
@@ -244,7 +252,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', 'Psychedelic'}:
+        if not self.thing.carrying.consumable:
             raise PlayError('cannot consume this kind of thing')
         if self.thing.carrying.type_ == 'Bottle' and\
            not self.thing.carrying.full:
@@ -256,20 +264,25 @@ 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 += 50
+            eaten = self.thing.uncarry()
+            self.thing.game.remove_thing(eaten)
 
 
 
@@ -371,3 +384,12 @@ class Task_SPIN(Task):
     def do(self):
         self.thing.carrying.spin()
         self.thing.send_msg('CHAT "You spin this object."')
+
+
+
+class Task_DANCE(Task):
+
+    def do(self):
+        self.thing.send_msg('CHAT "You dance."')
+        self.thing.dancing += 10
+        self.thing.game.changed = True