X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=koperkapel%2Floaders%2Flevelloader.py;h=0addeccf5c54d678dadbaa8d796e904e26ebf01e;hb=99bccc33422efc7e30588087e724ead3a7de7715;hp=640d9b168ada4e59073559058cb8654d72492fb5;hpb=bd7c8b7218aa80962ecdb3e8d3c0216aa3d40c1e;p=koperkapel.git

diff --git a/koperkapel/loaders/levelloader.py b/koperkapel/loaders/levelloader.py
index 640d9b1..0addecc 100644
--- a/koperkapel/loaders/levelloader.py
+++ b/koperkapel/loaders/levelloader.py
@@ -2,42 +2,18 @@
 
 import json
 
-from pgzero.loaders import images, ResourceLoader
-import os
-import random
+from pgzero.loaders import ResourceLoader
 
-class Tile:
-    IMG = None
+from ..gamelib.tiles import Wall, Floor, Tunnel, Underground, Grate
+from ..gamelib.level import Level
 
-    @classmethod
-    def image(cls):
-        if cls.IMG is None:
-            raise NotImplementedError()
-
-        return images.load(cls.IMG)
-
-class RandomizedTile(Tile):
-    IMGDIR = None
-
-    @classmethod
-    def image(cls):
-        if cls.IMGDIR is None:
-            raise NotImplementedError()
-
-        imgdir = os.path.join(os.path.dirname(__file__), '..', 'images', cls.IMGDIR)
-        img = os.path.splitext(random.choice(os.listdir(imgdir)))[0]
-
-        return images.load(os.path.join(cls.IMGDIR, img))
-
-class Floor(RandomizedTile):
-    IMGDIR = "floor"
-
-class Wall(RandomizedTile):
-    IMGDIR = "wall"
+        
 
 TILES = {
     "cwall": Wall, # rename this everywhere
     "floor": Floor,
+    "tunnel": Tunnel,
+    "underground": Underground,
 }
 
 class LevelLoader(ResourceLoader):
@@ -50,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'] = TILES[tile['base']].image()
+        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')