Make door closing visible.

[plomrogue2] / plomrogue / tasks.py

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index 9335aeddb0df450953a4ffb01bf4710142c9c150..a7f1dcf3f1d174ba43b7f3bd969a36cba2a65978 100644 (file)
--- 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
 
 
@@ -110,3 +112,19 @@ class Task_DROP(Task):
 
     def do(self):
         self.thing.carrying = None
+
+
+
+class Task_DOOR(Task):
+    todo = 1
+
+    def do(self):
+        self.thing.carrying = None
+        action_radius = list(self.thing.game.map_geometry.
+                             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:
+                t.open()
+            else:
+                t.close()