diff --git a/Zoelda/src/main/Tile.java b/Zoelda/src/main/Tile.java index 4e5593f..a131e16 100644 --- a/Zoelda/src/main/Tile.java +++ b/Zoelda/src/main/Tile.java @@ -17,6 +17,7 @@ public class Tile extends Knoten { public static final int GRASS = 0; public static final int WALL_TOP = 1; public static final int WALL_BOTTOM = 2; + public static final int STONE_WALL = 3; private Bild img; // Bild, das gerendert wird private int id; // Die id dises Tiles @@ -60,6 +61,8 @@ public class Tile extends Knoten { return "/res/images/tiles/wall_top.png"; case WALL_BOTTOM: return "/res/images/tiles/wall_bottom.png"; + case STONE_WALL: + return "/res/images/tiles/stone_wall.png"; } return null; } @@ -77,7 +80,7 @@ public class Tile extends Knoten { public boolean isCollidable() { // Alle Tiles durch die man nicht laufen soll müssen hier true zurückgeben, // sonst werden sie bei der Collisiondetection nicht berücksichtigt. - return id == WALL_TOP; + return id == WALL_TOP || id == STONE_WALL ; } /** diff --git a/Zoelda/src/main/World.java b/Zoelda/src/main/World.java index e321d0a..845e699 100644 --- a/Zoelda/src/main/World.java +++ b/Zoelda/src/main/World.java @@ -4,9 +4,9 @@ import ea.Knoten; import main.entities.Entity; import main.entities.Player; import main.entities.Snake; +import main.maps.Corridor; import main.entities.Spider; import main.maps.Map; -import main.maps.TestMap; /** * Hier werden alle Maps gespeichert. @@ -21,8 +21,8 @@ public class World extends Knoten { public World() { // Map initialisieren - currentMap = new TestMap(); - // Map zu EA hinzufügen + currentMap = new Corridor(); + // Map zu EA hinzuf�gen add(currentMap); // und Entities auch diff --git a/Zoelda/src/main/maps/Corridor.java b/Zoelda/src/main/maps/Corridor.java new file mode 100644 index 0000000..f1aeb7f --- /dev/null +++ b/Zoelda/src/main/maps/Corridor.java @@ -0,0 +1,22 @@ +package main.maps; + +import main.Tile; + +public class Corridor extends Map { + + public Corridor() { + super(5, 10); + + for (int x = 0; x < map.length; x++) { + for (int y = 0; y < map[0].length; y++) { + if((y == 0 || x == 0 || y == 9 || x == 4) && x != 2 ) { + map[x][y] = new Tile(3, x, y); + add(map[x][y]); + } else { + map[x][y] = new Tile(0, x, y); + add(map[x][y]); + } + } + } + } +} diff --git a/Zoelda/src/res/images/Spider Sprite Sheet.png b/Zoelda/src/res/images/Spider Sprite Sheet.png new file mode 100644 index 0000000..89de203 Binary files /dev/null and b/Zoelda/src/res/images/Spider Sprite Sheet.png differ diff --git a/Zoelda/src/res/images/tiles/stone_wall.png b/Zoelda/src/res/images/tiles/stone_wall.png new file mode 100644 index 0000000..84155eb Binary files /dev/null and b/Zoelda/src/res/images/tiles/stone_wall.png differ