diff --git a/.gitignore b/.gitignore index 425151c..1a2962a 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,4 @@ tank.blend1 TANKS.html TANKS.js TANKS.wasm +TANKSLPK.8xv diff --git a/CMakeLists.txt b/CMakeLists.txt index ddf56bb..7bc1a25 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,4 +22,4 @@ add_executable(dummy src/level.h src/main.cpp src/util/util.cpp - src/util/util.h src/objects/tank.cpp src/objects/tank.h src/objects/shell.cpp src/objects/shell.h src/objects/mine.cpp src/objects/mine.h src/globals.cpp src/globals.h src/util/profiler.c src/util/profiler.h src/graphics/gui.cpp src/graphics/gui.h src/graphics/partial_redraw.cpp src/graphics/partial_redraw.h src/graphics/dynamic_sprites.cpp src/graphics/dynamic_sprites.h src/ai/ai_state.h src/objects/physicsbody.cpp src/objects/physicsbody.h src/input.cpp src/input.h src/fwd.h src/util/trig.cpp src/util/trig.h src/util/cpp_internals.c src/physics/physics.h src/data/export_levels.cpp src/data/export_levels.h src/game.cpp src/game.h) + src/util/util.h src/objects/tank.cpp src/objects/tank.h src/objects/shell.cpp src/objects/shell.h src/objects/mine.cpp src/objects/mine.h src/globals.cpp src/globals.h src/util/profiler.c src/util/profiler.h src/graphics/gui.cpp src/graphics/gui.h src/graphics/partial_redraw.cpp src/graphics/partial_redraw.h src/graphics/dynamic_sprites.cpp src/graphics/dynamic_sprites.h src/ai/ai_state.h src/objects/physicsbody.cpp src/objects/physicsbody.h src/input.cpp src/input.h src/fwd.h src/util/trig.cpp src/util/trig.h src/util/cpp_internals.c src/physics/physics.h src/game.cpp src/game.h) diff --git a/makefile b/makefile index 4fe6a03..3f2480e 100644 --- a/makefile +++ b/makefile @@ -25,9 +25,6 @@ endif # ---------------------------- -tiles: - @$(MAKE) -C src/data/tiles --no-print-directory - SHELL = bash IMAGE_NAMES = {{{pl,en}_{base,turret},shell}_{0..8},mine_{0..2}} CONVIMG_INPUT = $(shell echo src/data/gfx/trimmed/$(IMAGE_NAMES).png) src/data/gfx/tileset.png src/data/gfx/bg_tank.png src/data/gfx/fg_tank.png diff --git a/src/data/export_levels.cpp b/src/data/export_levels.cpp deleted file mode 100644 index 5a768e3..0000000 --- a/src/data/export_levels.cpp +++ /dev/null @@ -1,218 +0,0 @@ -#include "export_levels.h" - -#include -#include "../objects/tank.h" -#include "tiles/lvlpack.h" - -// todo: maybe just invoke the level creator once that's finished instead of doing this -void create_levels() { -#ifdef CREATE_LEVEL_APPVAR - #define s(n) {sizeof(lvl##n##_compressed), sizeof(ser_tanks##n)/sizeof(ser_tanks##n[0])} - const serialized_tank_t *ser_tanks; //TODO: change to a 2D array somehow? - const serialized_tank_t ser_tanks1[] = {{PLAYER, 1, 6}, - {IMMOBILE, 14, 6}}; - const serialized_tank_t ser_tanks2[] = {{PLAYER, 1, 13}, - {BASIC, 14, 3}}; - const serialized_tank_t ser_tanks3[] = {{PLAYER, 1, 8}, - {BASIC, 3, 1}, - {BASIC, 13, 15}, - {IMMOBILE, 14, 8}}; - const serialized_tank_t ser_tanks4[] = {{PLAYER, 2, 14}, - {BASIC, 7, 8}, - {BASIC, 13, 2}, - {IMMOBILE, 13, 8}, - {IMMOBILE, 8, 2}}; - const serialized_tank_t ser_tanks5[] = {{PLAYER, 2, 14}, - {MISSILE, 12, 1}, - {MISSILE, 15, 9}}; - const serialized_tank_t ser_tanks6[] = {{PLAYER, 1, 8}, - {BASIC, 12, 4}, - {BASIC, 12, 15}, - {MISSILE, 14, 8}, - {MISSILE, 14, 13}}; - const serialized_tank_t ser_tanks7[] = {{PLAYER, 1, 14}, - {MISSILE, 1, 1}, - {MISSILE, 14, 2}, - {MISSILE, 1, 7}, - {MISSILE, 14, 15}}; - const serialized_tank_t ser_tanks8[] = {{PLAYER, 0, 8}, - {MISSILE, 15, 2}, - {MISSILE, 15, 14}, - {MINE, 11, 4}, - {MINE, 15, 8}, - {MINE, 10, 14}}; - const serialized_tank_t ser_tanks9[] = {{PLAYER, 2, 13}, - {MINE, 2, 3}, - {MINE, 14, 13}, - {BASIC, 5, 1}, - {BASIC, 10, 5}, - {BASIC, 11, 15}, - {BASIC, 14, 3}}; - const serialized_tank_t ser_tanks10[] = {{PLAYER, 0, 12}, - {RED, 8, 1}, - {RED, 15, 4}}; - const serialized_tank_t ser_tanks11[] = {{PLAYER, 1, 2}, - {BASIC, 2, 13}, - {BASIC, 10, 1}, - {MISSILE, 5, 0}, - {MISSILE, 14, 14}, - {RED, 14, 4}, - {RED, 7, 8}}; - const serialized_tank_t ser_tanks12[] = {{PLAYER, 1, 7}, - {RED, 10, 1}, - {RED, 6, 14}, - {IMMOB_MISSILE, 13, 15}, - {IMMOB_MISSILE, 14, 4}}; - const serialized_tank_t ser_tanks13[] = {{PLAYER, 0, 8}, - {MINE, 4, 15}, - {MINE, 7, 1}, - {MINE, 9, 10}, - {MISSILE, 14, 1}, - {MISSILE, 14, 15}, - {MISSILE, 15, 8}}; - const serialized_tank_t ser_tanks14[] = {{PLAYER, 1, 15}, - {RED, 1, 7}, - {RED, 10, 1}, - {RED, 14, 11}, - {IMMOB_MISSILE, 5, 6}, - {IMMOB_MISSILE, 10, 11}, - {IMMOB_MISSILE, 14, 1}}; - const serialized_tank_t ser_tanks15[] = {{PLAYER, 1, 15}, - {FAST, 4, 5}, - {FAST, 14, 2}, - {FAST, 14, 15}}; - const serialized_tank_t ser_tanks16[] = {{PLAYER, 1, 15}, - {FAST, 7, 1}, - {IMMOB_MISSILE, 14, 1}, - {FAST, 10, 8}, - {IMMOB_MISSILE, 6, 11}, - {FAST, 15, 11}}; - const serialized_tank_t ser_tanks17[] = {{PLAYER, 1, 13}, - {IMMOB_MISSILE, 2, 2}, - {IMMOB_MISSILE, 14, 3}, - {IMMOB_MISSILE, 1, 8}, - {IMMOB_MISSILE, 7, 8}, - {IMMOB_MISSILE, 14, 9}, - {IMMOB_MISSILE, 14, 14}}; - const serialized_tank_t ser_tanks18[] = {{PLAYER, 2, 13}, - {MISSILE, 3, 2}, - {FAST, 10, 2}, - {RED, 5, 4}, - {IMMOB_MISSILE, 8, 8}, - {MISSILE, 13, 14}, - {FAST, 10, 15}}; - const serialized_tank_t ser_tanks19[] = {{PLAYER, 1, 15}, - {FAST, 1, 1}, - {FAST, 7, 1}, - {FAST, 12, 1}, - {FAST, 8, 5}, - {FAST, 14, 6}, - {FAST, 1, 8}, - {FAST, 14, 11}, - {FAST, 12, 15}}; - const serialized_tank_t ser_tanks20[] = {{PLAYER, 2, 8}, - {INVISIBLE, 11, 6}, - {INVISIBLE, 13, 8}}; - level_t lvls[] = {s(1), s(2), s(3), s(4), s(5), s(6), s(7), s(8), s(9), s(10), s(11), s(12), s(13), s(14), s(15), - s(16), s(17), s(18), s(19), s(20)}; - level_pack_t lvl_pack = {"TANKS!", sizeof lvls / sizeof lvls[0], {0, 0, 0, 0, 0}}; - - ti_CloseAll(); - - ti_var_t appVar = ti_Open("TANKSLPK", "w"); - - ti_Write(&lvl_pack, sizeof(level_pack_t), 1, appVar); - for(int i = 0; i < lvl_pack.num_levels; i++) { - uint8_t *comp_tiles; - ti_Write(lvls + i, sizeof(level_t), 1, appVar); - switch(i) { - case 0: - default: - comp_tiles = lvl1_compressed; - ser_tanks = ser_tanks1; - break; - case 1: - comp_tiles = lvl2_compressed; - ser_tanks = ser_tanks2; - break; - case 2: - comp_tiles = lvl3_compressed; - ser_tanks = ser_tanks3; - break; - case 3: - comp_tiles = lvl4_compressed; - ser_tanks = ser_tanks4; - break; - case 4: - comp_tiles = lvl5_compressed; - ser_tanks = ser_tanks5; - break; - case 5: - comp_tiles = lvl6_compressed; - ser_tanks = ser_tanks6; - break; - case 6: - comp_tiles = lvl7_compressed; - ser_tanks = ser_tanks7; - break; - case 7: - comp_tiles = lvl8_compressed; - ser_tanks = ser_tanks8; - break; - case 8: - comp_tiles = lvl9_compressed; - ser_tanks = ser_tanks9; - break; - case 9: - comp_tiles = lvl10_compressed; - ser_tanks = ser_tanks10; - break; - case 10: - comp_tiles = lvl11_compressed; - ser_tanks = ser_tanks11; - break; - case 11: - comp_tiles = lvl12_compressed; - ser_tanks = ser_tanks12; - break; - case 12: - comp_tiles = lvl13_compressed; - ser_tanks = ser_tanks13; - break; - case 13: - comp_tiles = lvl14_compressed; - ser_tanks = ser_tanks14; - break; - case 14: - comp_tiles = lvl15_compressed; - ser_tanks = ser_tanks15; - break; - case 15: - comp_tiles = lvl16_compressed; - ser_tanks = ser_tanks16; - break; - case 16: - comp_tiles = lvl17_compressed; - ser_tanks = ser_tanks17; - break; - case 17: - comp_tiles = lvl18_compressed; - ser_tanks = ser_tanks18; - break; - case 18: - comp_tiles = lvl19_compressed; - ser_tanks = ser_tanks19; - break; - case 19: - comp_tiles = lvl20_compressed; - ser_tanks = ser_tanks20; - break; - } - ti_Write(comp_tiles, sizeof(uint8_t), lvls[i].compressed_tile_size, appVar); - ti_Write(ser_tanks, sizeof(serialized_tank_t), lvls[i].num_tanks, appVar); - } - - ti_SetArchiveStatus(true, appVar); - ti_CloseAll(); -#endif -} diff --git a/src/data/export_levels.h b/src/data/export_levels.h deleted file mode 100644 index 186a9b0..0000000 --- a/src/data/export_levels.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef TANKS_EXPORT_LEVELS_H -#define TANKS_EXPORT_LEVELS_H - -//Comment this out to stop the levels from being bundled with the program -#define CREATE_LEVEL_APPVAR - -void create_levels(); //Temporary function to make a level pack - -#endif //TANKS_EXPORT_LEVELS_H diff --git a/src/data/tiles/lvl1.csv b/src/data/tiles/lvl1.csv deleted file mode 100644 index 0eccad7..0000000 --- a/src/data/tiles/lvl1.csv +++ /dev/null @@ -1,17 +0,0 @@ -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 diff --git a/src/data/tiles/lvl10.csv b/src/data/tiles/lvl10.csv deleted file mode 100644 index 0bda8ee..0000000 --- a/src/data/tiles/lvl10.csv +++ /dev/null @@ -1,17 +0,0 @@ -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 5,13, 5, 5, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0,13,13,13, 0, 0, 0, 0, 0, 0, 0, 0,13,13,13, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 5, 5,13, 5, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 2, 2, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 diff --git a/src/data/tiles/lvl11.csv b/src/data/tiles/lvl11.csv deleted file mode 100644 index 8a8e200..0000000 --- a/src/data/tiles/lvl11.csv +++ /dev/null @@ -1,17 +0,0 @@ -0, 0, 0, 0,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 2, 0, 0, 0, 0, 5, 4,11,10, 0, 0, 0 -0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,10, 0, 0, 0 -0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0 -0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0 -0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0 -0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0 -0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0 -0, 0, 0,10, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0 -0, 0, 0,10,11, 4, 5, 0, 0, 0, 0, 2, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10, 0, 0, 0, 0 diff --git a/src/data/tiles/lvl12.csv b/src/data/tiles/lvl12.csv deleted file mode 100644 index 675d24e..0000000 --- a/src/data/tiles/lvl12.csv +++ /dev/null @@ -1,17 +0,0 @@ -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0,16,16, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0 -0, 0, 0, 0,16,16, 0, 0, 0, 0, 0, 3, 3, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0,11, 3, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0,11,11, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 3,11, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 3, 3, 0, 0, 0, 0, 0, 0,16,16, 0, 0, 0 -0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0,16,16, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 diff --git a/src/data/tiles/lvl13.csv b/src/data/tiles/lvl13.csv deleted file mode 100644 index ee74c69..0000000 --- a/src/data/tiles/lvl13.csv +++ /dev/null @@ -1,17 +0,0 @@ -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 1, 1,10,10, 1, 1,10,10, 1, 1, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0,10,10, 1, 1,10,10, 1, 1,10,10, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 1, 1,10,10, 1, 1,10,10, 1, 1, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 diff --git a/src/data/tiles/lvl14.csv b/src/data/tiles/lvl14.csv deleted file mode 100644 index 938a4f0..0000000 --- a/src/data/tiles/lvl14.csv +++ /dev/null @@ -1,17 +0,0 @@ -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 3, 2, 3, 2, 3,16, 3,16, 3,10, 3,10, 3 -0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 3, 2, 3, 0, 0, 0 -0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0 -0, 0, 0, 3, 2, 3, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0 -3,10, 3,10, 3,16, 3,16, 3, 2, 3, 2, 3, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 diff --git a/src/data/tiles/lvl15.csv b/src/data/tiles/lvl15.csv deleted file mode 100644 index 6b89512..0000000 --- a/src/data/tiles/lvl15.csv +++ /dev/null @@ -1,17 +0,0 @@ -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 4,11, 4,11, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0 -0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0 -0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0 -0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 4,11, 4,11, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0,11, 4,11, 4, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0 -0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0 -0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0 -0, 0, 0, 0, 0, 4, 0, 0, 0, 0,11, 4,11, 4, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 diff --git a/src/data/tiles/lvl16.csv b/src/data/tiles/lvl16.csv deleted file mode 100644 index 20a3253..0000000 --- a/src/data/tiles/lvl16.csv +++ /dev/null @@ -1,17 +0,0 @@ -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 2, 0, 0, 0, 9, 2, 9, 2, 9, 2, 0, 0, 0, 0 -0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0 -0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0 -0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 9, 2, 0, 0 -0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0 -0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0 -0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0 -0, 0, 2, 9, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0 -0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0 -0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0 -0, 0, 0, 0, 2, 9, 2, 9, 2, 9, 0, 0, 0, 2, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 diff --git a/src/data/tiles/lvl17.csv b/src/data/tiles/lvl17.csv deleted file mode 100644 index 58b3489..0000000 --- a/src/data/tiles/lvl17.csv +++ /dev/null @@ -1,17 +0,0 @@ -0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0,12, 0, 0, 0, 0,12, 0, 0, 0, 0, 0 -0, 0, 0, 2,11,12, 0, 0, 0, 0,12,11, 2, 1, 1, 1 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -1, 1, 1, 2,11,12, 0, 0, 0, 0,12,11, 2, 0, 0, 0 -0, 0, 0, 0, 0,12, 0, 0, 0, 0,12, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0 diff --git a/src/data/tiles/lvl18.csv b/src/data/tiles/lvl18.csv deleted file mode 100644 index 696b7d7..0000000 --- a/src/data/tiles/lvl18.csv +++ /dev/null @@ -1,17 +0,0 @@ -0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 2, 3, 2,11,10,11,10, 3, 2, 3, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 3, 2, 3,10,11,10,11, 2, 3, 2, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0 diff --git a/src/data/tiles/lvl19.csv b/src/data/tiles/lvl19.csv deleted file mode 100644 index 8c3a34d..0000000 --- a/src/data/tiles/lvl19.csv +++ /dev/null @@ -1,17 +0,0 @@ -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -1,10,10, 1, 1,10,10, 1, 1,10,10, 1, 1, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0,10,10, 1, 1,10,10, 1, 1,10,10, 1, 1,10 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -1,10,10, 1, 1,10,10, 1, 1,10,10, 1, 1, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 diff --git a/src/data/tiles/lvl2.csv b/src/data/tiles/lvl2.csv deleted file mode 100644 index a5ff144..0000000 --- a/src/data/tiles/lvl2.csv +++ /dev/null @@ -1,17 +0,0 @@ -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 1, 1, 2, 3, 4, 3,10, 9, 9, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 9, 9,10, 2, 3, 4, 3, 2, 1, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 diff --git a/src/data/tiles/lvl20.csv b/src/data/tiles/lvl20.csv deleted file mode 100644 index 80ca9bf..0000000 --- a/src/data/tiles/lvl20.csv +++ /dev/null @@ -1,17 +0,0 @@ -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 diff --git a/src/data/tiles/lvl3.csv b/src/data/tiles/lvl3.csv deleted file mode 100644 index 8f34282..0000000 --- a/src/data/tiles/lvl3.csv +++ /dev/null @@ -1,17 +0,0 @@ -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 1, 2, 9,10, 9,10, 2, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 2,10, 9,10, 9, 2, 1, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 diff --git a/src/data/tiles/lvl4.csv b/src/data/tiles/lvl4.csv deleted file mode 100644 index 268af88..0000000 --- a/src/data/tiles/lvl4.csv +++ /dev/null @@ -1,17 +0,0 @@ - 0, 0, 0, 0, 0,16, 0, 0, 0, 0,16, 0, 0, 0, 0, 0 - 0, 0, 0, 0, 0,16, 0, 0, 0, 0,16, 0, 0, 0, 0, 0 - 0, 0, 0, 0, 0,16, 0, 0, 0, 0,16, 0, 0, 0, 0, 0 - 0, 0, 0, 0, 0,16, 0, 0, 0, 0,16, 0, 0, 0, 0, 0 - 0, 0, 0, 0, 0,16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -16,16,16,16, 0,16, 0,16,16,16,16,16,16,16,16,16 - 0, 0, 0, 0, 0,16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 - 0, 0, 0, 0, 0,16, 0, 0, 0, 0,16, 0, 0, 0, 0, 0 - 0, 0, 0, 0, 0,16, 0, 0, 0, 0,16, 0, 0, 0, 0, 0 - 0, 0, 0, 0, 0,16, 0, 0, 0, 0,16, 0, 0, 0, 0, 0 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,16, 0, 0, 0, 0, 0 -16,16,16,16,16,16,16,16,16, 0,16, 0,16,16,16,16 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,16, 0, 0, 0, 0, 0 - 0, 0, 0, 0, 0,16, 0, 0, 0, 0,16, 0, 0, 0, 0, 0 - 0, 0, 0, 0, 0,16, 0, 0, 0, 0,16, 0, 0, 0, 0, 0 - 0, 0, 0, 0, 0,16, 0, 0, 0, 0,16, 0, 0, 0, 0, 0 - 0, 0, 0, 0, 0,16, 0, 0, 0, 0,16, 0, 0, 0, 0, 0 diff --git a/src/data/tiles/lvl5.csv b/src/data/tiles/lvl5.csv deleted file mode 100644 index e3ab432..0000000 --- a/src/data/tiles/lvl5.csv +++ /dev/null @@ -1,17 +0,0 @@ -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,14, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6,14, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0,14, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0,14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 diff --git a/src/data/tiles/lvl6.csv b/src/data/tiles/lvl6.csv deleted file mode 100644 index 23f2a54..0000000 --- a/src/data/tiles/lvl6.csv +++ /dev/null @@ -1,17 +0,0 @@ -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 3,10, 3,10, 3, 2, 3, 2, 3, 2, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0,16, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0,16, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0,16, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0,16, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0,16,16, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0,16, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0,16, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0,16, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0,16, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 2, 3, 2, 3, 2, 3,10, 3,10, 3, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 diff --git a/src/data/tiles/lvl7.csv b/src/data/tiles/lvl7.csv deleted file mode 100644 index 44a44c8..0000000 --- a/src/data/tiles/lvl7.csv +++ /dev/null @@ -1,17 +0,0 @@ -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -2, 3,10, 3, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 3,10, 3, 2 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -2, 3,10, 3, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 2, 3,10, 3, 2 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 diff --git a/src/data/tiles/lvl8.csv b/src/data/tiles/lvl8.csv deleted file mode 100644 index 9efe72c..0000000 --- a/src/data/tiles/lvl8.csv +++ /dev/null @@ -1,17 +0,0 @@ -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0,10, 0, 0, 0,10, 2, 2,10, 0, 0, 0,10, 0, 0 -0, 0,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10, 0, 0 -0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 0,10,10, 0, 0 -0, 0, 0,10, 0, 0, 0, 0, 0, 0, 0, 0,10, 0, 0, 0 -0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0 -0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0 -0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0 -0, 0, 0,10, 0, 0, 0, 0, 0, 0, 0, 0,10, 0, 0, 0 -0, 0,10,10, 0, 0, 0, 0, 0, 0, 0, 0,10,10, 0, 0 -0, 0,10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,10, 0, 0 -0, 0,10, 0, 0, 0,10, 2, 2,10, 0, 0, 0,10, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 diff --git a/src/data/tiles/lvl9.csv b/src/data/tiles/lvl9.csv deleted file mode 100644 index 2d9cf99..0000000 --- a/src/data/tiles/lvl9.csv +++ /dev/null @@ -1,17 +0,0 @@ -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 4, 4, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0,12, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0,12, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0,12, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0,12, 0, 0, 0, 0, 0, 0, 0, 0 -1, 3, 5, 7, 0, 0, 0,12,12, 0, 0, 0, 7, 5, 3, 1 -0, 0, 0, 0, 0, 0, 0, 0,12, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0,12, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0,12, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0,12, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 4, 4, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 \ No newline at end of file diff --git a/src/data/tiles/lvlpack.c b/src/data/tiles/lvlpack.c deleted file mode 100644 index e59e457..0000000 --- a/src/data/tiles/lvlpack.c +++ /dev/null @@ -1,92 +0,0 @@ -// Converted using ConvTile -#include - -uint8_t lvl3_compressed[31] = { - 0x00,0x83,0x00,0x00,0x01,0x02,0x09,0x0A,0xD1,0x01,0x02,0xD0,0x15,0x7C,0x0F,0x02,0x8F,0x0F,0x83,0xFC,0x5E,0xA2,0x32,0x01,0x02,0x01,0x0C,0x42,0xDD,0x00,0x01 -}; - -uint8_t lvl5_compressed[21] = { - 0x00,0x81,0x29,0x00,0x0E,0x1C,0x0F,0x06,0xE0,0x10,0x62,0x00,0x23,0x0E,0x06,0xE0,0x10,0xEE,0x4D,0x00,0x01 -}; - -uint8_t lvl12_compressed[36] = { - 0x00,0x83,0x22,0x00,0x10,0x10,0x54,0x07,0x03,0x69,0x0F,0x03,0x03,0x19,0x25,0x0E,0xA3,0x0E,0x0B,0x91,0x0E,0x0B,0xB1,0x2C,0xD0,0x0E,0xFC,0x59,0x36,0x96,0x10,0x5B, - 0x00,0x00,0x00,0x80 -}; - -uint8_t lvl1_compressed[23] = { - 0x00,0x83,0x25,0x00,0x01,0xC3,0x03,0x56,0x0F,0x00,0x09,0x8F,0x0F,0x82,0xE8,0x3F,0x62,0x7B,0x05,0xE8,0x00,0x00,0x04 -}; - -uint8_t lvl20_compressed[7] = { - 0x00,0x80,0x43,0xA0,0x00,0x00,0x10 -}; - -uint8_t lvl10_compressed[33] = { - 0x00,0x87,0xDC,0x00,0x02,0x00,0x25,0x0A,0x0F,0x04,0x00,0x05,0x0D,0x05,0x05,0x13,0x38,0x2A,0x0D,0x00,0x4A,0x0A,0x1F,0x5F,0xE7,0x60,0x5F,0x81,0x38,0xBF,0x20,0x00, - 0x10 -}; - -uint8_t lvl16_compressed[36] = { - 0x00,0x83,0x05,0x00,0x02,0x17,0x03,0x09,0x02,0x01,0x3C,0x0F,0xF0,0x18,0xFF,0x0F,0x31,0x19,0x0F,0xC1,0x00,0x2A,0x0F,0x09,0x0A,0x67,0x61,0x68,0xB9,0x01,0xE0,0x0F, - 0xB6,0x00,0x00,0x01 -}; - -uint8_t lvl11_compressed[46] = { - 0x00,0xA2,0x00,0x0A,0x00,0x36,0x00,0x3D,0x0F,0x02,0x04,0x61,0x0F,0x05,0x04,0x0B,0x0A,0x1D,0x1F,0x31,0x0F,0x02,0x02,0x1B,0x17,0xC1,0x06,0xAC,0x0F,0xF0,0x47,0x80, - 0x66,0x0B,0x04,0x05,0x82,0x80,0xA6,0x86,0x82,0xE6,0x48,0x0F,0x00,0x04 -}; - -uint8_t lvl6_compressed[32] = { - 0x00,0x83,0x12,0x00,0x03,0x0A,0x97,0x01,0x02,0x01,0x12,0x13,0x10,0x9E,0x08,0x0D,0xE0,0x0F,0xFE,0x40,0x2A,0x0F,0x40,0x9A,0x90,0xA4,0x20,0xC8,0xDC,0x20,0x00,0x10 -}; - -uint8_t lvl17_compressed[44] = { - 0x00,0xB7,0x00,0x04,0x02,0x3C,0x00,0x14,0xA1,0x0F,0x04,0x94,0x0F,0x0C,0x45,0x04,0x92,0x00,0x02,0x0B,0x8D,0x0F,0x0B,0x02,0x01,0x00,0x00,0x05,0xD5,0x00,0x32,0x13, - 0x3F,0x1F,0x5F,0x04,0xE1,0x8F,0x05,0x41,0xE4,0x00,0x00,0x80 -}; - -uint8_t lvl7_compressed[22] = { - 0x00,0x83,0xE0,0x00,0x02,0x03,0x0A,0x03,0xE0,0x03,0x8F,0x29,0x26,0xB8,0x2A,0x08,0xF8,0x5F,0xF8,0x00,0x00,0x04 -}; - -uint8_t lvl18_compressed[40] = { - 0x00,0x94,0x00,0x01,0x00,0x9E,0x00,0x16,0x0F,0x87,0xE1,0x20,0xA0,0x0F,0x02,0x03,0x02,0x0B,0x79,0x0A,0x01,0x05,0x03,0x00,0x06,0x95,0x00,0x38,0xF5,0x3E,0x01,0x46, - 0x06,0x90,0x7E,0x5A,0xBF,0x10,0x00,0x08 -}; - -uint8_t lvl4_compressed[34] = { - 0x00,0xB4,0x00,0x10,0xFC,0x04,0x00,0x1C,0xCD,0x0F,0x0A,0x5F,0x00,0x04,0x01,0x3C,0x00,0x7C,0x1F,0x1A,0x45,0x5F,0x4F,0x44,0x57,0x3C,0x64,0x7C,0x1F,0x1F,0x84,0xCF, - 0x00,0x02 -}; - -uint8_t lvl8_compressed[42] = { - 0x00,0x83,0x05,0x00,0x0A,0x92,0x03,0x02,0x02,0x4F,0x06,0x0F,0x15,0x1A,0xCF,0x04,0x10,0x71,0x09,0x93,0x20,0x27,0x08,0x02,0x0F,0x41,0x02,0x2C,0x0F,0x74,0x3F,0x7C, - 0x5F,0x7C,0x7F,0x78,0x9F,0x41,0x6C,0x00,0x00,0x02 -}; - -uint8_t lvl9_compressed[35] = { - 0x00,0x83,0x52,0x00,0x04,0x04,0x34,0x0F,0x0C,0x00,0x83,0x60,0x0F,0x01,0x03,0x05,0x07,0xBB,0x0F,0x10,0x08,0x07,0x05,0x03,0x01,0x3F,0x50,0x8F,0x9F,0x08,0x2F,0x00, - 0x80,0x00,0x40 -}; - -uint8_t lvl2_compressed[29] = { - 0x00,0x81,0x44,0x00,0x01,0x01,0x00,0x02,0x03,0x04,0x03,0x0A,0x09,0x09,0x00,0x81,0x5B,0x00,0x59,0x59,0x0A,0x61,0x02,0x01,0x02,0x94,0x5B,0x00,0x02 -}; - -uint8_t lvl19_compressed[25] = { - 0x00,0x82,0xE0,0x00,0x01,0x0A,0x0A,0x01,0x88,0x03,0x40,0x00,0x89,0x00,0x16,0x51,0x0A,0x8F,0x1C,0x81,0xBC,0x9F,0x20,0x00,0x10 -}; - -uint8_t lvl15_compressed[28] = { - 0x00,0x83,0x03,0x00,0x04,0x0B,0x01,0x92,0x07,0xE0,0x04,0xAE,0x07,0xE0,0x37,0xCA,0x00,0xA0,0x36,0xC2,0x6A,0x78,0x37,0x31,0x6D,0x80,0x00,0x40 -}; - -uint8_t lvl13_compressed[25] = { - 0x00,0x83,0x10,0x00,0x01,0x01,0x0A,0x0A,0x95,0x03,0x00,0x02,0x24,0x00,0xFC,0x4D,0x03,0x3F,0x29,0x03,0x10,0x9F,0x40,0x00,0x20 -}; - -uint8_t lvl14_compressed[38] = { - 0x00,0x83,0x12,0x00,0x03,0x02,0x94,0x01,0x10,0x01,0x0A,0xAB,0x01,0x0F,0x8F,0x1F,0x82,0x5E,0x0F,0x44,0x78,0x08,0x7E,0x18,0x0A,0xEC,0x58,0x94,0x2C,0x9C,0x3B,0x44, - 0x46,0x83,0x18,0x00,0x00,0x04 -}; \ No newline at end of file diff --git a/src/data/tiles/lvlpack.h b/src/data/tiles/lvlpack.h deleted file mode 100644 index 6213c48..0000000 --- a/src/data/tiles/lvlpack.h +++ /dev/null @@ -1,28 +0,0 @@ -// Converted using ConvTile -// This file contains all the tilemap sources for easier inclusion in a project -#ifndef lvlpack_header -#define lvlpack_header -#include - -extern uint8_t lvl3_compressed[31]; -extern uint8_t lvl5_compressed[21]; -extern uint8_t lvl12_compressed[36]; -extern uint8_t lvl1_compressed[23]; -extern uint8_t lvl20_compressed[7]; -extern uint8_t lvl10_compressed[33]; -extern uint8_t lvl16_compressed[36]; -extern uint8_t lvl11_compressed[46]; -extern uint8_t lvl6_compressed[32]; -extern uint8_t lvl17_compressed[44]; -extern uint8_t lvl7_compressed[22]; -extern uint8_t lvl18_compressed[40]; -extern uint8_t lvl4_compressed[34]; -extern uint8_t lvl8_compressed[42]; -extern uint8_t lvl9_compressed[35]; -extern uint8_t lvl2_compressed[29]; -extern uint8_t lvl19_compressed[25]; -extern uint8_t lvl15_compressed[28]; -extern uint8_t lvl13_compressed[25]; -extern uint8_t lvl14_compressed[38]; - -#endif diff --git a/src/data/tiles/makefile b/src/data/tiles/makefile deleted file mode 100644 index c4d568d..0000000 --- a/src/data/tiles/makefile +++ /dev/null @@ -1,2 +0,0 @@ -lvlpack.c: $(wildcard *.csv) - @convtile -c lvlpack; \ No newline at end of file diff --git a/src/level.cpp b/src/level.cpp index d05d448..8c3a561 100644 --- a/src/level.cpp +++ b/src/level.cpp @@ -4,9 +4,6 @@ #include "globals.h" -#include "data/tiles/lvlpack.h" - - void decompress_tiles(const void *comp_tiles) { //Decompress tile data zx7_Decompress(tiles, comp_tiles); diff --git a/src/main.cpp b/src/main.cpp index 7b2fe3e..8966d0f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -19,7 +19,6 @@ #include "globals.h" #include "util/profiler.h" #include "graphics/gui.h" -#include "data/export_levels.h" #include "game.h" int main() { @@ -27,10 +26,6 @@ int main() { ti_CloseAll(); - create_levels(); //TODO: TEMP (you'll just download an appvar after I get one properly generated.) - - dbg_printf("Created levels\n"); - init_graphics(); dbg_printf("Initted graphics\n");