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

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index a7bcf37..9165cd4 100644
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -4,7 +4,7 @@ from plomrogue.errors import PlayError, GameError
 
 class Task:
     argtypes = ''
-    todo = 3
+    todo = 1
 
     def __init__(self, thing, args=()):
         self.thing = thing
@@ -16,7 +16,6 @@ class Task:
 
 
 class Task_WAIT(Task):
-    todo = 1
 
     def do(self):
         pass
@@ -24,7 +23,6 @@ class Task_WAIT(Task):
 
 
 class Task_MOVE(Task):
-    todo = 1
     argtypes = 'string:direction'
 
     def get_move_target(self):
@@ -47,7 +45,6 @@ class Task_MOVE(Task):
 
 
 class Task_WRITE(Task):
-    todo = 1
     argtypes = 'string:char string'
 
     def check(self):
@@ -63,7 +60,6 @@ class Task_WRITE(Task):
 
 
 class Task_FLATTEN_SURROUNDINGS(Task):
-    todo = 10
     argtypes = 'string'
 
     def check(self):
@@ -80,35 +76,129 @@ class Task_FLATTEN_SURROUNDINGS(Task):
 
 
 class Task_PICK_UP(Task):
-    todo = 1
+    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
 
 
 
 class Task_DROP(Task):
-    todo = 1
 
     def check(self):
         if not self.thing.carrying:
             raise PlayError('nothing to drop')
+        if self.thing.carrying.type_ == 'Bottle' and self.thing.carrying.full:
+            for t in [t for t in self.thing.game.things
+                      if t.type_ == 'BottleDeposit'
+                      and t.position == self.thing.position]:
+                raise PlayError('cannot drop full bottle into bottle deposit')
 
     def do(self):
+        if self.thing.carrying.type_ == 'Bottle' and not self.thing.carrying.full:
+            for t in [t for t in self.thing.game.things
+                      if t.type_ == 'BottleDeposit'
+                      and t.position == self.thing.position]:
+                t.accept()
+                self.thing.game.things.remove(self.thing.carrying)
+                break
         self.thing.carrying = None
+
+
+
+class Task_DOOR(Task):
+
+    def do(self):
+        self.thing.carrying = None
+        action_radius = list(self.thing.game.map_geometry.
+                             get_neighbors_yxyx(self.thing.position).values())
+        for t in [t for t in self.thing.game.things if
+                  t.type_ == 'Door' and t.position in action_radius]:
+            if t.blocking:
+                t.open()
+            else:
+                t.close()
+
+
+
+class Task_INTOXICATE(Task):
+
+    def check(self):
+        if self.thing.carrying is None:
+            raise PlayError('carrying nothing to drink from')
+        if self.thing.carrying.type_ != 'Bottle':
+            raise PlayError('cannot drink from non-bottle')
+        if not self.thing.carrying.full:
+            raise PlayError('bottle is empty')
+
+    def do(self):
+        self.thing.carrying.full = False
+        self.thing.carrying.empty()
+        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'
+
+    def check(self):
+        if self.thing.carrying is None:
+            raise PlayError('nothing to command')
+        if not self.thing.carrying.commandable:
+            raise PlayError('cannot command this item type')
+
+    def do(self):
+        from plomrogue.misc import quote
+        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."')