diff --git a/CMakeLists.txt b/CMakeLists.txt index a060e14..392b278 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,6 +34,10 @@ set(ASSETS_cg assets-cg/spritesheet.png assets-cg/characters/Tituya.char assets-cg/characters/Lephenixnoir.char + assets-cg/characters/KikooDX.char + assets-cg/characters/Massena.char + assets-cg/characters/Tituya2.char + assets-cg/characters/PancarteVille.char ) fxconv_declare_assets(${ASSETS} ${ASSETS_fx} ${ASSETS_cg} WITH_METADATA) diff --git a/assets-cg/characters/KikooDX.char b/assets-cg/characters/KikooDX.char new file mode 100644 index 0000000..051dbbe --- /dev/null +++ b/assets-cg/characters/KikooDX.char @@ -0,0 +1,4 @@ +41 +10 +KikooDX +Je te rassure, pas de Pokemon ! diff --git a/assets-cg/characters/Lephenixnoir.char b/assets-cg/characters/Lephenixnoir.char index 787eb2f..25cbde8 100644 --- a/assets-cg/characters/Lephenixnoir.char +++ b/assets-cg/characters/Lephenixnoir.char @@ -1,4 +1,4 @@ -33 +50 30 Lephenixnoir -Ahah ! Je suis dans le jeu ! +Regarde ! Je n'ai pas de reflet ! diff --git a/assets-cg/characters/Massena.char b/assets-cg/characters/Massena.char new file mode 100644 index 0000000..4773a4c --- /dev/null +++ b/assets-cg/characters/Massena.char @@ -0,0 +1,4 @@ +2 +9 +Massena +C'est une belle ville non ? diff --git a/assets-cg/characters/PancarteVille.char b/assets-cg/characters/PancarteVille.char new file mode 100644 index 0000000..3211b27 --- /dev/null +++ b/assets-cg/characters/PancarteVille.char @@ -0,0 +1,4 @@ +10 +20 +Planete City +90+E FTW diff --git a/assets-cg/characters/Tituya.char b/assets-cg/characters/Tituya.char index 36068a1..7346d07 100644 --- a/assets-cg/characters/Tituya.char +++ b/assets-cg/characters/Tituya.char @@ -1,4 +1,4 @@ -39 -30 +37 +32 Tituya -Salut ! Ça va bien ? hé +J'ai toujours aimé ce pont diff --git a/assets-cg/characters/Tituya2.char b/assets-cg/characters/Tituya2.char new file mode 100644 index 0000000..d29ec4c --- /dev/null +++ b/assets-cg/characters/Tituya2.char @@ -0,0 +1,4 @@ +52 +2 +Tituya +La belle montagne ! diff --git a/assets-cg/converters.py b/assets-cg/converters.py index 01eb6b0..884df81 100644 --- a/assets-cg/converters.py +++ b/assets-cg/converters.py @@ -17,6 +17,8 @@ def convert_map(input, output, params, target): TILE_DOOR = 2 TILE_CHARACTER = 3 + TILE_BRIDGE = -1 #only for bridge detection to avoid solid behind + with open(input, "r") as jsonData: data = json.load(jsonData) @@ -40,6 +42,8 @@ def convert_map(input, output, params, target): value = TILE_DOOR elif type == "character": value = TILE_CHARACTER + elif type == "bridge": + value = TILE_BRIDGE else: value = TILE_AIR @@ -61,13 +65,23 @@ def convert_map(input, output, params, target): byte_tiles = bytearray() for j in tiles: - if i == nblayer-1: - value = tile_value.get(j) - if value == None: value = TILE_AIR - info_map += bytearray(fxconv.u16(value)) byte_tiles += bytearray(fxconv.u16(j)) o += fxconv.ref(byte_tiles) + + #generation of the collision map (take the maximum of the layer except for bridges) + for x in range(w*h): + value1 = tile_value.get(data["layers"][0]["data"][x]) + if(nblayer >= 2): + value2 = tile_value.get(data["layers"][1]["data"][x]) + if value1 == None: value1 = TILE_AIR + if value2 == None: value2 = TILE_AIR + if value2 == TILE_BRIDGE: value1 = value2 = TILE_AIR + info_map += bytearray(fxconv.u16(max(value1, value2))) + else: + if value1 == TILE_BRIDGE: value1 = TILE_AIR + info_map += bytearray(fxconv.u16(value1)) o += fxconv.ref(info_map) + else: raise fxconv.FxconvError(f"There is too much layer ! {nblayer} found for a max of 2") diff --git a/assets-cg/fxconv-metadata.txt b/assets-cg/fxconv-metadata.txt index 0c5f699..25c0b4f 100644 --- a/assets-cg/fxconv-metadata.txt +++ b/assets-cg/fxconv-metadata.txt @@ -1,12 +1,7 @@ tileset.png: type: bopti-image name: img_tileset - profile:p4 spritesheet.png: type: bopti-image name: img_spritesheet - -dialog.txt: - custom-type: dialog - name: dialog_1 diff --git a/assets-cg/maps/testCarte.tmx b/assets-cg/maps/testCarte.tmx index 326ce4c..5a438cd 100644 --- a/assets-cg/maps/testCarte.tmx +++ b/assets-cg/maps/testCarte.tmx @@ -1,91 +1,91 @@ - + -104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252, -103,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252, -104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252, -104,104,104,104,95,104,104,104,104,104,104,104,104,104,104,95,104,104,104,95,104,104,104,104,107,107,104,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252, -252,104,104,104,252,104,104,104,104,104,104,104,104,104,104,95,104,104,104,95,104,104,104,104,107,107,104,252,252,252,252,252,252,252,252,252,252,252,252,252,110,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252, -252,104,104,104,252,104,104,104,104,104,104,104,104,104,104,252,104,104,104,252,104,104,104,104,107,107,104,252,252,252,252,252,252,252,252,252,252,252,252,252,110,252,252,252,252,252,252,252,252,252,98,98,98,252,252,252, -252,252,252,252,252,104,104,104,104,104,104,104,104,104,104,252,104,104,104,252,104,104,104,104,107,107,104,252,252,252,252,252,252,252,252,252,252,252,252,110,110,252,252,252,252,252,252,252,252,252,98,98,98,252,252,252, -104,95,252,95,104,104,104,104,104,104,104,104,104,104,104,252,252,252,252,252,104,104,104,104,107,107,104,252,252,252,98,98,98,252,252,252,252,252,110,110,110,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252, -104,95,252,95,95,95,95,95,95,95,95,95,95,95,95,95,252,95,104,104,104,104,104,104,104,104,104,252,252,252,98,98,98,252,252,252,252,252,110,110,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252, -104,95,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,95,104,104,104,104,104,104,104,104,104,104,252,252,252,252,252,252,252,252,252,110,110,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252, -104,95,95,95,95,95,95,252,252,95,95,95,95,95,95,95,252,95,104,104,104,104,104,104,104,104,104,104,104,104,104,252,252,252,252,252,252,110,110,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252, -104,104,104,104,104,104,98,252,252,98,104,104,104,104,104,98,252,98,98,98,104,104,104,104,104,104,104,104,104,104,104,104,252,252,252,252,252,107,110,252,252,252,252,252,252,252,252,104,104,104,252,252,252,252,252,252, -104,104,104,104,104,104,98,252,252,98,104,104,104,104,104,98,252,252,252,252,252,252,252,252,252,104,104,104,104,104,104,104,104,104,252,252,252,107,110,252,252,252,252,252,252,252,104,104,104,104,104,252,252,252,252,252, -104,104,104,104,104,104,98,252,252,98,104,104,104,104,104,98,98,98,98,252,252,252,252,95,252,104,104,104,104,104,104,104,104,104,104,104,252,107,110,252,252,252,252,252,104,104,104,104,104,104,104,104,104,252,252,252, -104,104,104,104,104,104,98,252,252,98,104,104,104,104,104,104,104,104,98,252,252,252,252,104,252,104,104,104,104,104,104,104,104,104,104,252,252,110,107,252,252,252,104,104,104,104,104,104,104,104,104,104,104,104,104,104, -104,104,104,104,104,104,98,252,252,98,104,104,104,104,104,104,104,104,98,252,252,252,252,252,252,104,104,104,104,104,104,104,104,104,104,104,104,110,107,252,252,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104, -104,104,104,104,104,104,98,252,252,98,104,104,104,104,98,98,98,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,252,110,110,110,110,107,110,110,110,104,104,104,104,104,104,104,104,104,104,104,104,104,104, -104,104,104,104,104,104,98,252,252,98,104,104,104,104,98,98,98,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,252,110,110,107,107,107,107,110,110,110,110,110,104,104,104,104,104,104,104,104,104,104,104, -104,104,104,104,104,104,98,252,252,98,104,104,104,104,98,98,98,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,252,110,110,107,107,107,107,107,107,110,110,110,104,104,104,104,104,104,104,104,104,104,104, -104,104,104,104,104,104,98,252,252,98,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,252,252,110,110,110,110,107,107,107,107,107,107,110,104,104,104,104,104,104,104,104,104,104,104, -104,104,104,104,104,104,98,252,252,98,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,110,110,110,104,104,104,110,110,110,110,110,107,110,110,110,110,104,104,104,104,104,104,104,104,104,104,104, -104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,110,110,110,110,104,104,104,104,104,104,110,110,110,110,110,110,104,104,107,107,252,104,104,104,104,104,104,104, -104,104,104,104,95,95,104,104,104,104,104,95,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,110,110,110,104,104,104,104,104,104,104,252,252,252,252,104,104,104,104,107,252,252,104,104,104,104,104,104, -104,104,104,104,95,104,104,104,104,104,104,95,95,95,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,252,104,252,104,104,104,104,104,104,104,104,252,252,104,104,104,104,104,104, -104,95,95,95,95,252,252,252,252,95,95,95,95,95,95,95,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,252,104,104,104,104,104,104,104,104,104,104,104,104,107,107,107,107, -95,95,95,95,252,252,252,252,95,95,95,95,95,95,95,95,104,104,104,104,104,104,104,104,95,95,95,95,98,104,104,104,104,104,104,104,104,104,252,104,104,104,104,104,104,104,104,104,104,104,104,104,107,107,107,107, -95,95,95,95,252,252,252,95,95,95,95,95,95,95,95,95,104,104,104,104,104,104,95,95,95,95,95,95,98,98,104,104,104,252,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,107,107,107,107, -95,95,95,252,252,252,95,95,104,104,104,104,95,95,95,95,104,104,104,104,104,104,95,95,95,104,104,104,98,98,98,104,104,98,98,98,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,107,107,107,107, -95,95,95,252,252,95,101,101,101,101,101,101,95,95,95,95,104,104,104,104,104,104,95,95,104,104,104,104,104,98,98,98,98,98,98,98,98,98,98,98,104,104,104,104,104,104,104,104,104,104,104,104,107,107,107,107, -95,95,95,252,252,95,101,101,101,101,101,101,104,95,95,95,104,104,104,104,104,104,95,95,104,104,104,104,104,104,104,104,98,98,98,104,104,104,98,98,104,104,104,104,104,104,104,104,104,104,104,104,107,107,107,107, -95,95,95,252,252,95,101,101,101,101,101,101,104,95,95,95,104,104,104,104,104,104,95,95,104,104,104,104,104,104,104,104,104,98,98,98,104,98,98,98,104,104,104,104,104,104,104,104,104,104,104,104,107,107,107,107, -104,95,95,252,252,95,95,104,104,104,101,101,104,95,95,95,104,104,104,104,104,104,95,95,104,104,104,104,104,104,104,104,104,98,98,98,98,98,98,98,104,104,104,104,104,104,104,104,104,104,104,104,107,107,107,107, -104,104,95,95,252,252,95,95,104,101,101,101,104,95,95,95,104,95,95,95,95,95,95,95,104,104,104,104,104,104,104,104,104,104,104,98,98,98,104,104,104,104,104,104,104,104,104,104,104,104,104,104,107,107,107,107, -104,104,104,95,95,252,252,95,95,101,101,101,104,95,95,95,95,95,95,95,95,95,95,95,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,107,107,107,107, -104,104,104,95,95,252,252,252,95,101,101,101,95,95,95,95,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104, -104,104,104,104,95,95,252,252,252,101,101,101,95,95,95,95,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104, -104,104,104,104,104,95,95,252,252,252,95,95,95,95,95,95,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104, -104,104,104,104,104,104,95,95,95,252,252,95,95,95,95,95,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,252,252,252 +1,3,2,1,3,38,1,6,6,6,3,3,3,3,1,3,2,0,1,1,1,1,1,209,183,181,212,0,0,0,0,0,175,177,0,0,0,0,0,0,0,0,0,0,0,0,0,146,147,147,147,147,147,147,148,35, +1,2,3,8,1,1,2,3,2,3,6,1,1,1,1,37,40,1,0,0,0,0,0,2,209,210,210,183,212,213,182,0,204,206,0,6,6,6,6,6,6,6,6,6,6,6,0,204,178,0,207,179,205,178,150,148, +1,3,8,3,1,59,0,60,60,61,6,6,1,3,1,1,1,1,6,6,6,6,1,0,2,1,1,180,184,210,211,1,0,0,61,1,6,6,6,6,6,6,6,6,6,6,2,0,175,207,207,177,1,204,178,150, +1,1,3,32,36,88,89,89,89,63,61,6,3,1,2,0,0,3,1,1,1,3,3,1,0,1,1,209,211,1,59,60,62,121,90,1,6,6,6,2,3,1,1,1,6,6,6,0,175,176,207,177,2,32,175,207, +6,2,1,1,1,117,118,118,118,91,90,2,37,2,2,0,0,1,2,3,3,2,32,2,1,0,2,1,1,1,88,120,92,118,119,1,6,6,34,0,0,0,0,0,1,1,1,0,204,178,176,150,148,32,204,178, +6,1,0,0,3,3,32,32,1,117,119,2,39,1,98,99,100,1,3,3,0,3,38,1,1,146,0,1,1,0,88,120,90,1,1,1,4,35,1,0,205,205,0,0,1,1,1,1,0,204,178,208,150,148,31,175, +6,2,0,0,3,3,3,1,1,3,2,1,3,3,98,99,73,71,1,1,2,3,2,2,1,175,0,1,1,59,62,92,119,1,1,0,0,0,0,1,240,242,175,0,1,1,1,1,1,0,175,208,207,150,0,149, +1,98,99,100,3,1,2,3,3,2,3,2,3,1,98,99,99,100,3,32,3,2,2,2,1,175,0,1,1,88,121,90,1,1,6,0,177,39,109,240,243,271,175,0,39,1,1,1,1,0,204,178,208,176,208,176, +1,98,99,73,70,70,70,70,70,70,70,70,70,70,72,99,99,100,2,37,33,36,1,2,1,175,0,1,1,88,89,90,1,1,6,0,177,240,241,243,273,300,175,0,31,1,0,0,1,1,0,204,205,205,205,205, +39,98,99,99,99,99,99,99,99,99,99,99,99,99,99,99,99,100,1,3,1,3,3,3,1,204,0,6,1,117,91,63,61,1,6,0,177,298,272,301,271,39,175,0,34,32,0,0,1,1,1,0,0,0,0,1, +1,127,128,128,128,128,101,99,99,102,128,128,128,128,128,101,99,100,3,2,1,0,0,1,2,0,6,6,6,2,117,91,90,1,6,0,177,4,298,299,300,31,175,0,37,151,154,182,1,1,1,0,1,1,1,0, +1,40,1,59,60,61,98,99,99,100,240,241,242,1,38,98,99,73,71,1,0,0,0,0,1,0,6,6,6,1,3,88,63,61,1,0,150,147,147,147,147,147,149,0,1,180,181,155,153,2,1,1,1,1,6,6, +6,1,1,88,89,90,98,99,99,100,269,270,271,1,35,98,99,99,73,70,70,0,0,70,71,0,38,6,6,3,3,88,121,90,1,0,176,176,176,176,176,176,176,0,151,154,213,184,211,2,1,1,1,6,6,6, +6,1,1,0,118,119,98,99,99,100,298,272,244,242,3,127,128,128,101,99,99,99,99,99,100,146,0,3,2,1,1,88,89,90,2,6,6,6,6,6,6,6,1,151,154,213,213,182,59,60,60,61,3,6,6,6, +6,6,1,1,1,1,98,99,99,100,1,269,270,271,2,40,35,2,98,99,99,99,99,99,100,175,0,2,3,1,3,117,91,90,3,1,6,6,6,6,6,6,6,180,181,181,184,211,88,120,92,119,2,2,6,6, +7,7,1,1,1,1,98,99,99,100,1,298,272,244,241,242,1,1,127,128,128,128,128,128,129,175,0,151,0,2,2,2,88,63,61,2,1,1,6,6,6,6,2,180,184,210,211,59,62,92,119,1,3,2,151,152, +8,1,33,1,1,1,98,99,99,100,3,1,298,272,301,271,3,3,2,2,3,2,3,1,1,175,0,180,155,152,153,2,117,91,63,60,61,1,1,1,6,6,3,209,211,59,60,62,121,90,1,151,152,152,154,213, +1,1,1,1,1,1,98,99,99,100,2,40,1,298,299,300,39,1,1,2,1,1,2,2,2,175,0,209,183,213,155,153,1,117,118,91,63,60,60,60,61,1,1,1,59,62,89,120,89,90,3,180,0,213,213,181, +1,34,1,1,1,1,98,99,99,73,71,37,2,1,3,32,5,1,3,1,3,2,1,3,1,175,0,2,180,212,181,155,152,153,1,117,118,118,91,120,63,61,59,60,62,120,121,92,118,119,3,180,213,184,210,210, +36,38,1,1,1,1,98,99,99,130,73,70,71,2,2,3,1,33,40,38,2,2,1,3,1,175,0,3,209,210,210,210,210,211,1,1,1,1,88,120,121,63,62,89,121,89,92,119,2,1,3,180,184,211,240,241, +1,1,1,1,1,69,72,99,99,130,130,131,100,0,2,1,1,3,1,36,39,1,2,2,2,175,0,1,1,1,1,1,1,3,6,6,6,1,117,91,120,121,89,89,92,118,119,2,2,3,151,154,182,240,243,270, +1,1,1,59,61,127,128,128,128,128,128,128,129,2,2,1,3,2,3,3,2,3,3,3,2,204,206,0,0,0,0,0,0,6,6,0,6,6,1,88,121,121,121,92,119,1,1,1,151,152,154,213,182,298,272,270, +1,1,1,88,63,61,1,1,1,1,38,2,2,2,1,3,0,33,3,3,3,1,1,3,3,3,2,204,205,205,205,178,0,6,6,6,6,6,1,117,91,89,121,90,3,1,2,151,154,212,212,213,155,153,298,272, +1,0,60,62,121,90,161,162,162,163,1,59,60,61,2,3,1,0,0,3,0,3,1,2,3,2,1,1,1,3,1,175,0,1,6,6,6,6,6,1,117,91,121,63,61,1,1,209,183,213,212,212,213,155,153,298, +59,62,89,121,92,119,190,191,223,192,59,62,89,63,60,61,2,1,3,0,3,2,2,2,1,59,60,60,61,1,2,204,206,0,0,0,0,0,0,1,1,117,118,118,119,3,3,2,209,183,212,181,213,181,155,152, +117,118,91,89,90,161,164,223,194,221,117,118,118,91,89,90,3,2,2,3,2,1,59,60,60,62,120,121,90,1,1,1,1,3,2,240,241,242,1,0,0,0,138,138,0,0,0,0,3,209,210,183,212,213,213,181, +241,242,117,118,119,190,223,194,221,146,147,147,148,88,121,90,146,148,3,3,2,59,62,121,121,121,120,120,63,61,1,1,0,0,3,298,272,244,241,242,204,205,0,0,204,178,176,150,0,0,2,209,210,210,210,210, +301,244,242,5,2,190,223,192,146,149,0,176,177,88,120,90,175,150,148,3,3,88,121,120,121,92,91,121,121,63,61,0,0,0,0,1,269,301,270,244,242,1,156,158,2,204,205,205,178,150,0,2,1,1,1,1, +301,270,271,4,1,190,223,192,175,176,207,207,177,88,120,90,204,178,150,148,3,88,120,120,92,119,117,91,121,120,63,60,0,0,1,1,269,270,270,270,271,1,185,187,1,3,2,2,204,178,150,0,0,0,0,1, +270,301,271,3,161,164,223,192,175,176,176,208,177,88,120,63,61,204,205,206,2,88,89,120,90,1,2,117,118,91,121,121,121,63,61,1,269,301,301,270,271,1,185,187,1,2,1,1,1,204,205,205,178,208,150,0, +301,270,271,4,190,191,194,221,175,176,176,176,177,88,120,121,90,3,2,2,1,88,120,120,90,3,3,2,2,117,91,121,120,121,90,1,269,301,270,270,271,156,159,187,5,39,1,240,241,242,3,3,204,205,205,205, +301,273,300,1,190,194,221,146,149,176,176,176,177,88,89,121,63,60,60,60,60,62,89,89,90,2,1,2,3,2,117,91,121,92,119,240,243,270,301,270,271,185,217,187,35,33,240,243,302,244,241,241,242,1,1,1, +301,271,4,161,164,192,146,149,208,176,176,176,177,117,91,121,120,121,120,89,120,121,120,89,90,3,3,1,1,2,1,88,89,281,282,282,282,282,282,282,282,283,217,187,40,37,269,301,273,299,272,301,271,1,1,1, +299,300,3,190,191,192,175,208,0,176,176,176,150,148,88,89,120,89,120,120,89,120,120,121,90,2,3,3,2,3,3,117,91,310,311,311,311,311,311,311,311,312,218,160,158,240,243,273,300,1,298,272,244,241,241,241, +147,148,1,190,222,192,204,178,176,176,176,176,179,206,88,120,121,92,118,118,118,118,118,118,119,1,2,1,1,2,1,1,117,119,298,272,301,301,270,270,271,185,218,189,216,269,270,271,2,2,1,298,272,270,301,270, +176,177,161,164,222,165,163,204,178,207,176,179,206,59,62,0,92,119,3,2,2,3,1,3,1,3,2,2,2,3,2,2,3,3,2,298,272,270,301,301,271,185,186,187,240,243,270,244,242,2,0,2,298,272,301,301, +176,177,190,222,222,191,165,163,204,205,205,206,59,62,89,89,90,2,1,3,2,3,2,2,1,2,1,0,1,3,0,1,2,0,156,158,298,299,299,299,300,185,217,187,298,299,272,302,271,2,2,3,3,298,272,301, +176,177,190,191,223,191,222,165,162,162,162,163,88,89,89,120,63,61,3,1,1,2,3,3,3,2,1,3,2,2,1,1,1,3,185,160,157,157,157,157,157,159,186,160,158,3,298,299,300,1,1,2,1,1,298,272 -576,577,578,579,580,19,20,21,0,398,399,400,80,81,82,344,345,346,0,0,0,242,243,244,245,246,247,217,218,211,212,213,214,215,216,217,218,211,212,213,214,215,216,217,218,211,212,213,214,215,216,217,218,242,217,218, -605,606,607,608,609,0,59,60,61,427,428,429,109,110,111,373,374,375,376,377,80,81,82,0,0,0,0,246,247,240,241,242,243,244,245,246,247,240,241,242,243,244,245,246,247,240,241,242,243,244,245,246,247,242,246,247, -634,635,636,637,638,0,88,89,90,456,457,458,138,139,140,402,403,404,405,406,138,139,140,77,78,78,79,217,218,0,0,281,161,162,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -663,664,665,666,667,0,117,118,119,485,486,487,19,20,21,431,432,433,434,435,13,0,0,106,0,10,108,246,247,0,0,281,190,191,0,159,160,0,0,0,0,0,0,0,0,0,0,0,0,0,149,150,151,159,160,0, -692,693,694,695,696,211,212,0,0,215,216,217,218,0,0,460,461,462,463,464,19,20,21,106,10,0,108,157,158,0,0,0,219,220,0,188,189,0,0,0,0,224,0,281,281,0,0,0,0,0,178,179,180,188,189,0, -721,722,723,724,725,240,241,0,0,244,245,246,247,163,164,489,490,491,492,493,274,275,276,106,23,0,108,186,187,0,149,150,151,0,0,0,0,0,0,0,0,253,0,281,0,0,0,0,0,0,207,208,209,0,0,0, -750,751,224,753,754,593,594,595,596,0,0,0,0,192,193,518,519,520,521,522,303,304,305,106,0,0,108,217,218,0,178,179,180,0,0,0,0,0,0,0,0,0,0,281,0,0,0,0,0,0,236,237,238,0,0,0, -0,19,253,593,594,595,596,0,0,593,594,595,596,221,222,547,0,549,550,551,332,333,334,106,0,23,108,246,247,0,207,208,209,0,0,0,281,0,0,0,0,0,0,281,0,159,160,0,0,0,0,0,0,0,0,0, -0,16,0,15,21,19,14,18,19,19,14,15,19,18,13,21,0,19,677,0,361,362,363,135,136,136,137,243,185,0,236,237,238,0,0,0,281,0,0,0,0,0,0,281,0,188,189,0,0,0,0,281,281,0,0,0, -0,19,0,0,0,0,281,281,0,0,0,0,0,0,0,0,0,16,706,619,576,577,578,579,580,0,595,595,0,0,0,0,0,281,281,281,281,0,0,0,0,0,0,0,0,0,0,0,0,0,0,281,0,0,0,0, -0,14,18,19,14,16,19,0,0,17,21,15,19,19,19,17,0,19,619,0,605,606,607,608,609,0,595,595,0,0,0,0,0,0,0,0,0,0,0,0,0,281,281,0,161,162,0,0,0,0,0,281,281,0,0,0, -509,510,511,677,0,0,0,0,0,0,0,0,149,150,151,18,0,17,18,15,634,635,636,637,638,0,595,595,593,0,0,0,0,0,0,0,0,0,0,0,0,0,281,0,190,191,0,0,14,17,0,0,281,281,0,0, -538,539,540,706,80,81,82,0,0,80,81,82,178,179,180,20,0,0,0,0,663,664,665,666,667,0,595,595,565,0,0,0,0,0,0,0,0,0,0,0,0,281,0,0,219,220,0,62,63,64,0,0,0,0,0,0, -0,0,0,0,109,110,111,0,0,109,110,111,207,208,209,16,15,16,20,0,692,693,694,695,696,15,595,595,596,0,13,62,63,64,0,0,0,0,0,0,0,0,0,0,0,20,0,91,92,93,0,535,0,0,0,0, -0,19,20,21,109,110,111,0,0,109,110,111,236,237,238,19,20,21,20,0,721,722,723,724,725,0,595,595,594,0,17,91,92,93,0,0,0,0,0,0,0,0,19,19,19,21,0,120,121,122,0,535,0,268,269,270, -500,501,502,535,109,110,111,0,0,109,110,111,0,18,500,501,502,0,18,0,750,751,752,753,754,0,595,595,564,0,18,120,121,122,0,0,0,0,0,0,0,0,0,0,19,0,535,535,0,0,0,19,0,297,298,299, -529,530,531,535,138,139,140,0,0,138,139,140,535,0,529,530,531,0,535,536,537,537,535,535,536,537,595,595,565,0,0,20,0,0,0,0,0,0,0,0,0,0,0,62,63,64,0,0,18,0,0,19,0,326,327,328, -558,559,560,0,0,14,0,0,0,0,0,21,535,0,558,559,560,0,564,565,566,566,564,564,565,566,595,595,596,0,0,19,19,0,0,0,0,0,0,0,0,0,0,91,92,93,0,0,14,14,18,13,14,355,356,357, -587,588,589,19,21,15,0,0,0,0,0,19,0,15,587,588,589,0,593,594,595,595,593,593,594,595,595,595,536,0,19,19,19,0,0,0,0,0,0,0,0,0,0,120,121,122,0,535,0,13,0,0,21,268,269,270, -0,0,0,19,0,18,0,0,0,0,0,19,19,0,0,0,0,0,0,0,594,537,593,595,593,535,593,535,595,268,269,270,0,62,63,64,0,0,0,0,0,0,225,0,0,92,0,535,535,0,0,19,19,297,298,299, -0,21,19,21,0,0,0,0,0,0,0,277,278,279,0,19,0,0,16,0,0,0,19,19,20,0,0,0,0,297,298,299,0,91,92,93,0,0,0,0,0,0,254,0,0,92,92,92,0,0,0,19,0,326,327,328, -16,0,0,0,0,95,252,252,252,252,95,306,307,308,0,19,20,0,14,13,0,0,19,16,19,19,15,19,20,326,327,328,0,120,121,122,535,0,0,0,0,0,0,0,98,98,92,92,0,0,509,510,511,355,356,357, -16,277,278,279,0,95,252,252,252,252,95,335,336,337,0,15,21,0,19,0,0,0,0,0,0,19,20,509,510,511,356,357,0,17,20,15,535,0,113,0,113,0,0,0,0,98,92,92,0,0,538,539,540,0,0,0, -0,306,307,308,0,95,252,252,252,252,95,364,365,366,69,69,70,21,21,0,535,535,0,0,535,535,0,538,539,540,0,0,0,15,19,535,535,0,113,113,113,0,0,0,0,98,98,92,92,0,0,77,78,78,78,78, -0,335,336,337,0,0,224,0,0,0,0,0,0,19,20,21,99,13,16,0,535,535,393,394,395,0,21,20,0,0,68,69,70,0,535,535,346,347,348,113,113,0,0,594,0,0,98,98,98,0,0,106,0,0,0,0, -0,364,365,366,0,0,253,0,0,0,0,19,20,21,20,21,99,21,16,0,535,593,422,423,424,0,0,0,0,0,97,98,99,0,373,374,375,376,113,113,113,0,535,536,536,0,0,0,19,21,0,106,0,80,81,82, -157,158,0,0,0,0,0,0,0,0,0,0,0,509,510,511,99,0,15,0,535,537,451,452,453,0,0,0,0,0,126,127,128,0,402,403,404,405,406,113,113,0,593,536,593,0,0,14,21,0,16,106,0,109,110,111, -186,187,0,0,0,0,0,0,0,0,0,0,0,538,539,540,99,0,19,0,535,536,480,481,482,0,0,0,0,0,20,0,0,0,431,432,433,434,435,113,113,13,536,535,535,0,0,15,19,19,16,106,0,138,139,140, -19,20,21,0,0,0,595,594,535,536,537,565,0,0,0,0,99,0,20,0,595,595,0,0,0,0,0,0,0,0,19,19,20,0,460,461,462,463,464,0,113,18,535,594,593,0,17,16,0,21,0,106,0,0,0,0, -157,158,0,0,0,0,595,564,567,593,567,535,0,0,0,21,99,21,19,0,535,535,0,0,535,535,0,0,18,17,17,19,19,225,489,490,491,492,493,224,113,0,595,593,536,0,0,0,19,19,0,106,0,0,0,0, -186,187,0,0,0,0,595,536,536,566,564,566,0,0,0,21,99,19,0,0,535,535,0,0,593,593,535,0,0,0,16,19,19,254,518,519,520,521,522,253,113,0,535,595,535,0,0,268,269,270,0,106,80,81,82,0, -0,0,0,0,0,0,0,0,0,564,596,595,0,0,0,21,99,0,0,0,0,0,0,0,535,595,535,0,0,0,13,0,0,0,547,548,549,550,551,0,0,0,536,595,594,0,0,297,298,299,0,106,109,110,111,0, -18,14,278,279,0,0,0,0,0,596,537,535,0,0,0,0,95,0,0,0,0,0,0,0,535,537,594,535,0,0,0,0,0,0,0,0,0,0,0,0,0,0,594,594,595,0,16,326,327,328,535,106,138,139,140,0, -0,306,307,308,0,0,0,0,0,594,596,566,0,0,0,0,95,393,394,395,0,0,0,0,535,535,536,595,535,535,535,535,535,535,535,535,537,537,535,593,537,595,594,595,0,0,535,355,356,357,535,106,0,0,0,0, -0,335,336,337,0,0,0,0,0,567,567,566,0,0,0,0,99,422,423,424,0,0,0,0,0,535,535,593,536,593,536,535,537,596,593,593,593,535,535,535,535,268,269,270,268,269,535,268,269,270,535,135,136,136,136,136, -0,364,365,366,0,0,0,0,0,596,593,593,0,0,0,0,99,451,452,453,0,0,20,0,0,14,17,15,0,0,0,0,0,0,0,0,0,19,19,19,0,297,298,299,297,298,299,297,298,299,0,16,19,19,20,0, -19,20,21,509,510,511,0,0,0,0,0,0,157,158,159,160,99,480,481,509,510,511,17,20,0,153,154,155,156,157,158,159,160,153,154,155,156,157,158,159,160,326,327,328,326,327,328,326,327,328,0,14,20,0,19,21, -0,18,14,538,539,540,19,20,21,0,0,0,186,187,188,189,99,0,0,538,539,540,13,15,19,182,183,184,185,186,187,188,189,182,183,184,185,186,187,188,189,355,356,357,355,356,357,355,356,357,0,0,0,0,0,0 +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, +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, +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, +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,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,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,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,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,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,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,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,0,0,0,0,58,0,113,0,743,744,745,746,0,0,232,0,0,137,138, +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,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,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,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,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,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,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,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,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,294,294,294,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,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, +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, +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, +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,0,0,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,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,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,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,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, +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,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,320,321,322,294,294,0,0,0,0,0,0,0,0,0,0,0,0,0,294,294,0,0,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,349,350,351,56,294,0,0,0,0,0,0,0,0,0,0,0,0,0,294,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,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, +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, +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, +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 diff --git a/assets-cg/maps/tileset.tsx b/assets-cg/maps/tileset.tsx index bcb9a08..946c456 100644 --- a/assets-cg/maps/tileset.tsx +++ b/assets-cg/maps/tileset.tsx @@ -4,49 +4,61 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -55,15 +67,17 @@ - - - - - - - - - + + + + + + + + + + + @@ -75,338 +89,286 @@ - - - - - - - + + + + + + + + - - - - + + + + + + + + - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - + + - + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets-cg/tileset.png b/assets-cg/tileset.png index f5d64f9..56590b9 100644 Binary files a/assets-cg/tileset.png and b/assets-cg/tileset.png differ diff --git a/src/character.c b/src/character.c index a8b16ad..e1eec94 100644 --- a/src/character.c +++ b/src/character.c @@ -5,10 +5,10 @@ /*draw the dialog of a specified character*/ void draw_dialog(struct character *character) { - drect(1,1,400,80,C_WHITE); - dprint(1,20, C_BLACK, "(%d,%d)", character->x, character->y); - dprint(1,40, C_BLACK, "%s", character->name); - dprint(1,60, C_BLACK, "%s", character->dialog); + drect(20,10,370,80,C_WHITE); + dprint(25,20, C_BLACK, "(%d,%d)", character->x, character->y); + dprint(25,40, C_BLACK, "%s", character->name); + dprint(25,60, C_BLACK, "%s", character->dialog); dupdate(); int buffer = 1; while(1) { diff --git a/src/main.c b/src/main.c index 5c907ad..d23de83 100644 --- a/src/main.c +++ b/src/main.c @@ -18,6 +18,11 @@ struct map *maps[] = { extern struct character character_Tituya; extern struct character character_Lephenixnoir; +extern struct character character_Tituya2; +extern struct character character_KikooDX; +extern struct character character_Massena; +extern struct character character_PancarteVille; + struct character character_default = { .x = 0, @@ -29,6 +34,10 @@ struct character character_default = { struct character *characters[] = { &character_Tituya, &character_Lephenixnoir, + &character_Massena, + &character_Tituya2, + &character_KikooDX, + &character_PancarteVille, &character_default, }; @@ -39,8 +48,8 @@ static int callback_tick(volatile int *tick) { int main(void) { struct player player = { - .x = 35, - .y = 31, + .x = 32, + .y = 30, .show_x = 12, .show_y = 7, .direction = DIR_DOWN,