X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;ds=sidebyside;f=koperkapel%2Floaders%2Flevelloader.py;h=0addeccf5c54d678dadbaa8d796e904e26ebf01e;hb=6e3ad2c9b06bcfc2e943559532ae5d2fbf5346cd;hp=124161f37d12fe93dd9681471bf140cced3a3ef5;hpb=bc78ad7ce0a69ad00b10cf29a86d7596c1f90139;p=koperkapel.git

diff --git a/koperkapel/loaders/levelloader.py b/koperkapel/loaders/levelloader.py
index 124161f..0addecc 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, Grate
+from ..gamelib.level import Level
+
+        
+
+TILES = {
+    "cwall": Wall, # rename this everywhere
+    "floor": Floor,
+    "tunnel": Tunnel,
+    "underground": Underground,
+}
 
 class LevelLoader(ResourceLoader):
     """ Level loader. """
@@ -15,22 +26,35 @@ class LevelLoader(ResourceLoader):
         f = open(level_path, 'r')
         level_data = json.load(f)
         f.close()
-        self._height = len(level_data['tiles'])
-        self._width = len(level_data['tiles'][0])
-        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']
+        self._level.start_pos = level_data["starting pos"]
         # Consistency check, so we can assume things are correct
         # in the level renderer
-        for row, row_data in enumerate(self._tiles):
-            if len(row_data) != self._width:
+        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 row_data in self._tiles:
-            for tile in row_data:
-                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)
+                    # Hack this for now
+                    if layer == 'floor' and 'crawl' in tile[layer]['behaviour']:
+                        print('Here')
+                        tile['floor image'] = Grate.image(neighbors)
 
 
 levels = LevelLoader('levels')