X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=plomrogue%2Ftasks.py;h=a7bcf3772a4ab8f5e0351d63bb1da6f0e86c2f52;hb=80b6be9545812304bed7cf2a25434ef5f08a25c3;hp=9335aeddb0df450953a4ffb01bf4710142c9c150;hpb=d9c9b5b7d5cac2469ac075010c4d729e1adf0cc4;p=plomrogue2

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index 9335aed..a7bcf37 100644
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -1,5 +1,4 @@
 from plomrogue.errors import PlayError, GameError
-from plomrogue.mapping import YX
 
 
 
@@ -71,8 +70,9 @@ class Task_FLATTEN_SURROUNDINGS(Task):
         pass
 
     def do(self):
-        for yxyx in[self.thing.position] + \
-            list(self.thing.game.map_geometry.get_neighbors_yxyx(self.thing.position).values()):
+        for yxyx in [self.thing.position] + \
+                list(self.thing.game.map_geometry.get_neighbors_yxyx(
+                    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]] = '.'
@@ -87,8 +87,9 @@ class Task_PICK_UP(Task):
             raise PlayError('already carrying something')
         nothing_to_pick_up = True
         for t in [t for t in self.thing.game.things
-                  if t != self.thing and t.position == self.thing.position
-                  and t.type_ != 'Player']:
+                  if t.portable
+                  and t != self.thing and t.position == self.thing.position and
+                  t.type_ != 'Player']:
             nothing_to_pick_up = False
             break
         if nothing_to_pick_up:
@@ -96,7 +97,8 @@ class Task_PICK_UP(Task):
 
     def do(self):
         to_pick_up = [t for t in self.thing.game.things
-                      if t != self.thing and t.position == self.thing.position][0]
+                      if t.portable
+                      and t != self.thing and t.position == self.thing.position][0]
         self.thing.carrying = to_pick_up