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

Merge pull request #92 from an4tur0r/feature/arkanoid_speed

Browse Source 
Feature: allow to set ball speed in Arkanoid
This commit is contained in:
MX 2022-10-08 00:20:14 +03:00 committed by GitHub
commit aedde45de8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
applications/plugins/arkanoid/arkanoid_game.c
View File

@ -10,6 +10,7 @@
#define FLIPPER_LCD_WIDTH 128 #define FLIPPER_LCD_WIDTH 128
#define FLIPPER_LCD_HEIGHT 64 #define FLIPPER_LCD_HEIGHT 64
#define MAX_SPEED 3
typedef enum { EventTypeTick, EventTypeKey } EventType; typedef enum { EventTypeTick, EventTypeKey } EventType;
@ -51,6 +52,7 @@ typedef struct {
unsigned int brickCount; //Amount of bricks hit unsigned int brickCount; //Amount of bricks hit
int tick; //Tick counter int tick; //Tick counter
bool gameStarted; // Did the game start? bool gameStarted; // Did the game start?
int speed; // Ball speed
} ArkanoidState; } ArkanoidState;
typedef struct { typedef struct {
@ -72,12 +74,18 @@ int rand_range(int min, int max) {
void move_ball(Canvas* canvas, ArkanoidState* st) { void move_ball(Canvas* canvas, ArkanoidState* st) {
st->tick++; st->tick++;
int current_speed = abs(st->speed-1 - MAX_SPEED);
if (st->tick % current_speed != 0 && st->tick % (current_speed + 1) != 0) {
return;
}
if(st->ball_state.released) { if(st->ball_state.released) {
//Move ball //Move ball
if(abs(st->ball_state.dx) == 2) { if(abs(st->ball_state.dx) == 2) {
st->ball_state.xb += st->ball_state.dx / 2; st->ball_state.xb += st->ball_state.dx / 2;
// 2x speed is really 1.5 speed // 2x speed is really 1.5 speed
if(st->tick % 2 == 0) st->ball_state.xb += st->ball_state.dx / 2; if((st->tick / current_speed) % 2 == 0) st->ball_state.xb += st->ball_state.dx / 2;
} else { } else {
st->ball_state.xb += st->ball_state.dx; st->ball_state.xb += st->ball_state.dx;
} }
@ -286,6 +294,7 @@ static void arkanoid_state_init(ArkanoidState* arkanoid_state) {
arkanoid_state->ROWS = 4; arkanoid_state->ROWS = 4;
arkanoid_state->ball_state.dx = -1; arkanoid_state->ball_state.dx = -1;
arkanoid_state->ball_state.dy = -1; arkanoid_state->ball_state.dy = -1;
arkanoid_state->speed = 2;
arkanoid_state->bounced = false; arkanoid_state->bounced = false;
arkanoid_state->lives = 3; arkanoid_state->lives = 3;
arkanoid_state->level = 1; arkanoid_state->level = 1;
@ -414,8 +423,14 @@ int32_t arkanoid_game_app(void* p) {
} }
break; break;
case InputKeyUp: case InputKeyUp:
if(arkanoid_state->speed < MAX_SPEED) {
arkanoid_state->speed++;
}
break; break;
case InputKeyDown: case InputKeyDown:
if(arkanoid_state->speed > 1) {
arkanoid_state->speed--;
}
break; break;
case InputKeyOk: case InputKeyOk:
if(arkanoid_state->gameStarted == false) { if(arkanoid_state->gameStarted == false) {