X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomrogue%2Ftasks.py;h=4a6df1641202d75ca66f7f1a057d779774f155f9;hb=aab94ffb12aa0dedc240d7b29001699b95c49249;hp=3dc09282449ac03088d88800c488004f8dfafaee;hpb=dc2747c7daca975526206bfadecc1dd0ddcc8d67;p=plomrogue2

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index 3dc0928..4a6df16 100644
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -34,10 +34,11 @@ class Task_MOVE(Task):
 
     def check(self):
         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]:
             raise PlayError('blocked by other thing')
-        elif self.thing.game.maps[test_yxyx[0]][test_yxyx[1]] != '.':
+        elif self.thing.game.maps[test_yxyx[0]][test_yxyx[1]] in move_blockers:
             raise PlayError('blocked by impassable tile')
 
     def do(self):
@@ -77,7 +78,7 @@ 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.thing.game.maps[yxyx[0]][yxyx[1]] = self.thing.game.get_flatland()
             self.thing.game.record_fov_change(yxyx)
 
 
@@ -110,6 +111,8 @@ 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)
 
 
 
@@ -130,7 +133,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]:
@@ -143,6 +155,8 @@ 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)
 
 
 
@@ -166,18 +180,26 @@ 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:
+        if self.thing.carrying.type_ not in {'Bottle', 'Cookie'}:
+            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
-        self.thing.invalidate_map_view()
+        if self.thing.carrying.type_ == 'Bottle':
+            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)
+        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)
 
 
 
@@ -226,6 +248,8 @@ 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)
 
 
 
@@ -261,8 +285,10 @@ 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
+            dropped = self.uncarry()
+            self.thing.game.remove_thing(dropped)
+        # FIXME: pseudo-FOV-change actually
+        self.thing.game.record_fov_change(self.thing.position)