diff --git a/CMakeLists.txt b/CMakeLists.txt index b641aaf..5a9e915 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,8 +13,8 @@ find_package(LibProf 2.4 REQUIRED) #set the color mode either to 1b or 2b set(COLORMODE_fx 2b) -#set the color mode either to 2b or EGA64 -set(COLORMODE_cg EGA64) +#set the color mode either to 1b, 2b or EGA64 +set(COLORMODE_cg 1b) fxconv_declare_converters(assets/converters.py) @@ -35,10 +35,15 @@ set(ASSETS set(ASSETS_cg assets-cg/demo_player.png + assets-cg/demo_PNJ.png assets-cg/player_face.png assets-cg/font.png ) +set(ASSETS_cg_1b + assets-cg/levels/tileset1b_CG.png +) + set(ASSETS_cg_2b assets-cg/levels/tileset2b_CG.png ) @@ -49,6 +54,7 @@ set(ASSETS_cg_EGA64 set(ASSETS_fx assets-fx/demo_player.png + assets-fx/demo_PNJ.png assets-fx/player_face.png assets-fx/font.png # ... @@ -64,7 +70,7 @@ set(ASSETS_fx_2b # ... ) -fxconv_declare_assets(${ASSETS} ${ASSETS_fx} ${ASSETS_cg} ${ASSETS_fx_1b} ${ASSETS_fx_2b} ${ASSETS_cg_2b} ${ASSETS_cg_EGA64} WITH_METADATA) +fxconv_declare_assets(${ASSETS} ${ASSETS_fx} ${ASSETS_cg} ${ASSETS_fx_1b} ${ASSETS_fx_2b} ${ASSETS_cg_1b} ${ASSETS_cg_2b} ${ASSETS_cg_EGA64} WITH_METADATA) if("${FXSDK_PLATFORM_LONG}" STREQUAL fx9860G) add_executable(myaddin ${SOURCES} ${ASSETS} ${ASSETS_${FXSDK_PLATFORM}} ${ASSETS_${FXSDK_PLATFORM}_${COLORMODE_fx}} ) @@ -83,11 +89,14 @@ if("${COLORMODE_fx}" STREQUAL 2b) endif() # cg colormode +if("${COLORMODE_cg}" STREQUAL 1b) + target_compile_options(myaddin PRIVATE -Wall -Wextra -Os -DCOLOR1BIT) +endif() + if("${COLORMODE_cg}" STREQUAL 2b) target_compile_options(myaddin PRIVATE -Wall -Wextra -Os -DCOLOR2BIT) endif() - if("${COLORMODE_cg}" STREQUAL EGA64) target_compile_options(myaddin PRIVATE -Wall -Wextra -Os -DCOLOREGA) endif() @@ -111,6 +120,11 @@ if("${FXSDK_PLATFORM_LONG}" STREQUAL fx9860G) elseif("${FXSDK_PLATFORM_LONG}" STREQUAL fxCG50) + if("${COLORMODE_cg}" STREQUAL 1b) + generate_g3a(TARGET myaddin OUTPUT "PrjPC1b.g3a" + NAME "Col RPG 1bit" ICONS assets-cg/icon-uns.png assets-cg/icon-sel.png) + endif() + if("${COLORMODE_cg}" STREQUAL 2b) generate_g3a(TARGET myaddin OUTPUT "PrjPC2b.g3a" NAME "Col RPG Grey" ICONS assets-cg/icon-uns.png assets-cg/icon-sel.png) diff --git a/TODO.txt b/TODO.txt new file mode 100644 index 0000000..e9f2bcf --- /dev/null +++ b/TODO.txt @@ -0,0 +1,6 @@ +- Jeu de tuile 1bit pour CG pour avoir la version 1bit vérifiable en fonctionnement dans l'émulateur de Heath +- corriger les tuiles 1bit pour les rivières (tiles 1 2 3 et 4) avec niveaux de diphering pour tiles 1 et 3 (gris 33% et 66%) +- ajouter face pour dialogue pour PNJ +- ajouter indicateur visuel pour action joueur quand on est proche d'un PNJ ou d'un panneau + +- faire des fonts lisibles avec le set `print` disponible intégralement \ No newline at end of file diff --git a/assets-cg/demo_PNJ.png b/assets-cg/demo_PNJ.png new file mode 100644 index 0000000..f776fdc Binary files /dev/null and b/assets-cg/demo_PNJ.png differ diff --git a/assets-cg/fxconv-metadata.txt b/assets-cg/fxconv-metadata.txt index 2d52907..a631b2a 100644 --- a/assets-cg/fxconv-metadata.txt +++ b/assets-cg/fxconv-metadata.txt @@ -2,6 +2,10 @@ demo_player.png: type: bopti-image name: demo_player_img +demo_PNJ.png: + type: bopti-image + name: demo_PNJ_img + player_face.png: type: bopti-image name: player_face_img diff --git a/assets-cg/levels/fxconv-metadata.txt b/assets-cg/levels/fxconv-metadata.txt index 5caafd2..de727b0 100644 --- a/assets-cg/levels/fxconv-metadata.txt +++ b/assets-cg/levels/fxconv-metadata.txt @@ -1,3 +1,7 @@ +tileset1b_CG.png: + type: bopti-image + name: img_tilesetnpp + tileset2b_CG.png: type: bopti-image name: img_tilesetnpp diff --git a/assets-cg/levels/tileset1b_CG.png b/assets-cg/levels/tileset1b_CG.png new file mode 100644 index 0000000..089c983 Binary files /dev/null and b/assets-cg/levels/tileset1b_CG.png differ diff --git a/assets-fx/demo_PNJ.png b/assets-fx/demo_PNJ.png new file mode 100644 index 0000000..8198c59 Binary files /dev/null and b/assets-fx/demo_PNJ.png differ diff --git a/assets-fx/fxconv-metadata.txt b/assets-fx/fxconv-metadata.txt index 0bfccdd..0ca3da4 100644 --- a/assets-fx/fxconv-metadata.txt +++ b/assets-fx/fxconv-metadata.txt @@ -2,6 +2,10 @@ demo_player.png: type: bopti-image name: demo_player_img +demo_PNJ.png: + type: bopti-image + name: demo_PNJ_img + player_face.png: type: bopti-image name: player_face_img diff --git a/assets-fx/levels/backup/tileset1b.png b/assets-fx/levels/backup/tileset1b.png new file mode 100644 index 0000000..63f9c7b Binary files /dev/null and b/assets-fx/levels/backup/tileset1b.png differ diff --git a/assets/level0.tmx b/assets/level0.tmx index 0fd416f..2090f4e 100644 --- a/assets/level0.tmx +++ b/assets/level0.tmx @@ -1,5 +1,5 @@ - + @@ -90,10 +90,25 @@ - + - + + + + + + + + + + + + + + + +