Fix remixer drop bug.

[plomrogue2] / plomrogue / tasks.py

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index a6602cea926822ae8b7a58a4c7c50baad28f6e1b..9d3c23e7b69359da3dd9cdcd23a6cf853eb4ebbc 100644 (file)
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -86,15 +86,15 @@ class Task_PICK_UP(Task):
             get_neighbors_yxyx(self.thing.position).values()
         reach = [self.thing.position] + list(neighbors)
         if to_pick_up is None:
-            raise PlayError('no thing of ID %s exists %s' % self.args[0])
+            raise PlayError('no such thing exists')
         elif to_pick_up == self.thing:
             raise PlayError('cannot pick up oneself')
         elif to_pick_up.type_ == 'Player':
             raise PlayError('cannot pick up player')
         elif to_pick_up.position not in reach:
-            raise PlayError('thing of ID %s not in reach' % self.args[0])
+            raise PlayError('thing not in reach')
         elif not to_pick_up.portable:
-            raise PlayError('thing of ID %s not portable' % self.args[0])
+            raise PlayError('thing not portable')
 
     def do(self):
         to_pick_up = self.thing.game.get_thing(self.args[0])
@@ -122,6 +122,12 @@ class Task_DROP(Task):
                 t.accept()
                 self.thing.game.things.remove(self.thing.carrying)
                 break
+        elif self.thing.carrying.type_ == 'Hat':
+            for t in [t for t in self.thing.game.things
+                      if t.type_ == 'HatRemixer'
+                      and t.position == self.thing.position]:
+                t.accept(self.thing.carrying)
+                break
         self.thing.carrying = None
 
 
@@ -154,11 +160,8 @@ class Task_INTOXICATE(Task):
     def do(self):
         self.thing.carrying.full = False
         self.thing.carrying.empty()
-        for c_id in self.thing.game.sessions:
-            if self.thing.game.sessions[c_id]['thing_id'] == self.thing.id_:
-                self.thing.game.io.send('RANDOM_COLORS', c_id)
-                self.thing.game.io.send('CHAT "You are drunk now."', c_id)
-                break
+        self.thing.send_msg('RANDOM_COLORS')
+        self.thing.send_msg('CHAT "You are drunk now."')
         self.thing.drunk = 10000
 
 
@@ -174,10 +177,9 @@ class Task_COMMAND(Task):
 
     def do(self):
         from plomrogue.misc import quote
-        reply = self.thing.carrying.interpret(self.args[0])
-        for c_id in self.thing.game.sessions:
-            if self.thing.game.sessions[c_id]['thing_id'] == self.thing.id_:
-                self.thing.game.io.send('REPLY ' + quote(reply), c_id)
+        reply_lines = self.thing.carrying.interpret(self.args[0])
+        for line in reply_lines:
+            self.thing.send_msg('REPLY ' + quote(line))
 
 
 
@@ -202,5 +204,41 @@ class Task_INSTALL(Task):
         if self.thing.carrying:
             self.thing.carrying.install()
             self.thing.carrying = None
+            self.thing.send_msg('CHAT "You install the thing you carry."')
         else:
             self._get_uninstallables()[0].uninstall()
+            self.thing.send_msg('CHAT "You uninstall the thing here."')
+
+
+
+class Task_WEAR(Task):
+
+    def check(self):
+        if self.thing.name in self.thing.game.hats:
+            return
+        if not self.thing.carrying:
+            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')
+
+    def do(self):
+        if self.thing.name in self.thing.game.hats:
+            t = self.thing.game.thing_types['Hat'](self.thing.game,
+                                                   position=self.thing.position)
+            self.thing.game.things += [t]
+            t.design = self.thing.game.hats[self.thing.name]
+            del self.thing.game.hats[self.thing.name]
+            self.thing.send_msg('CHAT "You drop your hat."')
+            for remixer in [t for t in self.thing.game.things
+                            if t.type_ == 'HatRemixer'
+                            and t.position == self.thing.position]:
+                remixer.accept(t)
+                break
+        else:
+            from plomrogue.misc import quote
+            self.thing.game.hats[self.thing.name] = self.thing.carrying.design
+            self.thing.game.things.remove(self.thing.carrying)
+            self.thing.carrying = None
+            self.thing.send_msg('CHAT "You put on a hat."')