X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=koperkapel%2Floaders%2Flevelloader.py;h=3b2256517d73eee58f61ccd5fe7425fd80994050;hb=65537104872241bb4f1732bb19dcb78d5017d03d;hp=4fa6ecd9331360220ea1460f8e7bbd3f3d9af3f1;hpb=9716c38db307a48cc69bf5a3d77347d5fba4acc2;p=koperkapel.git

diff --git a/koperkapel/loaders/levelloader.py b/koperkapel/loaders/levelloader.py
index 4fa6ecd..3b22565 100644
--- a/koperkapel/loaders/levelloader.py
+++ b/koperkapel/loaders/levelloader.py
@@ -2,8 +2,19 @@
 
 import json
 
-from pgzero.loaders import images, ResourceLoader
+from pgzero.loaders import ResourceLoader
 
+from ..gamelib.tiles import Wall, Floor, Tunnel, Underground
+from ..gamelib.level import Level
+
+        
+
+TILES = {
+    "cwall": Wall, # rename this everywhere
+    "floor": Floor,
+    "tunnel": Tunnel,
+    "underground": Underground,
+}
 
 class LevelLoader(ResourceLoader):
     """ Level loader. """
@@ -15,14 +26,30 @@ class LevelLoader(ResourceLoader):
         f = open(level_path, 'r')
         level_data = json.load(f)
         f.close()
-        self._tiles = level_data['tiles']
+        self._level = Level()
+        self._level.height = len(level_data['tiles'])
+        self._level.width = len(level_data['tiles'][0])
+        self._level.tiles = level_data['tiles']
+        self._level.tileset = level_data['tileset']
+        # Consistency check, so we can assume things are correct
+        # in the level renderer
+        for row, row_data in enumerate(self._level.tiles):
+            if len(row_data) != self._level.width:
+                raise RuntimeError("Incorrect len for row %d" % row)
+        for tile in TILES.values():
+            tile.TILESET = self._level.tileset
         self._load_tile_images()
-        return level_data
+        return self._level
 
     def _load_tile_images(self):
         """Load all the tile images"""
-        for tile in self._tiles:
-            tile['image'] = images.load(tile['base'])
+        for y, row_data in enumerate(self._level.tiles):
+            for x, tile in enumerate(row_data):
+                neighborhood = self._level.get_neighbors(x, y)
+                for layer in ['floor', 'tunnels']:
+                    neighbors = [x[layer] if x else None for x in neighborhood]
+                    tile['%s image' % layer] = \
+                            TILES[tile[layer]['base']].image(neighbors)
 
 
 levels = LevelLoader('levels')