tools
/
minesweeper
1
0
Fork 0
Code Issues 11 Pull Requests Releases Activity

Update highlighting colors 

And fix a bug where the two preferences would get mixed up.
This commit is contained in:
Florine W. Dekker 2023-12-01 12:58:44 +01:00
parent bfbbda2624
commit fc959d9619
Signed by: FWDekker
GPG Key ID: D3DCFAA8A4560BE0
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
package-lock.json generated
View File

Binary file not shown.

16
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "minesweeper", "name": "minesweeper",
"version": "0.85.3", "version": "0.85.4",
"description": "Just Minesweeper!", "description": "Just Minesweeper!",
"author": "Florine W. Dekker", "author": "Florine W. Dekker",
"browser": "dist/bundle.js", "browser": "dist/bundle.js",
@ -17,21 +17,21 @@
}, },
"dependencies": { "dependencies": {
"alea": "^1.0.1", "alea": "^1.0.1",
"canvas-confetti": "^1.6.0" "canvas-confetti": "^1.9.2"
}, },
"devDependencies": { "devDependencies": {
"grunt": "^1.5.3", "grunt": "^1.6.1",
"grunt-cli": "^1.4.3", "grunt-cli": "^1.4.3",
"grunt-contrib-clean": "^2.0.1", "grunt-contrib-clean": "^2.0.1",
"grunt-contrib-copy": "^1.0.0", "grunt-contrib-copy": "^1.0.0",
"grunt-contrib-watch": "^1.1.0", "grunt-contrib-watch": "^1.1.0",
"grunt-focus": "^1.0.0", "grunt-focus": "^1.0.0",
"grunt-text-replace": "^0.4.0", "grunt-text-replace": "^0.4.0",
"grunt-webpack": "^5.0.0", "grunt-webpack": "^6.0.0",
"ts-loader": "^9.4.1", "ts-loader": "^9.5.1",
"ts-node": "^10.9.1", "ts-node": "^10.9.1",
"typescript": "^4.9.3", "typescript": "^5.3.2",
"webpack": "^5.75.0", "webpack": "^5.89.0",
"webpack-cli": "^5.0.0" "webpack-cli": "^5.1.4"
} }
} }

20
src/main/js/Display.ts
View File

@ -10,8 +10,9 @@ import {Preferences} from "./Preferences";
*/ */
export class Display { export class Display {
private readonly errorColor: string = "rgba(255, 0, 0, 0.3)"; private readonly errorColor: string = "rgba(255, 0, 0, 0.3)";
private readonly hintColor: string = "rgba(0, 0, 255, 0.3)"; private readonly hintColor: string = "rgba(128, 0, 128, 0.3)";
private readonly safeColor: string = "rgba(0, 255, 0, 0.5)"; private readonly chordableColor: string = "rgba(0, 0, 255, 0.5)";
private readonly allNeighborsAreMinesColor: string = "rgba(0, 255, 0, 0.5)";
private readonly scale: number = 30; private readonly scale: number = 30;
@ -321,7 +322,6 @@ export class Display {
(this.preferences.showChordableHints || this.preferences.showAllNeighborsAreMinesHints) (this.preferences.showChordableHints || this.preferences.showAllNeighborsAreMinesHints)
) { ) {
ctx.save(); ctx.save();
ctx.fillStyle = this.safeColor;
this.field.squareList this.field.squareList
.filter(it => !it.isCovered) .filter(it => !it.isCovered)
.filter(it => { .filter(it => {
@ -329,12 +329,14 @@ export class Display {
const flags = it.getNeighborCount(it => it.hasFlag); const flags = it.getNeighborCount(it => it.hasFlag);
const covered = it.getNeighborCount(it => it.isCovered); const covered = it.getNeighborCount(it => it.isCovered);
return ( if (this.preferences.showChordableHints && mines === covered && mines !== flags) {
(this.preferences.showChordableHints && mines === flags && covered !== flags) || ctx.fillStyle = this.chordableColor;
(this.preferences.showAllNeighborsAreMinesHints && mines === covered && mines !== flags) ctx.fillRect(it.x * this.scale, it.y * this.scale, this.scale, this.scale)
); } else if (this.preferences.showAllNeighborsAreMinesHints && mines === flags && covered !== flags) {
}) ctx.fillStyle = this.allNeighborsAreMinesColor;
.forEach(square => ctx.fillRect(square.x * this.scale, square.y * this.scale, this.scale, this.scale)); ctx.fillRect(it.x * this.scale, it.y * this.scale, this.scale, this.scale)
}
});
ctx.restore(); ctx.restore();
} }
} }