adjacent object now not highlighted if action was taken; turn now aut…

…o-ends if moveTiles == 0 and no action can be taken

src/App.css

@@ -1,5 +1,4 @@
 a {
-  /* text-decoration: none; */
   color: white;
 }
 

src/components/Board.jsx

@@ -149,10 +149,12 @@ export function Board({ ctx, G, moves, events }) {
       const isOpponent =
         isAdjacent &&
         G.tiles[idx] !== null &&
+        !currentPlayer.hasDoneAction &&
         G.players.find((player) => G.tiles[idx] === player.team) &&
         G.players.find((player) => G.tiles[idx] === player.team) !==
           currentPlayer.team;
-      const isItem = isAdjacent && G.tiles[idx] === "BOX";
+      const isItem =
+        isAdjacent && !currentPlayer.hasDoneAction && G.tiles[idx] === "BOX";
 
       const tileContent = G.tiles[idx];
 
@@ -302,6 +304,7 @@ export function isAdjacentTile(newTile, refTile, boardSize) {
 }
 
 export function getAdjacentTiles(tileIdx, boardSize) {
+  console.log("getAdjacentTiles");
   const rowSize = Math.sqrt(boardSize);
   const sameRow = Math.floor(tileIdx / rowSize);
   const sameColumn = tileIdx % rowSize;
@@ -320,6 +323,8 @@ export function getAdjacentTiles(tileIdx, boardSize) {
     adjacentTiles.push(tileIdx + 1);
   }
 
+  // console.log(adjacentTiles);
+
   return adjacentTiles;
 }
 
@@ -355,10 +360,7 @@ function renderMovementRoll(roll) {
     }
     if (die === 5) {
       return <GiDiceSixFacesFive key={idx} className="movement-die" />;
-    }
-    if (die === 6) {
-      return <GiDiceSixFacesSix key={idx} className="movement-die" />;
-    }
+    } else return <GiDiceSixFacesSix key={idx} className="movement-die" />;
   });
 }
 

src/components/Game.jsx

@@ -109,13 +109,6 @@ export const DungeonThrowdown = {
       if (currentPlayer.moveTiles === 0) {
         currentPlayer.isMoving = false;
         currentPlayer.hasMoved = true;
-        if (
-          getAdjacentTiles(currentPosition, G.tiles.length).every((tile) => {
-            return tile === null;
-          })
-        ) {
-          events.endTurn();
-        }
       }
     },
 
@@ -215,7 +208,7 @@ export const DungeonThrowdown = {
         currentPlayer.hasMoved = true;
       }
     },
-    openBox: ({ G, playerID, random }, tileIdx) => {
+    openBox: ({ G, playerID, random, moves }, tileIdx) => {
       const currentPlayer = G.players[playerID];
       const currentPlayerName = currentPlayer.name;
       const currentPlayerTeam = currentPlayer.team;
@@ -263,6 +256,7 @@ export const DungeonThrowdown = {
           G.messages.game = "The box is empty!";
         }
       } else {
+        console.log(moves);
         G.messages.game = "Can't do that right now!";
       }
     },
@@ -286,6 +280,8 @@ export const DungeonThrowdown = {
       const occupiedTiles = G.tiles.map((tile, idx) => {
         if (tile !== null) {
           return idx;
+        } else {
+          return null;
         }
       });
 
@@ -305,19 +301,21 @@ export const DungeonThrowdown = {
       currentPlayer.isMoving = false;
       currentPlayer.hasMoved = false;
       currentPlayer.hasDoneAction = false;
+      currentPlayer.moveTiles = 0;
     },
 
     endIf: ({ G, ctx }) => {
       const currentPlayer = G.players[ctx.currentPlayer];
       return (
         !currentPlayer.isMoving &&
         currentPlayer.hasMoved &&
-        currentPlayer.hasDoneAction
-        // || (
-        //   !currentPlayer.isMoving &&
-        //   currentPlayer.hasMoved &&
-        //   getAdjacentTiles(currentPlayer.position, G.tiles.length).length === 0
-        // )
+        (currentPlayer.hasDoneAction ||
+          getAdjacentTiles(currentPlayer.position, G.tiles.length).every(
+            (tile) => {
+              console.log(tile, G.tiles[tile]);
+              return G.tiles[tile] === null;
+            }
+          ))
       );
     },
   },

src/pages/Client.jsx

@@ -1,11 +1,3 @@
-// import { Client } from "boardgame.io/react";
-// import { DungeonThrowdown } from "../components/Game";
-// import { Board } from "../components/Board";
-
-// const ClientPage = Client({ game: DungeonThrowdown, board: Board });
-
-// export default ClientPage;
-
 import React, { useState, useEffect } from "react";
 import { Client } from "boardgame.io/react";
 import { DungeonThrowdown } from "../components/Game";

src/pages/Rules.jsx

@@ -31,7 +31,7 @@ const Rules = () => {
         <b>YOUR TURN:</b> Each turn has two phases, a Movement and an Action. To
         move to an adjacent tile{" "}
         <em>(i.e. one above, below, or to the side of you)</em>, you can{" "}
-        <GiArrowCursor /> click on that tile OR press the cooresponding{" "}
+        <GiArrowCursor /> click on that tile OR press the corresponding{" "}
         <span style={{ fontSize: 24 }}>
           <LuArrowUpSquare />
           <LuArrowLeftSquare />