X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=server_%2Fgame.py;h=07dde9d5011144f155758a0304479b1c046a94df;hb=795a476f5d4ba157f3287d7e2f5893cc91b6732e;hp=60c0f4726950d0756dc6a8a255e1583fb2c41559;hpb=9c3865bbfc4fe7721f8c2f057bce85e2300ea528;p=plomrogue2-experiments

diff --git a/server_/game.py b/server_/game.py
index 60c0f47..07dde9d 100644
--- a/server_/game.py
+++ b/server_/game.py
@@ -1,119 +1,21 @@
 import sys
 sys.path.append('../')
 import game_common
+import server_.map_
 
 
 class GameError(Exception):
     pass
 
 
-class Map(game_common.Map):
-
-    def __getitem__(self, yx):
-        return self.terrain[self.get_position_index(yx)]
-
-    def __setitem__(self, yx, c):
-        pos_i = self.get_position_index(yx)
-        self.terrain = self.terrain[:pos_i] + c + self.terrain[pos_i + 1:]
-
-    def __iter__(self):
-        """Iterate over YX position coordinates."""
-        for y in range(self.size[0]):
-            for x in range(self.size[1]):
-                yield [y, x]
-
-    def lines(self):
-        width = self.size[1]
-        for y in range(self.size[0]):
-            yield (y, self.terrain[y * width:(y + 1) * width])
-
-    # The following is used nowhere, so not implemented.
-    #def items(self):
-    #    for y in range(self.size[0]):
-    #        for x in range(self.size[1]):
-    #            yield ([y, x], self.terrain[self.get_position_index([y, x])])
-
-    @property
-    def size_i(self):
-        return self.size[0] * self.size[1]
-
-    def get_directions(self):
-        directions = []
-        for name in dir(self):
-            if name[:5] == 'move_':
-                directions += [name[5:]]
-        return directions
-
-    def new_from_shape(self, init_char):
-        return Map(self.size, init_char*self.size_i)
-
-    #def are_neighbors(self, pos_1, pos_2):
-    #    return abs(pos_1[0] - pos_2[0]) <= 1 and abs(pos_1[1] - pos_2[1] <= 1)
-
-    def are_neighbors(self, pos_1, pos_2):
-        if pos_1[0] == pos_2[0] and abs(pos_1[1] - pos_2[1] <= 1):
-            return True
-        elif abs(pos_1[0] - pos_2[0]) == 1:
-            if pos_1[0] % 2 == 0:
-                if pos_2[1] in (pos_1[1], pos_1[1] - 1):
-                    return True
-            elif pos_2[1] in (pos_1[1], pos_1[1] + 1):
-                return True
-        return False
-
-    def move(self, start_pos, direction):
-        mover = getattr(self, 'move_' + direction)
-        new_pos = mover(start_pos)
-        if new_pos[0] < 0 or new_pos[1] < 0 or \
-                new_pos[0] >= self.size[0] or new_pos[1] >= self.size[1]:
-            raise GameError('would move outside map bounds')
-        return new_pos
-
-    def move_LEFT(self, start_pos):
-        return [start_pos[0], start_pos[1] - 1]
-
-    def move_RIGHT(self, start_pos):
-        return [start_pos[0], start_pos[1] + 1]
-
-    #def move_UP(self, start_pos):
-    #    return [start_pos[0] - 1, start_pos[1]]
-
-    #def move_DOWN(self, start_pos):
-    #    return [start_pos[0] + 1, start_pos[1]]
-
-    def move_UPLEFT(self, start_pos):
-        if start_pos[0] % 2 == 0:
-            return [start_pos[0] - 1, start_pos[1] - 1]
-        else:
-            return [start_pos[0] - 1, start_pos[1]]
-
-    def move_UPRIGHT(self, start_pos):
-        if start_pos[0] % 2 == 0:
-            return [start_pos[0] - 1, start_pos[1]]
-        else:
-            return [start_pos[0] - 1, start_pos[1] + 1]
-
-    def move_DOWNLEFT(self, start_pos):
-        if start_pos[0] % 2 == 0:
-            return [start_pos[0] + 1, start_pos[1] - 1]
-        else:
-            return [start_pos[0] + 1, start_pos[1]]
-
-    def move_DOWNRIGHT(self, start_pos):
-        if start_pos[0] % 2 == 0:
-            return [start_pos[0] + 1, start_pos[1]]
-        else:
-            return [start_pos[0] + 1, start_pos[1] + 1]
-
-
 class World(game_common.World):
 
-    def __init__(self):
+    def __init__(self, game):
         super().__init__()
-        self.Thing = Thing  # use local Thing class instead of game_common's
-        self.Map = Map # use local Map class instead of game_common's
-        self.map_ = Map()  # use extended child class
+        self.game = game
         self.player_id = 0
+        # use extended local classes
+        self.Thing = Thing
 
     def proceed_to_next_player_turn(self):
         """Run game world turns until player can decide their next step.
@@ -261,7 +163,8 @@ class Game(game_common.CommonCommandsMixin):
 
     def __init__(self, game_file_name):
         import server_.io
-        self.world = World()
+        self.map_manager = server_.map_.map_manager
+        self.world = World(self)
         self.io = server_.io.GameIO(game_file_name, self)
         # self.pool and self.pool_result are currently only needed by the FIB
         # command and the demo of a parallelized game loop in cmd_inc_p.
@@ -277,7 +180,8 @@ class Game(game_common.CommonCommandsMixin):
             return 'Y:' + str(tuple_[0]) + ',X:' + str(tuple_[1])
 
         self.io.send('NEW_TURN ' + str(self.world.turn))
-        self.io.send('MAP ' + stringify_yx(self.world.map_.size))
+        self.io.send('MAP ' + self.world.map_.geometry +\
+                     ' ' + stringify_yx(self.world.map_.size))
         visible_map = self.world.get_player().get_visible_map()
         for y, line in visible_map.lines():
             self.io.send('VISIBLE_MAP_LINE %5s %s' % (y, self.io.quote(line)))