home · contact · privacy
Only allow opening/closing doors that are installed.
[plomrogue2] / plomrogue / tasks.py
index 14ea820bd153e20f016af575d59d74c110023826..b408ea49636b582a3dcbe8fd505faa196270fe99 100644 (file)
@@ -61,20 +61,15 @@ 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 reduce your weariness."'
-                                    % 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')
         if self.thing.carrying:
             self.thing.carrying.position = self.thing.position
+            if self.thing.carrying.type_ == 'Crate':
+                for t in self.thing.carrying.content:
+                    t.position = self.thing.position
 
 
 
@@ -139,6 +134,11 @@ class Task_PICK_UP(Task):
         to_pick_up.position = self.thing.position[:]
         self.thing.carrying = to_pick_up
         to_pick_up.carried = True
+        for t in [t for t in self.thing.game.things
+                  if t.type_ == 'Crate' and to_pick_up in t.content]:
+            t.remove_from_crate(to_pick_up)
+            self.thing.send_msg('CHAT "You take the item out of the crate."')
+            break
         self.thing.game.record_change(self.thing.position, 'other')
 
 
@@ -150,42 +150,46 @@ class Task_DROP(Task):
         if not self.thing.carrying:
             raise PlayError('nothing to drop')
         target_position = self._get_move_target()
-        if self.thing.carrying.type_ == 'Bottle' and self.thing.carrying.full:
-            for t in [t for t in self.thing.game.things
-                      if t.type_ == 'BottleDeposit'
-                      and t.position == target_position]:
-                raise PlayError('cannot drop full bottle into bottle deposit')
-        for t in [t for t in self.thing.game.things
-                  if t.type_ == 'CookieSpawner'
-                  and t.position == target_position]:
-            if not self.thing.carrying.cookable:
+        targets = [t for t in self.thing.game.things
+                   if t.position == target_position
+                   and not t == self.thing.carrying]
+        for target in targets:
+            if target.type_ == 'CookieSpawner' and\
+               not self.thing.carrying.cookable:
                 raise PlayError('cannot cook items of this type')
-            break
+            elif target.type_ == 'BottleDeposit':
+                if not self.thing.carrying.type_ == 'Bottle':
+                    raise PlayError('cannot only put bottle into bottle deposit')
+                if self.thing.carrying.full:
+                    raise PlayError('cannot drop full '
+                                    'bottle into bottle deposit')
+            elif target.type_ == 'Crate' and\
+                 self.thing.carrying.type_ == 'Crate':
+                raise PlayError('cannot put crate into crate')
 
     def do(self):
         target_position = self._get_move_target()
         dropped = self.thing.uncarry()
         dropped.position = target_position
-        over_cookie_spawner = None
-        for t in [t for t in self.thing.game.things
-                  if t.type_ == 'CookieSpawner'
-                  and t.position == dropped.position]:
-            over_cookie_spawner = t
-            break
-        if over_cookie_spawner:
-            over_cookie_spawner.accept(dropped)
-            self.thing.game.remove_thing(dropped)
-        elif dropped.type_ == 'Bottle' and not dropped.full:
-            for t in [t for t in self.thing.game.things
-                      if t.type_ == 'BottleDeposit'
-                      and t.position == dropped.position]:
-                t.accept()
+        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:
+            if target.type_ == 'CookieSpawner':
+                target.accept(dropped)
+                self.thing.game.remove_thing(dropped)
+                break
+            elif target.type_ == 'BottleDeposit':
+                target.accept()
                 self.thing.game.remove_thing(dropped)
                 break
-        elif dropped.type_ == 'Hat':
-            for t in [t for t in self.thing.game.things
-                      if t.type_ == 'HatRemixer'
-                      and t.position == dropped.position]:
+            elif target.type_ == 'Crate':
+                target.accept(dropped)
+                self.thing.send_msg('CHAT "You put the item into the crate."')
+                break
+            elif target.type_ == 'HatRemixer':
                 t.accept(dropped)
                 break
         self.thing.game.record_change(self.thing.position, 'other')
@@ -201,6 +205,8 @@ class Task_DOOR(Task):
                            t.type_ == 'Door' and t.position in action_radius]
         if len(reachable_doors) == 0:
             raise PlayError('not standing next to a door to open/close')
+        if len([d for d in reachable_doors if not d.portable]) == 0:
+            raise PlayError('can only open/close doors that are installed')
         for door in reachable_doors:
             if not door.blocks_movement:
                 return
@@ -235,7 +241,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:
@@ -247,20 +253,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)
 
 
 
@@ -362,3 +373,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