Improve player error messages, and log them to clients.

[plomrogue2] / plomrogue / tasks.py

diff --git a/plomrogue/tasks.py b/plomrogue/tasks.py
index e73b174a1fed351c03cf8c22bd791900e4f76cb9..ff1cc7ea613d721eec2ffa7c7368b48fa62117fc 100644 (file)
--- a/plomrogue/tasks.py
+++ b/plomrogue/tasks.py
@@ -20,7 +20,7 @@ class Task_WAIT(Task):
     todo = 1
 
     def do(self):
-        return 'success'
+        pass
 
 
 
@@ -40,10 +40,12 @@ class Task_MOVE(Task):
                           if t.blocking]:
             raise PlayError('blocked by other thing')
         elif self.thing.game.map[test_pos] != '.':
-            raise PlayError('would move into illegal territory')
+            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
 
 
 
@@ -75,3 +77,37 @@ class Task_FLATTEN_SURROUNDINGS(Task):
                 if not self.thing.game.can_do_tile_with_pw(yx, self.args[0]):
                     continue
                 self.thing.game.map[yx] = '.'
+
+
+
+class Task_PICK_UP(Task):
+    todo = 1
+
+    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 != 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 != self.thing and t.position == self.thing.position][0]
+        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')
+
+    def do(self):
+        self.thing.carrying = None