From b3612845fe156c2885a5e83ee818439c9511d5c9 Mon Sep 17 00:00:00 2001 From: bgiraudr Date: Thu, 26 May 2022 17:06:17 +0200 Subject: [PATCH] visual work on inventory --- CMakeLists.txt | 3 +++ assets-cg/battle_ui.png | Bin 17152 -> 17175 bytes assets-cg/fxconv-metadata.txt | 5 +++++ assets-cg/inventory.png | Bin 0 -> 1474 bytes assets-cg/items/item.png | Bin 150 -> 121 bytes assets-cg/items/item2.png | Bin 152 -> 121 bytes include/inventory.h | 3 ++- src/battle.c | 6 +++--- src/inventory.c | 34 ++++++++++++++++++++++++++-------- 9 files changed, 39 insertions(+), 12 deletions(-) create mode 100644 assets-cg/inventory.png diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ddbfb4..f35fb0b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,6 +22,7 @@ add_custom_command( WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/assets-cg/maps/ DEPENDS assets-cg/maps/testCarte.tmx assets-cg/maps/1.tmx + assets-cg/maps/2.tmx assets-cg/tileset.png assets-cg/maps/tileset.tsx assets-cg/maps/inside/tileset_in.tsx @@ -53,6 +54,7 @@ set(SOURCES set(ASSETS_cg assets-cg/tileset.png + assets-cg/inventory.png assets-cg/categories.png assets-cg/dialogue.png assets-cg/capacite.png @@ -60,6 +62,7 @@ set(ASSETS_cg assets-cg/maps/inside/tileset_in.png assets-cg/maps/testCarte.json assets-cg/maps/1.json + assets-cg/maps/2.json assets-cg/maps/inside/1.json assets-cg/maps/inside/2.json assets-cg/spritesheet.png diff --git a/assets-cg/battle_ui.png b/assets-cg/battle_ui.png index 205a2c4ad5a40457899d8438de049ac40ab6085c..7eb538ee3e7308346462a3956a5dbcc8572d073e 100644 GIT binary patch literal 17175 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 SU%CL17FQ6f6!{-ZXaWFYXaq9= literal 17152 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 diff --git a/assets-cg/fxconv-metadata.txt b/assets-cg/fxconv-metadata.txt index 09a0baa..0c5105e 100644 --- a/assets-cg/fxconv-metadata.txt +++ b/assets-cg/fxconv-metadata.txt @@ -34,6 +34,11 @@ battle_ui.png: type: bopti-image name: img_battle profile: p8 + +inventory.png: + type: bopti-image + name: img_inventory + profile: p8 player_moves.txt: custom-type: player_moves diff --git a/assets-cg/inventory.png b/assets-cg/inventory.png new file mode 100644 index 0000000000000000000000000000000000000000..0e8eca277943854a5a0380395c2008b0aba70371 GIT binary patch literal 1474 zcmeAS@N?(olHy`uVBq!ia0y~yVC(_1A8@b%Nr8&M`#_4N*vT`50|;t3QaTtISSvkU z978JRyuD)>q!KRRdeOy@TYGY9Lf^`zC#IYl4#tjRS z=Xmd%_2}Kpm)DC8dw>6KzrKF`_1AZI_%q#^W$#wcQ1m;3VUDkX+S6SO=hP$^Tv(EY z=EX8B=44|KJUFAF{jLLhlc8j>h(T8ZgMeVqvonDX;!TEvK!HhMfn$5B8B3Hv`W9>Q z?{3UvNoIPcv4Hs?gMyL-@65#weJqPDi$yN9f)%HM6n{?}iM?4gF z5C_?napZp=la;Zj>DM3M=P$Nr`e1MK=g;e}uSK7&&=Pl({{7lXCn4{5#2Oa^2EHw) zN&{6TbSugjUq^i1wL++;>`dT>zNzcFwGJ};Fw>3~4{b7>W65=G%Po+)wKEnc#H|Ji zGJbd)wnuLjOR~oMxC2so4}n^F8uGWk0;xJ&afA1an}L*p`@ub7e`W{D3-T~1H5oPl zjVbWH?m9JrC%um;O;Lg&z91XKopWxt_<=Pn%nv5#J$2o?o#nBMT-o8Oywtu`LOqFR z0u7c&?*-b#{NQxnOOOjM1C9T@`|0aNUIq;No?Khky=v9&<;&yGFSbAO%H|DQUqRWH z7zu{Sx3;~#690phIUxxcK=VcUCW{E5^JB86plyPHzJRGEal+oAo`)X`0|D0LBY*LkCzK=o>}{VCZ!K)0g0=QsNUY;-=$|XtCH}T~WBD_C9)|zdswNf1GJLscB~cBO z+qevvjgzdZ=OvxVGVvz$8z+@KgE5O5W?Dn>|J7W#b z1Txg_i4hMytIty`;vm1anGr}dJ-o}^VE3)~%F|Cbv?Un6Tvd~hD`Wn0O--WunMT7# zphWkygA5D$Pe0wbY8K1k!+8z=qJYWH?%wRhtE9mEeR0oLtYSNO!`Pki%T+C)5vC>* zK&^52_TAlk{n;S{pfJ!hhA(D168H8pym(q(95R)gx#7Zu1You?nEz0`&5|o&&;MB< z^Ozef=g0wFcVJFi9LSK5cE6IF^Jgw$sQ7yEbN8yr%^=rS?lfS?i?DJJoht$IZq@I* zGNGm~Ko*@juEOf@WD3aO3;v(VzRv^N1Ii$lHXy_5?5y2GfqFS)rFh=QF|2vKh5N7! dtHJhqhMV^|igMoltDnm{r-UW| Daxosq delta 139 zcmb=N#;DjC;OEZECB?xh)5S5wqBr@^{G%V{ zH!>Y?=}cn-0x^l^La9ut|LF@Q8H5j{D(tf1dGLj46I;xzk5Udg5~c|O(hYMad{`Q^ mXtL3|DV@fe!rU5s%nTm4`G3Y7+oTAzfWgz%&t;ucLK6ViBrCuG diff --git a/assets-cg/items/item2.png b/assets-cg/items/item2.png index e1dc7665efb9d22a4ec4993b72ebf80554dc98df..cdf65a7358fcf1bf2c042095880b186d85de156c 100644 GIT binary patch literal 121 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@(ny)977^n z-<~sMWKiHau%W5GvqIA7+Y+`}#(Oh2?zUtHszCxPesL{imQvfH;0zMll)5S5wqBr@^`GV*6 z%&ZNaLT7n^K*xYhxtYsT>c8H nr7r5JF`B~ZL26gTe~DWM4fb|)xq diff --git a/include/inventory.h b/include/inventory.h index 3d30244..4a20c27 100644 --- a/include/inventory.h +++ b/include/inventory.h @@ -12,4 +12,5 @@ struct Inventory { bool add_item_to_inventory(struct Game *game, struct Inventory *inventory, struct Item *item); int get_first_free_space(struct Inventory *inventory); void display_inventory(struct Inventory *inventory); -int open_inventory(struct Game *game, struct Inventory *inventory, char* context, bool keep_open); \ No newline at end of file +int open_inventory(struct Game *game, struct Inventory *inventory, char* context, bool keep_open); +int get_nb_items(struct Inventory *inventory); \ No newline at end of file diff --git a/src/battle.c b/src/battle.c index d0a241c..6dfc6a7 100644 --- a/src/battle.c +++ b/src/battle.c @@ -185,6 +185,7 @@ void draw_battle(struct Player *player, struct Monster *monster) { if(monster->stats->pv < 0) monster->stats->pv = 0; dclear(C_RGB(25,25,25)); + drect(323, 120, DWIDTH, 125, getTypeFromName(player->stats.type).color); dimage(0,0,&img_battle); int posHP = (float)player->stats.pv / player->stats.max_pv * WIDTH_HP; drect(290,138,290+WIDTH_HP,142,C_WHITE); @@ -198,8 +199,7 @@ void draw_battle(struct Player *player, struct Monster *monster) { drect(290,138,290+posHP,142,pcolor); dprint(333,124,C_BLACK,"%d",player->stats.level); - dprint(246,124,C_BLACK,"%d/%d", player->stats.pv, player->stats.max_pv); - dtext(340,115,C_BLUE, player->stats.type); + dprint(256,122,C_BLACK,"%d/%d", player->stats.pv, player->stats.max_pv); int posHPmonster = (float)monster->stats->pv / monster->stats->max_pv * WIDTH_HP; dprint(2,8,C_BLACK,"%s",monster->name); @@ -214,7 +214,7 @@ void draw_battle(struct Player *player, struct Monster *monster) { drect(48,23,48+posHPmonster,27,mcolor); dprint(90,9,C_BLACK,"%d",monster->stats->level); dprint(127,11,C_BLACK,"%d/%d", monster->stats->pv, monster->stats->max_pv); - dtext(92,0,C_BLUE, monster->stats->type); + drect(0,0,84,4,getTypeFromName(monster->stats->type).color); dimage(265,10,monster->sprite); } diff --git a/src/inventory.c b/src/inventory.c index 1b36fd9..094f7ed 100644 --- a/src/inventory.c +++ b/src/inventory.c @@ -22,6 +22,16 @@ int get_first_free_space(struct Inventory *inventory) { return NB_PLAYER_ITEMS; } +int get_nb_items(struct Inventory *inventory) { + int ret = 0; + for(int i = 0; i < NB_PLAYER_ITEMS; i++) { + if(inventory->items[i] != NULL) { + ret++; + } + } + return ret; +} + bool add_item_to_inventory(struct Game *game, struct Inventory *inventory, struct Item *item) { int index = get_first_free_space(inventory); @@ -47,23 +57,29 @@ bool add_item_to_inventory(struct Game *game, struct Inventory *inventory, struc } void display_inventory(struct Inventory *inventory) { + const int x_inventory = 30; + const int y_inventory = 56; for(int i = 0 ; i < NB_PLAYER_ITEMS ; i++) { int x = i%10; int y = i/10; if(inventory->items[i] != NULL) { - dimage(18*x+50,25*y+50,inventory->items[i]->sprite); + dimage(34*x+x_inventory, 41*y+y_inventory, inventory->items[i]->sprite); } else { - drect(18*x+50,25*y+50,18*x+65,25*y+65,C_BLACK); + drect(34*x+x_inventory, 41*y+y_inventory, 34*x+x_inventory+31, 41*y+y_inventory+31, C_BLACK); } } } int open_inventory(struct Game *game, struct Inventory *inventory, char* context, bool keep_open) { + extern bopti_image_t img_inventory; int buffer = keydown(KEY_SHIFT); struct Vec2 cursor = VEC2(0,0); int pos = 0; int suppression = 0; + const int x_inventory = 30; + const int y_inventory = 56; + while(1) { clearevents(); @@ -77,15 +93,17 @@ int open_inventory(struct Game *game, struct Inventory *inventory, char* context pos = cursor.x + cursor.y*10; - dclear(C_WHITE); - dtext(130,15,C_BLACK,context); - drect(18*cursor.x+48, 25*cursor.y+48, 18*cursor.x+67, 25*cursor.y+67,suppression ? C_RED : C_GREEN); - if(suppression) dtext(130,35,C_RED,"Suppression"); + dclear(C_RGB(25,25,25)); + dimage(0, 0, &img_inventory); + dtext(5,2,C_BLACK,context); + drect(34*cursor.x+x_inventory-2, 41*cursor.y+y_inventory-2, 34*cursor.x+x_inventory+33, 41*cursor.y+y_inventory+33, suppression ? C_RED : C_GREEN); + if(suppression) dtext(5,16,C_RED,"Suppression"); + dprint(5, 185, C_BLACK, "%d/%d", get_nb_items(inventory), NB_PLAYER_ITEMS); display_inventory(inventory); if(inventory->items[pos] != NULL) { - dprint(10, DHEIGHT-30, C_BLACK, "nom : %s", inventory->items[pos]->name); - dprint(10, DHEIGHT-15, C_BLACK, "desc : %s", inventory->items[pos]->description); + dtext(5, 30, C_BLACK, inventory->items[pos]->name); + dtext(104, 30, C_BLACK, inventory->items[pos]->description); } dupdate();