projects
/
koperkapel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
uninterrupted murder
[koperkapel.git]
/
koperkapel
/
loaders
/
levelloader.py
diff --git
a/koperkapel/loaders/levelloader.py
b/koperkapel/loaders/levelloader.py
index 601ea80b3609925d2ad5651ea333381be871970d..14db3bee5419de099d785e50d87fbbc7db72783c 100644
(file)
--- a/
koperkapel/loaders/levelloader.py
+++ b/
koperkapel/loaders/levelloader.py
@@
-9,16
+9,18
@@
from ..gamelib.level import Level
from ..gamelib.door import Door
from ..gamelib.keypad import Keypad
from ..gamelib.friendlyroach import get_friendly_roach
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 = {
TILES = {
- "cwall": Wall, # rename this everywhere
+ "cwall": Wall,
# rename this everywhere
"floor": Floor,
"tunnel": Tunnel,
"underground": Underground,
}
"floor": Floor,
"tunnel": Tunnel,
"underground": Underground,
}
+
class LevelLoader(ResourceLoader):
""" Level loader. """
class LevelLoader(ResourceLoader):
""" Level loader. """
@@
-36,8
+38,9
@@
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.tileset = level_data['tileset']
self._level.start_pos = level_data["starting pos"]
self._level.exit = level_data["exit"]
- self._level.enem
ie
s = []
+ self._level.enem
y_generator
s = []
self._level.friends = []
self._level.friends = []
+ self._level.items = []
# Consistency check, so we can assume things are correct
# in the level renderer
for row, row_data in enumerate(self._level.tiles):
# Consistency check, so we can assume things are correct
# in the level renderer
for row, row_data in enumerate(self._level.tiles):
@@
-67,6
+70,11
@@
class LevelLoader(ResourceLoader):
for pos in level_data['friendly roaches']:
roach = get_friendly_roach(pos[0], pos[1])
self._level.friends.append(roach)
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):
return self._level
def _load_tile_images(self):
@@
-76,8
+84,8
@@
class LevelLoader(ResourceLoader):
neighborhood = self._level.get_neighbors(x, y)
for layer in ['floor', 'tunnels']:
neighbors = [x[layer] if x else None for x in neighborhood]
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)
+ tile['%s image' % layer] =
(
+ TILES[tile[layer]['base']].image(neighbors)
)
# Hack this for now
if self._level.is_exit(x, y):
tile['floor image'] = Exit.image(neighbors)
# Hack this for now
if self._level.is_exit(x, y):
tile['floor image'] = Exit.image(neighbors)