From 6baaa14bde032afa363dbdd50119a20e9f47df1c Mon Sep 17 00:00:00 2001
From: Maks Jopek <maksymilian.jopek@prym-soft.pl>
Date: Mon, 26 Apr 2021 14:43:25 +0200
Subject: Bugfixes: to home, [40] -> [1], not destroying old chequer

---
 frontend/ts/logic.ts | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

(limited to 'frontend/ts/logic.ts')

diff --git a/frontend/ts/logic.ts b/frontend/ts/logic.ts
index b677307..438bd8c 100644
--- a/frontend/ts/logic.ts
+++ b/frontend/ts/logic.ts
@@ -1,5 +1,5 @@
 import { Coordinates, GameBoard, HomesOrBases, Square, tColors } from "../../helpers/helpersBack";
-
+import Helpers from "../../helpers/helpers.js"
 export default class Logic {
     static moveFromBase(gameBoard: GameBoard, color: tColors,) {
         let start: Square, i: number;
@@ -27,25 +27,32 @@ export default class Logic {
         return gameBoard;
     }
     static moveInMap(gameBoard: GameBoard, color: tColors, number: number) {
+        console.log("moveInMap::color ", color)
         gameBoard.map.forEach((square, i) => {
             if (square.chequers.length > 0 && square.chequers[0].color === color) {
-
                 for (let chequer of square.chequers) {
                     let x: number | undefined, y: number | undefined, coords: Coordinates | undefined, inMap: boolean,
                         homeIndex: number | undefined, befStart: number | undefined;
 
-                    gameBoard.map.forEach((square, i) => {
-                        if (square.start === color)
-                            befStart = i - 1;
-                    });
+                    if (color !== Helpers.Color.red) {
+                        gameBoard.map.forEach((square, i) => {
+                            if (square.start === color)
+                                befStart = i - 1;
+                        });
+                    } else {
+                        befStart = gameBoard.map.length - 1;
+                    }
                     if (befStart === undefined)
                         throw new Error("before start doesnt exist");
 
                     let range = (start: number, end: number) => Array.from(Array(end + 1).keys()).slice(start);
+                    console.log("range ", range(i, i + number));
+                    console.log("homeIndex ", befStart);
                     // if(i >= befStart && i + number <= befStart) {
                     if (range(i, i + number).includes(befStart)) {
+                        // debugger;
                         // homeIndex = gameBoard.map.length - i - 1 - number - 1;
-                        homeIndex = number - befStart + i;
+                        homeIndex = number - befStart + i - 1;
                         inMap = false;
 
                         if (homeIndex < gameBoard.homes[0].length) {
@@ -55,10 +62,12 @@ export default class Logic {
                         else {
                             x = y = undefined;
                         }
+                        console.log("toHome check ", { x, y, homeIndex, befStart });
                     } else {
-                        if(i + number >= gameBoard.map.length)
-                            number += i - gameBoard.map.length - 1 - number; //* -$number 'cause adding $number on 62 && 63 
-                            // i += number - gameBoard.map.length - 1 - number; //* -$number 'cause adding $number on 62 && 63 
+                        if (i + number >= gameBoard.map.length) {
+                            // debugger;
+                            number += i - gameBoard.map.length - i; //* -$i 'cause adding $i on 62 && 63 
+                        }// i += number - gameBoard.map.length - 1 - number; //* -$number 'cause adding $number on 62 && 63 
                         console.log("newIndex: ", i + number)
                         x = gameBoard.map[i + number].x;
                         y = gameBoard.map[i + number].y;
@@ -81,7 +90,6 @@ export default class Logic {
                 }
             }
         })
-
         return gameBoard;
     }
     static moveInHome(gameBoard: GameBoard, color: tColors, number: number) {
-- 
cgit v1.3.1