diff --git a/Zoelda/src/main/Tile.java b/Zoelda/src/main/Tile.java index 4717e5c..76ea94a 100644 --- a/Zoelda/src/main/Tile.java +++ b/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) { - buff = buff.getSubimage(16 * (int) (Math.random() * 10), 0, 16, 16); - } + //if (id == STONE_FLOOR) { + // 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; } diff --git a/Zoelda/src/main/maps/Corridor.java b/Zoelda/src/main/maps/Corridor.java index b398bdd..072c6fd 100644 --- a/Zoelda/src/main/maps/Corridor.java +++ b/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]); } diff --git a/Zoelda/src/res/images/tiles/TestTest.png b/Zoelda/src/res/images/tiles/TestTest.png new file mode 100644 index 0000000..c439029 Binary files /dev/null and b/Zoelda/src/res/images/tiles/TestTest.png differ diff --git a/Zoelda/src/res/images/tiles/stone_floor.png b/Zoelda/src/res/images/tiles/stone_floor.png deleted file mode 100644 index 70eadc3..0000000 Binary files a/Zoelda/src/res/images/tiles/stone_floor.png and /dev/null differ diff --git a/Zoelda/src/res/images/tiles/stone_wall.png b/Zoelda/src/res/images/tiles/stone_wall.png deleted file mode 100644 index b0842b0..0000000 Binary files a/Zoelda/src/res/images/tiles/stone_wall.png and /dev/null differ diff --git a/Zoelda/src/res/images/tiles/stone_wall_bottom.png b/Zoelda/src/res/images/tiles/stone_wall_bottom.png index 5878183..5279d0f 100644 Binary files a/Zoelda/src/res/images/tiles/stone_wall_bottom.png and b/Zoelda/src/res/images/tiles/stone_wall_bottom.png differ