diff --git a/game/assets/levels/level_2/Glitch Platform 1.tsx b/game/assets/levels/level_0/Glitch Platform 1.tsx similarity index 100% rename from game/assets/levels/level_2/Glitch Platform 1.tsx rename to game/assets/levels/level_0/Glitch Platform 1.tsx diff --git a/game/assets/levels/level_1/Level_2.psd b/game/assets/levels/level_0/Level_2.psd similarity index 100% rename from game/assets/levels/level_1/Level_2.psd rename to game/assets/levels/level_0/Level_2.psd diff --git a/game/assets/levels/level_0/appearing_platforms.png b/game/assets/levels/level_0/appearing_platforms.png index 53b660a..81db560 100644 Binary files a/game/assets/levels/level_0/appearing_platforms.png and b/game/assets/levels/level_0/appearing_platforms.png differ diff --git a/game/assets/levels/level_0/colliders.json b/game/assets/levels/level_0/colliders.json index e6a0a49..6011650 100644 --- a/game/assets/levels/level_0/colliders.json +++ b/game/assets/levels/level_0/colliders.json @@ -1,63 +1,86 @@ [ { "x": -500, - "y": 760, + "y": 800, "width": 16000, "height": 10 }, { - "x": 834, - "y": 592 - , - "width": 415, - "height": 54 + "x": 576, + "y": 512, + "width": 352, + "height": 32 }, { - "x": 1385, - "y": 374, - "width": 415, - "height": 54 + "x": 960, + "y": 352, + "width": 352, + "height": 32 }, { - "x": 1808, - "y": 376, - "width": 59, - "height": 379 + "x": 1728, + "y": 352, + "width": 352, + "height": 32 }, { - "x": 2352, - "y": 376, - "width": 59, - "height": 379 + "x": 2112, + "y": 512, + "width": 352, + "height": 32 }, { - "x": 3534, - "y": 590, - "width": 381, - "height": 57 + "x": 4256, + "y": 544, + "width": 352, + "height": 32 }, { - "x": 4299, - "y": 425, - "width": 197, - "height": 330 + "x": 4608, + "y": 480, + "width": 352, + "height": 96 }, { - "x": 4885, - "y": 584, - "width": 380, + "x": 5632, + "y": 288, + "width": 608, "height": 64 }, { - "x": 6333, - "y": 530, - "width": 415, - "height": 58 + "x": 6976, + "y": 480, + "width": 608, + "height": 64 }, { - "x": 7007, - "y": 393, - "width": 1124, - "height": 52 + "x": 7968, + "y": 480, + "width": 608, + "height": 64 + }, + { + "x": 1344, + "y": 512, + "width": 352, + "height": 32 + }, + { + "x": 4928, + "y": 544, + "width": 5280, + "height": 32 + }, + { + "x": 2496, + "y": 736, + "width": 640, + "height": 64 + }, + { + "x": 4608, + "y": 768, + "width": 5376, + "height": 32 } ] diff --git a/game/assets/levels/level_0/disappearing_platforms.png b/game/assets/levels/level_0/disappearing_platforms.png index 06f75ca..b334a76 100644 Binary files a/game/assets/levels/level_0/disappearing_platforms.png and b/game/assets/levels/level_0/disappearing_platforms.png differ diff --git a/game/assets/levels/level_2/level_0.tmx b/game/assets/levels/level_0/level_0.tmx similarity index 100% rename from game/assets/levels/level_2/level_0.tmx rename to game/assets/levels/level_0/level_0.tmx diff --git a/game/assets/levels/level_0/platforms.png b/game/assets/levels/level_0/platforms.png index 1cc7ca8..6ecb3ce 100644 Binary files a/game/assets/levels/level_0/platforms.png and b/game/assets/levels/level_0/platforms.png differ diff --git a/game/assets/levels/level_2/tiles.tsx b/game/assets/levels/level_0/tiles.tsx similarity index 100% rename from game/assets/levels/level_2/tiles.tsx rename to game/assets/levels/level_0/tiles.tsx diff --git a/game/assets/levels/level_2/untitled.tmx b/game/assets/levels/level_0/untitled.tmx similarity index 100% rename from game/assets/levels/level_2/untitled.tmx rename to game/assets/levels/level_0/untitled.tmx diff --git a/game/assets/levels/level_0/zones.json b/game/assets/levels/level_0/zones.json index 88d0901..15e2e30 100644 --- a/game/assets/levels/level_0/zones.json +++ b/game/assets/levels/level_0/zones.json @@ -1,30 +1,48 @@ { "appear": [ { - "x": 8130, - "y": 0, - "width": 56, - "height": 442 + "x": 2496, + "y": 736, + "width": 640, + "height": 64 }, { - "x": 9867, - "y": 698, - "width": 447, - "height": 58 + "x": 4608, + "y": 768, + "width": 5376, + "height": 32 + }, + { + "x": 10176, + "y": 0, + "width": 64, + "height": 576 } ], "disappear": [ { - "x": 2079, - "y": 0, - "width": 61, - "height": 378 + "x": 2880, + "y": 352, + "width": 352, + "height": 32 }, { - "x": 8131, - "y": 440, - "width": 56, - "height": 313 + "x": 4256, + "y": 576, + "width": 352, + "height": 224 + }, + { + "x": 7520, + "y": 0, + "width": 64, + "height": 480 + }, + { + "x": 9216, + "y": 480, + "width": 704, + "height": 64 } ], "kill":[ diff --git a/game/assets/levels/level_2/Level_3.psd b/game/assets/levels/level_1/Level_3.psd similarity index 100% rename from game/assets/levels/level_2/Level_3.psd rename to game/assets/levels/level_1/Level_3.psd diff --git a/game/assets/levels/level_1/appearing_platforms.png b/game/assets/levels/level_1/appearing_platforms.png index 81db560..452cc69 100644 Binary files a/game/assets/levels/level_1/appearing_platforms.png and b/game/assets/levels/level_1/appearing_platforms.png differ diff --git a/game/assets/levels/level_1/colliders.json b/game/assets/levels/level_1/colliders.json index 6011650..f8db77f 100644 --- a/game/assets/levels/level_1/colliders.json +++ b/game/assets/levels/level_1/colliders.json @@ -1,86 +1,117 @@ [ { - "x": -500, + "x": -5001, "y": 800, "width": 16000, "height": 10 }, { - "x": 576, + "x": 1280, "y": 512, - "width": 352, - "height": 32 - }, - { - "x": 960, - "y": 352, - "width": 352, - "height": 32 - }, - { - "x": 1728, - "y": 352, - "width": 352, - "height": 32 + "width": 544, + "height": 64 }, { "x": 2112, - "y": 512, - "width": 352, - "height": 32 + "y": 352, + "width": 480, + "height": 64 }, { - "x": 4256, - "y": 544, - "width": 352, - "height": 32 + "x": 3072, + "y": 608, + "width": 480, + "height": 64 }, { - "x": 4608, - "y": 480, - "width": 352, - "height": 96 + "x": 4096, + "y": 704, + "width": 480, + "height": 64 }, { - "x": 5632, + "x": 5760, + "y": 416, + "width": 480, + "height": 64 + }, + { + "x": 5984, + "y": 704, + "width": 320, + "height": 64 + }, + { + "x": 6368, "y": 288, - "width": 608, + "width": 544, "height": 64 }, { - "x": 6976, + "x": 7360, "y": 480, - "width": 608, + "width": 320, "height": 64 }, { - "x": 7968, - "y": 480, - "width": 608, + "x": 7808, + "y": 352, + "width": 320, "height": 64 }, { - "x": 1344, - "y": 512, - "width": 352, - "height": 32 - }, - { - "x": 4928, - "y": 544, - "width": 5280, - "height": 32 - }, - { - "x": 2496, - "y": 736, - "width": 640, - "height": 64 - }, - { - "x": 4608, + "x": 8064, "y": 768, - "width": 5376, + "width": 448, "height": 32 + }, + { + "x": 8128, + "y": 352, + "width": 320, + "height": 64 + }, + { + "x": 8448, + "y": 352, + "width": 320, + "height": 64 + }, + { + "x": 8704, + "y": 768, + "width": 448, + "height": 32 + }, + { + "x": 8768, + "y": 352, + "width": 320, + "height": 64 + }, + { + "x": 9088, + "y": 352, + "width": 320, + "height": 64 + }, + { + "x": 9696, + "y": 288, + "width": 320, + "height": 64 + }, + { + "x": 10080, + "y": 576, + "width": 320, + "height": 64 + }, + { + "x": 10432, + "y": 288, + "width": 320, + "height": 64 } + ] diff --git a/game/assets/levels/level_1/disappearing_platforms.png b/game/assets/levels/level_1/disappearing_platforms.png index b334a76..020bece 100644 Binary files a/game/assets/levels/level_1/disappearing_platforms.png and b/game/assets/levels/level_1/disappearing_platforms.png differ diff --git a/game/assets/levels/level_1/platforms.png b/game/assets/levels/level_1/platforms.png index 6ecb3ce..04f06ac 100644 Binary files a/game/assets/levels/level_1/platforms.png and b/game/assets/levels/level_1/platforms.png differ diff --git a/game/assets/levels/level_1/zones.json b/game/assets/levels/level_1/zones.json index 15e2e30..6150fd9 100644 --- a/game/assets/levels/level_1/zones.json +++ b/game/assets/levels/level_1/zones.json @@ -1,53 +1,81 @@ { "appear": [ { - "x": 2496, - "y": 736, - "width": 640, + "x": 736, + "y": 512, + "width": 544, "height": 64 }, { - "x": 4608, - "y": 768, - "width": 5376, - "height": 32 + "x": 2592, + "y": 352, + "width": 672, + "height": 64 }, { - "x": 10176, + "x": 3264, + "y": 352, + "width": 64, + "height": 448 + }, + { + "x": 5024, + "y": 704, + "width": 448, + "height": 64 + }, + { + "x": 6912, "y": 0, "width": 64, - "height": 576 + "height": 288 + }, + { + "x": 10528, + "y": 736, + "width": 384, + "height": 64 + }, + { + "x": 10688, + "y": 0, + "width": 64, + "height": 288 } ], "disappear": [ { - "x": 2880, - "y": 352, - "width": 352, + "x": 2528, + "y": 0, + "width": 64, + "height": 352 + }, + { + "x": 6912, + "y": 288, + "width": 64, + "height": 512 + }, + { + "x": 7840, + "y": 768, + "width": 1632, "height": 32 }, { - "x": 4256, - "y": 576, - "width": 352, - "height": 224 - }, - { - "x": 7520, + "x": 8064, "y": 0, "width": 64, - "height": 480 + "height": 352 }, { - "x": 9216, - "y": 480, - "width": 704, - "height": 64 + "x": 9024, + "y": 0, + "width": 64, + "height": 352 } ], - "kill":[ - - ], + "kill": [], "win": { "x": 12000, "y": 0, diff --git a/game/assets/levels/level_2/appearing_platforms.png b/game/assets/levels/level_2/appearing_platforms.png deleted file mode 100644 index 452cc69..0000000 Binary files a/game/assets/levels/level_2/appearing_platforms.png and /dev/null differ diff --git a/game/assets/levels/level_2/background.png b/game/assets/levels/level_2/background.png deleted file mode 100644 index 140b63e..0000000 Binary files a/game/assets/levels/level_2/background.png and /dev/null differ diff --git a/game/assets/levels/level_2/colliders.json b/game/assets/levels/level_2/colliders.json deleted file mode 100644 index f8db77f..0000000 --- a/game/assets/levels/level_2/colliders.json +++ /dev/null @@ -1,117 +0,0 @@ -[ - { - "x": -5001, - "y": 800, - "width": 16000, - "height": 10 - }, - { - "x": 1280, - "y": 512, - "width": 544, - "height": 64 - }, - { - "x": 2112, - "y": 352, - "width": 480, - "height": 64 - }, - { - "x": 3072, - "y": 608, - "width": 480, - "height": 64 - }, - { - "x": 4096, - "y": 704, - "width": 480, - "height": 64 - }, - { - "x": 5760, - "y": 416, - "width": 480, - "height": 64 - }, - { - "x": 5984, - "y": 704, - "width": 320, - "height": 64 - }, - { - "x": 6368, - "y": 288, - "width": 544, - "height": 64 - }, - { - "x": 7360, - "y": 480, - "width": 320, - "height": 64 - }, - { - "x": 7808, - "y": 352, - "width": 320, - "height": 64 - }, - { - "x": 8064, - "y": 768, - "width": 448, - "height": 32 - }, - { - "x": 8128, - "y": 352, - "width": 320, - "height": 64 - }, - { - "x": 8448, - "y": 352, - "width": 320, - "height": 64 - }, - { - "x": 8704, - "y": 768, - "width": 448, - "height": 32 - }, - { - "x": 8768, - "y": 352, - "width": 320, - "height": 64 - }, - { - "x": 9088, - "y": 352, - "width": 320, - "height": 64 - }, - { - "x": 9696, - "y": 288, - "width": 320, - "height": 64 - }, - { - "x": 10080, - "y": 576, - "width": 320, - "height": 64 - }, - { - "x": 10432, - "y": 288, - "width": 320, - "height": 64 - } - -] diff --git a/game/assets/levels/level_2/disappearing_platforms.png b/game/assets/levels/level_2/disappearing_platforms.png deleted file mode 100644 index 020bece..0000000 Binary files a/game/assets/levels/level_2/disappearing_platforms.png and /dev/null differ diff --git a/game/assets/levels/level_2/level0.xcf b/game/assets/levels/level_2/level0.xcf deleted file mode 100644 index 186b613..0000000 Binary files a/game/assets/levels/level_2/level0.xcf and /dev/null differ diff --git a/game/assets/levels/level_2/platforms.png b/game/assets/levels/level_2/platforms.png deleted file mode 100644 index 04f06ac..0000000 Binary files a/game/assets/levels/level_2/platforms.png and /dev/null differ diff --git a/game/assets/levels/level_2/zones.json b/game/assets/levels/level_2/zones.json deleted file mode 100644 index 33f001c..0000000 --- a/game/assets/levels/level_2/zones.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "appear": [ - { - "x": 736, - "y": 512, - "width": 544, - "height": 64 - }, - { - "x": 2592, - "y": 352, - "width": 672, - "height": 64 - }, - { - "x": 3264, - "y": 352, - "width": 64, - "height": 448 - }, - { - "x": 5024, - "y": 704, - "width": 448, - "height": 64 - }, - { - "x": 6912, - "y": 0, - "width": 64, - "height": 288 - }, - { - "x": 10528, - "y": 736, - "width": 384, - "height": 64 - }, - { - "x": 10688, - "y": 0, - "width": 64, - "height": 288 - } - ], - "disappear": [ - { - "x": 2528, - "y": 0, - "width": 64, - "height": 352 - }, - { - "x": 6912, - "y": 288, - "width": 64, - "height": 512 - }, - { - "x": 7840, - "y": 768, - "width": 1632, - "height": 32 - }, - { - "x": 8064, - "y": 0, - "width": 64, - "height": 352 - }, - { - "x": 9024, - "y": 0, - "width": 64, - "height": 352 - } - ], - "win": { - "x": 12000, - "y": 0, - "width": 100, - "height": 3000 - } -} diff --git a/game/assets/levels/levels.json b/game/assets/levels/levels.json index 8a02867..626517d 100644 --- a/game/assets/levels/levels.json +++ b/game/assets/levels/levels.json @@ -1,3 +1,4 @@ [ - "level_2" + "level_0", + "level_1" ]