From 0ae1c5874c8fda090fd07dba0f5b438e51323c45 Mon Sep 17 00:00:00 2001
From: yukirij <yukirij@yukiri.net>
Date: Sun, 18 Aug 2024 19:20:52 -0700
Subject: [PATCH] Remove friendly pieces from blocking counter.

---
 www/js/game.js      | 4 ++--
 www/js/interface.js | 1 -
 www/js/scene.js     | 2 ++
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/www/js/game.js b/www/js/game.js
index 9f1f019..e2e1174 100644
--- a/www/js/game.js
+++ b/www/js/game.js
@@ -405,6 +405,7 @@ GAME.Game = class {
 
                         // Target piece is ally.
                         if(target.player == piece.player) {
+                            pieces_blocking += 2;
 
                             // Move is only valid if pieces are swappable.
                             if(this.movement_swappable(piece, target, mask, dist, tile)) {
@@ -440,10 +441,9 @@ GAME.Game = class {
                                 }
                             }
 
+                            pieces_blocking += 1;
                             valid = false;
                         }
-
-                        pieces_blocking += 1;
                     }
 
                     // Handle blocking restrictions.
diff --git a/www/js/interface.js b/www/js/interface.js
index bd59216..51d26f6 100644
--- a/www/js/interface.js
+++ b/www/js/interface.js
@@ -60,7 +60,6 @@ const INTERFACE = {
         // Determine piece movement hints.
 
         let movements = null;
-        let target = null;
         let player = 0;
         if(selection.source == 0) {
             let piece_id = GAME_DATA.board.tiles[selection.tile].piece;
diff --git a/www/js/scene.js b/www/js/scene.js
index a39e559..ec9ddf1 100644
--- a/www/js/scene.js
+++ b/www/js/scene.js
@@ -500,6 +500,8 @@ const SCENES = {
 
     Game:{
         load(data) {
+            if(data === null) { return false; }
+
             let buttons_bottom = [ ];
             if(data.mode != 2) { buttons_bottom.push(UI.button("Retire", () => { })); }
             buttons_bottom.push(UI.button("Back", () => { LOAD(SCENES.Browse) }));