diff --git a/bin/de/deadlocker8/roadgame/logic/TileType.class b/bin/de/deadlocker8/roadgame/logic/TileType.class index c9c42623bd24163eabfccda50dda80cb5ac6370f..7c39c14ec9f44df69a4dffa6ebc4cfbda6edc71f 100644 Binary files a/bin/de/deadlocker8/roadgame/logic/TileType.class and b/bin/de/deadlocker8/roadgame/logic/TileType.class differ diff --git a/bin/de/deadlocker8/roadgame/tilepacks/TilePackAllPossibleTiles.class b/bin/de/deadlocker8/roadgame/tilepacks/TilePackAllPossibleTiles.class new file mode 100644 index 0000000000000000000000000000000000000000..d4fb3dd35a9351ad42448a1a1375848d5ecb4cd0 Binary files /dev/null and b/bin/de/deadlocker8/roadgame/tilepacks/TilePackAllPossibleTiles.class differ diff --git a/bin/de/deadlocker8/roadgame/tilepacks/TilePackDefault.class b/bin/de/deadlocker8/roadgame/tilepacks/TilePackDefault.class index 7c1427b4892c3b626dcc421e0966f879a5d01d83..e787b8f3dbae626a8a386df9c4f41c2dcda5eb43 100644 Binary files a/bin/de/deadlocker8/roadgame/tilepacks/TilePackDefault.class and b/bin/de/deadlocker8/roadgame/tilepacks/TilePackDefault.class differ diff --git a/src/de/deadlocker8/roadgame/logic/TileType.java b/src/de/deadlocker8/roadgame/logic/TileType.java index 296abc62d8856c49dddeb7d19532ffc80eed03cc..3ce5f9951fbf03d627d05293167a81e2580e7909 100644 --- a/src/de/deadlocker8/roadgame/logic/TileType.java +++ b/src/de/deadlocker8/roadgame/logic/TileType.java @@ -43,11 +43,14 @@ public enum TileType //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), + CASTLE_TRIANGLE_ROAD_RIGHT_END_IN_CASTLE(EdgeType.CASTLE, EdgeType.CASTLE, EdgeType.ROAD, EdgeType.GRASS, CenterType.CASTLE_TRIANGLE), + CASTLE_TRIANGLE_ROAD_LEFT_END_IN_CASTLE(EdgeType.CASTLE, EdgeType.CASTLE, EdgeType.GRASS, EdgeType.ROAD, CenterType.CASTLE_TRIANGLE), CASTLE_TUBE_ROAD_ONE_SIDE(EdgeType.CASTLE, EdgeType.ROAD, EdgeType.CASTLE, EdgeType.GRASS, CenterType.CASTLE), CASTLE_TUBE_ROAD_TWO_SIDE(EdgeType.CASTLE, EdgeType.ROAD, EdgeType.CASTLE, EdgeType.ROAD, CenterType.CASTLE), - CASTLE_U_ROAD_END(EdgeType.CASTLE, EdgeType.CASTLE, EdgeType.CASTLE, EdgeType.ROAD, CenterType.CASTLE); + CASTLE_U_ROAD_END(EdgeType.CASTLE, EdgeType.CASTLE, EdgeType.CASTLE, EdgeType.ROAD, CenterType.CASTLE), + + //special tiles + CHURCH(EdgeType.GRASS, EdgeType.GRASS,EdgeType.GRASS ,EdgeType.GRASS, CenterType.CHURCH); private EdgeType N; diff --git a/src/de/deadlocker8/roadgame/tilepacks/TilePackAllPossibleTiles.java b/src/de/deadlocker8/roadgame/tilepacks/TilePackAllPossibleTiles.java new file mode 100644 index 0000000000000000000000000000000000000000..e4045cb3ceaf893a669065dd90b1069487610b06 --- /dev/null +++ b/src/de/deadlocker8/roadgame/tilepacks/TilePackAllPossibleTiles.java @@ -0,0 +1,51 @@ +package de.deadlocker8.roadgame.tilepacks; + +import java.util.HashMap; + +import de.deadlocker8.roadgame.logic.TileType; + +public class TilePackAllPossibleTiles extends TilePack +{ + public TilePackAllPossibleTiles() + { + super("All Possible Tiles"); + + tiles = new HashMap<>(); + tiles.put(TileType.ROAD_END, 1); + tiles.put(TileType.ROAD_STRAIGHT, 1); + tiles.put(TileType.ROAD_CURVE, 1); + tiles.put(TileType.ROAD_T_JUNCTION, 1); + tiles.put(TileType.ROAD_X_JUNCTION, 1); + tiles.put(TileType.ROAD_END_CHURCH, 1); + tiles.put(TileType.ROAD_STRAIGHT_CHURCH, 1); + tiles.put(TileType.ROAD_CURVE_CHURCH, 1); + tiles.put(TileType.ROAD_T_JUNCTION_CHURCH, 1); + tiles.put(TileType.ROAD_X_JUNCTION_CHURCH, 1); + tiles.put(TileType.CASTLE_SINGLE, 1); + tiles.put(TileType.CASTLE_TWO_SINGLE_OPPOSITE, 1); + tiles.put(TileType.CASTLE_TWO_SINGLE_NEIGHBOR, 1); + tiles.put(TileType.CASTLE_THREE_SINGLE, 1); + tiles.put(TileType.CASTLE_FOUR_SINGLE, 1); + tiles.put(TileType.CASTLE_TRIANGLE, 1); + tiles.put(TileType.CASTLE_TUBE, 1); + tiles.put(TileType.CASTLE_FULL, 1); + tiles.put(TileType.CASTLE_U, 1); + tiles.put(TileType.CASTLE_SINGLE_ROAD_STRAIGHT, 1); + tiles.put(TileType.CASTLE_SINGLE_ROAD_CURVE_RIGHT, 1); + tiles.put(TileType.CASTLE_SINGLE_ROAD_CURVE_LEFT, 1); + tiles.put(TileType.CASTLE_SINGLE_ROAD_T_JUNCTION, 1); + tiles.put(TileType.CASTLE_SINGLE_ROAD_END_IN_CASTLE, 1); + tiles.put(TileType.CASTLE_SINGLE_ROAD_CURVE_RIGHT_END_IN_CASTLE, 1); + tiles.put(TileType.CASTLE_SINGLE_ROAD_CURVE_LEFT_END_IN_CASTLE, 1); + tiles.put(TileType.CASTLE_TWO_SINGLE_OPPOSITE_ROAD_STRAIGHT, 1); + tiles.put(TileType.CASTLE_TWO_SINGLE_NEIGHBOR_ROAD_CURVE, 1); + tiles.put(TileType.CASTLE_THREE_SINGLE_ROAD_END, 1); + tiles.put(TileType.CASTLE_TRIANGLE_ROAD_CURVE, 1); + tiles.put(TileType.CASTLE_TRIANGLE_ROAD_RIGHT_END_IN_CASTLE, 1); + tiles.put(TileType.CASTLE_TRIANGLE_ROAD_LEFT_END_IN_CASTLE, 1); + tiles.put(TileType.CASTLE_TUBE_ROAD_ONE_SIDE, 1); + tiles.put(TileType.CASTLE_TUBE_ROAD_TWO_SIDE, 1); + tiles.put(TileType.CASTLE_U_ROAD_END, 1); + tiles.put(TileType.CHURCH, 1); + } +} \ No newline at end of file diff --git a/src/de/deadlocker8/roadgame/tilepacks/TilePackDefault.java b/src/de/deadlocker8/roadgame/tilepacks/TilePackDefault.java index 66399cb357b9a58b6e99772a70652666d135657d..a2786b9cfc1a510291153c6c8b3c8b59ac134463 100644 --- a/src/de/deadlocker8/roadgame/tilepacks/TilePackDefault.java +++ b/src/de/deadlocker8/roadgame/tilepacks/TilePackDefault.java @@ -10,41 +10,26 @@ public class TilePackDefault extends TilePack { super("Default"); - tiles = new HashMap<>(); - tiles.put(TileType.ROAD_END, 1); - tiles.put(TileType.ROAD_STRAIGHT, 1); - tiles.put(TileType.ROAD_CURVE, 1); - tiles.put(TileType.ROAD_T_JUNCTION, 1); + tiles = new HashMap<>(); + + tiles.put(TileType.ROAD_STRAIGHT, 8); + tiles.put(TileType.ROAD_CURVE, 9); + tiles.put(TileType.ROAD_T_JUNCTION, 4); tiles.put(TileType.ROAD_X_JUNCTION, 1); - tiles.put(TileType.ROAD_END_CHURCH, 1); - tiles.put(TileType.ROAD_STRAIGHT_CHURCH, 1); - tiles.put(TileType.ROAD_CURVE_CHURCH, 1); - tiles.put(TileType.ROAD_T_JUNCTION_CHURCH, 1); - tiles.put(TileType.ROAD_X_JUNCTION_CHURCH, 1); - tiles.put(TileType.CASTLE_SINGLE, 1); - tiles.put(TileType.CASTLE_TWO_SINGLE_OPPOSITE, 1); - tiles.put(TileType.CASTLE_TWO_SINGLE_NEIGHBOR, 1); - tiles.put(TileType.CASTLE_THREE_SINGLE, 1); - tiles.put(TileType.CASTLE_FOUR_SINGLE, 1); - tiles.put(TileType.CASTLE_TRIANGLE, 1); - tiles.put(TileType.CASTLE_TUBE, 1); + tiles.put(TileType.ROAD_END_CHURCH, 2); + tiles.put(TileType.CASTLE_SINGLE, 5); + tiles.put(TileType.CASTLE_TWO_SINGLE_OPPOSITE, 3); + tiles.put(TileType.CASTLE_TWO_SINGLE_NEIGHBOR, 2); + tiles.put(TileType.CASTLE_TRIANGLE, 5); + tiles.put(TileType.CASTLE_TUBE, 3); tiles.put(TileType.CASTLE_FULL, 1); - tiles.put(TileType.CASTLE_U, 1); - tiles.put(TileType.CASTLE_SINGLE_ROAD_STRAIGHT, 1); - tiles.put(TileType.CASTLE_SINGLE_ROAD_CURVE_RIGHT, 1); - tiles.put(TileType.CASTLE_SINGLE_ROAD_CURVE_LEFT, 1); - tiles.put(TileType.CASTLE_SINGLE_ROAD_T_JUNCTION, 1); - tiles.put(TileType.CASTLE_SINGLE_ROAD_END_IN_CASTLE, 1); - tiles.put(TileType.CASTLE_SINGLE_ROAD_CURVE_RIGHT_END_IN_CASTLE, 1); - tiles.put(TileType.CASTLE_SINGLE_ROAD_CURVE_LEFT_END_IN_CASTLE, 1); - tiles.put(TileType.CASTLE_TWO_SINGLE_OPPOSITE_ROAD_STRAIGHT, 1); - tiles.put(TileType.CASTLE_TWO_SINGLE_NEIGHBOR_ROAD_CURVE, 1); - tiles.put(TileType.CASTLE_THREE_SINGLE_ROAD_END, 1); - tiles.put(TileType.CASTLE_TRIANGLE_ROAD_CURVE, 1); - tiles.put(TileType.CASTLE_TRIANGLE_ROAD_RIGHT, 1); - tiles.put(TileType.CASTLE_TRIANGLE_ROAD_LEFT, 1); - tiles.put(TileType.CASTLE_TUBE_ROAD_ONE_SIDE, 1); - tiles.put(TileType.CASTLE_TUBE_ROAD_TWO_SIDE, 1); - tiles.put(TileType.CASTLE_U_ROAD_END, 1); + tiles.put(TileType.CASTLE_U, 4); + tiles.put(TileType.CASTLE_SINGLE_ROAD_STRAIGHT, 4); + tiles.put(TileType.CASTLE_SINGLE_ROAD_CURVE_RIGHT, 3); + tiles.put(TileType.CASTLE_SINGLE_ROAD_CURVE_LEFT, 3); + tiles.put(TileType.CASTLE_SINGLE_ROAD_T_JUNCTION, 3); + tiles.put(TileType.CASTLE_TRIANGLE_ROAD_CURVE, 5); + tiles.put(TileType.CASTLE_U_ROAD_END, 3); + tiles.put(TileType.CHURCH, 4); } } \ No newline at end of file