Skip to content

feat: minesweeper autoreveal now cascades #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dann-huang merged 1 commit into from
Jun 25, 2025
Merged

feat: minesweeper autoreveal now cascades #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions frontend/src/app/live/draw/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@ export default function DrawPage() {
<h1 className='text-xl font-semibold'>Draw</h1>
<InfoCard width={250}>
<p className='text-primary'>Draw with others in the room!</p>
<p className='text-sm'>- ctl+drag/middle drag to pan</p>
<p className='text-sm'>- 2 finger to pan</p>
<p className='text-sm'>• ctl+drag/middle drag to pan</p>
<p className='text-sm'>• 2 finger to pan</p>
</InfoCard>
</div>
<div className='flex items-center space-x-1 text-sm text-muted-foreground'>
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/app/minesweeper/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ export default function MinesweeperPage() {
<h1 className='text-xl font-semibold'>Minesweeper</h1>
<InfoCard width={250}>
<p className='text-primary'>Normal Minesweeper rules</p>
<p className='text-sm'>- Left click to reveal cells</p>
<p className='text-sm'>- Right click to place flags</p>
<p className='text-sm'>- Reveal all non-mine cells to win</p>
<p className='text-sm'>• Left click to reveal cells</p>
<p className='text-sm'>• Right click to place flags</p>
<p className='text-sm'>• Reveal all non-mine cells to win</p>
</InfoCard>
</div>
</header>
Expand Down
36 changes: 14 additions & 22 deletions frontend/src/hooks/useMinesweeper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,23 +69,16 @@ const generateMines = (state: GameStatus, mines: number, startRow: number, start
}

const revealCascade = (state: GameStatus, row: number, col: number) => {
if (row < 0 || row >= state.board.length || col < 0 || col >= state.board[0].length) return;
if (state.board[row][col].state !== 'hidden') return;
state.board[row][col].state = 'revealed'
state.revealed++;
if (state.board[row][col].adj !== 0) return;
for (let r = -1; r <= 1; r++)
for (let c = -1; c <= 1; c++)
revealCascade(state, row + r, col + c);
}

const revealHelper = (state: GameStatus, row: number, col: number) => {
if (row < 0 || row >= state.board.length || col < 0 || col >= state.board[0].length) return;
if (state.board[row][col].state !== 'hidden') return;
state.board[row][col].state = 'revealed'
state.revealed++;
if (state.board[row][col].hasMine) state.status = 'lost';
else if (state.revealed === state.revealNeeded) state.status = 'won';
else if (state.board[row][col].adj === 0)
for (let r = -1; r <= 1; r++)
for (let c = -1; c <= 1; c++)
revealCascade(state, row + r, col + c);
}

export default function useMinesweeper(props: MineProps) {
Expand All @@ -107,17 +100,16 @@ export default function useMinesweeper(props: MineProps) {
if (gameState.board[row][col].state === 'revealed')
setState(produce(state => {
let flags = 0;
for (let r = -1; r <= 1; r++) {
for (let c = -1; c <= 1; c++) {
if (row + r < 0 || row + r >= state.board.length
|| col + c < 0 || col + c >= state.board[0].length) continue;
if (state.board[row + r][col + c].state === 'flagged') flags++;
}
}
if (flags === state.board[row][col].adj)
for (let r = -1; r <= 1; r++)
for (let c = -1; c <= 1; c++)
revealHelper(state, row + r, col + c);
for (let r = -1; r <= 1; r++)
for (let c = -1; c <= 1; c++)
if (row + r >= 0 && row + r < state.board.length
&& col + c >= 0 && col + c < state.board[0].length
&& state.board[row + r][col + c].state === 'flagged') flags++;

if (flags !== state.board[row][col].adj) return;
for (let r = -1; r <= 1; r++)
for (let c = -1; c <= 1; c++)
revealCascade(state, row + r, col + c);
}))
//manual reveal
else setState(produce(state => {
Expand Down