Fixed issue in dot library + added border identification to grid

Piratmac · Piratmac · commit 619c8523bb1b · 2021-12-20T10:39:46.000+01:00
diff --git a/2021/dot.py b/2021/dot.py
@@ -171,7 +171,7 @@ def manhattan_distance(self, reference=0):
     def set_terrain(self, terrain):
         self.terrain = terrain or self.terrain_default
         self.is_walkable, self.is_waypoint = self.terrain_map.get(
-            terrain, self.terrain_map[self.terrain_default]
+            self.terrain, self.terrain_map[self.terrain_default]
         )
 
     def set_directions(self):
diff --git a/2021/grid.py b/2021/grid.py
@@ -255,20 +255,16 @@ def get_borders(self):
         min_y, max_y = int(min(y_vals)), int(max(y_vals))
 
         borders = []
-        borders.append([x + 1j * max_y for x in sorted(x_vals)])
-        borders.append([max_x + 1j * y for y in sorted(y_vals)])
-        borders.append([x + 1j * min_y for x in sorted(x_vals)])
-        borders.append([min_x + 1j * y for y in sorted(y_vals)])
+        borders.append([self.dots[x + 1j * max_y] for x in sorted(x_vals)])
+        borders.append([self.dots[max_x + 1j * y] for y in sorted(y_vals)])
+        borders.append([self.dots[x + 1j * min_y] for x in sorted(x_vals)])
+        borders.append([self.dots[min_x + 1j * y] for y in sorted(y_vals)])
 
         borders_text = []
         for border in borders:
-            borders_text.append(
-                Grid({pos: self.dots[pos].terrain for pos in border})
-                .dots_to_text()
-                .replace("\n", "")
-            )
+            borders_text.append("".join(dot.terrain for dot in border))
 
-        return borders_text
+        return borders, borders_text
 
     def get_columns(self):
         """

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ def manhattan_distance(self, reference=0):`
`171`	`171`	`def set_terrain(self, terrain):`
`172`	`172`	`self.terrain = terrain or self.terrain_default`
`173`	`173`	`self.is_walkable, self.is_waypoint = self.terrain_map.get(`
`174`		`- terrain, self.terrain_map[self.terrain_default]`
	`174`	`+ self.terrain, self.terrain_map[self.terrain_default]`
`175`	`175`	`)`
`176`	`176`
`177`	`177`	`def set_directions(self):`