X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;ds=inline;f=plomrogue%2Ftasks.py;h=68f3269c04738ee8f44e785453f5c50fb8e2f713;hb=5a75ab241a01d23babfd01e85835f16ec4907cb8;hp=1e6737b64671188b967e42210a6fda8f73b7e3c9;hpb=52b01fc00d6ea2c053f9022981498b97ebd05839;p=plomrogue2

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index 1e6737b..68f3269 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)
 
 
 
@@ -143,6 +146,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)
 
 
 
@@ -177,7 +182,8 @@ class Task_INTOXICATE(Task):
         self.thing.send_msg('RANDOM_COLORS')
         self.thing.send_msg('CHAT "You are drunk now."')
         self.thing.drunk = 10000
-        self.thing.invalidate_map_view()
+        # FIXME: pseudo-FOV-change actually
+        self.thing.game.record_fov_change(self.thing.position)
 
 
 
@@ -198,6 +204,7 @@ class Task_COMMAND(Task):
 
 
 class Task_INSTALL(Task):
+    argtypes = 'string'
 
     def _get_uninstallables(self):
         return [t for t in self.thing.game.things
@@ -207,6 +214,9 @@ class Task_INSTALL(Task):
                 and t.position == self.thing.position]
 
     def check(self):
+        if not self.thing.game.can_do_tile_with_pw(*self.thing.position,
+                                                   self.args[0]):
+            raise GameError('wrong password for tile')
         if self.thing.carrying:
             if not hasattr(self.thing.carrying, 'installable')\
                or not self.thing.carrying.installable:
@@ -222,6 +232,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)
 
 
 
@@ -234,8 +246,8 @@ class Task_WEAR(Task):
             raise PlayError('carrying nothing to wear')
         if self.thing.name in self.thing.game.hats:
             raise PlayError('already wearing a hat')
-        if self.thing.carrying.type_ != 'Hat':
-            raise PlayError('can only wear a hat')
+        if self.thing.carrying.type_ not in {'Hat', 'Bottle'}:
+            raise PlayError('can not wear the kind of thing you hold')
 
     def do(self):
         if self.thing.name in self.thing.game.hats:
@@ -249,10 +261,18 @@ class Task_WEAR(Task):
                 remixer.accept(t)
                 break
         else:
-            self.thing.game.hats[self.thing.name] = self.thing.carrying.design
+            if self.thing.carrying.type_ == 'Bottle':
+                self.thing.send_msg('CHAT "Your attempt to wear a bottle on '
+                                    'your head fails."')
+                self.thing.carrying.sound('BOTTLE', 'SMASH')
+            elif self.thing.carrying.type_ == 'Hat':
+                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
-            self.thing.send_msg('CHAT "You put on a hat."')
+        # FIXME: pseudo-FOV-change actually
+        self.thing.game.record_fov_change(self.thing.position)
 
 
 
@@ -266,3 +286,4 @@ class Task_SPIN(Task):
 
     def do(self):
         self.thing.carrying.spin()
+        self.thing.send_msg('CHAT "You spin this object."')