Tweak and resize floor and door tiles

[erdslangetjie.git] / erdslangetjie / level.py

diff --git a/erdslangetjie/level.py b/erdslangetjie/level.py
index 645a62f7678aca49f89f85a024dbaf4cc9ecd327..d42cc71ea4b92f5eaf748a8633a1627eda3ef762 100644 (file)
--- a/erdslangetjie/level.py
+++ b/erdslangetjie/level.py
@@ -1,19 +1,16 @@
 # The level object
 
-from data import load_image
+import os
+from data import load_image, load, filepath
 
 
 class Level(object):
 
-    def __init__(self):
+    def __init__(self, levelfile):
         self.data = []
         self.exit_pos = []
         self.enter_pos = None
         self.tiles = []
-
-    def load(self, levelfile):
-        """Load the level"""
-        self.data = []
         # Because of how kivy's coordinate system works,
         # we reverse the lines so things match up between
         # the file and the display (top of file == top of display)
@@ -29,7 +26,7 @@ class Level(object):
             tile_line = []
             for i, c in enumerate(line):
                 if c == ' ':
-                    tile_line.append(load_image('tiles/floor.bmp'))
+                    tile_line.append(load_image('tiles/floor.png'))
                 elif c == '.':
                     tile_line.append(load_image('tiles/wall.bmp'))
                 elif c == 'E' or c == 'X':
@@ -39,12 +36,15 @@ class Level(object):
                         self.enter_pos = (i, j)
                     else:
                         self.exit_pos.append((i, j))
-                    tile_line.append(load_image('tiles/door.bmp'))
+                    tile_line.append(load_image('tiles/door.png'))
             self.tiles.append(tile_line)
 
     def get_tiles(self):
         return self.tiles
 
+    def get_size(self):
+        return len(self.tiles[0]), len(self.tiles)
+
     def at_exit(self, pos):
         return pos in self.exit_pos
 
@@ -60,3 +60,32 @@ class Level(object):
         if tile == '.':
             return True
         return False
+
+
+class LevelList(object):
+
+    LEVELS = 'level_list'
+
+    def __init__(self):
+        self.levels = []
+        level_list = load(self.LEVELS)
+        for line in level_list:
+            line = line.strip()
+            if os.path.exists(filepath(line)):
+                level_file = load(line)
+                self.levels.append(Level(level_file))
+                level_file.close()
+            else:
+                print 'Level list includes non-existant level %s' % line
+        level_list.close()
+        self._cur_level = 0
+
+    def get_current_level(self):
+        if self._cur_level < len(self.levels):
+            return self.levels[self._cur_level]
+        else:
+            return None
+
+    def advance_to_next_level(self):
+        self._cur_level += 1
+        return self.get_current_level()