X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=game_common.py;h=1119ce1b4f8b694a6f8a7f5da6b8686d07434752;hb=362ee8651a250d99377806c33451ceb5b027c606;hp=b729a29b82e79818e914b5386b34c32c81dbca14;hpb=b7d8d49aaca0cdfd7be583c5da44aa37e9ad693c;p=plomrogue2-experiments
diff --git a/game_common.py b/game_common.py
index b729a29..1119ce1 100644
--- a/game_common.py
+++ b/game_common.py
@@ -1,11 +1,36 @@
from parser import ArgError
+class MapManager:
+
+ def __init__(self, globs):
+ """With globs a globals() call, collect caller's Map classes."""
+ self.map_classes = []
+ for name in globs:
+ if name[:3] == 'Map':
+ self.map_classes += [globs[name]]
+
+ def get_map_geometries(self):
+ geometries = []
+ for map_class in self.map_classes:
+ geometries += [map_class.__name__[3:]]
+ return geometries
+
+ def get_map_class(self, geometry):
+ for map_class in self.map_classes:
+ if map_class.__name__[3:] == geometry:
+ return map_class
+
+
class Map:
- def __init__(self, size=(0, 0), terrain=''):
+ def __init__(self, size=(0, 0)):
self.size = size
- self.terrain = terrain
+ self.terrain = '?'*self.size_i
+
+ @property
+ def size_i(self):
+ return self.size[0] * self.size[1]
def set_line(self, y, line):
height_map = self.size[0]
@@ -18,13 +43,6 @@ class Map:
self.terrain = self.terrain[:y * width_map] + line +\
self.terrain[(y + 1) * width_map:]
- def set_size(self, yx):
- y, x = yx
- self.size = (y, x)
- self.terrain = ''
- for y in range(self.size[0]):
- self.terrain += '?' * self.size[1]
-
def get_position_index(self, yx):
return yx[0] * self.size[1] + yx[1]
@@ -32,10 +50,9 @@ class Map:
class World:
def __init__(self):
+ self.Thing = Thing # child classes may use an extended Thing class here
self.turn = 0
- self.map_ = Map()
self.things = []
- self.Thing = Thing # child classes may use an extended Thing class here
def get_thing(self, id_):
for thing in self.things:
@@ -45,6 +62,10 @@ class World:
self.things += [t]
return t
+ def new_map(self, geometry, yx):
+ map_type = self.game.map_manager.get_map_class(geometry)
+ self.map_ = map_type(yx)
+
class Thing:
@@ -57,10 +78,14 @@ class Thing:
class CommonCommandsMixin:
- def cmd_MAP_SIZE(self, yx):
- """Set self.map_size to yx, redraw self.terrain_map as '?' cells."""
- self.world.map_.set_size(yx)
- cmd_MAP_SIZE.argtypes = 'yx_tuple:nonneg'
+ def cmd_MAP(self, geometry, yx):
+ """Create new map of grid geometry, size yx and only '?' cells."""
+ legal_grids = self.map_manager.get_map_geometries()
+ if geometry not in legal_grids:
+ raise ArgError('First map argument must be one of: ' +
+ ', '.join(legal_grids))
+ self.world.new_map(geometry, yx)
+ cmd_MAP.argtypes = 'string yx_tuple:pos'
def cmd_THING_TYPE(self, i, type_):
t = self.world.get_thing(i)