X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=server_%2Fgame.py;h=143f3199f9dfa417cdece5419619978b26eaf73f;hb=1c48dfdf85d5549202412f01eced7712adf2d468;hp=ea3649732b20eb8f729f79545d07e6c498c68935;hpb=fb11e52f4e70470336504c84e4b05f3a3b6a9790;p=plomrogue2-experiments

diff --git a/server_/game.py b/server_/game.py
index ea36497..143f319 100644
--- a/server_/game.py
+++ b/server_/game.py
@@ -33,10 +33,6 @@ class Map(game_common.Map):
     #        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):
@@ -44,14 +40,12 @@ class Map(game_common.Map):
                 directions += [name[5:]]
         return directions
 
-    def get_position_index(self, yx):
-        return yx[0] * self.size[1] + yx[1]
-
     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)
+        import copy
+        new_map = copy.deepcopy(self)
+        for pos in new_map:
+            new_map[pos] = init_char
+        return new_map
 
     def move(self, start_pos, direction):
         mover = getattr(self, 'move_' + direction)
@@ -61,12 +55,6 @@ class Map(game_common.Map):
             raise GameError('would move outside map bounds')
         return new_pos
 
-    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_LEFT(self, start_pos):
         return [start_pos[0], start_pos[1] - 1]
 
@@ -74,13 +62,65 @@ class Map(game_common.Map):
         return [start_pos[0], start_pos[1] + 1]
 
 
+class MapHex(Map):
+
+    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_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 MapSquare(Map):
+
+    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 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]]
+
+
 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
+        # use extended local classes
+        self.Thing = Thing
+        self.MapHex = MapHex
+        self.MapSquare = MapSquare
 
     def proceed_to_next_player_turn(self):
         """Run game world turns until player can decide their next step.
@@ -244,7 +284,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_SIZE ' + stringify_yx(self.world.map_.size))
+        grid = self.world.map_.__class__.__name__[3:]
+        self.io.send('MAP ' + grid +' ' + 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)))