diff --git a/bin/de/deadlocker8/roadgame/logic/CenterType.class b/bin/de/deadlocker8/roadgame/logic/CenterType.class index 95d4df8668b7d78b6ad344bfab615e7cc65471cc..605cfc57139a7688e305ea3907b959b4d9bda746 100644 Binary files a/bin/de/deadlocker8/roadgame/logic/CenterType.class and b/bin/de/deadlocker8/roadgame/logic/CenterType.class differ diff --git a/bin/de/deadlocker8/roadgame/logic/Textures.class b/bin/de/deadlocker8/roadgame/logic/Textures.class index 0c0a89d2c7471997ac3cb9eb6a0f1bbbb6e8c5c3..4fc62bf90d43c03ea77512d5ba16b84d1f4adecd 100644 Binary files a/bin/de/deadlocker8/roadgame/logic/Textures.class and b/bin/de/deadlocker8/roadgame/logic/Textures.class differ diff --git a/bin/de/deadlocker8/roadgame/logic/TileTypes.class b/bin/de/deadlocker8/roadgame/logic/TileTypes.class index a2c0310b93364b0ca3a9a8bc77379aad42caa15b..83c09974fd8a9be82480b45c3bdf56d08d94093f 100644 Binary files a/bin/de/deadlocker8/roadgame/logic/TileTypes.class and b/bin/de/deadlocker8/roadgame/logic/TileTypes.class differ diff --git a/bin/de/deadlocker8/roadgame/resources/center_church.png b/bin/de/deadlocker8/roadgame/resources/center_church.png new file mode 100644 index 0000000000000000000000000000000000000000..28bd51be4cdf08ed8244163b44108da844f4f9b9 Binary files /dev/null and b/bin/de/deadlocker8/roadgame/resources/center_church.png differ diff --git a/bin/de/deadlocker8/roadgame/ui/Controller.class b/bin/de/deadlocker8/roadgame/ui/Controller.class index da6912eebc7b6b41608ad1889c1eca56f26e5c9d..2ca31bc55c221fc40fb4d2350985e442fa8d7571 100644 Binary files a/bin/de/deadlocker8/roadgame/ui/Controller.class and b/bin/de/deadlocker8/roadgame/ui/Controller.class differ diff --git a/src/de/deadlocker8/roadgame/logic/CenterType.java b/src/de/deadlocker8/roadgame/logic/CenterType.java index 3e7114b8c809231b59e8fb5b8fc1c47561b73035..ece35c28d6348d977ed721321d08211e76d35e4f 100644 --- a/src/de/deadlocker8/roadgame/logic/CenterType.java +++ b/src/de/deadlocker8/roadgame/logic/CenterType.java @@ -2,5 +2,5 @@ package de.deadlocker8.roadgame.logic; public enum CenterType { - EMPTY, CASTLE, CASTLE_TRIANGLE + EMPTY, CASTLE, CASTLE_TRIANGLE, CHURCH } \ No newline at end of file diff --git a/src/de/deadlocker8/roadgame/logic/Textures.java b/src/de/deadlocker8/roadgame/logic/Textures.java index 9625830f207ae9fbebb811648fce7ccde34bfc4e..79d1cbfbbebf0a2ac317b55ad769a1f116f3e6f2 100644 --- a/src/de/deadlocker8/roadgame/logic/Textures.java +++ b/src/de/deadlocker8/roadgame/logic/Textures.java @@ -11,6 +11,7 @@ public class Textures private Image imageCastle = new Image("de/deadlocker8/roadgame/resources/castle.png"); private Image imageCenterCastle = new Image("de/deadlocker8/roadgame/resources/center_castle.png"); private Image imageCenterCastleTriangle = new Image("de/deadlocker8/roadgame/resources/center_castle_triangle.png"); + private Image imageCenterChurch = new Image("de/deadlocker8/roadgame/resources/center_church.png"); public Textures() { @@ -51,4 +52,9 @@ public class Textures { return imageCenterCastleTriangle; } + + public Image getImageCenterChurch() + { + return imageCenterChurch; + } } \ No newline at end of file diff --git a/src/de/deadlocker8/roadgame/logic/TileTypes.java b/src/de/deadlocker8/roadgame/logic/TileTypes.java index f14b308d98513a26ac802f492847fd8aa9b2f35f..3241774a8d50bcd41f3dd857c4d917bc308703d6 100644 --- a/src/de/deadlocker8/roadgame/logic/TileTypes.java +++ b/src/de/deadlocker8/roadgame/logic/TileTypes.java @@ -2,31 +2,42 @@ package de.deadlocker8.roadgame.logic; public enum TileTypes { + //only roads ROAD_END(EdgeType.ROAD, EdgeType.GRASS, EdgeType.GRASS, EdgeType.GRASS, CenterType.EMPTY), ROAD_STRAIGHT(EdgeType.ROAD, EdgeType.GRASS, EdgeType.ROAD, EdgeType.GRASS, CenterType.EMPTY), ROAD_CURVE(EdgeType.ROAD, EdgeType.ROAD, EdgeType.GRASS, EdgeType.GRASS, CenterType.EMPTY), ROAD_T_JUNCTION(EdgeType.ROAD, EdgeType.ROAD, EdgeType.ROAD, EdgeType.GRASS, CenterType.EMPTY), ROAD_X_JUNCTION(EdgeType.ROAD, EdgeType.ROAD, EdgeType.ROAD, EdgeType.ROAD, CenterType.EMPTY), + //roads with churches + ROAD_END_CHURCH(EdgeType.ROAD, EdgeType.GRASS, EdgeType.GRASS, EdgeType.GRASS, CenterType.CHURCH), + ROAD_STRAIGHT_CHURCH(EdgeType.ROAD, EdgeType.GRASS, EdgeType.ROAD, EdgeType.GRASS, CenterType.CHURCH), + ROAD_CURVE_CHURCH(EdgeType.ROAD, EdgeType.ROAD, EdgeType.GRASS, EdgeType.GRASS, CenterType.CHURCH), + ROAD_T_JUNCTION_CHURCH(EdgeType.ROAD, EdgeType.ROAD, EdgeType.ROAD, EdgeType.GRASS, CenterType.CHURCH), + ROAD_X_JUNCTION_CHURCH(EdgeType.ROAD, EdgeType.ROAD, EdgeType.ROAD, EdgeType.ROAD, CenterType.CHURCH), + + //single castles CASTLE_SINGLE(EdgeType.CASTLE, EdgeType.GRASS, EdgeType.GRASS, EdgeType.GRASS,CenterType.EMPTY), CASTLE_TWO_SINGLE_OPPOSITE(EdgeType.CASTLE, EdgeType.GRASS, EdgeType.CASTLE, EdgeType.GRASS, CenterType.EMPTY), CASTLE_TWO_SINGLE_NEIGHBOR(EdgeType.CASTLE, EdgeType.CASTLE, EdgeType.GRASS, EdgeType.GRASS, CenterType.EMPTY), CASTLE_THREE_SINGLE(EdgeType.CASTLE, EdgeType.CASTLE, EdgeType.CASTLE, EdgeType.GRASS, CenterType.EMPTY), CASTLE_FOUR_SINGLE(EdgeType.CASTLE, EdgeType.CASTLE, EdgeType.CASTLE, EdgeType.CASTLE, CenterType.EMPTY), + //special castles CASTLE_TRIANGLE(EdgeType.CASTLE, EdgeType.CASTLE, EdgeType.GRASS, EdgeType.GRASS, CenterType.CASTLE_TRIANGLE), CASTLE_TUBE(EdgeType.CASTLE, EdgeType.GRASS, EdgeType.CASTLE, EdgeType.GRASS, CenterType.CASTLE), CASTLE_FULL(EdgeType.CASTLE, EdgeType.CASTLE, EdgeType.CASTLE, EdgeType.CASTLE, CenterType.CASTLE), + //single castles with roads CASTLE_SINGLE_ROAD_STRAIGHT(EdgeType.CASTLE, EdgeType.ROAD, EdgeType.GRASS, EdgeType.ROAD,CenterType.EMPTY), CASTLE_SINGLE_ROAD_CURVE_RIGHT(EdgeType.CASTLE, EdgeType.ROAD, EdgeType.ROAD, EdgeType.GRASS,CenterType.EMPTY), CASTLE_SINGLE_ROAD_CURVE_LEFT(EdgeType.CASTLE, EdgeType.GRASS, EdgeType.ROAD, EdgeType.ROAD,CenterType.EMPTY), - CASTLE_SINGLE_ROAD_T_JUNCTION(EdgeType.CASTLE, EdgeType.ROAD, EdgeType.ROAD, EdgeType.ROAD,CenterType.EMPTY), - + CASTLE_SINGLE_ROAD_T_JUNCTION(EdgeType.CASTLE, EdgeType.ROAD, EdgeType.ROAD, EdgeType.ROAD,CenterType.EMPTY), CASTLE_TWO_SINGLE_OPPOSITE_ROAD_STRAIGHT(EdgeType.CASTLE, EdgeType.ROAD, EdgeType.CASTLE, EdgeType.ROAD, CenterType.EMPTY), CASTLE_TWO_SINGLE_NEIGHBOR_ROAD_CURVE(EdgeType.CASTLE, EdgeType.CASTLE, EdgeType.ROAD, EdgeType.ROAD, CenterType.EMPTY), CASTLE_THREE_SINGLE_ROAD_END(EdgeType.CASTLE, EdgeType.CASTLE, EdgeType.CASTLE, EdgeType.ROAD, CenterType.EMPTY), + //special castles with roads CASTLE_TRIANGLE_ROAD_CURVE(EdgeType.CASTLE, EdgeType.CASTLE, EdgeType.ROAD, EdgeType.ROAD, CenterType.CASTLE_TRIANGLE), CASTLE_TRIANGLE_ROAD_RIGHT(EdgeType.CASTLE, EdgeType.CASTLE, EdgeType.ROAD, EdgeType.GRASS, CenterType.CASTLE_TRIANGLE), CASTLE_TRIANGLE_ROAD_LEFT(EdgeType.CASTLE, EdgeType.CASTLE, EdgeType.GRASS, EdgeType.ROAD, CenterType.CASTLE_TRIANGLE), diff --git a/src/de/deadlocker8/roadgame/resources/center_church.png b/src/de/deadlocker8/roadgame/resources/center_church.png new file mode 100644 index 0000000000000000000000000000000000000000..28bd51be4cdf08ed8244163b44108da844f4f9b9 Binary files /dev/null and b/src/de/deadlocker8/roadgame/resources/center_church.png differ diff --git a/src/de/deadlocker8/roadgame/ui/Controller.java b/src/de/deadlocker8/roadgame/ui/Controller.java index 788629997fa7e017cc4d74ec70a3eb7c3419943a..2f9fdeb372add504cb592532dea15510f2079916 100644 --- a/src/de/deadlocker8/roadgame/ui/Controller.java +++ b/src/de/deadlocker8/roadgame/ui/Controller.java @@ -226,6 +226,8 @@ public class Controller } return iv; + case CHURCH: + return new ImageView(textures.getImageCenterChurch()); default: return new ImageView(textures.getImageEmpty()); }