X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomrogue%2Ftasks.py;h=eca94003d6c8a5a52e3b6f15d13464f188c17d86;hb=018bb0242ebd2b7e9fde170fae830376dea55e16;hp=e73b174a1fed351c03cf8c22bd791900e4f76cb9;hpb=0747716a70ba46dbd6a8d7091b864e02b754f56f;p=plomrogue2

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index e73b174..eca9400 100644
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -1,11 +1,10 @@
 from plomrogue.errors import PlayError, GameError
-from plomrogue.mapping import YX
 
 
 
 class Task:
     argtypes = ''
-    todo = 3
+    todo = 1
 
     def __init__(self, thing, args=()):
         self.thing = thing
@@ -17,61 +16,146 @@ class Task:
 
 
 class Task_WAIT(Task):
-    todo = 1
 
     def do(self):
-        return 'success'
+        pass
 
 
 
 class Task_MOVE(Task):
-    todo = 1
     argtypes = 'string:direction'
 
     def get_move_target(self):
-        return self.thing.game.map_geometry.move(self.thing.position,
-                                                 self.args[0])
+        return self.thing.game.map_geometry.move_yxyx(self.thing.position,
+                                                      self.args[0])
 
     def check(self):
-        test_pos = self.get_move_target()
-        if test_pos is None:
-            raise PlayError('would move out of map')
-        elif test_pos in [t.position for t in self.thing.game.things
-                          if t.blocking]:
+        test_yxyx = self.get_move_target()
+        if test_yxyx in [t.position for t in self.thing.game.things
+                         if t.blocking]:
             raise PlayError('blocked by other thing')
-        elif self.thing.game.map[test_pos] != '.':
-            raise PlayError('would move into illegal territory')
+        elif self.thing.game.maps[test_yxyx[0]][test_yxyx[1]] != '.':
+            raise PlayError('blocked by impassable tile')
 
     def do(self):
         self.thing.position = self.get_move_target()
+        if self.thing.carrying:
+            self.thing.carrying.position = self.thing.position
 
 
 
 class Task_WRITE(Task):
-    todo = 1
     argtypes = 'string:char string'
 
     def check(self):
-        if not self.thing.game.can_do_tile_with_pw(self.thing.position,
+        if not self.thing.game.can_do_tile_with_pw(*self.thing.position,
                                                    self.args[1]):
             raise GameError('wrong password for tile')
 
     def do(self):
-        self.thing.game.map[self.thing.position] = self.args[0]
+        big_yx = self.thing.position[0]
+        little_yx = self.thing.position[1]
+        self.thing.game.maps[big_yx][little_yx] = self.args[0]
 
 
 
 class Task_FLATTEN_SURROUNDINGS(Task):
-    todo = 10
     argtypes = 'string'
 
     def check(self):
         pass
 
     def do(self):
-        for yx in[self.thing.position] + \
-            list(self.thing.game.map_geometry.get_neighbors(self.thing.position).values()):
-            if yx is not None:
-                if not self.thing.game.can_do_tile_with_pw(yx, self.args[0]):
-                    continue
-                self.thing.game.map[yx] = '.'
+        for yxyx in [self.thing.position] + \
+                list(self.thing.game.map_geometry.get_neighbors_yxyx(
+                    self.thing.position).values()):
+            if not self.thing.game.can_do_tile_with_pw(*yxyx, self.args[0]):
+                continue
+            self.thing.game.maps[yxyx[0]][yxyx[1]] = '.'
+
+
+
+class Task_PICK_UP(Task):
+
+    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')
+
+    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]
+        self.thing.carrying = to_pick_up
+
+
+
+class Task_DROP(Task):
+
+    def check(self):
+        if not self.thing.carrying:
+            raise PlayError('nothing to drop')
+
+    def do(self):
+        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
+        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.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 = 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)