X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=plomrogue%2Ftasks.py;h=1204001b4d202ec54ff8a3891d5b13708608045f;hb=5e1dd193ed529ff9d3ca3746736d74d3ca55d864;hp=105002316193b544448cdecabdc2a6410a5b41ef;hpb=1bb87f7a1151a6f244974c99cd7c392eeb0a8a35;p=plomrogue2

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index 1050023..1204001 100644
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -76,25 +76,29 @@ class Task_FLATTEN_SURROUNDINGS(Task):
 
 
 class Task_PICK_UP(Task):
-    argtypes = 'int:nonneg'
+    argtypes = 'int:pos'
 
     def check(self):
         if self.thing.carrying:
             raise PlayError('already carrying something')
         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 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 != self.thing.position:
-            raise PlayError('thing of ID %s not in reach' % self.args[0])
+        elif to_pick_up.position not in reach:
+            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])
+        to_pick_up.position = self.thing.position[:]
         self.thing.carrying = to_pick_up
 
 
@@ -158,6 +162,7 @@ class Task_INTOXICATE(Task):
         self.thing.drunk = 10000
 
 
+
 class Task_COMMAND(Task):
     argtypes = 'string'
 
@@ -173,3 +178,29 @@ class Task_COMMAND(Task):
         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)
+
+
+
+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
+        else:
+            self._get_uninstallables()[0].uninstall()