Changed level design

Author: Callum-OP

TileMap.cpp

@@ -54,14 +54,12 @@ class TileMapRenderer {
     TileMapRenderer() {
         // Load all tile definitions
         loadTile('#', "assets/images/WallLowM.png", TileAsset::Type::Wall);
-        loadTile('<', "assets/images/WallLowL.png", TileAsset::Type::Wall);
-        loadTile('>', "assets/images/WallLowR.png", TileAsset::Type::Wall);
-        loadTile('[', "assets/images/WallHighL.png", TileAsset::Type::Wall);
-        loadTile(']', "assets/images/WallHighR.png", TileAsset::Type::Wall);
-        loadTile('_', "assets/images/WallHighM.png", TileAsset::Type::Wall);
         loadTile('L', "assets/images/WallSideL.png", TileAsset::Type::Wall);
         loadTile('R', "assets/images/WallSideR.png", TileAsset::Type::Wall);
         loadTile('U', "assets/images/WallSideU.png", TileAsset::Type::Wall);
+        loadTile('l', "assets/images/WallSideL.png", TileAsset::Type::Wall);
+        loadTile('r', "assets/images/WallSideR.png", TileAsset::Type::Wall);
+        loadTile('u', "assets/images/WallSideU.png", TileAsset::Type::Wall);
 
         loadTile('.', "assets/images/Floor.png", TileAsset::Type::Floor);
         loadTile(',', "assets/images/Grass.png", TileAsset::Type::Floor);
@@ -103,7 +101,7 @@ class TileMapRenderer {
                     window.draw(sprite);
                 // Should still draw a floor even if there is another object there
                 // It will decide the texture of the floor by looking at nearby floors
-                } else if (tile != 'U' && tile != 'L' && tile != 'R') {
+                } else if (tile != 'U' && tile != 'L' && tile != 'R' && tile != '%') {
                     // Count nearby floor symbols
                     std::map<char,int> counts;
                     for (int dy = -1; dy <= 1; ++dy) {

level.txt

@@ -1,27 +1,39 @@
-L_____________RL_______________________R,,,,,,
-L#############RL#######################R,,,,,,
-L.............RL.......................R,,,,,,
-L....G...P....RL...E.....G.......H.....R,,,,,,
-L.............RL.......................R,,,,,,
-L.....[________]..........[_______]....R,,,,,,
-###...##########..#####...<#######>...##,,,,,,
-#......<>..........#.............#,,,,,#,,,,,,
-#......<>.C....E.._#....G....H...#,,,,,#----->
-#.E..__<>.........-#.............#,,,,,#_____>
-##>.<#####...#############...######...#######>
-#........#.............#................,,,,,,
-#..H.....#....G....C...#....E......G....,,,,,,
-#........#.............#................,,,,,,
-###...#########...#########...##########,,,,,,
-#...........#.........#................#,,,,,,
-#..H..G.....#..E......#...H....E.......#,,,,,,
-#...........#.........#................#,,,,,,
-#....##...########....#####...#####....#,,,,,,
-#....#...........#....#...........#....#,,,,,,
-#....#....C..G...#.E..#.....C.....#..H.#,,,,,,
-#....#...........#....#...........#....#,,,,,,
-#....#####...#####....#####...#####....R,,,,,,
-#......................................R,,,,,,
-L..E...........H...........G..E........R,,,,,,
-L....G.........E.......................R,,,,,,
-.UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU.,,,,,,
+LUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUR
+LL##########%#######%##########RR
+LL##########%#######%##########RR
+LL.........l%r.....l%r.........RR
+LL.C....E..l%r..P..l%r..E....C.RR
+LL.........l%r.....l%r.........RR
+LL.........l%r.....l%r.........RR
+L%UUUUUUrlUU%r.....l%UUrlUUUUUU%R
+LL######rl##%r.....l%##rl######RR
+LL######rl##%r..E..l###rl######RR
+LL.........l%r.....l#r.........RR
+LL...H.....l%r.............G...RR
+LL......E..l%r..........E....H.RR
+LL.........l%r.....lUr.........RR
+L%UrlUUUUUUU%r.....l%UUUUUUUUUU%R
+LL#rl#######%r.....l%##########RR
+LL#rl########r..E..l%##########RR
+LL.........l#r.....l%r.........RR
+LL.................l%r.........RR
+LL.C....E..........l%r..E....C.RR
+LL.........lUr.....l%r.........RR
+L%UUUUUUUUUU%r.....l%UUrlUUUUUU%R
+LL###########r.....l###rl######RR
+LL###########r.....l###rl######RR
+LL.............................RR
+LL.............E....G......H...RR
+LL........G....................RR
+LL...H............G............RR
+LL.............................RR
+L%UUUUUUrlUUUr.....lUUUrlUUUUUU%R
+LL######rl##%r.....l%##rl######RR
+LL######rl##%r..E..l%##rl######RR
+LL.........l%r.....l%r.........RR
+LL.........l%r.....l%r.........RR
+LL.C....E..l%r.....l%r..E....C.RR
+LL.........l%r.....l%r.........RR
+L%UUUUUUUUUU%UUUUUUU%UUUUUUUUUU%R
+L###############################R
+L###############################R

main.cpp

@@ -99,7 +99,7 @@ int main()
     // Find player and walls
     for (int y = 0; y < size.y; ++y) {
         for (int x = 0; x < size.x; ++x) {
-            if (map.getTile(x, y) == '#') {
+            if (map.getTile(x, y) == '#' || map.getTile(x, y) == 'U' || map.getTile(x, y) == 'L' || map.getTile(x, y) == 'R'  || map.getTile(x, y) == '%') {
                 grid.nodes[y][x].wall = true;
             }
             if (map.getTile(x, y) == 'P') {
@@ -143,7 +143,7 @@ int main()
     for (int y = 0; y < size.y; ++y) { // Height
         for (int x = 0; x < size.x; ++x) { // Width
             // Walls
-            if (map.getTile(x, y) == '#') {
+            if (map.getTile(x, y) == '#' || map.getTile(x, y) == 'U' || map.getTile(x, y) == 'L' || map.getTile(x, y) == 'R'  || map.getTile(x, y) == '%') {
                 Object wall;
                 wall.pos = Vec2(x * TILE_SIZE + TILE_SIZE / 2.0f, y * TILE_SIZE + TILE_SIZE / 2.0f);
                 wall.aabb.min = Vec2(x * TILE_SIZE, y * TILE_SIZE);