diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/GameSceneController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/GameSceneController.java index f812d0d04a4d76d6e6256bfadfaa1353b97770bf..febd5cd7ceb79b0c12c8e4395ed5067b013e5582 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/GameSceneController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/GameSceneController.java @@ -49,7 +49,7 @@ public class GameSceneController implements Initializable { //map data - String mapString = "4 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 " + + /*String mapString = "4 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 " + "4 1 9 1 9 1 9 1 9 1 9 1 9 1 9 1 9 3 " + "4 9 10 9 10 9 10 9 10 9 10 9 10 9 10 9 10 3 " + "4 1 9 1 9 1 9 1 9 1 9 1 9 1 9 1 9 3 " + @@ -67,6 +67,26 @@ public class GameSceneController implements Initializable { "4 1 9 1 9 1 9 1 9 1 9 1 9 1 9 1 9 3 " + "4 9 10 9 10 9 10 9 10 9 10 9 10 9 10 9 10 3 " + "4 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 "; + */ + + String mapString = "10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 " + + "10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 " + + "10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 " + + "10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 " + + "10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 " + + "10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 " + + "10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 " + + "10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 " + + "10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 " + + "10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 " + + "10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 " + + "10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 " + + "10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 " + + "10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 " + + "10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 " + + "10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 " + + "10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 " + + "10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10"; int horizontalTileCount = 18; int verticalTileCount = 18; diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/Map/TileManager.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/Map/TileManager.java index 9b1347d9c2197be373924cf5221393c560b1e22c..91bd3801a0ac5e18e0f903fe2bc03a74b0e908d5 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Model/Map/TileManager.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/Map/TileManager.java @@ -57,7 +57,7 @@ public class TileManager { new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); tileSet[9] = TileFactory.createTile(TileType.WALKABLE, TileType.NON_DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); - //Textures of solid tiles + //Textures of solid tiles + non destructible tileSet[10] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/grass_biom/building/StoneGrassLand00.png")))); tileSet[11] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE,