Allow selection of grid geometry via MAP command. A lot refactoring.

[plomrogue2-experiments] / game_common.py

diff --git a/game_common.py b/game_common.py
index 689398ddbce3cd85f93e7bcee5cbd1d2ce9e8c0a..b37e4475ffaf3fd420e53cd39eea6551c169bce2 100644 (file)
--- a/game_common.py
+++ b/game_common.py
@@ -3,9 +3,13 @@ from parser import ArgError
 
 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,21 +22,16 @@ 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]
 
 
 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:
@@ -42,6 +41,10 @@ class World:
         self.things += [t]
         return t
 
+    def new_map(self, geometry, yx):
+        map_type = getattr(self, 'Map' + geometry)
+        self.map_ = map_type(yx)
+
 
 class Thing:
 
@@ -52,12 +55,16 @@ class Thing:
         self.position = [0,0]
 
 
-class Commander:
+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 = {'Hex', 'Square'}
+        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:nonneg'
 
     def cmd_THING_TYPE(self, i, type_):
         t = self.world.get_thing(i)