X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=game_common.py;h=7731c61eebe782e8c8e07187e9925a1d20343539;hb=804c0812954c9ab11bffaef5fee644ee4350b2a6;hp=5aa4b2544729d337fcef2ee939fe1ddeddc3ea63;hpb=9c3865bbfc4fe7721f8c2f057bce85e2300ea528;p=plomrogue2-experiments
diff --git a/game_common.py b/game_common.py
index 5aa4b25..7731c61 100644
--- a/game_common.py
+++ b/game_common.py
@@ -1,11 +1,33 @@
from parser import ArgError
+class MapManager:
+
+ def __init__(self, map_classes):
+ """Collects tuple of basic Map[Geometry] classes."""
+ self.map_classes = map_classes
+
+ 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]
@@ -25,22 +47,23 @@ class Map:
class World:
def __init__(self):
- self.Map = Map # child classes may use an extended Map class here
self.Thing = Thing # child classes may use an extended Thing class here
self.turn = 0
- self.map_ = self.Map()
self.things = []
- def get_thing(self, id_):
+ def get_thing(self, id_, create_unfound=True):
for thing in self.things:
if id_ == thing.id_:
return thing
- t = self.Thing(self, id_)
- self.things += [t]
- return t
+ if create_unfound:
+ t = self.Thing(self, id_)
+ self.things += [t]
+ return t
+ return None
- def new_map(self, yx):
- self.map_ = self.Map(yx, '?')
+ def new_map(self, geometry, yx):
+ map_type = self.game.map_manager.get_map_class(geometry)
+ self.map_ = map_type(yx)
class Thing:
@@ -54,10 +77,10 @@ class Thing:
class CommonCommandsMixin:
- def cmd_MAP(self, yx):
- """Create new map of size yx and only '?' cells."""
- self.world.new_map(yx)
- cmd_MAP.argtypes = 'yx_tuple:nonneg'
+ def cmd_MAP(self, geometry, yx):
+ """Create new map of grid geometry, size yx and only '?' cells."""
+ self.world.new_map(geometry, yx)
+ cmd_MAP.argtypes = 'string:geometry yx_tuple:pos'
def cmd_THING_TYPE(self, i, type_):
t = self.world.get_thing(i)