X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=client.py;h=6594fb506fe7f78a8c050a5ce364dbbca9bd0ba6;hb=b7d8d49aaca0cdfd7be583c5da44aa37e9ad693c;hp=07d59c235c5a2b21f9b3ff7ba90c6f29b75a86e2;hpb=fb11e52f4e70470336504c84e4b05f3a3b6a9790;p=plomrogue2-experiments

diff --git a/client.py b/client.py
index 07d59c2..6594fb5 100755
--- a/client.py
+++ b/client.py
@@ -60,18 +60,33 @@ 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_)
+
+        #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)
+
+        new_terrain_list = []
+        x = 0
+        y = 0
+        for c in terrain_as_list:
+            new_terrain_list += [c, ' ']
+            x += 1
+            if x == self.game.world.map_.size[1]:
+                new_terrain_list += ['\n']
+                x = 0
+                y += 1
+                if y % 2 != 0:
+                    new_terrain_list += [' ']
+        return ''.join(new_terrain_list)
 
     def update(self):
         """Redraw all non-edit widgets."""