X-Git-Url: https://plomlompom.com/repos/pick_tasks?a=blobdiff_plain;f=server_%2Fgame.py;h=f6a5e9e2437ccd92ffe15e131986da91f8c061d0;hb=3576b6cfa39467478565b704de0160fc48c9a181;hp=974de92866979b25b0031a9c62969e6fdbc7ffa2;hpb=a0ff1bc357c32328749982b8a2c5d2970a2eeaa2;p=plomrogue2-experiments

diff --git a/server_/game.py b/server_/game.py
index 974de92..f6a5e9e 100644
--- a/server_/game.py
+++ b/server_/game.py
@@ -1,6 +1,7 @@
 import sys
 sys.path.append('../')
 import game_common
+import parser
 
 
 class GameError(Exception):
@@ -18,11 +19,19 @@ def move_pos(direction, pos_yx):
         pos_yx[1] -= 1
 
 
+class Map(game_common.Map):
+
+    def get_line(self, y):
+        width = self.size[1]
+        return self.terrain[y * width:(y + 1) * width]
+
+
 class World(game_common.World):
 
     def __init__(self):
         super().__init__()
         self.Thing = Thing  # use local Thing class instead of game_common's
+        self.map_ = Map()  # use extended child class
         self.player_id = 0
 
     def proceed_to_next_player_turn(self):
@@ -60,7 +69,7 @@ class Task:
         self.thing = thing
         self.args = args
         self.kwargs = kwargs
-        self.todo = 1
+        self.todo = 3
 
     def check(self):
         if self.name == 'move':
@@ -71,13 +80,16 @@ class Task:
             test_pos = self.thing.position[:]
             move_pos(direction, test_pos)
             if test_pos[0] < 0 or test_pos[1] < 0 or \
-               test_pos[0] >= self.thing.world.map_size[0] or \
-               test_pos[1] >= self.thing.world.map_size[1]:
+               test_pos[0] >= self.thing.world.map_.size[0] or \
+               test_pos[1] >= self.thing.world.map_.size[1]:
                 raise GameError('would move outside map bounds')
-            pos_i = test_pos[0] * self.thing.world.map_size[1] + test_pos[1]
-            map_tile = self.thing.world.terrain_map[pos_i]
+            pos_i = test_pos[0] * self.thing.world.map_.size[1] + test_pos[1]
+            map_tile = self.thing.world.map_.terrain[pos_i]
             if map_tile != '.':
                 raise GameError('would move into illegal terrain')
+            for t in self.thing.world.things:
+                if t.position == test_pos:
+                    raise GameError('would move into other thing')
 
 
 class Thing(game_common.Thing):
@@ -85,12 +97,14 @@ class Thing(game_common.Thing):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.task = Task(self, 'wait')
+        self.last_task_result = None
 
     def task_wait(self):
-        pass
+        return 'success'
 
     def task_move(self, direction):
         move_pos(direction, self.position)
+        return 'success'
 
     def decide_task(self):
         if self.position[1] > 1:
@@ -116,19 +130,34 @@ class Thing(game_common.Thing):
         """
         try:
             self.task.check()
-        except GameError:
+        except GameError as e:
             self.task = None
+            self.last_task_result = e
             if is_AI:
                 self.decide_task()
             return
         self.task.todo -= 1
         if self.task.todo <= 0:
             task = getattr(self, 'task_' + self.task.name)
-            task(*self.task.args, **self.task.kwargs)
+            self.last_task_result = task(*self.task.args, **self.task.kwargs)
             self.task = None
         if is_AI and self.task is None:
             self.decide_task()
 
+    def get_visible_map(self):
+        size = self.world.map_.size
+        m = Map(size, ' '*size[0]*size[1])
+        y_me = self.position[0]
+        x_me = self.position[1]
+        for y in range(m.size[0]):
+            if y in (y_me - 1, y_me, y_me + 1):
+                for x in range(m.size[1]):
+                    if x in (x_me - 1, x_me, x_me + 1):
+                        pos = y * size[1] + x
+                        c = self.world.map_.terrain[pos]
+                        m.terrain = m.terrain[:pos] + c + m.terrain[pos+1:]
+        return m
+
 
 class Commander():
 
@@ -146,16 +175,20 @@ class Commander():
         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_GET_GAMESTATE(self, connection_id):
+        """Send game state jto caller."""
+        self.send_gamestate(connection_id)
 
     def cmd_ECHO(self, msg, connection_id):
         """Send msg to caller."""
-        self.send_to(connection_id, msg)
+        self.send(msg, connection_id)
     cmd_ECHO.argtypes = 'string'
 
     def cmd_ALL(self, msg, connection_id):
         """Send msg to all clients."""
-        self.send_all(msg)
+        self.send(msg)
     cmd_ALL.argtypes = 'string'
+
+    def cmd_TERRAIN_LINE(self, y, terrain_line):
+        self.world.map_.set_line(y, terrain_line)
+    cmd_TERRAIN_LINE.argtypes = 'int:nonneg string'