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

Zoelda/src/main/Tile.java

@@ -40,9 +40,9 @@ public class Tile extends Knoten {
 			if (id == GRASS) {
 				buff = buff.getSubimage(16 * (int) (Math.random() * 8), 0, 16, 16);
 			}
-			if (id == STONE_FLOOR) {
+			//if (id == STONE_FLOOR) {
-				buff = buff.getSubimage(16 * (int) (Math.random() * 10), 0, 16, 16);
+			//	buff = buff.getSubimage(16 * (int) (Math.random() * 10), 0, 16, 16);
-			}
+			//}
 			// Skalieren
 			BufferedImage scaled = new BufferedImage(World.SCALE, World.SCALE, BufferedImage.TYPE_INT_RGB);
 			scaled.getGraphics().drawImage(buff, 0, 0, World.SCALE, World.SCALE, null);
@@ -72,7 +72,7 @@ public class Tile extends Knoten {
 		case STONE_WALL_BOTTOM:
 			return "/res/images/tiles/stone_wall_bottom.png";
 		case STONE_FLOOR:
-			return "/res/images/tiles/Stone_floor.png";
+			return "/res/images/tiles/TestTest.png";
 		}
 		return null;
 	}

Zoelda/src/main/maps/Corridor.java

@@ -7,22 +7,22 @@ import main.entities.Snake;
 public class Corridor extends Map {
 
 	public Corridor() {
-		super(5, 10);
+		super(15, 11);
 		
 		for (int x = 0; x < map.length; x++) {
 			for (int y = 0; y < map[0].length; y++) {
 				//Wand
-				if((y == 0 || x == 0 || y == 9 || x == 4) && x != 2 ) {
+				if((y == 0 || x == 5 || y == 10 || x == 9) && x != 7 && x >= 5 && x <= 9) {
 					map[x][y] = new Tile(3, x, y);
 					add(map[x][y]);
 				} 
 				//3D-Wand
-				else if(y == 1 && (x != 0 || x != 4)&& x != 2 ) {
+				else if(y == 1 && (x != 0 || x != 4)&& x != 7 && x >= 6 && x <= 8 ) {
 					map[x][y] = new Tile(4, x, y);
 					add(map[x][y]);
 				}
 				//Steinboden
-				else {
+				else if (x >= 6 && x <= 8 ) {
 					map[x][y] = new Tile(5, x, y);
 					add(map[x][y]);
 				}