X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/balance?a=blobdiff_plain;f=plomrogue%2Ftasks.py;h=f3945c2a36366ea7b9a370a8e35a0772ed1490c8;hb=ea5ddf2c37571f3fb0ed486cd4a4294b82c54b54;hp=a6602cea926822ae8b7a58a4c7c50baad28f6e1b;hpb=35714a1e0616ada0be5929d5fb8100047e46cdd2;p=plomrogue2

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index a6602ce..f3945c2 100644
--- 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])
@@ -154,11 +154,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 +171,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))