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 9098fe76231a23881b37e7cded64f663a66f2bf3..572d5cf346ffbb1ee73f5a9efeed843f55872775 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/GameSceneController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/GameSceneController.java @@ -53,6 +53,8 @@ public class GameSceneController implements Initializable { //map data String mapString = "10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 " + + "10 1 1 1 20 1 20 1 20 1 20 1 20 1 20 1 1 10 " + + "10 1 1 20 10 20 10 20 10 20 10 20 10 20 10 20 1 10 " + "10 1 20 1 20 1 20 1 20 1 20 1 20 1 20 1 20 10 " + "10 20 10 20 10 20 10 20 10 20 10 20 10 20 10 20 10 10 " + "10 1 20 1 20 1 20 1 20 1 20 1 20 1 20 1 20 10 " + @@ -65,11 +67,28 @@ public class GameSceneController implements Initializable { "10 20 10 20 10 20 10 20 10 20 10 20 10 20 10 20 10 10 " + "10 1 20 1 20 1 20 1 20 1 20 1 20 1 20 1 20 10 " + "10 20 10 20 10 20 10 20 10 20 10 20 10 20 10 20 10 10 " + - "10 1 20 1 20 1 20 1 20 1 20 1 20 1 20 1 20 10 " + + "10 1 20 1 20 1 20 1 20 1 20 1 20 1 20 1 1 10 " + + "10 1 1 20 10 20 10 20 10 20 10 20 10 20 10 1 1 10 " + + "10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 "; + + /*String mapString = "10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 " + + "10 1 1 20 20 20 20 20 20 20 20 20 20 20 20 1 1 10 " + + "10 1 10 20 10 20 10 20 10 10 20 10 20 10 20 10 1 10 " + + "10 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 10 " + + "10 20 10 20 10 20 10 20 10 10 20 10 20 10 20 10 20 10 " + + "10 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 10 " + + "10 20 10 20 10 20 10 20 10 10 20 10 20 10 20 10 20 10 " + + "10 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 10 " + "10 20 10 20 10 20 10 20 10 20 10 20 10 20 10 20 10 10 " + - "10 1 20 1 20 1 20 1 20 1 20 1 20 1 20 1 20 10 " + "10 20 10 20 10 20 10 20 10 20 10 20 10 20 10 20 10 10 " + - "10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 "; + "10 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 10 " + + "10 20 10 20 10 20 10 20 10 10 20 10 20 10 20 10 20 10 " + + "10 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 10 " + + "10 20 10 20 10 20 10 20 10 10 20 10 20 10 20 10 20 10 " + + "10 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 10 " + + "10 1 10 20 10 20 10 20 10 10 20 10 20 10 20 10 1 10 " + + "10 1 1 20 20 20 20 20 20 20 20 20 20 20 20 1 1 10 " + + "10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 ";*/ /*String mapString = "11 10 13 10 13 10 10 12 14 14 11 10 10 13 10 13 10 12 " + 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 bad0d8419c4ddbb2c81233d7ab8f33b289dbda1c..ec85519531097e4467a1654832639b452bcbbea7 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 @@ -80,7 +80,7 @@ public class TileManager { new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); //Textures of destructible tiles tileSet[20] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, - new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); + new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/grass_biom/building/box.png")))); tileSet[21] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); tileSet[22] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, @@ -137,35 +137,35 @@ public class TileManager { tileSet[14] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/dark_lands_biom/building/StoneGateDarkLand04.png")))); tileSet[15] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, - new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/dark_lands_biom/building/NoTexture.png")))); + new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); tileSet[16] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, - new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/dark_lands_biom/ground/NoTexture.png")))); + new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); tileSet[17] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); tileSet[18] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); tileSet[19] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); - //Testures of destructible tiles - tileSet[20] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, - new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); - tileSet[21] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, + //Textures of destructible tiles + tileSet[20] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.DESTRUCTIBLE, + new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/dark_lands_biom/building/box.png")))); + tileSet[21] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); - tileSet[22] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, + tileSet[22] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); - tileSet[23] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, + tileSet[23] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); - tileSet[24] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, + tileSet[24] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); - tileSet[25] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, + tileSet[25] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); - tileSet[26] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, + tileSet[26] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); - tileSet[27] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, + tileSet[27] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); - tileSet[28] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, + tileSet[28] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); - tileSet[29] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, + tileSet[29] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); } catch (Exception e) { log.error(e); @@ -214,26 +214,26 @@ public class TileManager { new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); tileSet[19] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); - //Testures of destructible tiles - tileSet[20] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, + //Textures of destructible tiles + tileSet[20] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/bomberman/building/box.png")))); - tileSet[21] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, + tileSet[21] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); - tileSet[22] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, + tileSet[22] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); - tileSet[23] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, + tileSet[23] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); - tileSet[24] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, + tileSet[24] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); - tileSet[25] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, + tileSet[25] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); - tileSet[26] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, + tileSet[26] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); - tileSet[27] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, + tileSet[27] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); - tileSet[28] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, + tileSet[28] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); - tileSet[29] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, + tileSet[29] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); } catch (Exception e) { log.error(e); @@ -282,26 +282,26 @@ public class TileManager { new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); tileSet[19] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); - //Testures of destructible tiles - tileSet[20] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, - new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); - tileSet[21] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, + //Textures of destructible tiles + tileSet[20] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.DESTRUCTIBLE, + new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/forrest_biom/building/box.png")))); + tileSet[21] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); - tileSet[22] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, + tileSet[22] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); - tileSet[23] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, + tileSet[23] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); - tileSet[24] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, + tileSet[24] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); - tileSet[25] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, + tileSet[25] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); - tileSet[26] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, + tileSet[26] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); - tileSet[27] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, + tileSet[27] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); - tileSet[28] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, + tileSet[28] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); - tileSet[29] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.NON_DESTRUCTIBLE, + tileSet[29] = TileFactory.createTile(TileType.NON_WALKABLE,TileType.DESTRUCTIBLE, new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/map/NoTexture.png")))); } catch (Exception e) { log.error(e); diff --git a/src/main/resources/textures/map/dark_lands_biom/building/box.png b/src/main/resources/textures/map/dark_lands_biom/building/box.png new file mode 100644 index 0000000000000000000000000000000000000000..6c6cf965c67c4e8008c453bd87f27542d9ebe8a2 Binary files /dev/null and b/src/main/resources/textures/map/dark_lands_biom/building/box.png differ diff --git a/src/main/resources/textures/map/grass_biom/building/box.png b/src/main/resources/textures/map/grass_biom/building/box.png new file mode 100644 index 0000000000000000000000000000000000000000..6c6cf965c67c4e8008c453bd87f27542d9ebe8a2 Binary files /dev/null and b/src/main/resources/textures/map/grass_biom/building/box.png differ