X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=new2%2Fplomrogue%2Fmapping.py;h=e0a59d8e225f56af79b0b516bb7f6e366de164a4;hb=8f4f247a8c36610a5cd4eb03ddb26dcc701e38ab;hp=cd0c23def676edd8eb146fca15da7c781201fb28;hpb=8db0e200f8c2d279c68ca01b9ae235ab63c8f642;p=plomrogue2-experiments

diff --git a/new2/plomrogue/mapping.py b/new2/plomrogue/mapping.py
index cd0c23d..e0a59d8 100644
--- a/new2/plomrogue/mapping.py
+++ b/new2/plomrogue/mapping.py
@@ -1,4 +1,5 @@
 import collections
+from plomrogue.errors import ArgError
 
 
 
@@ -27,6 +28,12 @@ class MapGeometry():
                 directions += [name[5:]]
         return directions
 
+    def get_neighbors(self, pos):
+        neighbors = {}
+        for direction in self.get_directions():
+            neighbors[direction] = self.move(pos, direction)
+        return neighbors
+
     def move(self, start_pos, direction):
         mover = getattr(self, 'move_' + direction)
         target = mover(start_pos)
@@ -57,6 +64,38 @@ class MapGeometrySquare(MapGeometryWithLeftRightMoves):
 
 
 
+class MapGeometryHex(MapGeometryWithLeftRightMoves):
+
+    def move_UPLEFT(self, start_pos):
+        start_indented = start_pos.y % 2
+        if start_indented:
+            return YX(start_pos.y - 1, start_pos.x)
+        else:
+            return YX(start_pos.y - 1, start_pos.x - 1)
+
+    def move_UPRIGHT(self, start_pos):
+        start_indented = start_pos.y % 2
+        if start_indented:
+            return YX(start_pos.y - 1, start_pos.x + 1)
+        else:
+            return YX(start_pos.y - 1, start_pos.x)
+
+    def move_DOWNLEFT(self, start_pos):
+        start_indented = start_pos.y % 2
+        if start_indented:
+            return YX(start_pos.y + 1, start_pos.x)
+        else:
+            return YX(start_pos.y + 1, start_pos.x - 1)
+
+    def move_DOWNRIGHT(self, start_pos):
+        start_indented = start_pos.y % 2
+        if start_indented:
+            return YX(start_pos.y + 1, start_pos.x + 1)
+        else:
+            return YX(start_pos.y + 1, start_pos.x)
+
+
+
 class Map():
 
     def __init__(self, map_size):
@@ -77,5 +116,21 @@ class Map():
     def size_i(self):
         return self.size.y * self.size.x
 
+    def set_line(self, y, line):
+        height_map = self.size.y
+        width_map = self.size.x
+        if y >= height_map:
+            raise ArgError('too large row number %s' % y)
+        width_line = len(line)
+        if width_line != width_map:
+            raise ArgError('map line width %s unequal map width %s' % (width_line, width_map))
+        self.terrain = self.terrain[:y * width_map] + line +\
+                       self.terrain[(y + 1) * width_map:]
+
     def get_position_index(self, yx):
         return yx.y * self.size.x + yx.x
+
+    def lines(self):
+        width = self.size.x
+        for y in range(self.size.y):
+            yield (y, self.terrain[y * width:(y + 1) * width])