Merge branch 'master' of https://git.ngb.schule/Tim/Zoelda

Zoelda/src/main/Tile.java

@@ -18,6 +18,7 @@ public class Tile extends Knoten {
 	public static final int WALL_TOP = 1;
 	public static final int WALL_BOTTOM = 2;
 	public static final int STONE_WALL = 3;
+	public static final int STONE_WALL_BOTTOM = 4;
 
 	private Bild img; // Bild, das gerendert wird
 	private int id; // Die id dises Tiles
@@ -63,6 +64,8 @@ public class Tile extends Knoten {
 			return "/res/images/tiles/wall_bottom.png";
 		case STONE_WALL:
 			return "/res/images/tiles/stone_wall.png";
+		case STONE_WALL_BOTTOM:
+			return "/res/images/tiles/stone_wall_bottom.png";
 		}
 		return null;
 	}

Zoelda/src/main/World.java

@@ -5,6 +5,7 @@ import main.entities.Entity;
 import main.entities.Player;
 import main.entities.Snake;
 import main.entities.Spider;
+import main.maps.Corridor;
 import main.maps.Map;
 import main.maps.TestMap;
 

Zoelda/src/main/maps/Corridor.java

@@ -12,7 +12,11 @@ public class Corridor extends Map {
 				if((y == 0 || x == 0 || y == 9 || x == 4) && x != 2 ) {
 					map[x][y] = new Tile(3, x, y);
 					add(map[x][y]);
-				} else {
+				} else if(y == 1 && (x != 0 || x != 4)&& x != 2 ) {
+					map[x][y] = new Tile(4, x, y);
+					add(map[x][y]);
+				}
+				else {
 					map[x][y] = new Tile(0, x, y);
 					add(map[x][y]);
 				}