X-Git-Url: https://plomlompom.com/repos/?p=plomrogue2-experiments;a=blobdiff_plain;f=game_common.py;h=7731c61eebe782e8c8e07187e9925a1d20343539;hp=0598dfa77e61f715c224a84f7cedaaedb158664b;hb=HEAD;hpb=7a02f223961c532d9423433427c0e1b3e1cdb871

diff --git a/game_common.py b/game_common.py
index 0598dfa..7731c61 100644
--- a/game_common.py
+++ b/game_common.py
@@ -1,39 +1,69 @@
 from parser import ArgError
 
 
-class World:
+class MapManager:
 
-    def __init__(self):
-        self.turn = 0
-        self.map_size = (0, 0)
-        self.terrain_map = ''
-        self.things = []
-        self.Thing = Thing  # child classes may use an extended Thing class here
+    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 set_map_size(self, yx):
-        y, x = yx
-        self.map_size = (y, x)
-        self.terrain_map = ''
-        for y in range(self.map_size[0]):
-            self.terrain_map += '?' * self.map_size[1]
+    def get_map_class(self, geometry):
+        for map_class in self.map_classes:
+            if map_class.__name__[3:] == geometry:
+                return map_class
 
-    def set_map_line(self, y, line):
-        width_map = self.map_size[1]
-        if y >= self.map_size[0]:
+
+class Map:
+
+    def __init__(self, size=(0, 0)):
+        self.size = size
+        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]
+        width_map = self.size[1]
+        if y >= height_map:
             raise ArgError('too large row number %s' % y)
         width_line = len(line)
         if width_line > width_map:
             raise ArgError('too large map line width %s' % width_line)
-        self.terrain_map = self.terrain_map[:y * width_map] + line + \
-                           self.terrain_map[(y + 1) * width_map:]
+        self.terrain = self.terrain[:y * width_map] + line +\
+                       self.terrain[(y + 1) * width_map:]
+
+    def get_position_index(self, yx):
+        return yx[0] * self.size[1] + yx[1]
 
-    def get_thing(self, id_):
+
+class World:
+
+    def __init__(self):
+        self.Thing = Thing  # child classes may use an extended Thing class here
+        self.turn = 0
+        self.things = []
+
+    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, geometry, yx):
+        map_type = self.game.map_manager.get_map_class(geometry)
+        self.map_ = map_type(yx)
 
 
 class Thing:
@@ -45,16 +75,12 @@ class Thing:
         self.position = [0,0]
 
 
-class Commander:
-
-    def cmd_MAP_SIZE(self, yx):
-        """Set self.map_size to yx, redraw self.terrain_map as '?' cells."""
-        self.world.set_map_size(yx)
-    cmd_MAP_SIZE.argtypes = 'yx_tuple:nonneg'
+class CommonCommandsMixin:
 
-    def cmd_TERRAIN_LINE(self, y, terrain_line):
-        self.world.set_map_line(y, terrain_line)
-    cmd_TERRAIN_LINE.argtypes = 'int:nonneg string'
+    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)