Improve set solver method

ganlvtech · Feb 8, 2019 · 305319a · 305319a
1 parent d3c4e81
commit 305319a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/src/game.ts b/src/game.ts
@@ -22,7 +22,17 @@ export default class CatchTheCatGame extends Phaser.Game {
         this.mainScene = scene;
     }
 
+    private _solver;
+
+    get solver() {
+        return this._solver;
+    }
+
     set solver(value) {
-        this.mainScene.cat.solver = value;
+        this._solver = value;
+        try {
+            this.mainScene.cat.solver = value;
+        } finally {
+        }
     }
 }
diff --git a/src/scenes/mainScene.ts b/src/scenes/mainScene.ts
@@ -1,4 +1,5 @@
 import data from "../data";
+import CatchTheCatGame from "../game";
 import Cat from "../sprites/cat";
 import Block from "../sprites/block";
 import ResetButton from "../sprites/resetButton";
@@ -26,6 +27,7 @@ export default class MainScene extends Phaser.Scene {
     public readonly r: number;
     public readonly dx: number;
     public readonly dy: number;
+    public game: CatchTheCatGame;
 
     constructor(w: number, h: number, r: number) {
         super({
@@ -135,6 +137,9 @@ export default class MainScene extends Phaser.Scene {
         this.createStatusText();
         this.createResetButton();
         this.reset();
+        if (this.game.solver) {
+            this.cat.solver = this.game.solver;
+        }
     }
 
     getPosition(i: number, j: number): NeighbourData {

diff --git a/src/solvers/defaultSolver.ts b/src/solvers/defaultSolver.ts
@@ -4,7 +4,7 @@ export default function defaultSolver(blocksIsWall: boolean[][], i: number, j: n
     let result = -1;
     let neighbours = MainScene.getNeighbours(i, j);
     neighbours.forEach((neighbour, direction) => {
-        if (direction == -1) {
+        if (result === -1) {
             if (blocksIsWall[neighbour.i] !== undefined
                 && blocksIsWall[neighbour.i][neighbour.j] !== undefined
                 && !blocksIsWall[neighbour.i][neighbour.j]) {