diff --git a/Zoelda/src/main/World.java b/Zoelda/src/main/World.java index 90255be..33cad7c 100644 --- a/Zoelda/src/main/World.java +++ b/Zoelda/src/main/World.java @@ -8,6 +8,7 @@ import main.maps.Corridor; import main.entities.player.Player; import main.maps.Map; import main.maps.TestMap; +import main.maps.TutorialMap; /** * Hier werden alle Maps gespeichert. @@ -22,7 +23,7 @@ public class World extends Knoten { public World() { // Map initialisieren - currentMap = new TestMap(); + currentMap = new TutorialMap(); // Map zu EA hinzuf�gen add(currentMap); @@ -57,7 +58,7 @@ public class World extends Knoten { Main.instance.manager.anmelden(e, 20); } } - + public Map getCurrentMap() { return currentMap; } diff --git a/Zoelda/src/main/maps/Corridor.java b/Zoelda/src/main/maps/Corridor.java index 172a80d..b398bdd 100644 --- a/Zoelda/src/main/maps/Corridor.java +++ b/Zoelda/src/main/maps/Corridor.java @@ -11,13 +11,17 @@ public class Corridor extends Map { 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 ) { map[x][y] = new Tile(3, x, y); add(map[x][y]); - } else if(y == 1 && (x != 0 || x != 4)&& x != 2 ) { + } + //3D-Wand + else if(y == 1 && (x != 0 || x != 4)&& x != 2 ) { map[x][y] = new Tile(4, x, y); add(map[x][y]); } + //Steinboden else { map[x][y] = new Tile(5, x, y); add(map[x][y]); diff --git a/Zoelda/src/main/maps/TutorialMap.java b/Zoelda/src/main/maps/TutorialMap.java new file mode 100644 index 0000000..097b998 --- /dev/null +++ b/Zoelda/src/main/maps/TutorialMap.java @@ -0,0 +1,29 @@ +package main.maps; + +import main.Tile; + +public class TutorialMap extends Map { + + public TutorialMap() { + super(15, 11); + for (int x = 0; x < map.length; x++) { + for (int y = 0; y < map[0].length; y++) { + //Wand, Sichtschutz + if (y == 0 ||y == map[0].length - 1 || x == 0 || x == map.length - 1 || ((y == 4|| y == 5) && x == 10 )) { + map[x][y] = new Tile (1, x, y); + add(map [x][y]); + } + //3D-Wand, 3F-Sichtschutz + else if(y == 1 || ( y == 6 && x == 10)) { + map[x][y] = new Tile (2, x, y); + add(map [x][y]); + } + //Grasboden + else{ + map[x][y] = new Tile(0, x, y); + add(map[x][y]); + } + } + } + } +}