Skip to content

Commit

Permalink
Merge pull request #3 from panki27/flagsbased-uncover
Browse files Browse the repository at this point in the history 
Uncover surrounding fields if number of set flags is correct. Thanks @gelin
  • Loading branch information
@panki27
panki27 authored Oct 13, 2022
2 parents a9d6011 + d63dce1 commit addd984
Show file tree
Hide file tree
Showing 2 changed files with 92 additions and 49 deletions.
1 change: 1 addition & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ This is a Minesweeper implementation for the Flipper Zero device.
- Arrow buttons to move
- Push center button to open field
- Hold center button to toggle flag
- Push center button on an already open field that has the correct amount of flags surrounding it to auto-open the remaining ones (thanks @gelin!)

## Compiling

Expand Down
140 changes: 91 additions & 49 deletions minesweeper.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ static void timer_callback(void* ctx) {
}

static void input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
furi_assert(event_queue);
furi_assert(event_queue);

PluginEvent event = {.type = EventTypeKey, .input = *input_event};
furi_message_queue_put(event_queue, &event, FuriWaitForever);
Expand Down Expand Up @@ -111,7 +111,7 @@ static void render_callback(Canvas* const canvas, void* ctx) {
x*TILE_HEIGHT, // x
8 + (y * TILE_WIDTH), // y
TILE_WIDTH,
TILE_HEIGHT,
TILE_HEIGHT,
tile_0_bits);
break;
case TileType1:
Expand All @@ -120,7 +120,7 @@ static void render_callback(Canvas* const canvas, void* ctx) {
x*TILE_HEIGHT, // x
8 + (y * TILE_WIDTH), // y
TILE_WIDTH,
TILE_HEIGHT,
TILE_HEIGHT,
tile_1_bits);
break;
case TileType2:
Expand All @@ -129,7 +129,7 @@ static void render_callback(Canvas* const canvas, void* ctx) {
x*TILE_HEIGHT, // x
8 + (y * TILE_WIDTH), // y
TILE_WIDTH,
TILE_HEIGHT,
TILE_HEIGHT,
tile_2_bits);
break;
case TileType3:
Expand All @@ -138,7 +138,7 @@ static void render_callback(Canvas* const canvas, void* ctx) {
x*TILE_HEIGHT, // x
8 + (y * TILE_WIDTH), // y
TILE_WIDTH,
TILE_HEIGHT,
TILE_HEIGHT,
tile_3_bits);
break;
case TileType4:
Expand All @@ -147,7 +147,7 @@ static void render_callback(Canvas* const canvas, void* ctx) {
x*TILE_HEIGHT, // x
8 + (y * TILE_WIDTH), // y
TILE_WIDTH,
TILE_HEIGHT,
TILE_HEIGHT,
tile_4_bits);
break;
case TileType5:
Expand All @@ -156,7 +156,7 @@ static void render_callback(Canvas* const canvas, void* ctx) {
x*TILE_HEIGHT, // x
8 + (y * TILE_WIDTH), // y
TILE_WIDTH,
TILE_HEIGHT,
TILE_HEIGHT,
tile_5_bits);
break;
case TileType6:
Expand All @@ -165,7 +165,7 @@ static void render_callback(Canvas* const canvas, void* ctx) {
x*TILE_HEIGHT, // x
8 + (y * TILE_WIDTH), // y
TILE_WIDTH,
TILE_HEIGHT,
TILE_HEIGHT,
tile_6_bits);
break;
case TileType7:
Expand All @@ -174,7 +174,7 @@ static void render_callback(Canvas* const canvas, void* ctx) {
x*TILE_HEIGHT, // x
8 + (y * TILE_WIDTH), // y
TILE_WIDTH,
TILE_HEIGHT,
TILE_HEIGHT,
tile_7_bits);
break;
case TileType8:
Expand All @@ -183,7 +183,7 @@ static void render_callback(Canvas* const canvas, void* ctx) {
x*TILE_HEIGHT, // x
8 + (y * TILE_WIDTH), // y
TILE_WIDTH,
TILE_HEIGHT,
TILE_HEIGHT,
tile_8_bits);
break;
case TileTypeFlag:
Expand All @@ -192,7 +192,7 @@ static void render_callback(Canvas* const canvas, void* ctx) {
x*TILE_HEIGHT, // x
8 + (y * TILE_WIDTH), // y
TILE_WIDTH,
TILE_HEIGHT,
TILE_HEIGHT,
tile_flag_bits);
break;
case TileTypeUncleared:
Expand All @@ -201,7 +201,7 @@ static void render_callback(Canvas* const canvas, void* ctx) {
x*TILE_HEIGHT, // x
8 + (y * TILE_WIDTH), // y
TILE_WIDTH,
TILE_HEIGHT,
TILE_HEIGHT,
tile_uncleared_bits);
break;
case TileTypeMine:
Expand All @@ -210,7 +210,7 @@ static void render_callback(Canvas* const canvas, void* ctx) {
x*TILE_HEIGHT, // x
8 + (y * TILE_WIDTH), // y
TILE_WIDTH,
TILE_HEIGHT,
TILE_HEIGHT,
tile_mine_bits);
break;
}
Expand Down Expand Up @@ -238,7 +238,7 @@ static void setup_playfield(Minesweeper* minesweeper_state) {
int rand_y = rand() % PLAYFIELD_HEIGHT;
// make sure first guess isn't a mine
if (minesweeper_state->minefield[rand_x][rand_y] == FieldEmpty &&
(minesweeper_state->cursor_x != rand_x && minesweeper_state->cursor_y != rand_y )) {
(minesweeper_state->cursor_x != rand_x && minesweeper_state->cursor_y != rand_y )) {
minesweeper_state->minefield[rand_x][rand_y] = FieldMine;
mines_left--;
}
Expand Down Expand Up @@ -273,7 +273,7 @@ static bool game_lost(Minesweeper* minesweeper_state) {
dialog_message_set_buttons(message, NULL, "Play again", NULL);

dialog_message_set_icon(message, NULL, 0, 10);

NotificationApp* notifications = furi_record_open(RECORD_NOTIFICATION);
notification_message(notifications, &sequence_set_vibro_on);
furi_record_close(RECORD_NOTIFICATION);
Expand All @@ -293,7 +293,7 @@ static bool game_won(Minesweeper* minesweeper_state) {
tempStr = furi_string_alloc();

int seconds = 0;
int minutes = 0;
int minutes = 0;
uint32_t ticks_elapsed = furi_get_tick() - minesweeper_state->game_started_tick;
seconds = (int) ticks_elapsed / furi_kernel_get_tick_frequency();
minutes = (int) seconds / 60;
Expand All @@ -305,28 +305,31 @@ static bool game_won(Minesweeper* minesweeper_state) {
dialog_message_set_header(message, header_text, 64, 3, AlignCenter, AlignTop);
dialog_message_set_text(message, furi_string_get_cstr(tempStr), 64, 32, AlignCenter, AlignCenter);
dialog_message_set_buttons(message, NULL, "Play again", NULL);
// TODO: create icon
dialog_message_set_icon(message, NULL, 72, 17);

DialogMessageButton choice = dialog_message_show(dialogs, message);
dialog_message_free(message);
furi_string_free(tempStr);
furi_record_close(RECORD_DIALOGS);
return choice == DialogMessageButtonCenter;
return choice == DialogMessageButtonCenter;
}

// returns false if the move loses the game - otherwise true
static bool play_move(Minesweeper* minesweeper_state, int cursor_x, int cursor_y) {
if (minesweeper_state->playfield[cursor_x][cursor_y] != TileTypeUncleared) {
// we're on an already uncovered field
return true;
if (minesweeper_state->playfield[cursor_x][cursor_y] == TileTypeFlag) {
// we're on a flagged field, do nothing
return true;
}
if (minesweeper_state->minefield[cursor_x][cursor_y] == FieldMine) {
// TODO: player loses!
minesweeper_state->playfield[cursor_x][cursor_y] = TileTypeMine;
return false;
} else {
// get number of surrounding mines.
int hint = 0;
// player loses - draw mine
minesweeper_state->playfield[cursor_x][cursor_y] = TileTypeMine;
return false;
}

if (minesweeper_state->playfield[cursor_x][cursor_y] >= TileType1 && minesweeper_state->playfield[cursor_x][cursor_y] <= TileType8) {
// click on a cleared cell with a number
// count the flags around
int flags = 0;
for (int y = cursor_y-1; y <= cursor_y+1; y++) {
for (int x = cursor_x-1; x <= cursor_x+1; x++) {
if ( x == cursor_x && y == cursor_y ) {
Expand All @@ -335,37 +338,76 @@ static bool play_move(Minesweeper* minesweeper_state, int cursor_x, int cursor_y
}
// make sure we don't go OOB
if ( x >= 0 && x < PLAYFIELD_WIDTH && y >= 0 && y < PLAYFIELD_HEIGHT) {
if(minesweeper_state->minefield[x][y] == FieldMine) {
hint ++;
if (minesweeper_state->playfield[x][y] == TileTypeFlag) {
flags ++;
}
}
}
}
// 〜(￣▽￣〜) don't judge me (〜￣▽￣)〜
minesweeper_state->playfield[cursor_x][cursor_y] = hint;
minesweeper_state->fields_cleared++;
FURI_LOG_D("Minesweeper", "Setting %d,%d to %d", cursor_x, cursor_y, hint);
if (hint == 0) {
// auto open surrounding fields.
int mines = minesweeper_state->playfield[cursor_x][cursor_y]; // ¯\_(ツ)_/¯
if (flags == mines) {
// auto uncover all non-flags around (to win faster ;)
for (int auto_y = cursor_y-1; auto_y <= cursor_y+1; auto_y++) {
for (int auto_x = cursor_x-1; auto_x <= cursor_x+1; auto_x++) {
if ( auto_x == cursor_x && auto_y == cursor_y ) {
continue;
}
if ( auto_x >= 0 && auto_x < PLAYFIELD_WIDTH && auto_y >= 0 && auto_y < PLAYFIELD_HEIGHT) {
if (minesweeper_state->playfield[auto_x][auto_y] == TileTypeUncleared) {
play_move(minesweeper_state, auto_x, auto_y);
if(!play_move(minesweeper_state, auto_x, auto_y)) {
// flags were wrong, we got a mine!
return false;
}
}
}
}
}
// we're done without hitting a mine - so return
return true;
}
return true;
}

// calculate number of surrounding mines.
int hint = 0;
for (int y = cursor_y-1; y <= cursor_y+1; y++) {
for (int x = cursor_x-1; x <= cursor_x+1; x++) {
if ( x == cursor_x && y == cursor_y ) {
// we're on the cell the user selected, so ignore.
continue;
}
// make sure we don't go OOB
if ( x >= 0 && x < PLAYFIELD_WIDTH && y >= 0 && y < PLAYFIELD_HEIGHT) {
if(minesweeper_state->minefield[x][y] == FieldMine) {
hint ++;
}
}
}
}
// 〜(￣▽￣〜) don't judge me (〜￣▽￣)〜
minesweeper_state->playfield[cursor_x][cursor_y] = hint;
minesweeper_state->fields_cleared++;
FURI_LOG_D("Minesweeper", "Setting %d,%d to %d", cursor_x, cursor_y, hint);
if (hint == 0) {
// the field is "empty"
// auto open surrounding fields.
for (int auto_y = cursor_y-1; auto_y <= cursor_y+1; auto_y++) {
for (int auto_x = cursor_x-1; auto_x <= cursor_x+1; auto_x++) {
if ( auto_x == cursor_x && auto_y == cursor_y ) {
continue;
}
if ( auto_x >= 0 && auto_x < PLAYFIELD_WIDTH && auto_y >= 0 && auto_y < PLAYFIELD_HEIGHT) {
if (minesweeper_state->playfield[auto_x][auto_y] == TileTypeUncleared) {
play_move(minesweeper_state, auto_x, auto_y);
}
}
}
}
}
return true;
}

static void minesweeper_state_init(Minesweeper* const minesweeper_state) {
minesweeper_state->cursor_x = minesweeper_state->cursor_y = 0;
minesweeper_state->cursor_x = minesweeper_state->cursor_y = 0;
minesweeper_state->game_started = false;
for (int y = 0; y < PLAYFIELD_HEIGHT; y++) {
for (int x = 0; x < PLAYFIELD_WIDTH; x++){
Expand Down Expand Up @@ -393,11 +435,11 @@ int32_t minesweeper_app(void* p) {
furi_record_close(RECORD_DIALOGS);

FuriMessageQueue* event_queue = furi_message_queue_alloc(8, sizeof(PluginEvent));

Minesweeper* minesweeper_state = malloc(sizeof(Minesweeper));
// setup
minesweeper_state_init(minesweeper_state);

ValueMutex state_mutex;
if (!init_mutex(&state_mutex, minesweeper_state, sizeof(minesweeper_state))) {
FURI_LOG_E("Minesweeper", "cannot create mutex\r\n");
Expand All @@ -407,13 +449,13 @@ int32_t minesweeper_app(void* p) {
// BEGIN IMPLEMENTATION

// Set system callbacks
ViewPort* view_port = view_port_alloc();
ViewPort* view_port = view_port_alloc();
view_port_draw_callback_set(view_port, render_callback, &state_mutex);
view_port_input_callback_set(view_port, input_callback, event_queue);
minesweeper_state->timer = furi_timer_alloc(timer_callback, FuriTimerTypeOnce, &state_mutex);
minesweeper_state->timer = furi_timer_alloc(timer_callback, FuriTimerTypeOnce, &state_mutex);

// Open GUI and register view_port
Gui* gui = furi_record_open("gui");
Gui* gui = furi_record_open("gui");
gui_add_view_port(gui, view_port, GuiLayerFullscreen);

PluginEvent event;
Expand All @@ -423,7 +465,7 @@ int32_t minesweeper_app(void* p) {
if(event_status == FuriStatusOk) {
// press events
if(event.type == EventTypeKey) {
if(event.input.type == InputTypeShort) {
if(event.input.type == InputTypeShort) {
switch(event.input.key) {
case InputKeyUp:
minesweeper_state->cursor_y--;
Expand Down Expand Up @@ -461,15 +503,15 @@ int32_t minesweeper_app(void* p) {
setup_playfield(minesweeper_state);
} else {
// player wants to exit :(
processing = false;
processing = false;
}
} else {
// check win condition.
if (minesweeper_state->fields_cleared == (PLAYFIELD_HEIGHT*PLAYFIELD_WIDTH) - MINECOUNT){
if (game_won(minesweeper_state)) {
//player wants to restart
setup_playfield(minesweeper_state);
} else {
} else {
processing = false;
}
}
Expand All @@ -496,9 +538,9 @@ int32_t minesweeper_app(void* p) {
case InputKeyBack:
processing = false;
break;
}
}
}
}
}
} else {
// event timeout
;
Expand Down

0 comments on commit addd984

Please sign in to comment.