Skip to content

Commit

Permalink
working uncovering, auto uncover
Browse files Browse the repository at this point in the history
  • Loading branch information
@panki27
panki27 committed Sep 22, 2022
1 parent b0615c8 commit ff45866
Show file tree
Hide file tree
Showing 2 changed files with 235 additions and 55 deletions.
51 changes: 45 additions & 6 deletions assets.h
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,48 @@
#define tile_uncleared_width 8
#define tile_uncleared_height 8
static uint8_t tile_uncleared_bits[] = {
0xFF, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0xFF, };

#define tile_0_width 8
#define tile_0_height 8
static uint8_t tile_0_bits[] = {
0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, };
#define tile_1_width 8
#define tile_1_height 8
static uint8_t tile_1_bits[] = {
0x81, 0x10, 0x18, 0x10, 0x10, 0x10, 0x10, 0x81, };
#define tile_2_width 8
#define tile_2_height 8
static uint8_t tile_2_bits[] = {
0x81, 0x1C, 0x20, 0x20, 0x18, 0x04, 0x3C, 0x81, };
#define tile_3_width 8
#define tile_3_height 8
static uint8_t tile_3_bits[] = {
0x81, 0x1C, 0x20, 0x20, 0x18, 0x20, 0x1C, 0x81, };
#define tile_4_width 8
#define tile_4_height 8
static uint8_t tile_4_bits[] = {
0x81, 0x04, 0x14, 0x14, 0x3C, 0x10, 0x10, 0x81, };
#define tile_5_width 8
#define tile_5_height 8
static uint8_t tile_5_bits[] = {
0x81, 0x3C, 0x04, 0x1C, 0x20, 0x20, 0x1C, 0x81, };
#define tile_6_width 8
#define tile_6_height 8
static uint8_t tile_6_bits[] = {
0x81, 0x18, 0x24, 0x04, 0x1C, 0x24, 0x18, 0x81, };
#define tile_7_width 8
#define tile_7_height 8
static uint8_t tile_7_bits[] = {
0x81, 0x3C, 0x20, 0x20, 0x10, 0x08, 0x08, 0x81, };
#define tile_8_width 8
#define tile_8_height 8
static uint8_t tile_8_bits[] = {
0x81, 0x18, 0x24, 0x18, 0x24, 0x24, 0x18, 0x81, };
#define tile_mine_width 8
#define tile_mine_height 8
static uint8_t tile_mine_bits[] = {
0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA, };
0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA, };
#define tile_uncleared_width 8
#define tile_uncleared_height 8
static uint8_t tile_uncleared_bits[] = {
0xFF, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0xFF, };
#define tile_flag_width 8
#define tile_flag_height 8
static uint8_t tile_flag_bits[] = {
0xFF, 0x81, 0xB9, 0x89, 0x89, 0x9D, 0x81, 0xFF, };
239 changes: 190 additions & 49 deletions minesweeper.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,18 @@ typedef struct {
} PluginEvent;

typedef enum {
TileTypeUncleared, // this HAS to be the first element so it gets assigned 0 for easier init :)
TileTypeCleared,
TileType0,
TileType1,
TileType2,
TileType3,
TileType4,
TileType5,
TileType6,
TileType7,
TileType8,
TileTypeFlag,
TileTypeMine
TileType0, // this HAS to be in order, then
TileType1,
TileType2,
TileType3,
TileType4,
TileType5,
TileType6,
TileType7,
TileType8,
TileTypeUncleared,
TileTypeFlag,
TileTypeMine
} TileType;

typedef enum {
Expand All @@ -47,8 +46,8 @@ typedef enum {
typedef struct {
Field minefield[PLAYFIELD_WIDTH][PLAYFIELD_HEIGHT];
TileType playfield[PLAYFIELD_WIDTH][PLAYFIELD_HEIGHT];
int cursor_cell_x;
int cursor_cell_y;
int cursor_x;
int cursor_y;
bool game_started;
} Minesweeper;

Expand All @@ -67,27 +66,120 @@ static void render_callback(Canvas* const canvas, void* ctx) {
canvas_set_font(canvas, FontPrimary);
for (int y = 0; y < PLAYFIELD_HEIGHT; y++) {
for (int x = 0; x < PLAYFIELD_WIDTH; x++) {
if ( x == minesweeper_state->cursor_cell_x && y == minesweeper_state->cursor_cell_y) {
if ( x == minesweeper_state->cursor_x && y == minesweeper_state->cursor_y) {
canvas_invert_color(canvas);
}
if (minesweeper_state->minefield[x][y] == FieldMine) {
canvas_draw_xbm(
canvas,
x*TILE_HEIGHT, // x
8 + (y * TILE_WIDTH), // y
TILE_WIDTH,
TILE_HEIGHT,
tile_mine_bits);
} else {
canvas_draw_xbm(
canvas,
x*TILE_HEIGHT, // x
8 + (y * TILE_WIDTH), // y
TILE_WIDTH,
TILE_HEIGHT,
tile_uncleared_bits);
switch (minesweeper_state->playfield[x][y]) {
case TileType0:
canvas_draw_xbm(
canvas,
x*TILE_HEIGHT, // x
8 + (y * TILE_WIDTH), // y
TILE_WIDTH,
TILE_HEIGHT,
tile_0_bits);
break;
case TileType1:
canvas_draw_xbm(
canvas,
x*TILE_HEIGHT, // x
8 + (y * TILE_WIDTH), // y
TILE_WIDTH,
TILE_HEIGHT,
tile_1_bits);
break;
case TileType2:
canvas_draw_xbm(
canvas,
x*TILE_HEIGHT, // x
8 + (y * TILE_WIDTH), // y
TILE_WIDTH,
TILE_HEIGHT,
tile_2_bits);
break;
case TileType3:
canvas_draw_xbm(
canvas,
x*TILE_HEIGHT, // x
8 + (y * TILE_WIDTH), // y
TILE_WIDTH,
TILE_HEIGHT,
tile_3_bits);
break;
case TileType4:
canvas_draw_xbm(
canvas,
x*TILE_HEIGHT, // x
8 + (y * TILE_WIDTH), // y
TILE_WIDTH,
TILE_HEIGHT,
tile_4_bits);
break;
case TileType5:
canvas_draw_xbm(
canvas,
x*TILE_HEIGHT, // x
8 + (y * TILE_WIDTH), // y
TILE_WIDTH,
TILE_HEIGHT,
tile_5_bits);
break;
case TileType6:
canvas_draw_xbm(
canvas,
x*TILE_HEIGHT, // x
8 + (y * TILE_WIDTH), // y
TILE_WIDTH,
TILE_HEIGHT,
tile_6_bits);
break;
case TileType7:
canvas_draw_xbm(
canvas,
x*TILE_HEIGHT, // x
8 + (y * TILE_WIDTH), // y
TILE_WIDTH,
TILE_HEIGHT,
tile_7_bits);
break;
case TileType8:
canvas_draw_xbm(
canvas,
x*TILE_HEIGHT, // x
8 + (y * TILE_WIDTH), // y
TILE_WIDTH,
TILE_HEIGHT,
tile_8_bits);
break;
case TileTypeFlag:
canvas_draw_xbm(
canvas,
x*TILE_HEIGHT, // x
8 + (y * TILE_WIDTH), // y
TILE_WIDTH,
TILE_HEIGHT,
tile_flag_bits);
break;
case TileTypeUncleared:
canvas_draw_xbm(
canvas,
x*TILE_HEIGHT, // x
8 + (y * TILE_WIDTH), // y
TILE_WIDTH,
TILE_HEIGHT,
tile_uncleared_bits);
break;
case TileTypeMine:
canvas_draw_xbm(
canvas,
x*TILE_HEIGHT, // x
8 + (y * TILE_WIDTH), // y
TILE_WIDTH,
TILE_HEIGHT,
tile_mine_bits);
break;
}
if ( x == minesweeper_state->cursor_cell_x && y == minesweeper_state->cursor_cell_y) {
if ( x == minesweeper_state->cursor_x && y == minesweeper_state->cursor_y) {
canvas_invert_color(canvas);
}
}
Expand All @@ -102,24 +194,69 @@ 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_cell_x != rand_x && minesweeper_state->cursor_cell_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--;
}
}
}

static void 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;
}
if (minesweeper_state->minefield[cursor_x][cursor_y] == FieldMine) {
// TODO: player loses!
return;
} else {
// get 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;
FURI_LOG_D("Minesweeper", "Setting %d,%d to %d", cursor_x, cursor_y, hint);
if (hint == 0) {
// 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);
}
}
}
}
}
}
}

static void minesweeper_state_init(Minesweeper* const plugin_state) {
plugin_state->cursor_cell_x = plugin_state->cursor_cell_y = 0;
plugin_state->cursor_x = plugin_state->cursor_y = 0;
plugin_state->game_started = false;
for (int y = 0; y < PLAYFIELD_HEIGHT; y++) {
for (int x = 0; x < PLAYFIELD_WIDTH; x++){
plugin_state->minefield[x][y] = FieldEmpty;
plugin_state->playfield[x][y] = TileTypeUncleared;
}
}
//plugin_state->minefield = {0};
//plugin_state->playfield = {0};
}

int32_t minesweeper_app(void* p) {
Expand Down Expand Up @@ -158,34 +295,38 @@ int32_t minesweeper_app(void* p) {
if(event.input.type == InputTypePress) {
switch(event.input.key) {
case InputKeyUp:
minesweeper_state->cursor_cell_y--;
if(minesweeper_state->cursor_cell_y < 0) {
minesweeper_state->cursor_cell_y = 0;
minesweeper_state->cursor_y--;
if(minesweeper_state->cursor_y < 0) {
minesweeper_state->cursor_y = 0;
}
break;
case InputKeyDown:
minesweeper_state->cursor_cell_y++;
if(minesweeper_state->cursor_cell_y > PLAYFIELD_HEIGHT) {
minesweeper_state->cursor_cell_y = PLAYFIELD_HEIGHT;
minesweeper_state->cursor_y++;
if(minesweeper_state->cursor_y >= PLAYFIELD_HEIGHT) {
minesweeper_state->cursor_y = PLAYFIELD_HEIGHT-1;
}
break;
case InputKeyRight:
minesweeper_state->cursor_cell_x++;
if(minesweeper_state->cursor_cell_x > PLAYFIELD_WIDTH) {
minesweeper_state->cursor_cell_x = PLAYFIELD_WIDTH;
minesweeper_state->cursor_x++;
if(minesweeper_state->cursor_x >= PLAYFIELD_WIDTH) {
minesweeper_state->cursor_x = PLAYFIELD_WIDTH-1;
}
break;
case InputKeyLeft:
minesweeper_state->cursor_cell_x--;
if(minesweeper_state->cursor_cell_x < 0) {
minesweeper_state->cursor_cell_x = 0;
minesweeper_state->cursor_x--;
if(minesweeper_state->cursor_x < 0) {
minesweeper_state->cursor_x = 0;
}
break;
case InputKeyOk:
if (!minesweeper_state->game_started) {
setup_playfield(minesweeper_state);
minesweeper_state->game_started = true;
}
play_move(
minesweeper_state,
minesweeper_state->cursor_x,
minesweeper_state->cursor_y);
break;
case InputKeyBack:
// Exit the plugin
Expand Down

0 comments on commit ff45866

Please sign in to comment.