From 95572ac86f2ed6b713cd8b7d5f2b307522d12d16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Schw=C3=B6rer?= Date: Mon, 11 Aug 2014 12:40:19 +0200 Subject: [PATCH] More Map Pieces --- .../{p0_start.tmx => p00_start.tmx} | 0 .../{p0_template.tmx => p00_template.tmx} | 0 android/assets/map_pieces/{p1.tmx => p01.tmx} | 0 android/assets/map_pieces/{p2.tmx => p02.tmx} | 0 android/assets/map_pieces/{p3.tmx => p03.tmx} | 0 android/assets/map_pieces/{p4.tmx => p04.tmx} | 0 android/assets/map_pieces/{p5.tmx => p05.tmx} | 0 android/assets/map_pieces/{p6.tmx => p06.tmx} | 0 android/assets/map_pieces/{p7.tmx => p07.tmx} | 0 android/assets/map_pieces/{p8.tmx => p08.tmx} | 0 android/assets/map_pieces/p09.tmx | 648 ++++++++++ android/assets/map_pieces/p10.tmx | 648 ++++++++++ android/assets/map_pieces/p11.tmx | 1080 +++++++++++++++++ android/assets/map_pieces/p12.tmx | 648 ++++++++++ android/assets/map_pieces/p13.tmx | 648 ++++++++++ android/assets/map_pieces/p9.tmx | 648 ++++++++++ .../game/world/map/CRMapStorage.java | 23 +- 17 files changed, 4334 insertions(+), 9 deletions(-) rename android/assets/map_pieces/{p0_start.tmx => p00_start.tmx} (100%) rename android/assets/map_pieces/{p0_template.tmx => p00_template.tmx} (100%) rename android/assets/map_pieces/{p1.tmx => p01.tmx} (100%) rename android/assets/map_pieces/{p2.tmx => p02.tmx} (100%) rename android/assets/map_pieces/{p3.tmx => p03.tmx} (100%) rename android/assets/map_pieces/{p4.tmx => p04.tmx} (100%) rename android/assets/map_pieces/{p5.tmx => p05.tmx} (100%) rename android/assets/map_pieces/{p6.tmx => p06.tmx} (100%) rename android/assets/map_pieces/{p7.tmx => p07.tmx} (100%) rename android/assets/map_pieces/{p8.tmx => p08.tmx} (100%) create mode 100644 android/assets/map_pieces/p09.tmx create mode 100644 android/assets/map_pieces/p10.tmx create mode 100644 android/assets/map_pieces/p11.tmx create mode 100644 android/assets/map_pieces/p12.tmx create mode 100644 android/assets/map_pieces/p13.tmx create mode 100644 android/assets/map_pieces/p9.tmx diff --git a/android/assets/map_pieces/p0_start.tmx b/android/assets/map_pieces/p00_start.tmx similarity index 100% rename from android/assets/map_pieces/p0_start.tmx rename to android/assets/map_pieces/p00_start.tmx diff --git a/android/assets/map_pieces/p0_template.tmx b/android/assets/map_pieces/p00_template.tmx similarity index 100% rename from android/assets/map_pieces/p0_template.tmx rename to android/assets/map_pieces/p00_template.tmx diff --git a/android/assets/map_pieces/p1.tmx b/android/assets/map_pieces/p01.tmx similarity index 100% rename from android/assets/map_pieces/p1.tmx rename to android/assets/map_pieces/p01.tmx diff --git a/android/assets/map_pieces/p2.tmx b/android/assets/map_pieces/p02.tmx similarity index 100% rename from android/assets/map_pieces/p2.tmx rename to android/assets/map_pieces/p02.tmx diff --git a/android/assets/map_pieces/p3.tmx b/android/assets/map_pieces/p03.tmx similarity index 100% rename from android/assets/map_pieces/p3.tmx rename to android/assets/map_pieces/p03.tmx diff --git a/android/assets/map_pieces/p4.tmx b/android/assets/map_pieces/p04.tmx similarity index 100% rename from android/assets/map_pieces/p4.tmx rename to android/assets/map_pieces/p04.tmx diff --git a/android/assets/map_pieces/p5.tmx b/android/assets/map_pieces/p05.tmx similarity index 100% rename from android/assets/map_pieces/p5.tmx rename to android/assets/map_pieces/p05.tmx diff --git a/android/assets/map_pieces/p6.tmx b/android/assets/map_pieces/p06.tmx similarity index 100% rename from android/assets/map_pieces/p6.tmx rename to android/assets/map_pieces/p06.tmx diff --git a/android/assets/map_pieces/p7.tmx b/android/assets/map_pieces/p07.tmx similarity index 100% rename from android/assets/map_pieces/p7.tmx rename to android/assets/map_pieces/p07.tmx diff --git a/android/assets/map_pieces/p8.tmx b/android/assets/map_pieces/p08.tmx similarity index 100% rename from android/assets/map_pieces/p8.tmx rename to android/assets/map_pieces/p08.tmx diff --git a/android/assets/map_pieces/p09.tmx b/android/assets/map_pieces/p09.tmx new file mode 100644 index 0000000..7b2598c --- /dev/null +++ b/android/assets/map_pieces/p09.tmx @@ -0,0 +1,648 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/assets/map_pieces/p10.tmx b/android/assets/map_pieces/p10.tmx new file mode 100644 index 0000000..baace01 --- /dev/null +++ b/android/assets/map_pieces/p10.tmx @@ -0,0 +1,648 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/assets/map_pieces/p11.tmx b/android/assets/map_pieces/p11.tmx new file mode 100644 index 0000000..822fa2f --- /dev/null +++ b/android/assets/map_pieces/p11.tmx @@ -0,0 +1,1080 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/assets/map_pieces/p12.tmx b/android/assets/map_pieces/p12.tmx new file mode 100644 index 0000000..9b9278b --- /dev/null +++ b/android/assets/map_pieces/p12.tmx @@ -0,0 +1,648 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/assets/map_pieces/p13.tmx b/android/assets/map_pieces/p13.tmx new file mode 100644 index 0000000..f5ee65f --- /dev/null +++ b/android/assets/map_pieces/p13.tmx @@ -0,0 +1,648 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/assets/map_pieces/p9.tmx b/android/assets/map_pieces/p9.tmx new file mode 100644 index 0000000..1593f44 --- /dev/null +++ b/android/assets/map_pieces/p9.tmx @@ -0,0 +1,648 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/src/de/samdev/colorrunner/game/world/map/CRMapStorage.java b/core/src/de/samdev/colorrunner/game/world/map/CRMapStorage.java index 7322cbd..b519a14 100644 --- a/core/src/de/samdev/colorrunner/game/world/map/CRMapStorage.java +++ b/core/src/de/samdev/colorrunner/game/world/map/CRMapStorage.java @@ -10,16 +10,21 @@ public class CRMapStorage { public static final Random random = new Random(); public static final List maps = new ArrayList(); - public static final CRTiledMap map_start = register("p0_start.tmx", false); + public static final CRTiledMap map_start = register("p00_start.tmx", false); - public static final CRTiledMap map_01 = register("p1.tmx"); - public static final CRTiledMap map_02 = register("p2.tmx"); - public static final CRTiledMap map_03 = register("p3.tmx"); - public static final CRTiledMap map_04 = register("p4.tmx"); - public static final CRTiledMap map_05 = register("p5.tmx"); - public static final CRTiledMap map_06 = register("p6.tmx"); - public static final CRTiledMap map_07 = register("p7.tmx"); - public static final CRTiledMap map_08 = register("p8.tmx"); + public static final CRTiledMap map_01 = register("p01.tmx"); + public static final CRTiledMap map_02 = register("p02.tmx"); + public static final CRTiledMap map_03 = register("p03.tmx"); + public static final CRTiledMap map_04 = register("p04.tmx"); + public static final CRTiledMap map_05 = register("p05.tmx"); + public static final CRTiledMap map_06 = register("p06.tmx"); + public static final CRTiledMap map_07 = register("p07.tmx"); + public static final CRTiledMap map_08 = register("p08.tmx"); + public static final CRTiledMap map_09 = register("p09.tmx"); + public static final CRTiledMap map_10 = register("p10.tmx"); + public static final CRTiledMap map_11 = register("p11.tmx"); + public static final CRTiledMap map_12 = register("p12.tmx"); + public static final CRTiledMap map_13 = register("p13.tmx"); public static CRTiledMap register(String path) { return register(path, true);