X-Git-Url: https://plomlompom.com/repos/%22https:/validator.w3.org/static/git-favicon.png?a=blobdiff_plain;f=plomrogue%2Ftasks.py;h=f7fb3124da02b32e46a887b95eed9ee8a57214ea;hb=a789724e6b1b5eb514f82ac4d7092f7575180c31;hp=d8d118a78108eb9fce1cad108816ac8509c8dd94;hpb=028871514fd40755055facc5883a4f8076dcebad;p=plomrogue2

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index d8d118a..f7fb312 100644
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -1,4 +1,5 @@
 from plomrogue.errors import PlayError, GameError
+from plomrogue.misc import quote
 
 
 
@@ -33,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):
@@ -76,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.game.get_flatland()
             self.thing.game.record_fov_change(yxyx)
 
 
@@ -109,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)
 
 
 
@@ -142,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)
 
 
 
@@ -176,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)
 
 
 
@@ -190,7 +197,6 @@ class Task_COMMAND(Task):
             raise PlayError('cannot command this item type')
 
     def do(self):
-        from plomrogue.misc import quote
         reply_lines = self.thing.carrying.interpret(self.args[0])
         for line in reply_lines:
             self.thing.send_msg('REPLY ' + quote(line))
@@ -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,8 +261,29 @@ class Task_WEAR(Task):
                 remixer.accept(t)
                 break
         else:
-            from plomrogue.misc import quote
-            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)
+
+
+
+class Task_SPIN(Task):
+
+    def check(self):
+        if not self.thing.carrying:
+            raise PlayError('holding nothing to spin')
+        if not hasattr(self.thing.carrying, 'spinnable'):
+            raise PlayError('held object not spinnable')
+
+    def do(self):
+        self.thing.carrying.spin()
+        self.thing.send_msg('CHAT "You spin this object."')