DarkFlippers/unleashed-firmware
1
1
Fork 0
mirror of https://github.com/DarkFlippers/unleashed-firmware.git synced 2024-11-28 02:45:45 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #114 from TQMatvey/flappy_patches

Browse Source 
Flappy: Border hitboxes, bigger Pilars
This commit is contained in:
MX 2022-10-17 21:41:24 +03:00 committed by GitHub
commit 6d999abb80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
applications/plugins/flappy_bird/flappy_bird.c
View File

@ -12,10 +12,10 @@
#define FLAPPY_BIRD_WIDTH 10 #define FLAPPY_BIRD_WIDTH 10
#define FLAPPY_PILAR_MAX 6 #define FLAPPY_PILAR_MAX 6
#define FLAPPY_PILAR_DIST 40 #define FLAPPY_PILAR_DIST 35
#define FLAPPY_GAB_HEIGHT 25 #define FLAPPY_GAB_HEIGHT 25
#define FLAPPY_GAB_WIDTH 5 #define FLAPPY_GAB_WIDTH 10
#define FLAPPY_GRAVITY_JUMP -1.1 #define FLAPPY_GRAVITY_JUMP -1.1
#define FLAPPY_GRAVITY_TICK 0.15 #define FLAPPY_GRAVITY_TICK 0.15
@ -100,10 +100,6 @@ static void flappy_game_state_init(GameState* const game_state) {
flappy_game_random_pilar(game_state); flappy_game_random_pilar(game_state);
} }
// static void flappy_game_reset(GameState* const game_state) {
// FURI_LOG_I(TAG, "Reset Game State\r\n"); // Resetting State
// }
static void flappy_game_tick(GameState* const game_state) { static void flappy_game_tick(GameState* const game_state) {
if(game_state->state == GameStateLife) { if(game_state->state == GameStateLife) {
if(!game_state->debug) { if(!game_state->debug) {
@ -136,11 +132,12 @@ static void flappy_game_tick(GameState* const game_state) {
} }
if(pilar->point.x < -FLAPPY_GAB_WIDTH) pilar->visible = 0; if(pilar->point.x < -FLAPPY_GAB_WIDTH) pilar->visible = 0;
// Checking out of bounds if(game_state->bird.point.y <= 0 - FLAPPY_BIRD_WIDTH){
if(game_state->bird.point.y < 0 - FLAPPY_BIRD_WIDTH || game_state->bird.point.y = 64;
game_state->bird.point.y > FLIPPER_LCD_HEIGHT) { }
game_state->state = GameStateGameOver;
break; if(game_state->bird.point.y > 64 - FLAPPY_BIRD_WIDTH){
game_state->bird.point.y = FLIPPER_LCD_HEIGHT - FLAPPY_BIRD_WIDTH;
} }
// Bird inbetween pipes // Bird inbetween pipes
@ -237,10 +234,6 @@ static void flappy_game_render_callback(Canvas* const canvas, void* ctx) {
canvas_set_font(canvas, FontPrimary); canvas_set_font(canvas, FontPrimary);
canvas_draw_str(canvas, 37, 31, "Game Over"); canvas_draw_str(canvas, 37, 31, "Game Over");
/*if(game_state->points != 0 && game_state->points % 5 == 0) {
DOLPHIN_DEED(getRandomDeed());
}*/
canvas_set_font(canvas, FontSecondary); canvas_set_font(canvas, FontSecondary);
char buffer[12]; char buffer[12];
snprintf(buffer, sizeof(buffer), "Score: %u", game_state->points); snprintf(buffer, sizeof(buffer), "Score: %u", game_state->points);
@ -304,16 +297,16 @@ int32_t flappy_game_app(void* p) {
if(event.input.type == InputTypePress) { if(event.input.type == InputTypePress) {
switch(event.input.key) { switch(event.input.key) {
case InputKeyUp: case InputKeyUp:
game_state->bird.point.y--; if(game_state->state == GameStateLife) {
flappy_game_flap(game_state);
}
break; break;
case InputKeyDown: case InputKeyDown:
game_state->bird.point.y++;
break; break;
case InputKeyRight: case InputKeyRight:
game_state->bird.point.x++;
break; break;
case InputKeyLeft: case InputKeyLeft:
game_state->bird.point.x--;
break; break;
case InputKeyOk: case InputKeyOk:
if(game_state->state == GameStateGameOver) { if(game_state->state == GameStateGameOver) {