diff --git a/core/assets/common/game/kidnapping/common/gfx/dobre.png b/core/assets/common/game/kidnapping/common/gfx/correct.png similarity index 100% rename from core/assets/common/game/kidnapping/common/gfx/dobre.png rename to core/assets/common/game/kidnapping/common/gfx/correct.png diff --git a/core/assets/common/game/kidnapping/common/gfx/lineNESW-2.png b/core/assets/common/game/kidnapping/common/gfx/lineNESW.png similarity index 100% rename from core/assets/common/game/kidnapping/common/gfx/lineNESW-2.png rename to core/assets/common/game/kidnapping/common/gfx/lineNESW.png diff --git a/core/assets/common/game/kidnapping/common/gfx/lineNWSE-2.png b/core/assets/common/game/kidnapping/common/gfx/lineNWSE.png similarity index 100% rename from core/assets/common/game/kidnapping/common/gfx/lineNWSE-2.png rename to core/assets/common/game/kidnapping/common/gfx/lineNWSE.png diff --git a/core/assets/common/game/kidnapping/common/gfx/zde-jsi.png b/core/assets/common/game/kidnapping/common/gfx/position-current.png similarity index 100% rename from core/assets/common/game/kidnapping/common/gfx/zde-jsi.png rename to core/assets/common/game/kidnapping/common/gfx/position-current.png diff --git a/core/assets/common/game/kidnapping/common/gfx/papir-pravidla.png b/core/assets/common/game/kidnapping/common/gfx/rules-background.png similarity index 100% rename from core/assets/common/game/kidnapping/common/gfx/papir-pravidla.png rename to core/assets/common/game/kidnapping/common/gfx/rules-background.png diff --git a/core/assets/common/game/kidnapping/common/gfx/tiles/domek1.png b/core/assets/common/game/kidnapping/common/gfx/tiles/house1.png similarity index 100% rename from core/assets/common/game/kidnapping/common/gfx/tiles/domek1.png rename to core/assets/common/game/kidnapping/common/gfx/tiles/house1.png diff --git a/core/assets/common/game/kidnapping/common/gfx/tiles/domek2.png b/core/assets/common/game/kidnapping/common/gfx/tiles/house2.png similarity index 100% rename from core/assets/common/game/kidnapping/common/gfx/tiles/domek2.png rename to core/assets/common/game/kidnapping/common/gfx/tiles/house2.png diff --git a/core/assets/common/game/kidnapping/common/gfx/tiles/domek3.png b/core/assets/common/game/kidnapping/common/gfx/tiles/house3.png similarity index 100% rename from core/assets/common/game/kidnapping/common/gfx/tiles/domek3.png rename to core/assets/common/game/kidnapping/common/gfx/tiles/house3.png diff --git a/core/assets/common/game/kidnapping/common/gfx/tiles/domek4.png b/core/assets/common/game/kidnapping/common/gfx/tiles/house4.png similarity index 100% rename from core/assets/common/game/kidnapping/common/gfx/tiles/domek4.png rename to core/assets/common/game/kidnapping/common/gfx/tiles/house4.png diff --git a/core/assets/common/game/kidnapping/common/gfx/tiles/domek5.png b/core/assets/common/game/kidnapping/common/gfx/tiles/house5.png similarity index 100% rename from core/assets/common/game/kidnapping/common/gfx/tiles/domek5.png rename to core/assets/common/game/kidnapping/common/gfx/tiles/house5.png diff --git a/core/assets/common/game/kidnapping/common/gfx/tiles/domek6.png b/core/assets/common/game/kidnapping/common/gfx/tiles/house6.png similarity index 100% rename from core/assets/common/game/kidnapping/common/gfx/tiles/domek6.png rename to core/assets/common/game/kidnapping/common/gfx/tiles/house6.png diff --git a/core/assets/common/game/kidnapping/common/gfx/tiles/domek7.png b/core/assets/common/game/kidnapping/common/gfx/tiles/house7.png similarity index 100% rename from core/assets/common/game/kidnapping/common/gfx/tiles/domek7.png rename to core/assets/common/game/kidnapping/common/gfx/tiles/house7.png diff --git a/core/assets/common/game/kidnapping/common/gfx/tiles/domek8.png b/core/assets/common/game/kidnapping/common/gfx/tiles/house8.png similarity index 100% rename from core/assets/common/game/kidnapping/common/gfx/tiles/domek8.png rename to core/assets/common/game/kidnapping/common/gfx/tiles/house8.png diff --git a/core/assets/common/game/kidnapping/common/gfx/tiles/hriste.png b/core/assets/common/game/kidnapping/common/gfx/tiles/playground.png similarity index 100% rename from core/assets/common/game/kidnapping/common/gfx/tiles/hriste.png rename to core/assets/common/game/kidnapping/common/gfx/tiles/playground.png diff --git a/core/assets/common/game/kidnapping/common/gfx/tiles/posta.png b/core/assets/common/game/kidnapping/common/gfx/tiles/post.png similarity index 100% rename from core/assets/common/game/kidnapping/common/gfx/tiles/posta.png rename to core/assets/common/game/kidnapping/common/gfx/tiles/post.png diff --git a/core/assets/common/game/kidnapping/common/gfx/tiles/skola.png b/core/assets/common/game/kidnapping/common/gfx/tiles/school.png similarity index 100% rename from core/assets/common/game/kidnapping/common/gfx/tiles/skola.png rename to core/assets/common/game/kidnapping/common/gfx/tiles/school.png diff --git a/core/assets/common/game/kidnapping/common/gfx/tiles/vila1.png b/core/assets/common/game/kidnapping/common/gfx/tiles/villa1.png similarity index 100% rename from core/assets/common/game/kidnapping/common/gfx/tiles/vila1.png rename to core/assets/common/game/kidnapping/common/gfx/tiles/villa1.png diff --git a/core/assets/common/game/kidnapping/common/gfx/tiles/vila2.png b/core/assets/common/game/kidnapping/common/gfx/tiles/villa2.png similarity index 100% rename from core/assets/common/game/kidnapping/common/gfx/tiles/vila2.png rename to core/assets/common/game/kidnapping/common/gfx/tiles/villa2.png diff --git a/core/assets/common/game/kidnapping/common/gfx/tiles/vila3.png b/core/assets/common/game/kidnapping/common/gfx/tiles/villa3.png similarity index 100% rename from core/assets/common/game/kidnapping/common/gfx/tiles/vila3.png rename to core/assets/common/game/kidnapping/common/gfx/tiles/villa3.png diff --git a/core/assets/common/game/kidnapping/common/gfx/tiles/vila4.png b/core/assets/common/game/kidnapping/common/gfx/tiles/villa4.png similarity index 100% rename from core/assets/common/game/kidnapping/common/gfx/tiles/vila4.png rename to core/assets/common/game/kidnapping/common/gfx/tiles/villa4.png diff --git a/core/assets/common/game/kidnapping/common/gfx/spatne.png b/core/assets/common/game/kidnapping/common/gfx/wrong.png similarity index 100% rename from core/assets/common/game/kidnapping/common/gfx/spatne.png rename to core/assets/common/game/kidnapping/common/gfx/wrong.png diff --git a/core/assets/common/game/kidnapping/common/gfx/znovu-pressed.png b/core/assets/common/game/kidnapping/common/gfx/znovu-pressed.png deleted file mode 100644 index 7be563dd996efb3da6e368c983d7ab8413075eb3..0000000000000000000000000000000000000000 Binary files a/core/assets/common/game/kidnapping/common/gfx/znovu-pressed.png and /dev/null differ diff --git a/core/assets/common/game/kidnapping/common/gfx/znovu.png b/core/assets/common/game/kidnapping/common/gfx/znovu.png deleted file mode 100644 index 7f95a7d5016f10996099306b0c3bb9dd0cbb9d39..0000000000000000000000000000000000000000 Binary files a/core/assets/common/game/kidnapping/common/gfx/znovu.png and /dev/null differ diff --git a/core/src/cz/nic/tablexia/game/games/kidnapping/actors/Map.java b/core/src/cz/nic/tablexia/game/games/kidnapping/actors/Map.java index d244a943842b71f7375e629e2cd545d4a17af905..acaefb195da2a5a1a6c70d8ffd51f5cf9139d3e9 100644 --- a/core/src/cz/nic/tablexia/game/games/kidnapping/actors/Map.java +++ b/core/src/cz/nic/tablexia/game/games/kidnapping/actors/Map.java @@ -64,7 +64,7 @@ public class Map extends Group { public void addTile(Position position, Tile tile) { int baseX = getBaseX(position); - int baseY = getBaseY(position) + (tile.getTileType().getyOffset() / 2); + int baseY = getBaseY(position) + (tile.getTileType().getYOffset() / 2); tile.setPosition(baseX, baseY); tile.setPosition(position); tileMap.put(position, tile); diff --git a/core/src/cz/nic/tablexia/game/games/kidnapping/media/assets/TextureTypes.java b/core/src/cz/nic/tablexia/game/games/kidnapping/media/assets/TextureTypes.java index d4ee30225f2de6e68e8289c5928f95476f9325a3..101a0c6872a7da0e2aacbe67e1aec7fd746ef7f9 100644 --- a/core/src/cz/nic/tablexia/game/games/kidnapping/media/assets/TextureTypes.java +++ b/core/src/cz/nic/tablexia/game/games/kidnapping/media/assets/TextureTypes.java @@ -28,15 +28,15 @@ import cz.nic.tablexia.game.common.media.AssetDescription; */ public enum TextureTypes implements AssetDescription { - POSITION_CURRENT("zde-jsi"), // + POSITION_CURRENT("position-current"), // OVERLAY("overlay"), // EAR("ear"), // - PAPER("papir-pravidla"), - POSITION_LINE_NWSE("lineNWSE-2"), // - POSITION_LINE_NESW("lineNESW-2"), // + PAPER("rules-background"), + POSITION_LINE_NWSE("lineNWSE"), // + POSITION_LINE_NESW("lineNESW"), // - WRONG("spatne"), // - CORRECT("dobre"), // + WRONG("wrong"), // + CORRECT("correct"), // POSITION_NEXT_NW("arrow-left-top-unpressed"), // POSITION_NEXT_NE("arrow-right-top-unpressed"), // diff --git a/core/src/cz/nic/tablexia/game/games/kidnapping/media/assets/TileType.java b/core/src/cz/nic/tablexia/game/games/kidnapping/media/assets/TileType.java index 5cdda73521032bd2f400edf8a7504ace3fe552ff..e544691e79c10771429fdf2eb6c08d4d351c2533 100644 --- a/core/src/cz/nic/tablexia/game/games/kidnapping/media/assets/TileType.java +++ b/core/src/cz/nic/tablexia/game/games/kidnapping/media/assets/TileType.java @@ -10,29 +10,29 @@ import cz.nic.tablexia.game.common.media.AssetDescription; public enum TileType implements AssetDescription { - DOME1(1, 1, "domek1", 78), // - DOME2(1, 1, "domek2", 78), // - DOME3(1, 1, "domek3", 78), // - DOME4(1, 1, "domek4", 78), // - DOME5(1, 1, "domek5", 78), // - DOME6(1, 1, "domek6", 78), // - DOME7(1, 1, "domek7", 78), // - DOME8(1, 1, "domek8", 78), // - HRISTE(1, 1, "hriste", 78), // + HOUSE1(1, 1, "house1", 78), // + HOUSE2(1, 1, "house2", 78), // + HOUSE3(1, 1, "house3", 78), // + HOUSE4(1, 1, "house4", 78), // + HOUSE5(1, 1, "house5", 78), // + HOUSE6(1, 1, "house6", 78), // + HOUSE7(1, 1, "house7", 78), // + HOUSE8(1, 1, "house8", 78), // + PLAYGOUND(1, 1, "playground", 78), // PARK(1, 1, "park", 78), // - POSTA(1, 1, "posta", 78), // - SKOLA(1, 1, "skola", 78), // - VILA1(1, 1, "vila1", 78), // - VILA2(1, 1, "vila2", 78), // - VILA3(1, 1, "vila3", 78), // - VILA4(1, 1, "vila4", 78); // + POST(1, 1, "post", 78), // + SCHOOL(1, 1, "school", 78), // + VILLA1(1, 1, "villa1", 78), // + VILLA2(1, 1, "villa2", 78), // + VILLA3(1, 1, "villa3", 78), // + VILLA4(1, 1, "villa4", 78); // public static final String BASE_DIR = "tiles/"; private final int swSize, seSize; private final String name; private final int yOffset; - private TileType(int sw, int se, String name, int yOffset) { + TileType(int sw, int se, String name, int yOffset) { this.swSize = sw; this.seSize = se; this.name = name; @@ -51,7 +51,7 @@ public enum TileType implements AssetDescription { return BASE_DIR + name; } - public int getyOffset() { + public int getYOffset() { return yOffset; }