From 0db6dd32386701f59e2bbb7f7c1916e61e4ce8b0 Mon Sep 17 00:00:00 2001 From: mibi88 Date: Sun, 24 Jul 2022 12:44:49 +0200 Subject: [PATCH] =?UTF-8?q?20220724=20-=20Pr=C3=A9paration=20du=20crafting?= =?UTF-8?q?.=20am=C3=A9lioration,=20ajout=20de=20quelque=20sprites.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 3 +- assets-fx/tiles/blocks/cherry.png | Bin 96 -> 120 bytes assets-fx/tiles/blocks/fxconv-metadata.txt | 10 ++++- .../blocks/{woodstep.png => woodstep1.png} | Bin assets-fx/tiles/blocks/woodstep2.png | Bin 0 -> 118 bytes assets-fx/tiles/blocks/woodstick.png | Bin 0 -> 111 bytes latest-build/Builder.g1a | Bin 41892 -> 42252 bytes src/gamesettings.h | 4 +- src/main.c | 38 ++++++++++++------ src/{player.h => objects.h} | 21 ++++++++++ 10 files changed, 59 insertions(+), 17 deletions(-) rename assets-fx/tiles/blocks/{woodstep.png => woodstep1.png} (100%) create mode 100644 assets-fx/tiles/blocks/woodstep2.png create mode 100644 assets-fx/tiles/blocks/woodstick.png rename src/{player.h => objects.h} (52%) diff --git a/CMakeLists.txt b/CMakeLists.txt index a7c04d3..a9fc633 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,8 @@ set(ASSETS_fx assets-fx/tiles/blocks/water2.png assets-fx/tiles/blocks/wheat.png assets-fx/tiles/blocks/woodplks.png - assets-fx/tiles/blocks/woodstep.png + assets-fx/tiles/blocks/woodstep1.png + assets-fx/tiles/blocks/woodstep2.png assets-fx/player/skin1/player0.png assets-fx/player/skin1/player1.png assets-fx/player/skin1/player2.png diff --git a/assets-fx/tiles/blocks/cherry.png b/assets-fx/tiles/blocks/cherry.png index d4ce59446c4bb96b77824972663f96bd74ae1e37..d7107664b633786d00e30255f85a0de18625ef77 100644 GIT binary patch delta 84 zcmYeOm>|K)!OXzG@cE+O&WVbmPD~|1e!>6$pV)f;I8apH)5S4_V`g#!5TrCPxmld$ l5Kn0FG;mUtm{`HVz`$g}z(2Vw{SQzngQu&X%Q~loCIF;L8ms^S delta 60 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 delta 4918 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 Br3wH5 diff --git a/src/gamesettings.h b/src/gamesettings.h index 6d8675f..f5966d1 100644 --- a/src/gamesettings.h +++ b/src/gamesettings.h @@ -3,4 +3,6 @@ # define WORLDGEN_SOIL 8 // Blocks (y) of soil. # define WORLD_WIDTH 64 // World width. # define WORLD_HEIGHT 64 // World height. -# define INVENTORY_SIZE 5 // Size of the inventory. \ No newline at end of file +# define INVENTORY_SIZE 5 // Size of the inventory. +# define CRAFTSIZE 9 // How many different blocks you can use to craft something. +# define CRAFTINGS 3 // How many things you can craft. \ No newline at end of file diff --git a/src/main.c b/src/main.c index 72945dc..171259d 100644 --- a/src/main.c +++ b/src/main.c @@ -17,6 +17,10 @@ extern bopti_image_t stone_tile; extern bopti_image_t coal_tile; extern bopti_image_t steel_tile; extern bopti_image_t wood_tile; +extern bopti_image_t woodplanks_tile; +extern bopti_image_t woodsteps_1_tile; +extern bopti_image_t woodsteps_2_tile; +extern bopti_image_t woodstick_tile; extern bopti_image_t skin1_player_left1; extern bopti_image_t skin1_player_left2; extern bopti_image_t skin1_player_right1; @@ -24,12 +28,15 @@ extern bopti_image_t skin1_player_right2; extern bopti_image_t select_tool; extern bopti_image_t invnormal; extern bopti_image_t invselected; +extern bopti_image_t craftselection; +extern bopti_image_t arrow_1; +extern bopti_image_t arrow_2; extern bopti_image_t overlay_break_1; extern bopti_image_t overlay_break_2; extern bopti_image_t overlay_break_3; extern bopti_image_t overlay_break_4; -# include "player.h" +# include "objects.h" //int x, y, pos, hour, animation, orient, timing, falling, jumping, jumpheight; int pos, hour; @@ -223,6 +230,11 @@ void drawdetailinv(){ } } } +void drawcrafting(){ + dimage(32, 0, &craftselection); + dimage(4, 28, &arrow_2); + dimage(116, 28, &arrow_1); +} int main(void) { dclear(C_WHITE); dimage(16, TITLE_IMAGE_MARGIN, &title_img); @@ -431,6 +443,9 @@ int main(void) { clearevents(); if(keydown(KEY_MENU)){ game = 4; + while(keydown(KEY_MENU)){ + clearevents(); + } } // dtext(1, 1, C_BLACK, "test"); mappartdisplaying(player.x, player.y, terrain, player.orient+player.animation); @@ -454,10 +469,10 @@ int main(void) { while(keydown(KEY_EXE)){ clearevents(); } - }else if(keydown(KEY_1)){ + }else if(keydown(KEY_MENU)){ game = 5; clearevents(); - while(keydown(KEY_1)){ + while(keydown(KEY_MENU)){ clearevents(); } } @@ -524,6 +539,7 @@ int main(void) { } }else if(game == 5){ dclear(C_WHITE); + drawcrafting(); dupdate(); clearevents(); if(keydown(KEY_EXE)){ @@ -534,17 +550,13 @@ int main(void) { } } clearevents(); - if (keydown(KEY_0)){ - if(player.invselect