X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=client.py;h=9d0da0d534399be8f546258d8976036ac53c9eb6;hb=64bf1873a6686c1bc974321c13d3c9f7800db0d6;hp=dd40323fca7038e45f8684bd1f34bd086e96523d;hpb=7d25c53656415a4699f6ad899974839eaa62af36;p=plomrogue2-experiments

diff --git a/client.py b/client.py
index dd40323..9d0da0d 100755
--- a/client.py
+++ b/client.py
@@ -4,10 +4,58 @@ import plom_socket_io
 import socket
 import threading
 from parser import ArgError, Parser
-from game_common import World, Commander
+import game_common
 
 
-class Game(Commander):
+def get_map_class(geometry):
+    return globals()['Map' + geometry]
+
+
+class MapSquare(game_common.Map):
+
+    def list_terrain_to_lines(self, terrain_as_list):
+        terrain = ''.join(terrain_as_list)
+        map_lines = []
+        start_cut = 0
+        while start_cut < len(terrain):
+            limit = start_cut + self.game.world.map_.size[1]
+            map_lines += [terrain[start_cut:limit]]
+            start_cut = limit
+        return "\n".join(map_lines)
+
+
+class MapHex(game_common.Map):
+
+    def list_terrain_to_lines(self, terrain_as_list):
+        new_terrain_list = []
+        x = 0
+        y = 0
+        for c in terrain_as_list:
+            new_terrain_list += [c, ' ']
+            x += 1
+            if x == self.size[1]:
+                new_terrain_list += ['\n']
+                x = 0
+                y += 1
+                if y % 2 != 0:
+                    new_terrain_list += [' ']
+        return ''.join(new_terrain_list)
+
+
+class World(game_common.World):
+
+    def __init__(self, *args, **kwargs):
+        """Extend original with local classes and empty default map.
+
+        We need the empty default map because we draw the map widget
+        on any update, even before we actually receive map data.
+        """
+        super().__init__(*args, **kwargs)
+        self.get_map_class = get_map_class
+        self.map_ = self.get_map_class('Hex')()
+
+
+class Game(game_common.CommonCommandsMixin):
     world = World()
     log_text = ''
 
@@ -60,18 +108,11 @@ class WidgetManager:
 
     def draw_map(self):
         """Draw map view from .game.map_.terrain, .game.things."""
-        map_lines = []
-        map_size = len(self.game.world.map_.terrain)
-        start_cut = 0
-        while start_cut < map_size:
-            limit = start_cut + self.game.world.map_.size[1]
-            map_lines += [self.game.world.map_.terrain[start_cut:limit]]
-            start_cut = limit
+        terrain_as_list = list(self.game.world.map_.terrain[:])
         for t in self.game.world.things:
-            line_as_list = list(map_lines[t.position[0]])
-            line_as_list[t.position[1]] = self.game.symbol_for_type(t.type_)
-            map_lines[t.position[0]] = ''.join(line_as_list)
-        return "\n".join(map_lines)
+            pos_i = self.game.world.map_.get_position_index(t.position)
+            terrain_as_list[pos_i] = self.game.symbol_for_type(t.type_)
+        return self.game.world.map_.list_terrain_to_lines(terrain_as_list)
 
     def update(self):
         """Redraw all non-edit widgets."""