zoeissleeping/RustySweep
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change mine restrictions to be more faithful

Browse Source
This commit is contained in:
Zoe
2024-02-07 22:03:56 -06:00
parent 181d61ede3
commit e7b70a6a05
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main.rs
View File

@@ -311,7 +311,7 @@ fn game_loop() -> io::Result<()> {
let mut stdin = String::new(); let mut stdin = String::new();
println!("Please select board size"); println!("Please select board size");
gith
let boards = [ let boards = [
Board::new(9, 9, 10), Board::new(9, 9, 10),
Board::new(16, 16, 40), Board::new(16, 16, 40),
@@ -498,12 +498,6 @@ fn make_custom_board() -> Result<Board, CustomBoardError> {
return Err(CustomBoardError::Error); return Err(CustomBoardError::Error);
} }
if mines.get_num() == (cols.get_num() * rows.get_num())
|| (cols.get_num() * rows.get_num()) < mines.get_num()
{
return Err(CustomBoardError::Error);
}
// winmine minimums at least in the winmine from archive.org // winmine minimums at least in the winmine from archive.org
if cols.get_num() < 8 { if cols.get_num() < 8 {
cols = Input::Num(8) cols = Input::Num(8)
@@ -517,6 +511,10 @@ fn make_custom_board() -> Result<Board, CustomBoardError> {
mines = Input::Num(10); mines = Input::Num(10);
} }
if mines.get_num() > (rows.get_num() - 1) * (cols.get_num() - 1) {
mines = Input::Num((rows.get_num() - 1) * (cols.get_num() - 1));
}
return Ok(Board::new(rows.get_num(), cols.get_num(), mines.get_num())); return Ok(Board::new(rows.get_num(), cols.get_num(), mines.get_num()));
} }