CLeaner way to fix PGN

[vchess.git] / public / javascripts / components / game.js

diff --git a/public/javascripts/components/game.js b/public/javascripts/components/game.js
index 147aeaf..9364c8d 100644 (file)
--- a/public/javascripts/components/game.js
+++ b/public/javascripts/components/game.js
@@ -16,6 +16,7 @@ Vue.component('my-game', {
                        seek: false,
                        fenStart: "",
                        incheck: [],
+                       pgnTxt: "",
                        expert: document.cookie.length>0 ? document.cookie.substr(-1)=="1" : false,
                };
        },
@@ -349,7 +350,7 @@ Vue.component('my-game', {
                                                                attrs: { id: "pgn-game" },
                                                                on: { click: this.download },
                                                                domProps: {
-                                                                       innerHTML: this.vr.getPGN(this.mycolor, this.score, this.fenStart, this.mode)
+                                                                       innerHTML: this.pgnTxt
                                                                }
                                                        }
                                                )
@@ -493,6 +494,7 @@ Vue.component('my-game', {
                        this.score = score;
                        let modalBox = document.getElementById("modal-eog");
                        modalBox.checked = true;
+                       this.pgnTxt = this.vr.getPGN(this.mycolor, this.score, this.fenStart, this.mode);
                        setTimeout(() => { modalBox.checked = false; }, 2000);
                        if (this.mode == "human")
                                this.clearStorage();
@@ -598,6 +600,7 @@ Vue.component('my-game', {
                                return;
                        }
                        this.vr = new VariantRules(fen, moves || []);
+                       this.pgnTxt = ""; //redundant with this.score = "*", but cleaner
                        this.mode = mode;
                        this.incheck = []; //in case of
                        this.fenStart = continuation
@@ -618,10 +621,9 @@ Vue.component('my-game', {
                                this.seek = false;
                                if (!!moves && moves.length > 0) //imply continuation
                                {
-                                       const oppCol = this.vr.turn;
                                        const lastMove = moves[moves.length-1];
                                        this.vr.undo(lastMove);
-                                       this.incheck = this.vr.getCheckSquares(lastMove, oppCol);
+                                       this.incheck = this.vr.getCheckSquares(lastMove);
                                        this.vr.play(lastMove, "ingame");
                                }
                                delete localStorage["newgame"];
@@ -635,8 +637,7 @@ Vue.component('my-game', {
                        }
                },
                playComputerMove: function() {
-                       const compColor = this.mycolor=='w' ? 'b' : 'w';
-                       const compMove = this.vr.getComputerMove(compColor);
+                       const compMove = this.vr.getComputerMove();
                        // HACK: avoid selecting elements before they appear on page:
                        setTimeout(() => this.play(compMove, "animate"), 500);
                },
@@ -751,8 +752,7 @@ Vue.component('my-game', {
                                this.animateMove(move);
                                return;
                        }
-                       const oppCol = this.vr.getOppCol(this.vr.turn);
-                       this.incheck = this.vr.getCheckSquares(move, oppCol); //is opponent in check?
+                       this.incheck = this.vr.getCheckSquares(move); //is opponent in check?
                        // Not programmatic, or animation is over
                        if (this.mode == "human" && this.vr.turn == this.mycolor)
                                this.conn.send(JSON.stringify({code:"newmove", move:move, oppid:this.oppid}));
@@ -760,7 +760,7 @@ Vue.component('my-game', {
                        this.vr.play(move, "ingame");
                        if (this.mode == "human")
                                this.updateStorage(); //after our moves and opponent moves
-                       const eog = this.vr.checkGameOver(this.vr.turn);
+                       const eog = this.vr.checkGameOver();
                        if (eog != "*")
                                this.endGame(eog);
                        else if (this.mode == "computer" && this.vr.turn != this.mycolor)