X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=koperkapel%2Floaders%2Flevelloader.py;h=9c3b6cfc19fc57c31af97b1c4337bb016131d7f8;hb=57cda86d1aa60e04e3dd7567439cd79cd95f3e1a;hp=ccab73f1f017dc1000c94027687f4194a796b6cd;hpb=fffaf24241b36462cd2ebaad646f3ebd20dbdf63;p=koperkapel.git

diff --git a/koperkapel/loaders/levelloader.py b/koperkapel/loaders/levelloader.py
index ccab73f..9c3b6cf 100644
--- a/koperkapel/loaders/levelloader.py
+++ b/koperkapel/loaders/levelloader.py
@@ -10,6 +10,7 @@ from ..gamelib.door import Door
 from ..gamelib.keypad import Keypad
 from ..gamelib.friendlyroach import get_friendly_roach
 from ..gamelib.items import get_item
+from ..gamelib.enemy_generator import EnemyGenerator
 
 
 TILES = {
@@ -37,7 +38,7 @@ class LevelLoader(ResourceLoader):
         self._level.tileset = level_data['tileset']
         self._level.start_pos = level_data["starting pos"]
         self._level.exit = level_data["exit"]
-        self._level.enemies = []
+        self._level.enemy_generators = []
         self._level.friends = []
         self._level.items = []
         # Consistency check, so we can assume things are correct
@@ -64,13 +65,16 @@ class LevelLoader(ResourceLoader):
                 doors.append(new_door)
             # Add the keypads
             for keypad in door_info['keypads']:
-                new_keypad = Keypad(keypad[0], keypad[1], doors)
+                new_keypad = Keypad(keypad[0], keypad[1], doors, keypad[2])
                 self._level.keypads.append(new_keypad)
         for pos in level_data['friendly roaches']:
             roach = get_friendly_roach(pos[0], pos[1])
             self._level.friends.append(roach)
         for item in level_data['items']:
             self._level.items.append(get_item(item))
+        for generator in level_data['enemy generators']:
+            enemy = EnemyGenerator(generator, self._level)
+            self._level.enemy_generators.append(enemy)
         return self._level
 
     def _load_tile_images(self):