X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Ftasks.py;h=9165cd44b63d0adece3c1da95366cdbd7b5fae4a;hb=6e918e5b3cd6627a0a23b4008dbe3d6bfe784abe;hp=8fa3a178067bf4864f929638b79d5a8e4d8bb6d2;hpb=d56384f9b6c88bab666162a0f97d7e64f2b3951c;p=plomrogue2

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index 8fa3a17..9165cd4 100644
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -76,24 +76,29 @@ class Task_FLATTEN_SURROUNDINGS(Task):
 
 
 class Task_PICK_UP(Task):
+    argtypes = 'int:pos'
 
     def check(self):
         if self.thing.carrying:
             raise PlayError('already carrying something')
-        nothing_to_pick_up = True
-        for t in [t for t in self.thing.game.things
-                  if t.portable
-                  and t != self.thing and t.position == self.thing.position and
-                  t.type_ != 'Player']:
-            nothing_to_pick_up = False
-            break
-        if nothing_to_pick_up:
-            raise PlayError('nothing to pick up')
+        to_pick_up = self.thing.game.get_thing(self.args[0])
+        neighbors = self.thing.game.map_geometry.\
+            get_neighbors_yxyx(self.thing.position).values()
+        reach = [self.thing.position] + list(neighbors)
+        if to_pick_up is None:
+            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 not in reach')
+        elif not to_pick_up.portable:
+            raise PlayError('thing not portable')
 
     def do(self):
-        to_pick_up = [t for t in self.thing.game.things
-                      if t.portable
-                      and t != self.thing and t.position == self.thing.position][0]
+        to_pick_up = self.thing.game.get_thing(self.args[0])
+        to_pick_up.position = self.thing.position[:]
         self.thing.carrying = to_pick_up
 
 
@@ -149,14 +154,12 @@ 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
 
 
+
 class Task_COMMAND(Task):
     argtypes = 'string'
 
@@ -168,7 +171,34 @@ 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))
+
+
+
+class Task_INSTALL(Task):
+
+    def _get_uninstallables(self):
+        return [t for t in self.thing.game.things
+                if t != self.thing
+                and hasattr(t, 'installable') and t.installable
+                and (not t.portable)
+                and t.position == self.thing.position]
+
+    def check(self):
+        if self.thing.carrying:
+            if not hasattr(self.thing.carrying, 'installable')\
+               or not self.thing.carrying.installable:
+                raise PlayError('carried thing not installable')
+        elif len(self._get_uninstallables()) == 0:
+            raise PlayError('nothing to uninstall here')
+
+    def do(self):
+        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."')