X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=plomrogue%2Ftasks.py;h=3dc09282449ac03088d88800c488004f8dfafaee;hb=dc2747c7daca975526206bfadecc1dd0ddcc8d67;hp=d8d118a78108eb9fce1cad108816ac8509c8dd94;hpb=028871514fd40755055facc5883a4f8076dcebad;p=plomrogue2

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index d8d118a..3dc0928 100644
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -1,4 +1,5 @@
 from plomrogue.errors import PlayError, GameError
+from plomrogue.misc import quote
 
 
 
@@ -190,7 +191,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 +198,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 +208,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:
@@ -234,8 +238,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 +253,27 @@ 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."')
+
+
+
+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."')