Simplify toilet need calcuation, add pee-into-pants emergency exit.

[plomrogue2] / plomrogue / tasks.py

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index f7fb3124da02b32e46a887b95eed9ee8a57214ea..4f390d47c92a88fbb1782944f623b3c44012d846 100644 (file)
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -36,15 +36,20 @@ class Task_MOVE(Task):
         test_yxyx = self._get_move_target()
         move_blockers = self.thing.game.get_movement_blockers()
         if test_yxyx in [t.position for t in self.thing.game.things
-                         if t.blocking]:
+                         if t.blocks_movement]:
             raise PlayError('blocked by other thing')
         elif self.thing.game.maps[test_yxyx[0]][test_yxyx[1]] in move_blockers:
             raise PlayError('blocked by impassable tile')
 
     def do(self):
-        self.thing.game.record_fov_change(self.thing.position)
+        self.thing.game.record_change(self.thing.position, 'other')
+        if self.thing.blocks_light:
+            self.thing.game.record_change(self.thing.position, 'fov')
         self.thing.position = self._get_move_target()
-        self.thing.game.record_fov_change(self.thing.position)
+        self.thing.game.record_change(self.thing.position, 'other')
+        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
 
@@ -62,7 +67,7 @@ class Task_WRITE(Task):
         big_yx = self.thing.position[0]
         little_yx = self.thing.position[1]
         self.thing.game.maps[big_yx][little_yx] = self.args[0]
-        self.thing.game.record_fov_change((big_yx, little_yx))
+        self.thing.game.record_change((big_yx, little_yx), 'fov')
 
 
 
@@ -78,8 +83,8 @@ class Task_FLATTEN_SURROUNDINGS(Task):
                     self.thing.position).values()):
             if not self.thing.game.can_do_tile_with_pw(*yxyx, self.args[0]):
                 continue
-            self.thing.game.maps[yxyx[0]][yxyx[1]] = self.game.get_flatland()
-            self.thing.game.record_fov_change(yxyx)
+            self.thing.game.maps[yxyx[0]][yxyx[1]] = self.thing.game.get_flatland()
+            self.thing.game.record_change(yxyx, 'fov')
 
 
 
@@ -111,8 +116,7 @@ class Task_PICK_UP(Task):
         to_pick_up.position = self.thing.position[:]
         self.thing.carrying = to_pick_up
         to_pick_up.carried = True
-        # FIXME: pseudo-FOV-change actually
-        self.thing.game.record_fov_change(self.thing.position)
+        self.thing.game.record_change(self.thing.position, 'other')
 
 
 
@@ -133,7 +137,16 @@ class Task_DROP(Task):
         target_position = self._get_move_target()
         dropped = self.thing.uncarry()
         dropped.position = target_position
-        if dropped.type_ == 'Bottle' and not dropped.full:
+        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]:
@@ -146,8 +159,7 @@ class Task_DROP(Task):
                       and t.position == dropped.position]:
                 t.accept(dropped)
                 break
-        # FIXME: pseudo-FOV-change actually
-        self.thing.game.record_fov_change(self.thing.position)
+        self.thing.game.record_change(self.thing.position, 'other')
 
 
 
@@ -158,11 +170,12 @@ class Task_DOOR(Task):
                              get_neighbors_yxyx(self.thing.position).values())
         for t in [t for t in self.thing.game.things if
                   t.type_ == 'Door' and t.position in action_radius]:
-            if t.blocking:
+            if t.blocks_movement:
                 t.open()
             else:
                 t.close()
-            self.thing.game.record_fov_change(t.position)
+            self.thing.game.record_change(t.position, 'other')
+            self.thing.game.record_change(t.position, 'fov')
 
 
 
@@ -170,20 +183,33 @@ class Task_INTOXICATE(Task):
 
     def check(self):
         if self.thing.carrying is None:
-            raise PlayError('carrying nothing to drink from')
-        if self.thing.carrying.type_ != 'Bottle':
-            raise PlayError('cannot drink from non-bottle')
-        if not self.thing.carrying.full:
+            raise PlayError('carrying nothing to consume')
+        if self.thing.carrying.type_ not in {'Bottle', 'Cookie', 'Psychedelic'}:
+            raise PlayError('cannot consume this kind of thing')
+        if self.thing.carrying.type_ == 'Bottle' and\
+           not self.thing.carrying.full:
             raise PlayError('bottle is empty')
 
     def do(self):
-        self.thing.carrying.full = False
-        self.thing.carrying.empty()
-        self.thing.send_msg('RANDOM_COLORS')
-        self.thing.send_msg('CHAT "You are drunk now."')
-        self.thing.drunk = 10000
-        # FIXME: pseudo-FOV-change actually
-        self.thing.game.record_fov_change(self.thing.position)
+        if self.thing.carrying.type_ == 'Bottle':
+            self.thing.carrying.full = False
+            self.thing.carrying.empty()
+            self.thing.send_msg('CHAT "You are drunk now."')
+            self.thing.need_for_toilet += 10000
+            self.thing.drunk = 10000
+            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.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.add_cookie_char(self.thing.carrying.thing_char)
+            eaten = self.thing.uncarry()
+            self.thing.game.remove_thing(eaten)
 
 
 
@@ -232,8 +258,7 @@ class Task_INSTALL(Task):
         else:
             self._get_uninstallables()[0].uninstall()
             self.thing.send_msg('CHAT "You uninstall the thing here."')
-        # FIXME: pseudo-FOV-change actually
-        self.thing.game.record_fov_change(self.thing.position)
+        self.thing.game.record_change(self.thing.position, 'other')
 
 
 
@@ -269,10 +294,9 @@ class Task_WEAR(Task):
                 self.thing.game.hats[self.thing.name] =\
                     self.thing.carrying.design
                 self.thing.send_msg('CHAT "You put on a hat."')
-            self.thing.game.remove_thing(self.thing.carrying)
-            self.thing.carrying = None
-        # FIXME: pseudo-FOV-change actually
-        self.thing.game.record_fov_change(self.thing.position)
+            dropped = self.thing.uncarry()
+            self.thing.game.remove_thing(dropped)
+        self.thing.game.record_change(self.thing.position, 'other')