X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=new%2Fplomrogue%2Fmapping.py;h=c9398d47ef515f4d8e085005485b94fb82b450b9;hb=f5797c816396a105c0d72cc826c2cc2566f1478c;hp=64dad7c8a5ac0490c1f440dc3909876de4d5aa36;hpb=4b636feb0fc0bc00f9aa786533a72eea102e6087;p=plomrogue2-experiments
diff --git a/new/plomrogue/mapping.py b/new/plomrogue/mapping.py
index 64dad7c..c9398d4 100644
--- a/new/plomrogue/mapping.py
+++ b/new/plomrogue/mapping.py
@@ -2,12 +2,28 @@ from plomrogue.errors import ArgError
-class MapBase:
+class Map:
def __init__(self, size=(0, 0)):
self.size = size
self.terrain = '?'*self.size_i
+ def __getitem__(self, yx):
+ return self.terrain[self.get_position_index(yx)]
+
+ def __setitem__(self, yx, c):
+ pos_i = self.get_position_index(yx)
+ if type(c) == str:
+ self.terrain = self.terrain[:pos_i] + c + self.terrain[pos_i + 1:]
+ else:
+ self.terrain[pos_i] = c
+
+ 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)
+
@property
def size_i(self):
return self.size[0] * self.size[1]
@@ -26,25 +42,6 @@ class MapBase:
def get_position_index(self, yx):
return yx[0] * self.size[1] + yx[1]
-
-class Map(MapBase):
-
- def __getitem__(self, yx):
- return self.terrain[self.get_position_index(yx)]
-
- def __setitem__(self, yx, c):
- pos_i = self.get_position_index(yx)
- if type(c) == str:
- self.terrain = self.terrain[:pos_i] + c + self.terrain[pos_i + 1:]
- else:
- self.terrain[pos_i] = c
-
- 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]):
@@ -69,10 +66,9 @@ class Map(MapBase):
return self.neighbors_to[pos]
for direction in self.get_directions():
neighbors[direction] = None
- try:
- neighbors[direction] = self.move(pos, direction)
- except GameError:
- pass
+ neighbor_pos = self.move(pos, direction)
+ if neighbor_pos:
+ neighbors[direction] = neighbor_pos
self.neighbors_to[pos] = neighbors
return neighbors
@@ -88,7 +84,7 @@ class Map(MapBase):
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 None
return new_pos