Add install/uninstall feedback messages.

[plomrogue2] / plomrogue / tasks.py

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index 1204001b4d202ec54ff8a3891d5b13708608045f..9165cd44b63d0adece3c1da95366cdbd7b5fae4a 100644 (file)
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -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))
 
 
 
@@ -202,5 +198,7 @@ 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."')