X-Git-Url: https://git.ctpug.org.za/?p=erdslangetjie.git;a=blobdiff_plain;f=erdslangetjie%2Flevel.py;h=925974cf5dcdd6bdff124027a0ac10a0a582310b;hp=450ce8c6152b4e2f9932b3eac0c3d8667b8ce632;hb=7226f363830b124ffc4f6b9a8a1a254a07b54be2;hpb=bbbabb3f3e92e6862140ab0ab6417bcd65707134

diff --git a/erdslangetjie/level.py b/erdslangetjie/level.py
index 450ce8c..925974c 100644
--- a/erdslangetjie/level.py
+++ b/erdslangetjie/level.py
@@ -3,6 +3,11 @@
 import os
 from data import load_image, load, filepath
 
+WALL = '.'
+FLOOR = ' '
+ENTRY = 'E'
+EXIT = 'X'
+
 
 class Level(object):
 
@@ -25,18 +30,18 @@ class Level(object):
         for j, line in enumerate(self.data):
             tile_line = []
             for i, c in enumerate(line):
-                if c == ' ':
-                    tile_line.append(load_image('tiles/floor.bmp'))
-                elif c == '.':
-                    tile_line.append(load_image('tiles/wall.bmp'))
-                elif c == 'E' or c == 'X':
-                    if c == 'E':
+                if c == FLOOR:
+                    tile_line.append(load_image('tiles/floor.png'))
+                elif c == WALL:
+                    tile_line.append(self.get_wall_tile(i, j))
+                elif c == ENTRY or c == EXIT:
+                    if c == ENTRY:
                         if self.enter_pos:
                             raise RuntimeError('Multiple entry points')
                         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):
@@ -48,6 +53,57 @@ class Level(object):
     def at_exit(self, pos):
         return pos in self.exit_pos
 
+    def get_wall_tile(self, x, y):
+        # Is the neighbour in this direction also a wall?
+        left = right = top = bottom = False
+        if x == 0:
+            left = True
+        elif self.data[y][x - 1] == WALL:
+            left = True
+        if x == len(self.data[0]) - 1:
+            right = True
+        elif self.data[y][x + 1] == WALL:
+            right = True
+        if y == 0:
+            top = True
+        elif self.data[y - 1][x] == WALL:
+            top = True
+        if y == len(self.data) - 1:
+            bottom = True
+        elif self.data[y + 1][x] == WALL:
+            bottom = True
+        if top and bottom and left and right:
+            return load_image('tiles/cwall.png')
+        elif bottom and left and right:
+            return load_image('tiles/bottom_wall.png')
+        elif top and left and right:
+            return load_image('tiles/top_wall.png')
+        elif top and bottom and right:
+            return load_image('tiles/left_wall.png')
+        elif top and bottom and left:
+            return load_image('tiles/right_wall.png')
+        elif top and bottom:
+            return load_image('tiles/vert_wall.png')
+        elif left and right:
+            return load_image('tiles/horiz_wall.png')
+        elif left and top:
+            return load_image('tiles/corner_lt.png')
+        elif left and bottom:
+            return load_image('tiles/corner_lb.png')
+        elif right and top:
+            return load_image('tiles/corner_rt.png')
+        elif right and bottom:
+            return load_image('tiles/corner_rb.png')
+        elif top:
+            return load_image('tiles/end_top.png')
+        elif bottom:
+            return load_image('tiles/end_bottom.png')
+        elif left:
+            return load_image('tiles/end_right.png')
+        elif right:
+            return load_image('tiles/end_left.png')
+        return load_image('tiles/pillar.png')
+
     def blocked(self, pos):
         if pos[0] < 0:
             return True
@@ -89,3 +145,6 @@ class LevelList(object):
     def advance_to_next_level(self):
         self._cur_level += 1
         return self.get_current_level()
+
+    def reset(self):
+        self._cur_level = 0