From 9ef1c5daf8338d199eb5f71eca7a6601d3ea00d5 Mon Sep 17 00:00:00 2001 From: bgiraudr Date: Sat, 22 Jan 2022 17:12:24 +0100 Subject: [PATCH] Interiors now use their own tileset --- CMakeLists.txt | 8 +- assets-cg/converters.py | 2 + assets-cg/maps/inside/1.tmx | 52 +-- assets-cg/maps/inside/2.tmx | 70 ++-- assets-cg/maps/inside/3.tmx | 92 ----- assets-cg/maps/inside/fxconv-metadata.txt | 5 + assets-cg/maps/inside/tileset_in.png | Bin 0 -> 6397 bytes assets-cg/maps/inside/tileset_in.tsx | 46 +++ assets-cg/maps/testCarte.tmx | 54 +-- assets-cg/maps/tileset.tsx | 416 +++++++++++++++++----- assets-cg/tileset.png | Bin 60683 -> 54195 bytes include/define.h | 6 +- include/map.h | 1 + src/engine.c | 5 +- src/map.c | 5 - src/talkable.c | 2 +- 16 files changed, 465 insertions(+), 299 deletions(-) delete mode 100644 assets-cg/maps/inside/3.tmx create mode 100644 assets-cg/maps/inside/tileset_in.png create mode 100644 assets-cg/maps/inside/tileset_in.tsx diff --git a/CMakeLists.txt b/CMakeLists.txt index 87b0203..ab1552e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,19 +15,19 @@ add_custom_command( OUTPUT "${CMAKE_CURRENT_LIST_DIR}/assets-cg/maps/testCarte.json" "${CMAKE_CURRENT_LIST_DIR}/assets-cg/maps/inside/1.json" "${CMAKE_CURRENT_LIST_DIR}/assets-cg/maps/inside/2.json" - "${CMAKE_CURRENT_LIST_DIR}/assets-cg/maps/inside/3.json" COMMENT "Convert tmx map to json" COMMAND tiled --export-tileset json tileset.tsx tileset.json + COMMAND tiled --export-tileset json inside/tileset_in.tsx inside/tileset_in.json COMMAND find | grep .*.tmx | sed 's/.tmx//g' | xargs -l bash -c 'tiled --export-map json $$0.tmx $$0.json' WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/assets-cg/maps/ DEPENDS assets-cg/maps/testCarte.tmx assets-cg/maps/1.tmx assets-cg/tileset.png assets-cg/maps/tileset.tsx + assets-cg/maps/inside/tileset_in.tsx assets-cg/converters.py assets-cg/maps/inside/1.tmx - assets-cg/maps/inside/2.tmx - assets-cg/maps/inside/3.tmx) + assets-cg/maps/inside/2.tmx) set(SOURCES src/main.c @@ -44,11 +44,11 @@ set(SOURCES set(ASSETS_cg assets-cg/tileset.png + assets-cg/maps/inside/tileset_in.png assets-cg/maps/testCarte.json assets-cg/maps/1.json assets-cg/maps/inside/1.json assets-cg/maps/inside/2.json - assets-cg/maps/inside/3.json assets-cg/spritesheet.png assets-cg/uf8x9 ) diff --git a/assets-cg/converters.py b/assets-cg/converters.py index efbf037..e3d09ec 100644 --- a/assets-cg/converters.py +++ b/assets-cg/converters.py @@ -33,6 +33,7 @@ def convert_map(input, output, params, target): tileset = open(tilesetPath, "r") data_tileset = json.load(tileset) + tileset_size = data_tileset.get("columns") tileset.close() tile_value = {} @@ -85,6 +86,7 @@ def convert_map(input, output, params, target): structMap += fxconv.u32(w) + fxconv.u32(h) + fxconv.u32(nbTilelayer) + fxconv.u32(nbDialog) + fxconv.u32(nbTelep) structMap += fxconv.ref(f"img_{nameTilesetFree}") + structMap += fxconv.u32(tileset_size) structMap += fxconv.ptr(dialogs) structMap += fxconv.ptr(teleporter) diff --git a/assets-cg/maps/inside/1.tmx b/assets-cg/maps/inside/1.tmx index 3eb9d36..d183916 100644 --- a/assets-cg/maps/inside/1.tmx +++ b/assets-cg/maps/inside/1.tmx @@ -1,48 +1,48 @@ - + - + -682,683,683,683,683,683,683,683,683,683,683,684, -711,712,712,712,712,712,712,712,712,712,712,713, -740,741,741,741,741,741,741,741,741,741,741,742, -617,617,617,617,617,617,617,617,617,617,617,617, -617,617,617,617,617,617,617,617,617,617,617,617, -617,617,617,617,617,617,617,617,617,617,617,617, -617,617,617,617,617,617,617,617,617,736,736,736, -617,617,617,617,617,617,617,617,736,736,736,736, -617,617,617,617,617,617,617,617,736,736,736,736, -617,617,0,617,617,617,617,617,617,736,736,736 +83,84,84,84,84,84,84,84,84,84,84,85, +100,101,101,101,101,101,101,101,101,101,101,102, +117,118,118,118,118,118,118,118,118,118,118,119, +42,42,42,42,42,113,113,42,42,42,42,42, +42,42,42,42,42,113,113,42,42,42,42,42, +113,42,42,42,42,42,42,42,42,42,42,42, +113,42,42,42,42,42,42,42,42,113,113,113, +42,42,42,42,42,42,42,42,113,113,113,113, +42,0,0,0,0,42,42,42,113,113,113,113, +0,0,0,0,0,0,42,42,42,113,113,113 0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,710,710,0,0,0,0,0, -678,0,701,701,0,739,739,0,0,0,646,647, -707,0,730,730,0,736,736,0,0,0,675,676, -0,0,0,0,0,736,736,0,0,0,0,0, -736,0,702,703,0,0,0,0,248,250,249,250, -736,0,731,732,0,0,0,0,277,704,705,736, -0,0,0,0,0,0,0,0,277,733,734,0, -614,615,615,615,615,616,0,0,0,735,735,678, -643,644,728,729,644,645,0,0,0,0,0,707 +0,0,0,0,0,99,99,0,0,0,0,0, +79,0,90,90,0,116,116,0,0,0,59,60, +96,0,107,107,0,0,0,0,0,0,76,77, +0,0,0,0,0,0,0,0,0,0,0,0, +0,0,91,92,0,0,0,0,0,0,0,0, +0,0,108,109,0,0,0,28,0,93,94,0, +0,0,0,0,0,0,0,45,0,110,111,0, +39,40,40,40,40,41,0,62,0,112,112,79, +56,57,105,106,57,58,0,0,0,0,0,96 - - + + - + - + - + diff --git a/assets-cg/maps/inside/2.tmx b/assets-cg/maps/inside/2.tmx index 3121d4e..d9a6bb1 100644 --- a/assets-cg/maps/inside/2.tmx +++ b/assets-cg/maps/inside/2.tmx @@ -1,63 +1,53 @@ - + - + -682,683,683,683,683,683,683,683,683,683,683,683,683,683,684, -711,712,712,712,712,712,712,712,712,712,712,712,712,712,713, -740,741,741,741,741,741,741,741,741,741,741,741,741,741,742, -617,617,617,617,617,617,617,617,617,617,617,617,617,617,617, -736,736,736,736,736,736,736,736,736,736,736,736,736,736,736, -736,736,736,736,736,736,736,736,736,736,736,736,736,736,736, -736,736,736,736,617,655,736,736,736,736,736,736,736,736,736, -617,617,736,736,617,655,736,736,736,736,736,736,736,736,736, -617,617,736,736,617,655,736,736,736,736,736,736,736,736,736, -736,736,736,736,617,655,736,736,736,736,736,736,736,736,736 +83,84,84,84,84,84,84,84,84,84,84,84,84,84,85, +100,101,101,101,101,101,101,101,101,101,101,101,101,101,102, +117,118,118,118,118,118,118,118,118,118,118,118,118,118,119, +42,42,42,42,42,42,42,42,42,42,42,42,42,42,42, +113,113,113,113,113,113,113,113,113,113,113,113,113,113,113, +113,113,113,113,113,113,113,113,113,113,113,40,40,113,113, +113,113,113,113,42,0,113,113,113,113,56,57,57,58,113, +42,42,113,113,42,0,113,113,113,113,113,74,74,113,113, +42,42,113,113,42,0,113,40,40,113,113,113,113,113,113, +113,113,113,113,42,0,113,105,106,113,113,113,113,113,113 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,710,710,0,0,679,680,681,0,0,710,710,0,0, -678,0,739,739,0,0,0,0,0,0,0,739,739,646,647, -707,0,0,0,0,0,0,0,0,0,0,0,0,675,676, -0,706,706,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,614,615,615,616,0, -708,709,0,0,0,654,0,0,0,0,643,644,644,645,0, -737,738,0,0,0,654,0,0,0,0,672,673,673,674,0, -0,0,0,0,0,654,614,615,615,616,0,0,0,0,0, -0,0,0,0,0,654,643,728,729,645,0,0,0,0,0 +0,0,99,99,0,0,81,82,0,0,0,0,0,0,0, +79,0,116,116,0,0,0,0,0,90,90,0,0,59,60, +96,0,0,0,0,0,0,0,0,107,107,0,0,76,77, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,39,91,92,41,0, +97,98,0,0,0,67,0,0,0,0,0,108,109,0,0, +114,115,0,0,0,67,0,0,0,0,73,0,0,75,0, +0,0,0,0,0,67,39,0,0,41,0,0,0,0,0, +0,0,0,0,0,67,56,0,0,58,0,0,0,0,0 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,704,705,0,0,0,0,0,0,701,701,0,0,0,677, -0,733,734,0,0,0,0,0,0,730,730,0,0,0,0, +0,93,94,0,0,0,0,0,0,0,0,0,0,0,78, +0,110,111,0,0,0,0,0,0,0,0,0,0,0,0, +0,112,112,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,702,703,0,0, -0,0,0,0,0,0,0,0,0,0,0,731,732,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,678,0,0,678,0,0,0,0,0, -0,0,0,0,0,0,707,0,0,707,0,0,0,0,0 +0,0,0,0,0,68,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,68,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,68,79,0,0,79,0,0,0,0,0, +0,0,0,0,0,68,96,0,0,96,0,0,0,0,0 - - - - - - - - - - - - + + diff --git a/assets-cg/maps/inside/3.tmx b/assets-cg/maps/inside/3.tmx deleted file mode 100644 index d823b26..0000000 --- a/assets-cg/maps/inside/3.tmx +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - -682,683,683,683,683,683,683,683,683,625,626,683,683,683,683,683,683,683,683,684, -711,0,0,712,712,712,712,712,712,654,655,712,0,0,712,712,0,0,712,713, -740,741,741,741,741,741,741,741,741,654,655,741,741,741,741,741,741,741,741,742, -617,617,617,617,617,617,617,617,617,0,0,617,617,617,617,617,617,617,617,617, -736,736,736,736,736,736,736,736,736,0,0,736,736,736,736,736,736,736,736,736, -736,736,736,736,736,736,736,736,736,736,736,736,736,736,736,736,736,736,736,736, -736,736,736,643,644,644,645,736,736,736,736,736,736,736,736,736,736,736,736,736, -736,736,736,643,644,644,645,736,736,736,736,736,736,736,736,736,736,736,736,736, -0,0,0,0,0,0,0,736,736,736,736,736,736,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,736,736,736,736,736,736,0,0,0,0,0,0,0, -617,0,617,617,617,0,617,736,736,736,736,736,736,104,104,104,104,104,104,104, -736,736,736,736,736,736,736,736,736,736,736,736,736,191,191,191,191,191,191,191, -736,736,0,0,736,736,736,736,736,736,736,736,736,191,191,191,0,0,191,191, -736,736,736,736,736,736,736,736,736,736,736,736,736,191,191,191,191,191,191,191, -736,736,736,736,736,736,736,736,736,728,729,736,736,191,191,191,191,191,191,191 - - - - -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,710,710,0,0,0,0,679,0,0,0,0,710,710,0,0,710,710,0,0, -0,739,739,0,704,705,0,0,0,0,0,0,739,739,0,0,739,739,0,0, -0,0,0,0,733,734,0,0,0,654,655,0,0,0,0,0,0,0,0,0, -0,0,0,0,706,706,0,0,0,654,655,591,0,0,0,0,0,0,0,0, -0,0,591,614,615,615,616,0,0,711,713,620,0,0,0,0,0,0,0,0, -0,0,620,0,0,0,0,0,0,740,742,649,0,0,0,0,0,0,0,0, -682,683,649,683,683,683,684,0,0,0,0,0,0,682,683,683,683,683,683,684, -711,712,0,712,712,712,713,0,0,0,0,0,0,711,712,712,712,712,712,713, -740,701,0,741,741,701,742,0,0,239,0,0,0,740,741,741,741,741,741,742, -0,730,0,0,0,730,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,239,0,0,0,0,702,703,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,731,732,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 - - - - -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,708,709,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,737,738,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,708,709,708,709, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,737,738,737,738, -0,0,683,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,712,0,679,0,0,0,0,0,0,0,0,0,0,0,680,681,0,0, -0,0,741,0,678,0,0,0,0,0,0,0,0,0,678,0,646,647,0,678, -0,0,0,0,707,0,0,0,0,0,0,0,0,0,707,0,675,676,0,707, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,735,702,703,706,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,706,731,732,735,0,0,0,0,0,0,0,0,0,0,0,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/assets-cg/maps/inside/fxconv-metadata.txt b/assets-cg/maps/inside/fxconv-metadata.txt index 7eaaba9..1f4c3f3 100644 --- a/assets-cg/maps/inside/fxconv-metadata.txt +++ b/assets-cg/maps/inside/fxconv-metadata.txt @@ -1,3 +1,8 @@ *.json: custom-type: map name_regex: (.*)\.json in_\1 + +tileset_in.png: + type: bopti-image + name: img_tileset_in + profile: p4 diff --git a/assets-cg/maps/inside/tileset_in.png b/assets-cg/maps/inside/tileset_in.png new file mode 100644 index 0000000000000000000000000000000000000000..1bbf2449987f0cd4d183e0331b49d641f483bb2c GIT binary patch literal 6397 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 A#sB~S literal 0 HcmV?d00001 diff --git a/assets-cg/maps/inside/tileset_in.tsx b/assets-cg/maps/inside/tileset_in.tsx new file mode 100644 index 0000000..0cb3a4a --- /dev/null +++ b/assets-cg/maps/inside/tileset_in.tsx @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets-cg/maps/testCarte.tmx b/assets-cg/maps/testCarte.tmx index 1be3e65..06df9ac 100644 --- a/assets-cg/maps/testCarte.tmx +++ b/assets-cg/maps/testCarte.tmx @@ -50,40 +50,40 @@ 295,295,294,294,0,0,0,0,0,0,294,294,295,295,294,0,0,108,0,0,0,0,0,0,0,0,137,138,138,138,138,84,0,0,82,138,138,138,138,138,138,138,138,138,138,138,84,0,320,321,322,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,20,21,0,110,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 294,295,294,0,0,320,321,322,0,0,0,294,295,294,0,0,0,137,138,138,138,138,84,0,0,0,0,0,0,0,0,108,0,0,110,0,0,0,0,0,0,0,0,0,0,0,113,0,349,350,351,0,28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,49,50,0,110,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -294,0,0,0,0,349,350,351,0,0,0,0,294,0,660,661,662,663,0,0,0,0,137,84,0,0,0,0,0,0,0,137,138,138,139,0,0,0,0,0,0,0,0,0,0,0,137,84,378,379,380,0,57,0,0,0,0,0,0,0,0,0,0,0,0,320,321,322,0,0,0,82,139,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -294,0,0,0,0,378,379,380,22,23,0,0,0,0,689,690,691,692,0,0,0,0,0,137,84,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,174,0,0,0,0,113,0,0,0,0,0,0,0,0,0,0,0,26,0,0,0,0,0,349,350,351,0,0,82,139,0,0,0,0,0,323,324,325,0,0,0,0,0,0,0,28,0,323,324,325,0,0,0,0,0,0,0,0, -0,656,657,658,659,0,0,0,51,52,0,0,0,0,718,719,720,721,0,323,324,325,0,0,137,84,0,0,320,321,322,0,0,0,0,0,0,0,0,82,83,83,203,84,0,0,0,113,0,0,0,0,0,0,0,0,0,0,0,55,0,0,0,0,0,378,379,380,0,174,111,261,0,0,0,0,0,352,353,354,0,0,0,635,636,637,638,57,0,352,353,354,0,0,0,0,0,0,0,0, -0,685,686,687,688,0,0,0,0,0,0,0,0,0,747,748,749,750,0,352,353,354,0,0,0,137,84,0,349,350,351,0,0,0,0,0,0,0,0,111,0,0,232,113,0,0,0,137,84,0,0,0,0,320,321,322,0,0,0,0,0,0,0,0,0,0,0,0,0,203,139,0,0,0,0,0,0,381,382,383,0,245,0,664,665,666,667,0,0,381,382,383,0,0,0,0,0,0,0,0, -0,714,715,716,717,245,24,25,0,246,0,24,25,245,0,0,0,0,0,381,382,383,0,0,0,0,108,0,378,379,380,0,0,0,0,82,83,83,83,139,0,0,0,113,0,0,0,0,137,84,0,0,0,349,350,351,0,0,0,0,0,0,0,0,0,0,0,0,82,232,0,0,0,0,0,0,0,0,0,0,0,274,0,693,694,695,696,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,743,744,745,746,274,53,54,0,275,0,53,54,274,0,0,0,0,0,0,0,0,0,0,0,0,108,0,0,0,0,0,0,0,0,111,0,0,0,0,0,0,0,113,0,656,657,658,659,108,0,0,0,378,379,380,0,0,0,0,0,0,0,0,0,0,82,138,139,0,0,0,0,0,0,0,0,0,0,0,0,303,0,722,723,724,725,0,0,0,0,0,635,636,637,638,0,245,0,0, -0,0,29,0,0,303,0,0,0,304,0,0,0,303,0,0,0,0,0,0,0,0,0,0,0,0,108,0,0,0,0,0,0,0,0,111,0,0,0,0,0,0,0,113,0,685,686,687,688,137,84,174,0,0,0,0,0,0,0,0,0,0,0,0,0,82,139,111,0,0,18,19,0,0,0,0,0,0,0,0,0,0,0,751,752,753,754,0,0,0,0,0,664,665,666,667,0,274,0,0, -0,0,58,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,635,636,637,638,0,79,142,0,0,0,0,0,0,0,0,111,0,0,0,0,0,29,0,113,0,714,715,716,717,0,137,203,138,138,84,0,0,0,0,0,0,0,82,138,138,139,0,140,81,0,47,48,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,25,0,0,693,694,695,696,0,303,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,664,665,666,667,0,108,0,0,0,0,0,0,0,0,0,111,0,239,0,0,0,58,0,113,0,743,744,745,746,0,0,232,0,0,137,138,138,138,138,138,138,138,139,0,0,0,0,0,111,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,53,54,0,0,722,723,724,725,0,0,0,0, -0,0,0,0,0,0,245,0,0,245,0,0,0,0,0,0,0,0,0,0,693,694,695,696,0,108,0,0,0,0,0,0,0,0,0,111,0,0,0,0,0,0,0,113,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,111,0,0,0,0,0,0,0,0,0,635,636,637,638,0,0,0,245,0,0,0,0,245,0,751,752,753,754,0,0,0,0, -0,0,320,321,322,0,274,0,0,274,0,0,0,0,0,0,0,0,0,0,722,723,724,725,0,108,0,0,0,0,0,0,0,0,0,140,141,141,141,141,141,141,141,142,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,320,321,322,0,0,0,111,0,0,323,324,325,0,0,0,0,664,665,666,667,0,0,0,274,0,323,324,325,274,0,0,0,0,0,0,0,0,0, -0,0,349,350,351,0,303,0,0,303,0,0,0,0,0,0,0,0,0,0,751,752,753,754,0,137,84,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,349,350,351,0,0,0,111,0,0,352,353,354,0,0,0,0,693,694,695,696,0,0,0,303,0,352,353,354,303,0,0,0,0,0,0,0,0,0, -0,0,378,379,380,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,113,320,321,322,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,378,379,380,0,0,0,111,0,0,381,382,383,0,0,0,0,722,723,724,725,0,0,0,0,0,381,382,383,0,0,0,0,0,0,323,324,325,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,108,349,350,351,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,111,0,0,0,0,0,0,0,0,0,751,752,753,754,0,0,0,0,0,22,23,0,29,0,0,0,0,0,352,353,354,0, +294,0,0,0,0,349,350,351,0,0,0,0,294,0,330,331,332,333,0,0,0,0,137,84,0,0,0,0,0,0,0,137,138,138,139,0,0,0,0,0,0,0,0,0,0,0,137,84,378,379,380,0,57,0,0,0,0,0,0,0,0,0,0,0,0,320,321,322,0,0,0,82,139,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +294,0,0,0,0,378,379,380,22,23,0,0,0,0,359,360,361,362,0,0,0,0,0,137,84,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,174,0,0,0,0,113,0,0,0,0,0,0,0,0,0,0,0,26,0,0,0,0,0,349,350,351,0,0,82,139,0,0,0,0,0,323,324,325,0,0,0,0,0,0,0,28,0,323,324,325,0,0,0,0,0,0,0,0, +0,326,327,328,329,0,0,0,51,52,0,0,0,0,388,389,390,391,0,323,324,325,0,0,137,84,0,0,320,321,322,0,0,0,0,0,0,0,0,82,83,83,203,84,0,0,0,113,0,0,0,0,0,0,0,0,0,0,0,55,0,0,0,0,0,378,379,380,0,174,111,261,0,0,0,0,0,352,353,354,0,0,0,334,335,336,337,57,0,352,353,354,0,0,0,0,0,0,0,0, +0,355,356,357,358,0,0,0,0,0,0,0,0,0,413,414,415,416,0,352,353,354,0,0,0,137,84,0,349,350,351,0,0,0,0,0,0,0,0,111,0,0,232,113,0,0,0,137,84,0,0,0,0,320,321,322,0,0,0,0,0,0,0,0,0,0,0,0,0,203,139,0,0,0,0,0,0,381,382,383,0,245,0,363,364,365,366,0,0,381,382,383,0,0,0,0,0,0,0,0, +0,384,385,386,387,245,24,25,0,246,0,24,25,245,0,0,0,0,0,381,382,383,0,0,0,0,108,0,378,379,380,0,0,0,0,82,83,83,83,139,0,0,0,113,0,0,0,0,137,84,0,0,0,349,350,351,0,0,0,0,0,0,0,0,0,0,0,0,82,232,0,0,0,0,0,0,0,0,0,0,0,274,0,392,393,394,395,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,413,414,415,416,274,53,54,0,275,0,53,54,274,0,0,0,0,0,0,0,0,0,0,0,0,108,0,0,0,0,0,0,0,0,111,0,0,0,0,0,0,0,113,0,326,327,328,329,108,0,0,0,378,379,380,0,0,0,0,0,0,0,0,0,0,82,138,139,0,0,0,0,0,0,0,0,0,0,0,0,303,0,421,422,423,424,0,0,0,0,0,334,335,336,337,0,245,0,0, +0,0,29,0,0,303,0,0,0,304,0,0,0,303,0,0,0,0,0,0,0,0,0,0,0,0,108,0,0,0,0,0,0,0,0,111,0,0,0,0,0,0,0,113,0,355,356,357,358,137,84,174,0,0,0,0,0,0,0,0,0,0,0,0,0,82,139,111,0,0,18,19,0,0,0,0,0,0,0,0,0,0,0,450,451,452,453,0,0,0,0,0,363,364,365,366,0,274,0,0, +0,0,58,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,334,335,336,337,0,79,142,0,0,0,0,0,0,0,0,111,0,0,0,0,0,29,0,113,0,384,385,386,387,0,137,203,138,138,84,0,0,0,0,0,0,0,82,138,138,139,0,140,81,0,47,48,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,25,0,0,392,393,394,395,0,303,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,363,364,365,366,0,108,0,0,0,0,0,0,0,0,0,111,0,239,0,0,0,58,0,113,0,413,414,415,416,0,0,232,0,0,137,138,138,138,138,138,138,138,139,0,0,0,0,0,111,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,53,54,0,0,421,422,423,424,0,0,0,0, +0,0,0,0,0,0,245,0,0,245,0,0,0,0,0,0,0,0,0,0,392,393,394,395,0,108,0,0,0,0,0,0,0,0,0,111,0,0,0,0,0,0,0,113,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,111,0,0,0,0,0,0,0,0,0,334,335,336,337,0,0,0,245,0,0,0,0,245,0,450,451,452,453,0,0,0,0, +0,0,320,321,322,0,274,0,0,274,0,0,0,0,0,0,0,0,0,0,421,422,423,424,0,108,0,0,0,0,0,0,0,0,0,140,141,141,141,141,141,141,141,142,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,320,321,322,0,0,0,111,0,0,323,324,325,0,0,0,0,363,364,365,366,0,0,0,274,0,323,324,325,274,0,0,0,0,0,0,0,0,0, +0,0,349,350,351,0,303,0,0,303,0,0,0,0,0,0,0,0,0,0,450,451,452,453,0,137,84,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,349,350,351,0,0,0,111,0,0,352,353,354,0,0,0,0,392,393,394,395,0,0,0,303,0,352,353,354,303,0,0,0,0,0,0,0,0,0, +0,0,378,379,380,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,113,320,321,322,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,378,379,380,0,0,0,111,0,0,381,382,383,0,0,0,0,421,422,423,424,0,0,0,0,0,381,382,383,0,0,0,0,0,0,323,324,325,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,108,349,350,351,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,111,0,0,0,0,0,0,0,0,0,450,451,452,453,0,0,0,0,0,22,23,0,29,0,0,0,0,0,352,353,354,0, 0,0,0,0,0,294,0,0,0,0,0,0,0,0,0,0,0,294,294,294,294,294,294,294,294,0,108,378,379,380,0,0,0,0,0,0,0,0,0,0,0,0,26,0,0,0,0,0,0,0,0,320,321,322,0,0,0,0,0,0,0,0,0,0,0,0,0,82,139,0,0,0,0,0,0,0,0,0,0,0,0,0,24,25,0,0,0,51,52,0,58,0,0,0,0,0,381,382,383,0, -0,0,0,0,294,294,0,0,0,0,0,0,0,0,0,0,0,0,294,294,294,294,294,294,294,0,108,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,55,0,0,0,0,0,0,0,0,349,350,351,0,0,0,0,0,0,0,0,0,0,0,0,0,111,0,0,0,660,661,662,663,0,28,0,0,0,0,0,53,54,0,0,0,0,0,0,0,0,0,656,657,658,659,0,0,0, -0,0,0,0,294,294,245,0,0,245,0,0,0,0,0,0,0,0,0,0,0,294,294,294,0,0,108,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,378,379,380,0,0,0,0,0,0,0,0,0,0,0,0,0,111,0,0,0,689,690,691,692,0,57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,685,686,687,688,0,0,0, -0,0,0,294,294,294,274,0,0,274,20,21,320,321,322,0,0,0,0,0,0,0,294,0,0,0,108,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,82,139,0,0,0,718,719,720,721,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,714,715,716,717,0,0,0, -0,0,0,0,0,0,303,0,0,303,49,50,349,350,351,0,0,0,0,0,0,0,0,0,0,0,108,0,0,0,0,0,0,0,320,321,322,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,111,0,0,0,0,747,748,749,750,0,0,245,0,0,0,0,0,0,0,0,0,0,0,0,24,25,0,743,744,745,746,0,0,0, +0,0,0,0,294,294,0,0,0,0,0,0,0,0,0,0,0,0,294,294,294,294,294,294,294,0,108,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,55,0,0,0,0,0,0,0,0,349,350,351,0,0,0,0,0,0,0,0,0,0,0,0,0,111,0,0,0,330,331,332,333,0,28,0,0,0,0,0,53,54,0,0,0,0,0,0,0,0,0,326,327,328,329,0,0,0, +0,0,0,0,294,294,245,0,0,245,0,0,0,0,0,0,0,0,0,0,0,294,294,294,0,0,108,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,378,379,380,0,0,0,0,0,0,0,0,0,0,0,0,0,111,0,0,0,359,360,361,362,0,57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,355,356,357,358,0,0,0, +0,0,0,294,294,294,274,0,0,274,20,21,320,321,322,0,0,0,0,0,0,0,294,0,0,0,108,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,82,139,0,0,0,388,389,390,391,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,384,385,386,387,0,0,0, +0,0,0,0,0,0,303,0,0,303,49,50,349,350,351,0,0,0,0,0,0,0,0,0,0,0,108,0,0,0,0,0,0,0,320,321,322,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,111,0,0,0,0,413,414,415,416,0,0,245,0,0,0,0,0,0,0,0,0,0,0,0,24,25,0,413,414,415,416,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,378,379,380,0,79,80,81,0,0,0,0,0,0,0,137,138,138,138,138,138,84,0,349,350,351,0,0,0,0,0,0,0,20,21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,82,139,0,0,0,0,0,0,0,0,0,0,274,0,0,0,0,0,0,0,0,0,0,0,0,53,54,0,0,0,0,0,0,0,0, 320,321,322,0,0,0,0,0,0,0,0,0,0,306,249,249,108,0,140,80,81,0,0,0,0,0,0,0,0,0,0,0,108,0,378,379,380,0,0,0,0,0,0,0,49,50,0,0,0,0,22,23,0,0,0,0,0,0,0,0,0,0,0,0,0,111,0,0,0,0,0,0,0,0,0,0,0,303,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 349,350,351,0,0,0,0,0,0,0,0,0,0,0,0,0,137,138,84,0,110,249,249,249,249,249,249,249,250,249,251,0,108,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,51,52,0,0,0,0,0,0,0,0,320,321,322,0,82,139,0,0,0,0,0,0,323,324,325,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 378,379,380,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,137,138,139,0,0,0,0,0,0,0,0,0,280,0,137,138,138,138,138,138,84,0,0,0,174,174,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,349,350,351,0,111,0,0,0,0,0,0,0,352,353,354,0,0,0,0,0,0,0,0,0,323,324,325,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,280,635,636,637,638,0,0,0,137,83,138,138,203,203,138,138,138,84,0,0,0,0,0,0,0,0,0,0,0,0,378,379,380,82,139,0,0,0,0,0,0,0,381,382,383,0,0,255,256,257,258,0,0,0,352,353,354,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,320,321,322,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,280,664,665,666,667,0,0,0,0,0,0,0,232,232,0,0,0,137,138,84,0,0,0,0,0,0,0,0,0,0,0,0,82,139,0,0,0,0,0,0,0,0,0,0,0,0,0,284,285,286,287,0,0,0,381,382,383,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,349,350,351,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,306,693,694,695,696,0,0,0,0,0,0,0,0,0,0,0,0,0,0,137,84,0,0,0,0,0,0,0,0,0,82,138,139,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,285,286,287,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,378,379,380,0,0,0,0,0,0,0,0,294,0,0,0,0,0,0,0,0,0,0,722,723,724,725,0,0,12,13,0,0,0,0,0,294,0,0,0,0,0,137,138,138,138,84,0,0,0,82,138,139,0,280,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,285,286,287,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,19, -0,0,0,0,0,0,0,0,0,294,294,0,0,0,0,0,0,0,0,0,294,0,0,0,0,294,0,0,0,0,0,751,752,753,754,0,0,41,42,0,0,0,0,0,294,294,0,0,0,0,29,0,0,0,137,138,138,138,139,0,0,0,280,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,285,286,287,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,47,48, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,280,334,335,336,337,0,0,0,137,83,138,138,203,203,138,138,138,84,0,0,0,0,0,0,0,0,0,0,0,0,378,379,380,82,139,0,0,0,0,0,0,0,381,382,383,0,0,255,256,257,258,0,0,0,352,353,354,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,320,321,322,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,280,363,364,365,366,0,0,0,0,0,0,0,232,232,0,0,0,137,138,84,0,0,0,0,0,0,0,0,0,0,0,0,82,139,0,0,0,0,0,0,0,0,0,0,0,0,0,284,285,286,287,0,0,0,381,382,383,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,349,350,351,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,306,392,393,394,395,0,0,0,0,0,0,0,0,0,0,0,0,0,0,137,84,0,0,0,0,0,0,0,0,0,82,138,139,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,285,286,287,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,378,379,380,0,0,0,0,0,0,0,0,294,0,0,0,0,0,0,0,0,0,0,421,422,423,424,0,0,12,13,0,0,0,0,0,294,0,0,0,0,0,137,138,138,138,84,0,0,0,82,138,139,0,280,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,285,286,287,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,19, +0,0,0,0,0,0,0,0,0,294,294,0,0,0,0,0,0,0,0,0,294,0,0,0,0,294,0,0,0,0,0,450,451,452,453,0,0,41,42,0,0,0,0,0,294,294,0,0,0,0,29,0,0,0,137,138,138,138,139,0,0,0,280,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,285,286,287,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,47,48, 0,0,0,0,0,0,0,0,0,294,294,56,0,0,0,0,0,0,294,294,294,0,0,0,0,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,294,294,0,0,0,0,58,0,0,0,0,0,0,0,0,0,0,0,280,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,285,286,287,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,294,294,294,0,0,0,0,0,0,0,0,0,0,0,0,0,294,294,0,0,0,0,0,0,252,253,253,0,28,0,253,253,254,0,0,294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,285,286,287,0,0,0,0,0,0,0,0,0,12,13,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,320,321,322,294,294,0,0,0,0,0,0,0,0,0,0,0,0,0,294,294,0,239,0,0,0,0,0,0,0,0,57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,313,314,315,316,0,0,0,656,657,658,659,0,0,41,42,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,349,350,351,56,294,0,0,0,0,0,0,0,0,0,0,0,0,0,294,294,0,0,0,239,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,342,343,344,345,0,0,0,685,686,687,688,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,378,379,380,294,294,0,0,320,321,322,0,0,0,0,0,0,0,0,294,0,0,0,0,0,0,0,339,340,340,340,340,340,340,340,341,0,0,0,0,0,0,0,320,321,322,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,714,715,716,717,0,0,0,0,0,0,0,0,0,0,0,0, -294,0,0,0,0,0,0,0,0,0,0,0,0,0,349,350,351,0,0,294,294,294,294,294,294,294,323,324,325,323,324,325,323,324,325,0,0,0,0,0,0,0,0,0,0,0,0,0,0,349,350,351,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,13,0,0,0,0,0,0,0,0,28,0,743,744,745,746,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,320,321,322,294,294,0,0,0,0,0,0,0,0,0,0,0,0,0,294,294,0,239,0,0,0,0,0,0,0,0,57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,313,314,315,316,0,0,0,326,327,328,329,0,0,41,42,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,349,350,351,56,294,0,0,0,0,0,0,0,0,0,0,0,0,0,294,294,0,0,0,239,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,342,343,344,345,0,0,0,355,356,357,358,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,378,379,380,294,294,0,0,320,321,322,0,0,0,0,0,0,0,0,294,0,0,0,0,0,0,0,339,340,340,340,340,340,340,340,341,0,0,0,0,0,0,0,320,321,322,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,384,385,386,387,0,0,0,0,0,0,0,0,0,0,0,0, +294,0,0,0,0,0,0,0,0,0,0,0,0,0,349,350,351,0,0,294,294,294,294,294,294,294,323,324,325,323,324,325,323,324,325,0,0,0,0,0,0,0,0,0,0,0,0,0,0,349,350,351,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12,13,0,0,0,0,0,0,0,0,28,0,413,414,415,416,0,0,0,0,0,0,0,0,0,0,0,0, 294,0,0,0,0,0,0,0,0,0,0,0,0,0,378,379,380,0,0,0,294,294,294,294,0,0,352,353,354,352,353,354,352,353,354,0,0,0,0,0,0,0,0,0,0,0,0,0,0,378,379,380,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,42,0,0,0,0,0,0,0,0,57,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 294,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,381,382,383,381,382,383,381,382,383,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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/assets-cg/maps/tileset.tsx b/assets-cg/maps/tileset.tsx index 9902698..4ea7542 100644 --- a/assets-cg/maps/tileset.tsx +++ b/assets-cg/maps/tileset.tsx @@ -1,9 +1,24 @@ - + - + + + + + + + + + + + + + + + + @@ -15,48 +30,211 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -84,6 +262,9 @@ + + + @@ -95,6 +276,7 @@ + @@ -114,17 +296,27 @@ + + + + + + + + + + @@ -133,12 +325,28 @@ + + + + + + + + + + + + + + + + @@ -146,115 +354,125 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets-cg/tileset.png b/assets-cg/tileset.png index c4146fa8e4e0f5ef866ec67dd64809aa5def06bb..5bbf628ad29ac335738b6112e4f0a706189519d0 100644 GIT binary patch delta 9245 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 F{|C)@-UR>v delta 15784 zcmch;WmHt(_c(lMMWm5#>24$k7+O*~MWwr>xgb(fA|>55ba$76Ff`KLB1kjTe?H&! zynJ5&X03U1?!ITo*?sn{D@Kc2K>JFHo$~|}000V5xTl7GrV7jqZ_-`4L46!fwwymL z`mOH35}We-B`)(gKQFgiuDY7Sa(GJhubFOMP@XVUL%O`+=ImcIMc&6#6p0!Ocn zi##k?)t*^AF@E~`8A{sMn6IPC4x2AmxSVS(4M*-b_aw#2JYJ3@bAr;jR~kPcH7hv)Xp#=&kS)%D+z)fSsTRQ65wdxr>03aUYek=T+Q#hqA;{he)+yFdMrYeTIW?8^#xG5Szrfz$ z)7vVvIJLsGEcYsm^g^^1UoBw5>0B(%b$pA)a@fJrJ0tu<|B`M7@WPa7IKDPlB{17rViBT+NZh?%yxdP4um&jU?+EcswWoI&(oa?LXC~dXvUhg2Grgp!>w5iz=sYYO?DN zNe#F0^YfUSEk_g8XM9J)30I@|Oe%3BaQlABbR0xrq z`+qC_ELY!!IwpOnmCkH`38|vMp8sk9jqQ2IrGvf%Za>a!r`ac$7m*S+s2VQY~!3^ye!-mbq1y+UxS)Xc8iB+h#_xi}GBm-VBR;j&f z6~$}e7XS3VPWm7w;ulGVm-xv_Nb9z|{a*mse-VXqw-i0`61^|qY?{mT69R7;#0B=e zcT)_$(ZfTIGlLG=#o*_8@FsvoJHqlvZ~rL?+C3WC9xd{e0e1G7IbF;|Ga-h$g^*JeZDNuFA%l_t0As6=F9md^btX=>*LMN1%k}iM zQ{%4$rAG7x5cbz*)1FG)*!;YRQJzgp@|hE8){t z+X?=mtk=~ZM}C<`6NrVZUkEdNMJUjY|E=+Il|#5A_wiK>EE2!+9u z>9$GIi}7Y(njfn)rzI=a3%db~gH4Iv%*-f>rOA$d|1NwkqHeZHo5C9AzQ$}|mh3&6 zv^6M@e9L1XQ3Ic$}`lyy+4)r-t4g8WY=E((%3GGVDeF>=RZ9&2pbGA z(Ak;}{p&O+lZiQh!nL{6dzWx?N7mkdxpqJmWW@`=S> zyv56N2gTXb-5O>}l26ZySEL@F^r8_V+*I0EHSs$*UcQZ^UMK(Ohs8BD3--fn=pq#;@)XLknOh30-d}5XFx8n z<`hho7aUJ#WMsdc8jcwBck@Pt_(T#hRw;`pMlBjJuTn#MLMOW!_41(m^cO9qY+zTv zz`c7~HYdj3mIaUAvI%E+$rH`8bv7G09rXXqB-V*iuE&lvXd1mlSOSev=G7AvI#K#i z&#YqnS6nja3dP$OiT%Qt-z3(Aq>G{oa~E2;H#airRiO2}--Xu|P&rK=BiV`TUu^6( z@|Cx~LbNoK>MSO}U z!H$Bc#FgYdKIE;35lJm9z+>kSa&Ql|})1ZGynWtIDE$rI{tX>!kup2bg5Lv12Wy>Nei-Un-=@)mb9Tzk#8 zgm4u6lxhAjb?3}2tT9=7i;=31ws&?aogI4volRI4_AWnnU3@j{Kmt03yk8dAg2@OC zou7}}=a^p?U&i!u*>FK+?CJf(nRQ1SooN?ouOP#o+^y}{opK4M4**@$&)|%epo8B6 z>qbTq6T58|JoRP0Z@@*U@n5%`r9v7@2OceW$@&R#kJ*Rt4$b@9u&WOq+{4{apb?X_ z=+b-5D2?9Tfq-D5oG&25P~91L)q&Dn#VM!kNPlY5^22=_HP=S#;hAbJSZtf%I1kg-WqJ*T&JR?}Y3O7!H5{ne`EtJO3f#mxg2Azkp7HtE zprUc)k2WAZwOb*ZtPWv-q~r@(GgrZ(W&LD}dV5sS_-n~r1_{%VncbrkV&yp@f*@MN zjtMe+G%AB4yfk04*HD#48!u(Wi+lr~H2D!k3oc^&sEeN_kAMvh!%PgrvL7MKyUkml z7;xH;2fh{A)a|UT+q|({o+)4~V=9S5H!&d9S5Pppbo>Y@QE;G?=}8`2@7Cctatf^DVr4ub%t0{55t@4d51a z1cP7%l}ggwh;Ce8cMs1K5={8NOi_-ZOiG};9=|Qe>KKQ=)N-vM z48)hgIf@>WDf2hg%zQS-z(OIS65^?T^xA*&MxxjhTOHU`9MqaLh}JAX=m_tAu`=c( z)Ccj`OL0b)-nCKXwG4bjXS~na5Jj?{7}v_gkoV^UR$fzi1imMi8>%KenQxvNI?%%1 zT$NaqPjQqMq?g5^kE^xK&&bpe3Mq*6UJKyChRqx*@6x?$aPQW>@bT4%tEjG}`?Hq{ zEr9`VEPa0LYw3T%)gWMYQ&=PO>cQKe1(TU(xR=E~HBRFE=aU^Vv;ua{U-wGyVWm4q zM${%8jC9;=z^YpbG1}#%UVp@@*-~h#)bK!_YLAk+rBj0M%d%uQ$^83ssl)g(b*8fQ zr_fu-eMn#ngARo>e{5bd!>l~nUujR z){-vr+5DKtU*T@jB~LVl-m(3VH`sYqsCQs%4k7Wllx$V}tSR5z-495-*VRYf*fmRnmu2M_hcF?}=PA)sXB5o@8 zmX6R{VUP%qi)97jF%c295tVp4pG)lH-{3a?yejMwPFOxL^siTI%hT|ns|`fzoN0FP z-mwlLiFHqlHsn7y%iiqu=-oSYW1H?S&$MS`#;Tti)Vi-*{@$EXt(Pv%dBAPx9oAr+ zl1wFqD~Epb6fB_TI3a?yt@JM%$-1FSB3(d37Y0=103Fu@-eX=8E7P|VxOi_^cN*{f{o`+695zx^sUHT&~!Btgef(!Zk zh9vvvm7iU#GSX4OG50t$0Jn?O{HH3Gk2dlJ@1`+}lb;xGBi@-Fl^7qnCR9KN1bv59 zh`*w$gF2}}(_OZ@S#RuMx_^0ebm@*mMjN5fXW@5DRTZ)wA%UDu-0_Orb|Gq?nem@1 z5PURZcp1~E^;e&&tjdwN(v7X4{2Uz2a~#8%*3Gl`$z>;QV6+=J{KvR?x<<$7(8$DK zWUzJl%Lbww8f8cAk|gf2UiuPMQ`uO}XkOuoF1Xu^QCj+2_ivEbc-%j3a5(EZj4HDX zN5(O`q}I?2#;GCXJJ(r6?DM5leY-OTHuea?ZaXV3Ey#f`oB6p))Kv2`;zd0B_iEe2Z9Pjb%hx&@01; zaw3jn$<6JZTXvy;x=Kr5^{@^%9u-x56Ub-RXz5Kzz(v(60}cB38GA*h%OsUTH+%R& zn=kmTUZjMA>O+0Z$5oZ#)bMW=vd%sSPB*O!U1wCjXL)cHTkJNM-W_=h%V2hihO0Q# zAaFb`@wNiK*EY?@Atr`b+b@JobpaIn|hLZxR#bl(lrc1LRQFe3^VHKW-z=_s;* z>gMTSBgNeIxIUz@B=+->7a(u*Z?DUB9{HfNaG)b%jRn_u z0{}We87iZr+-!2gy4*~GF`%xOgB1MhUs}xzC)1N*#rwWrn2qXoOn}pJxl$Z0f~3-EM$)zRj6L7I7s#itJ%kmW@2n+NjOu{SQ4 zEdeeqr-hq-#hSVYvW}MYNV;K;;_dl+2iXvKgnmQd=yQ9|bvBr0P!cPFR%4W5F#9cI z((wRNais3ROUGNtMc~os$o3peMUY>s*Wry`jx3UNA(8T=)f80G+a)PZZcpG#3k{UW z8M$9mC%*)F29kRXS@TPVXk3X?`~CIBFUY*f=Wy`FjBwY24|JEYg_c+#fgBl$j_es0Z4zN8(QjuiKFji}StOkwfkv+J46S z_oo;lD*Uk2$aNvzm`@>&lU1UDqQHG9`wi$T!61fT*%?P{8 z8;8EgXw$jKZkHhZT1ctSxXZXphy3sLzG;gQjvi$i-;nVF=eU z3*?#cp`!Cs`xI)>_h#Pwj6Yui|NObw;0uEE+YP%96CO@I5kQe{$jRSx$_LRD#ZANg( zo3j=%CI$v-;dMd+0;XURR?GSjQ?z|43Km$*Y+_m+tvO%+Fzfg$f@_0tso7wLA9tO`UPv_W}7Z|sYB_is@O;Gq8Es@{I)iK{`-e9g&FykpfJO$cx ze=S_99Q0GS6w7@0*%9X6`LNL=odlnnlH}y6GHsA;a+;e+IJNikBnQ?Kt{#~gcfWZi z@$lhj&=JCpA82@}{`~ym&XN}zobMu(9B{erQWVPa_NX1oih58@oR|y4F=k*;q2kcQ zaD=={X(%|<(eW>i`%#sG1g$m{g3WlI7gQ306-Z3D`e8`VbV`;(FpP8~Ev}ASK#u!T z>a^717k{?-K>zy(+P1bbhMnc7+!037f-q^}bNAQdO7l!Jrdqmc)HiGEO{zvi=2z$?${(gDJ z(#_LuIztsIm~G-W9~!ng&(nVMHzRJ?`~-zvG^GKGkO(;C_mVN&O44WwJQs+xb`u*E zD_!h#a^(6bD_N~1&Z}hTgL)=_%xnVN@e(6GkBm7#MeD9eFI3hWJC8*JR+f$jEO(ne zuS&RlP?t+YNn@(zgQA3iOa$^FXTdxE{#}$M#uF4b&|mU90~Jx9ARjtfu(dHuJ_Xj7 z->@!>xgLEp36UIIxm2j-f{rq4zbzrOlqN_EBF@lTYGq~Z&~y+_w-^RS-|5K;5>fr3 z80U%-!mIoqiOeqJY8PH7Qx$ZV>lNaR`=}c#Q((Mn$1l98XlZ!`-t8U^0l?Lxn^Tdn z|H&nc7r68A;#*i)5Y1#5H7K{M>zs^<4b+gm<@nk3-h&-@`>{+L)8@rEX0foQfFxAo z_~FO2L!Xk(`C{DvvTV>yd|YqX~|% z-U?NmM_PTFWVamzS)?H8tbP(F8X)P}nKQU=+-$$BJyUziK#Dokf$Woi)x;1JBk9hZ zDUA_k`+7l^!xyorbdDCtZ++{X^r0Pp^d-_%PW$RRLOO~CNBo~JlBU-Hk~ zo-(8ycq(=&;!Z%*op%YX8HQ1x9kFpzg{lflQ%MHCzRCuZ`6W=^x-30|V2{NH#{G3K zgGEuXnOc1&*^{uolYnO;Ixk6J6n(I#+cPBgK}YJX-n+In8;TQPNxbw)payH4nh{sV@zA@1XRdwnTznkTu-DcIy!*P*& zU$~@oeF>HbqJI3q`thvHCW~a9_0wcId&9=>wa@I(H}WQ{?!}1hV=7D=oQeI5UyAOQ zrsrV;0HWn2K{1-)C7s$zwMq591jB=pz#@G|Jrfl@}AsW}u zlnw3I+IYMW-JP>Dh@-HrcB!V#<+I7WJn&s~TwI|8xYA=bl2q(QIc##YYFKp}zDGWd z_ryKr(D}`9{{=;7qj)atbPt?9tn3;hny%2_o_$=h-taAxS|&I{#Pkvc!RB8?2ycJk zozY8Qkdc>Vz6fT|KJNuaQMpr|t-IKa#igo5erD|xs54#Gp{%SDK-f)$&-xo4g9k-M zBVDOx|E`yS#eweoU0u`&;m9;eAEqe;B&mmu7g7gd{h$+I zCpX49KOEiGZ|V$rCKv7`-iD~c7r6j zPxnHIBJQ`6kb>L}$T1uih3tkS1535%5&zBo)UEnvXozIkJ=a`iDYpHbq~L9_lCrjN z!WW3{rR10HG>tJdmNO?wfd%%- zk_FD6O=UDhMK}XU#T>>K98p4xfKC)SzEji9E_9PFZ5tgeU&z>Rg$g!7Nes=lP%&9v zm#I0f?)dK`@qsypDiqLy3fT%=Ol_;lKR7gqVNszy=-ggh#x<{t0%{Ib8@$+NTYf5S*Dfu zgKRd_Eo8R{PjJOS_8&qxX@+CBca(5HFspdxs1SP^{G*qcD!fi1w9MQjZTYo`AKC@# zx@)tX53Dxu{jgRpIya=KXu2uxOc(p2;IrGbHh4Hi%G%^HzgkSK)=YWS?ll`=x#&OqWNI&iF4={17oiV~>TZ zCTG%6_2u1C4;3iy5miW4-A=Uf0)Lv_t3ao=gs3!^nO*5P`RC7(7Ymmkr-!^do^)6JZNuwE zS$6%Di!Yl?_cbBpE$7kz6_LJ?6Sh!zbKR zZ{!6aR7A~ymkdgWA2f=I9)jY{98@byhmY!(>GK^I-L<&x1+bQWzOnm?MgrVXXxY8i z7|xa_>jv?bp3p_}I(UPf?u?CslCc>XRLHl{8+9aycwOyLu_Hzp<~p|7I?3_l-5L;`#ot&V!^+XS=-FVV2e zvl4f2ZJ`HJT+$6CN9~u|qTi$Zc5`221O5oVHF~&x%E(KudGzK+j5334I&Me8w%Vc7 zXWzSC*IGWB*Klu+=U0KVKoT5{Bp_)4$k^v!!J-H`J}3BtUY*xs*g_1klEgdzU`&b3 zgG*)!bra49s6fASN7WJj8R3nFdWrJ+aBacGg7>LdHuIiWpYdKhe|FyG4N}ycOALvx zp-)6|V`Td}o*f#(a%a%ifEhth@J~la=Z9JYpi^~5^N4F#xqv#|2ur3UP%D4G`JR=V zdvFh(_W%twm$%nqZAb=BN}Q&@D>TdkO_SD_Mi?Lhz*C3rX1wb8p#7ZlD=)7HLVp1- zoL~t4<|Yv6dT1@=ykk zeS7w5u*-zP^pW&I0^Lh1w*8ktWuSATKlkh+0xv8j_w1rAZ}GA3{mvYo0hsq?=EBO2 zw&c4z=+$^4r5QRU-7?qsrw$K3qD5T{x>Y%D7pbjlDq(l-MMH;;)uChuXj=a9WlbSH zjX|fvo2qq?I+U{W)$#%eIYab3!UCFY#wa9=sm#E&k@4?i2L2G=E%N@$qy}^1*W<#Dz8b zbU%f6ANcbM68roKM({tjHSaw!AinED6S#VjB!8J&R_0PSzv5&cpuca#vr<8Ia8F`v zr2kXEsiI2U^w6*)&=y2g>!sPQTEULdB*#UPPlRhoepVR-r=4U9TNlT;E%M~ zaejfRYu(^IK5(*~8ERv1U&qDvEv?aaDBqk@VJ6otnbt=#xYd( zX37HeZU66Sw!zLjNshUy<*`2qjIz3?hNjNUSHWge2C<|Xh80CrRU7f^i~>6136g1Vvu(ACY&>)6UH{Q1eWUn~#F~v6)$F>ci0|Nno){;uxQa3< zDd|}e>Zr$v9ybP^_(AM20es+>lM`#OgZoCd@SJZ&6Za<8e&y|!I~CF zD%!S-wsDEdpJk3auKqcO9BX!#0vW_r`6;m24&G74>$S5_+BKve+(Kw=#!}?YDVr+d z=UnG1g_l>RKu7aI%z95W}~)(%srR<#vXx>n+45?}p{Z9XK6 z1;augY+3dVG&F^cQ74LC6EG{>)(zVTa^`>w%3`xb8>U?o5AT#47oz9%?F!De=z$nJD5pag!M0GarVbdiSTRF&ucxq%T6&Bobh=S0bG}&iZ^QV&#~ZvYel{-k zDiU+_wS~&?qOp@HasTkC>?KOfd$pi#-UH7wWSyD?*PEj9};q2(goZTS8%r07s z{jawL{GMOc*-jN1mS$O(fi0pb6oHJhWQo+X4T9+dFuWdqyoKo zHXNSP$@1tzhnUW|B-pne=2S|mdrD22(Tz4b@yb0(mkmfvOhgq0%hHWg0&?nd@_gAY z+kFV{8^wS~jAA+|{Ysw8vttdZr$F_zd;l|#Q2{ZjbKPa@D;Pjtli{{-e8{PpdSfpX;)loV7Tk23bTnErYE>xv=B?;%vPmM#6}7CJ_~B z7j1d59PBaV4KIGS`I9|a!DTx&8jfPq6(LFSM=)Yi+1PO~-SbDZt&8mHFWA<;7$+Vv zp$v9^l}Zdk1r$2ymVOv1J3U2qevriU&CuSGA>vI2$TiyOIuP$Ye|H9m2iepeMM*#G zM912K14U}-I`plchqEU{8WO=8nJ6E-q>1g{0FXyRyhcKUM1a zjT|!|U44TK#50?Eg1X0blYs(k67ud9@k=7pO#{FnQ}_`8(< zsbc0&Up>oH)}_>P>p^7UsqA7WH+7v%#Hjrh^{0N}@Ym_Fijm#mqTdb}#mT}-U<2yZ zj$EttV)54E4{YFd-eWn|N?#k}u`vm~5dgWDV?reef(=iPDJ4esDDUul5<9saTEbbE zwq{kGxJ?-K%G3^nON*AA=7%q?%^dAu+Il&49~wiZ4*oF@D(;?3MB6GPBkCE|W{%~_ zl2b^+rJG6#suW~v&!A82XJJjq{vV#u#(V(U9xDef9&VhaPQ*w5y)szmSX!(6-u*xd z3eYn``!xlnTb#ug@K-hS+JCn{Qu>eR1#LpSm8wRdwr}onSjvA4f0!L9(rOkkg}-Kp zjed|5NVeoKHE48`%<8n0RHr>FDqtr;c5XhnO?rRZ^(ZNK&9B|be+oLfZ!TajMPRp2 zJiR-Ze*^g-)`ir(<_4IS+3rwPR&R&-o$U4c@uR9jXvvcwg-kcU@6DPHP&^OeWwC7m zxgjA@tZgqBntTuj8yaTHIxvI^3Z{)-JdJ8HjUFZ*lZr&JrIex3w>W|PH`*A8u=>~J zS=I`pEKOrxT&YJ>j9?m3%_nz5HNlU8r{R47E_}vzpA~L-Ww?JwSgJyv15jj4n#b0? z_SIGlp68)X2qFq{Zl<=Z7So?tdaA(8_BeXg^~pu_!ov3~rPCT=ICN|lW`BYBVg7Xk zE#yjjwZu%{nbt0ab8y=e7-!YZ1)M7EqB#?0e+rT$alfUb0JE$TvvqZfI!nK>W^U-F zd##j%gxa2-zS-V0%gcqvm-&tpZS9-7h0mlQaet05CDJJSRinb_B$GzVq{$69&4+ZT?ssm+Cx@dDUD|Z^ADh4oRmEQ6VG05b6A;MbT;7 ztV{FMq2k(qV#zZUat)gpZi<--jh4S?-!yzT*Y_D?cpU?qjDIJBHvJV#JEFC4Ze|R1 z3fZ6y?*6r_I}^qN=;-OGpitO9N-jfm8>FaWR<1n2L*d6?*^lIbcT?FY=@ckr`l){K zowff?-umGVt}_yV7UEr&uOApNk;VZ4Q7U76(yK48F&}coa0i5?73Pdg#QI>Y6xSL^(x{zdGg zj2e)KawMzfyU@-aF&Z;#dv8NY$IQ(>oJ2k#VlT;JoJQL(%wA1|YE&3oR>!Pxu(Vd^ zR+u#To7Q#iTRNvZo0VS;N6PdaKHdj!3WFJ-IvL=r(0)CAkpu(@bZoYI!p}P^jD^ij z{8~IrH6*0Jz_d$mx392b7s+xWgeT0vWv1j=FmTAY&PPl+eO4y|qbRe**T-iv->;~+ zc>AcIzwVyH7LAV_hA;G1NFo$IrviWK$EAHD90O7TE_r*>C_tHFA?)2xmHl9_#nkZt zUKJgEe`AqygVvLjnD5dMkSpXFwQ(6grtkdmz?ir;{(pVg|IrJG76;mT?-S;mXVgYD zn+1`SsC%{byu?V8nt08Gs;-k0B!wQsn(jD&ct;LUNe5EpYO-1d6@7U!VUTUSoYJNw zAtTe;VXY=l1gt@~QjS6P@aa`uy_cpb#%Dere)cHXO6#STLJ}-!XYOyc-uRR{&G(64 zko@qs_QAHtr3jIqr?b0sab+^i|$J#TmtWZ7-DT`sqwJ?3Qu(*g4XS3symz#@n zB>HWFUQCk9RE>erB?cjpv_3yK$8!AUk95+z^-&sYeFLhmP z0l4TZ?|ScNN((=qJ{bPtNbh*$lH8)3ADn6Fl%v>@vBO)eiz9`G4@h{x3gL{{HMCm^oa>Gsgjb-(L%xcrCN0x8(x>j?;g$ z1fI&&UPH0epuuD6Z?!|c0r9!zIOo0&@fCDnxvL4;?ob(4jCz`%KZs|D-%j*1hR2nJ z`HD=YOhsj5H6`;BzzBLYZWZMkx?d!?f1BjA`ts6gF*u86t+K5E{2eFRh^DKnSnXsQ zViKb#{){&RV#!a68hq`ZXlHx7oVZ?k&zXA9(rda6Cd<_am^X1lDQETa1G1;1xAy=2 zpig_M&4=yv?%jjFqcL~~Zq4<9*ZKRt7b)iG5N!PQzip2xh3_R0d(wxOXQ>AbR%Juy z-c8faw8tg`u2~ODkFhOXNDg9z5X?*W`GHFxJqyp_>p(wJodp8*| zQu~mzzPoT_>%@vC`%|S`qS+pMJL(+GI}u#s#*#8iM?^|%TS}RCjih2#IU8NDtSL6+ z6W^q@R1^<}t(Di)S3#+D)JJc-Ry^|mipCuWlC<>T!>E~H_qcOr>C-+bo*g-2JUOdd zM$`P<5Wk1bR6}WnnPTTJZR$uSW`)QE2_lXiM7E0ADJ8iqh5Hw~gdr>}6(TW-U}EAA zlHI+MK=oyBl(au*kffvnExN&H69zQe!X3Ccn>lA#lZTM4j=c?Hfp<328gCh19U9=AE> zKdvgNrWru}yIGX>AZAGtJD*k!Y|%4C`1_cI&XHgh)coei+4WZKa0{Yp`E?L`Y}kb* z@aC7<3<70~pocB?Jya*6%;`FM{0@ zy}+lyNfqsVuANWqZdys`$9s|}6+U6%*o_T_8x6XLx9yXp*?q;wW}jN0fuUnw&KQ6M z;$CFJ>z^eM^uQ;5>gL#7{^}Aa^-f&(`4ch)=rMb9+2Lr${9XUyY#1rHi`oh)iqeQr>j!;TA%$xI5wIjCMuzQ?MIfQ()>7U zdIN_gpYBXdYS=Gx=qkA55WA(brk}Gcy4I}~%1xf3>5LGiDxpk5v5}c(HiH#UZnqvdBpSb z{(z2!t4wluQ}HUf2_@)A{6g&&vV0g2Fiv6}r7j!wAHINbx1gE_TzUcn-q^vPVLUb2 z;!g7s@K@3-TuT@d*TuI$9Ks~9CZ7T#-4ay2;`5VS+KC*qlxUQY)Rkn(W_~21h2qV|}dv)b55|<<)plbT%%AgWY4%UROsa4}7`6R9k8GZ!1%2 z)w*4)Rj-oiJ(>r%lQm!6=m!Rj{fF_b2#7z^>B9j>RbmKH5VvSTjfLDF5MMFwy2d(N zkm@e4q0ogyrD{awjAZ1j1~%Y8)?N?h1NXso*mF3>=?1drF@xZHCg}T#l_9p3s9Qrh63A^Wn!y?8~ zJFX4n9p2aPYV#iV3^s|uME3ac;~iF#0Nos0z$1FVL~4+OH6AJ;rHunj6m!~MaX49a z)ycSLAAUG*%LB*OS}qhqB7RlMv%N@jxqoKA@sMD?r!UN)vA^O_G5p< z0bECEYnFyiOw@+C+(dN{W6xo!lQ2%J?oVqNW)2E0aw{h5S!=-U$HinW<6g=!Y1$y- zqUR$iLy|>}ll8Tui&(f2s@)?rtZF2T?xQgszTa0!$OfCmQL#xHJg+MlBRcDxSTTGE z4DoGhcu2>M!(xq%6`A{Qs;1)e-r7OBW}xVT-Gq@ljorbUTL~l&Ut9FmJ?6ut{cEO& z4%y>Vj-@6njd_yMuIJ%_$qv%BcBi-+BRs(YO=!U1E)SM*Mj>4()U_Q?8ixc-r;Q!Y zaM!qEtS;pZ6QUaYs#R&ePrdx5{dJ&t#&@#6156fpy?${PHphI+2%_8Db@3|shSy72 z><{hRec)TyF9>)eqJe)txCg?3$X@Q2xh(m@Yp@97hxdSu2kWy>7LX7BLTsowDs zg55OF5PR0xLw|Yn?B#gME7XaPuO#?C1>BZjW!fpj(UvJ1@9rWu-c1cDeh#R|(pTTkDImtii{*Fs zA|fK;NkhtSi@Gp4=x_P}5kj(s7a@>{~<8Ep*SM^+wKq0Qd4-EcTwJvOaJC>3l zHtW@S+4220Gg92{RIN&$jS=;H+39|%%-yzGT6PX z%}yWyd&B{wXx4#x*DEuAxXWGmveTvA)9yh7%14yya&Hy+~uVQXCs#$ in&jmr5y^Oz#>sZk!7rCHiAH{p4Jga2Ln~$9e)@m#goa@N diff --git a/include/define.h b/include/define.h index b0ffe0b..f628c65 100644 --- a/include/define.h +++ b/include/define.h @@ -1,5 +1,5 @@ #pragma once -/*the width of the tileset*/ -#define TILESET_WIDTH 29 /*the size of one tile*/ -#define TILE_SIZE 16 \ No newline at end of file +#define TILE_SIZE 16 + +#define NB_INTERIORS 2 \ No newline at end of file diff --git a/include/map.h b/include/map.h index 63bdc0b..5772cab 100644 --- a/include/map.h +++ b/include/map.h @@ -13,6 +13,7 @@ struct Map { int w, h, nb_layers, dialog_count, teleporter_count; /*the tileset to use*/ bopti_image_t *tileset; + int tileset_size; /*list of all the dialog*/ struct Talkable *dialogs; struct Teleporter *teleporters; diff --git a/src/engine.c b/src/engine.c index 20330bc..e84b3d9 100644 --- a/src/engine.c +++ b/src/engine.c @@ -28,6 +28,7 @@ void engine_draw(struct Game const *game) { void engine_draw_map(struct Game const *game) { const int x_offset = (game->camera.offset.x - DWIDTH/2); const int y_offset = (game->camera.offset.y - DHEIGHT/2); + const int tileset_size = game->map->tileset_size; for (int y = 1 ; y <= DHEIGHT / TILE_SIZE-1; y++) { for (int x = 1 ; x <= DWIDTH / TILE_SIZE; x++) { @@ -42,8 +43,8 @@ void engine_draw_map(struct Game const *game) { if (tile_id != 0) { tile_id--; - unsigned int tile_x = TILE_SIZE * (tile_id % TILESET_WIDTH); - unsigned int tile_y = TILE_SIZE * (tile_id / TILESET_WIDTH); + unsigned int tile_x = TILE_SIZE * (tile_id % tileset_size); + unsigned int tile_y = TILE_SIZE * (tile_id / tileset_size); dsubimage(x * TILE_SIZE - x_offset%TILE_SIZE, y * TILE_SIZE - y_offset%TILE_SIZE, game->map->tileset, diff --git a/src/map.c b/src/map.c index 77a1049..d4611cd 100644 --- a/src/map.c +++ b/src/map.c @@ -27,16 +27,12 @@ int map_get_player_tile(struct Game const *game) { /*generate the interior*/ void generate_interior_map(struct Game *game) { - const int NB_INTERIORS = 3; - extern struct Map in_1; extern struct Map in_2; - extern struct Map in_3; struct Map *interiors[] = { &in_1, &in_2, - &in_3 }; srand(game->player->pos.x * game->player->pos.y); @@ -45,7 +41,6 @@ void generate_interior_map(struct Game *game) { game->player->pos = locate_tile(game->map, TILE_DOOR_OUT); } -/*may be useful later*/ void set_map(struct Game *game, int id) { game->map = maps[id]; } diff --git a/src/talkable.c b/src/talkable.c index d777d4d..d02e0d8 100644 --- a/src/talkable.c +++ b/src/talkable.c @@ -26,7 +26,7 @@ void draw_dialog(struct Talkable *talkable) { dprint(25,20, C_BLACK, "%s", talkable->name); //TODO Il y a moyen de faire mieux avec seulement curr_line. - //Cela semble globalement fonctionner, mais j'ai pu oobserver des petites erreurs + //Cela semble globalement fonctionner, mais j'ai pu observer des petites erreurs if(strlen(curr_line) > LIMIT) { char remain[strlen(curr_line)+1]; char split[LIMIT+1];