From 468ee6ce5b2f67c8e8722ac5691ed6d8b137e87a Mon Sep 17 00:00:00 2001 From: KikooDX Date: Thu, 3 Jun 2021 12:07:38 +0200 Subject: [PATCH] finish da thing The thing is now complete. --- CMakeLists.txt | 2 +- assets/icon-sel.png | Bin 8388 -> 2360 bytes assets/icon-uns.png | Bin 4629 -> 639 bytes assets/tileset.png | Bin 566 -> 549 bytes include/grid.h | 10 ++++++---- src/game/init.c | 2 -- src/grid/shop.c | 7 +++++-- src/main.c | 43 +++++++++++++++++++++++++++++++------------ 8 files changed, 43 insertions(+), 21 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ff1e561..1a72321 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ # toolchain file and module path of the fxSDK cmake_minimum_required(VERSION 3.18) -project(ProtoDig C) +project(ProtoMine C) include(GenerateG3A) include(Fxconv) diff --git a/assets/icon-sel.png b/assets/icon-sel.png index 7137b504cfd44f62f3105ce7a203b9100a557d0f..33ff6be9b6eda6ea8d41c76014c51565084618d2 100644 GIT binary patch delta 2350 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 ag#Q8hHNm}t`+-sb0000MZM>$= z$(sGM!!L5Y{rj-M__yborv}q_Ud)MJbFKVyWzNpX9h@JM_XzEo*nc*oXJ>uX&vS1r zez+YDXl*$*bCLc7AEcAVKLnCz4Bg4?uy!rP@sS{LvCO zWBz3S?SHLr&A27>V%JLT_=YOaPVr2^1eYwaHBqM7&)@Gl`19G>4`-t}rvT%tVNP&I l;xY$#oPoWH8jTo2HH_ShLOSZV(!v;kz|+;wWt~$(69D)N90C9U literal 4629 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 LNkvXXu0mjfMjhGA diff --git a/assets/tileset.png b/assets/tileset.png index b312dbda949bd2a054cd1298f628ac6b2c7671a0..5ca01fa4c74c697fe4ed9ca4162e0e4fa23fdf46 100644 GIT binary patch delta 510 zcmVL!F@N7lL_t(&f$fXUy+7`2`YSpbf!0J8Kxm320mD8UPHZm!Nv@Y^Zo= z7{50iea3-jY%1bBb=C*)pJ3?>2FO~2=^Rq zP%lM20|3m;rN(h)ao0KHbNXID^U2JpPA?KoX8?e_*^;^5*=+x%sp6iXBYzktvxfNq zjb;D@&5NgddVe2Bd2SSI_4mp!PDYagQpKQDAE*PMqyW^I)vMVxNCjg}G1y`ikS+e= zcG{ooBk6l(?E(;>aS8y)=lnQWXy25vDSfZd=|3LnG%%zB5z|0C8^q}W?>AcoqzX2g z%VV>pT%OZE0yGHlvt-YJO9NbcvsHkEb~N|A0-&t90(Sst5CGb$z64I+D_kw`8-dZJ z2&9y(^(7v~Xo_|dh|BR3&G!Lv8$xuaFPHl@`g;Y7z}it>dmhjv0G2H4QUze?GB4gT z{!2k%j8RX|Yvz8W)fdi=b4y0)|8ejSw>%F10_fk5N(&~ A%m4rY delta 528 zcmV+r0`L8$1hxc_F@Nw$L_t(&f$f76iMYWl@^>6^1G;jmT(4lC|0{{R$ z=Tj9mJbnE*F1`yi{?IJi^jQOBdFhtRk6y9JZujXl@z>@-JAVN8@KH=Of)AcQG>f*6 zc-nYG6FU~v20(nVB@;;5p(^U*HTqq;Pin@vG;Jc%I76G#!~l{QoXFDeVp*fh{q7wU zUz^!dc(fd>Dr#07Dr!hP-vs`6UCeQ>P{Fgj9IUQT--u2;l-{}XF*rk6F99#F&#HJV z0z+w?!#Q{I?0*l;^V7i{1tlxNyNEsqTpO~={GDl2k z2~z|3_-`wkBeqP0u8r9Y*XT-2mVi(Pph@A&MbQ1_5O>Aj>?-F~FeE(~% S0J8u900{s|MNUMnLSTXn#`$gl diff --git a/include/grid.h b/include/grid.h index d316115..a50d8a1 100644 --- a/include/grid.h +++ b/include/grid.h @@ -1,7 +1,5 @@ #pragma once -#include "tiles.h" #include -#include struct Grid { int width; @@ -9,10 +7,14 @@ struct Grid { uint8_t *data; }; +#include "player.h" +#include "tiles.h" +#include + struct Grid grid_new(int width, int height); void grid_free(struct Grid); void grid_set(struct Grid *restrict, int x, int y, enum Tile); enum Tile grid_get(struct Grid, int x, int y); void grid_draw(struct Grid, int scr_x, int scr_y); -void grid_random_walker(struct Grid *restrict grid); -void grid_shop(struct Grid *restrict grid); +void grid_random_walker(struct Grid *restrict); +void grid_shop(struct Grid *restrict, struct Player *restrict); diff --git a/src/game/init.c b/src/game/init.c index 5f00af4..ec3be1e 100644 --- a/src/game/init.c +++ b/src/game/init.c @@ -10,8 +10,6 @@ game_init(void) grid_random_walker(&game.floor); game.player = player_init(0, game.floor.height / 2); game.rest = grid_new(25, 14); - game.player_rest = - player_init(game.rest.width / 2, game.rest.height - 1); return game; } diff --git a/src/grid/shop.c b/src/grid/shop.c index 2cfb7af..6f9c3c6 100644 --- a/src/grid/shop.c +++ b/src/grid/shop.c @@ -1,13 +1,16 @@ #include "grid.h" +#include "player.h" #include "tiles.h" void -grid_shop(struct Grid *restrict grid) +grid_shop(struct Grid *restrict grid, struct Player *restrict player) { const int x_middle = grid->width / 2; const int y_middle = grid->height / 2; grid_set(grid, x_middle - 2, y_middle, TILE_CONTRACTS_SPEED_UP); grid_set(grid, x_middle + 2, y_middle, TILE_CONTRACTS_SLOW_DOWN); - grid_set(grid, grid->width - 1, grid->height - 1, TILE_ZONE_TRANSITION); + grid_set(grid, grid->width - 3, grid->height - 3, TILE_ZONE_TRANSITION); + + *player = player_init(x_middle, y_middle + 2); } diff --git a/src/main.c b/src/main.c index 90c0eba..43d8810 100644 --- a/src/main.c +++ b/src/main.c @@ -14,15 +14,18 @@ int main(void) { struct Game game; + int state = 0; init_rand(); + do { + game = game_init(); - game = game_init(); + do { + state = main_loop(&game); + } while (!state); - while (!main_loop(&game)) { - } - - game_deinit(game); + game_deinit(game); + } while (state == -1); return 1; } @@ -31,7 +34,16 @@ static void init_rand(void) { dclear(C_BLACK); - dprint(0, 0, C_WHITE, "PRESS SHIFT"); + dprint(16, 16, C_WHITE, "Instructions:"); + dprint(16, 48, C_WHITE, "Move to the right to outrun scrolling."); + dprint(16, 64, C_WHITE, "Destroy gold (yellow blocs) for money."); + dprint(16, 80, C_WHITE, + "Rest rooms freeze time and propose two deals."); + dprint(16, 96, C_WHITE, "(NB: they impact scrolling speed and money)"); + dprint(16, 112, C_WHITE, "Have fun!"); + dprint(48, 128, C_WHITE, "-- KikooDX"); + dprint_opt(DWIDTH / 2, DHEIGHT - 16, C_WHITE, C_NONE, DTEXT_CENTER, + DTEXT_BOTTOM, "PRESS SHIFT"); dupdate(); unsigned int seed = 0; @@ -57,7 +69,7 @@ main_loop(struct Game *restrict game) case GameFloor: if (player_update(&game->player, &game->floor)) { game->state = GameRest; - grid_shop(&game->rest); + grid_shop(&game->rest, &game->player_rest); } scroll_x -= scroll_speed; scroll_speed += 0.0003; @@ -80,6 +92,11 @@ main_loop(struct Game *restrict game) } break; case GameDead: + if (keydown(KEY_SHIFT)) { + scroll_x = 99.0; + scroll_speed = 0.6; + return -1; + } default: break; } @@ -98,12 +115,14 @@ main_loop(struct Game *restrict game) game->state = GameDead; break; case GameDead: - dprint(0, 0, C_WHITE, "You died :("); - dprint(0, 16, C_WHITE, "Collected $%d", *game->player.cash); - dprint(0, 32, C_WHITE, "Survived %d feets", + dprint(16, 16 + 0, C_WHITE, "Scrolling killed you :("); + dprint(16, 16 + 16, C_WHITE, "Collected $%d", + *game->player.cash); + dprint(16, 16 + 16, C_WHITE, "Survived %d feets", -(int)(scroll_x / 4)); - dprint(0, 48, C_WHITE, "Thanks for playing :)"); - dprint(0, 64, C_WHITE, "(Press EXIT)"); + dprint(16, 16 + 48, C_WHITE, "Thanks for playing :)"); + dprint(16, 16 + 80, C_WHITE, + "Press SHIFT to play again or EXIT to quit"); break; default: break;