diff --git a/CMakeLists.txt b/CMakeLists.txt index 232456a..c02ba57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,8 +11,9 @@ include(Fxconv) find_package(Gint 2.9 REQUIRED) find_package(LibProf 2.4 REQUIRED) -#set the color mode either to 1bit or 2bits +#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) fxconv_declare_converters(assets/converters.py) diff --git a/README.md b/README.md index e726c19..e688b87 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,9 @@ A ce stade, on a déjà implémenté : - [x] Affichage de la map selon la position du joueur - [x] Gestion des touches - [x] Gestion des collisions +- [x] Carte Multilayer (Background, Foreground + accessibilité / Dommages) avec transparence du calque Foreground - [x] Personnage +- [ ] Dialogues - [ ] Interraction - [ ] NPC - [ ] Changement de map @@ -23,3 +25,6 @@ Les tiles sont issues de Game Boy Top-down RPG Fantasy Tileset (FREE) [Tiles Background Assets by Gumpy Function](https://gumpyfunction.itch.io/game-boy-rpg-fantasy-tileset-free) Converties en niveau de gris avec Gimp + +Une version 1-bit (N&B) implémentée par Shadow15510 +Une version couleur CG implémentée par Fcalva diff --git a/assets-cg/levels/not used anymore (backup)/tileset2b_CG.png b/assets-cg/levels/not used anymore (backup)/tileset2b_CG.png new file mode 100644 index 0000000..2e6b6e6 Binary files /dev/null and b/assets-cg/levels/not used anymore (backup)/tileset2b_CG.png differ diff --git a/assets-cg/levels/tilesetEGA64_CG_bak.png b/assets-cg/levels/not used anymore (backup)/tilesetEGA64_CG_bak.png similarity index 100% rename from assets-cg/levels/tilesetEGA64_CG_bak.png rename to assets-cg/levels/not used anymore (backup)/tilesetEGA64_CG_bak.png diff --git a/assets-cg/levels/tileset2b_CG.png b/assets-cg/levels/tileset2b_CG.png index 2e6b6e6..aa53e42 100644 Binary files a/assets-cg/levels/tileset2b_CG.png and b/assets-cg/levels/tileset2b_CG.png differ diff --git a/assets-cg/levels/tilesetEGA64_CG.png b/assets-cg/levels/tilesetEGA64_CG.png index f27561c..86428c6 100755 Binary files a/assets-cg/levels/tilesetEGA64_CG.png and b/assets-cg/levels/tilesetEGA64_CG.png differ diff --git a/assets-fx/levels/tileset1b.png b/assets-fx/levels/tileset1b.png index 193c0c0..63f9c7b 100644 Binary files a/assets-fx/levels/tileset1b.png and b/assets-fx/levels/tileset1b.png differ diff --git a/assets-fx/levels/tileset2b.png b/assets-fx/levels/tileset2b.png index 2c2ad04..59ffc2b 100644 Binary files a/assets-fx/levels/tileset2b.png and b/assets-fx/levels/tileset2b.png differ diff --git a/assets/level0.tmx b/assets/level0.tmx index 1d0e971..e51ad31 100644 --- a/assets/level0.tmx +++ b/assets/level0.tmx @@ -33,12 +33,12 @@ 2,2,2,297,298,299,300,393,394,395,396,325,2,265,266,2,301,386,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,387,2,2,2,2,2,2,2,2,2,2,2 - + 257,0,0,0,0,257,0,0,0,0,0,0,0,0,0,0,257,0,0,225,226,227,228,201,202,203,204,273,274,275,276,249,250,251,252,0,0,0,93,94,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,249,250,251,252,225,226,227,228,0,0,0,0,273,274,275,276,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,125,126,127,128,0,0,303,350,351,303,0,0,0,350,351,0,0,0,273,274,275,276,249,250,251,252,201,202,203,204,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,273,274,275,276,225,226,227,228,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,184,0,0,0,0,0,0,0,0,0,0,273,274,275,276,225,226,227,228,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,302,0,130,129,166,0,0,0,0,249,250,251,252,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,201,202, 0,0,0,0,278,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,201,202,203,204,273,274,275,276,0,356,357,0,0,0,0,0,0,0,0,354,355,0,0,225,226, 201,202,203,204,302,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,166,225,226,227,228,0,0,0,0,0,380,381,0,0,0,0,0,0,0,0,378,379,0,0,249,250,