Keep checking tasks are possible during proceeding.

[plomrogue2-experiments] / server_ / game.py

diff --git a/server_/game.py b/server_/game.py
index 148c5c7c8fd9db3909df52eea4213ce6284476df..974de92866979b25b0031a9c62969e6fdbc7ffa2 100644 (file)
--- a/server_/game.py
+++ b/server_/game.py
@@ -110,7 +110,17 @@ class Thing(game_common.Thing):
         Decrements .task.todo; if it thus falls to <= 0, enacts method whose
         name is 'task_' + self.task.name and sets .task = None. If is_AI, calls
         .decide_task to decide a self.task.
+
+        Before doing anything, checks that task is still possible, and aborts
+        it otherwise (for AI things, decides a new task).
         """
+        try:
+            self.task.check()
+        except GameError:
+            self.task = None
+            if is_AI:
+                self.decide_task()
+            return
         self.task.todo -= 1
         if self.task.todo <= 0:
             task = getattr(self, 'task_' + self.task.name)
@@ -118,3 +128,34 @@ class Thing(game_common.Thing):
             self.task = None
         if is_AI and self.task is None:
             self.decide_task()
+
+
+class Commander():
+
+    def cmd_MOVE(self, direction):
+        """Set player task to 'move' with direction arg, finish player turn."""
+        if direction not in {'UP', 'DOWN', 'RIGHT', 'LEFT'}:
+            raise parser.ArgError('Move argument must be one of: '
+                                  'UP, DOWN, RIGHT, LEFT')
+        self.world.get_player().set_task('move', direction=direction)
+        self.proceed()
+    cmd_MOVE.argtypes = 'string'
+
+    def cmd_WAIT(self):
+        """Set player task to 'wait', finish player turn."""
+        self.world.get_player().set_task('wait')
+        self.proceed()
+
+    def cmd_GET_TURN(self, connection_id):
+        """Send world.turn to caller."""
+        self.send_to(connection_id, str(self.world.turn))
+
+    def cmd_ECHO(self, msg, connection_id):
+        """Send msg to caller."""
+        self.send_to(connection_id, msg)
+    cmd_ECHO.argtypes = 'string'
+
+    def cmd_ALL(self, msg, connection_id):
+        """Send msg to all clients."""
+        self.send_all(msg)
+    cmd_ALL.argtypes = 'string'