fix game-end bugs

Author: h908714124

src/main/client/src/feature/game/GamePanel.jsx

@@ -71,7 +71,7 @@ function Panel({gameState, setGameState}) {
   return (
     <>
       <WhoIsWho gameState={gameState} />
-      <WarpControls
+      <ReviewControls
         gameState={gameState}
         setGameState={setGameState}
         activePlay={activePlay} />
@@ -111,13 +111,13 @@ function WhoIsWho({gameState}) {
           <IoMdExit />
         </IconContext.Provider>
       </button>
-      {timesetting ? <>
+      {!end && !counting && timesetting ? <>
         <div className={color === WHITE ? timeClassname : ""}>
-          {!counting && !end && color === WHITE ? timeRemaining : timesetting}
+          {color === WHITE ? timeRemaining : timesetting}
         </div>
         <div />
         <div className={color === BLACK ? timeClassname : ""}>
-          {!counting && !end && color === BLACK ? timeRemaining : timesetting}
+          {color === BLACK ? timeRemaining : timesetting}
         </div>
         <div />
         <div />
@@ -126,7 +126,7 @@ function WhoIsWho({gameState}) {
   )
 }
 
-function WarpControls({gameState, setGameState, activePlay}) {
+function ReviewControls({gameState, setGameState, activePlay}) {
   return (
     <div className="flex-none flex gap-x-1 items-center">
       {!activePlay && (

src/main/client/src/feature/game/state.js

@@ -135,9 +135,6 @@ export function isAtEnd(gameState) {
 
 export function teleport(baseState, targetPos) {
   let viewPos = baseState.viewPos
-  if (targetPos >= baseState.queueLength) {
-    return goToEnd(baseState)
-  }
   let diff = targetPos - viewPos
   let direction = Math.sign(diff)
   let moves = baseState.moves
@@ -172,26 +169,6 @@ export function moveForward(baseState) {
   return teleport(baseState, viewPos + 1)
 }
 
-function goToEnd(baseState) {
-  let moves = baseState.moves
-  let queueLength = baseState.queueLength
-  let baseBoard = baseState.baseBoard
-  let historyBoard = baseState.historyBoard
-  let counting = baseState.state === STATE_COUNTING
-  for (let i = baseState.viewPos; i < moves.length; i++) {
-    let move = moves[i]
-    let previousMove = getMove(moves, i - 1)
-    let [, updated] = updateBoardState(baseBoard, previousMove, move, counting)
-    baseBoard = updated
-  }
-  let board = rehydrate(baseBoard, historyBoard)
-  return produce(baseState, (draft) => {
-    draft.board = board
-    draft.viewPos = queueLength
-    draft.lastMove = getMove(moves, queueLength - 1)
-  })
-}
-
 export function addMove(baseState, move) {
   let {action, n} = move
   let {moves, baseBoard, historyBoard, state, queueLength} = baseState
@@ -207,11 +184,16 @@ export function addMove(baseState, move) {
   }
   if (action === "end") {
     let updated = resetCounting(baseBoard)
+    let finalQueueLength = getFinalQueueLength(baseState)
+    let lastMove = finalQueueLength ? moves[finalQueueLength - 1] : undefined
     return produce(baseState, (draft) => {
       draft.moves.push(move)
       draft.state = 0
       draft.baseBoard = updated
       draft.board = rehydrate(updated, historyBoard)
+      draft.queueLength = finalQueueLength
+      draft.viewPos = finalQueueLength
+      draft.lastMove = lastMove
     })
   }
   let [storedMove, updated, forbidden] = updateBoardState(baseBoard, previousMove, move, counting)
@@ -234,6 +216,15 @@ export function addMove(baseState, move) {
   })
 }
 
+function getFinalQueueLength({moves, queueLength}) {
+  let copy = [...moves]
+  copy = copy.slice(0, queueLength)
+  while (copy.length && copy[copy.length - 1].action === "pass") {
+    copy.pop()
+  }
+  return copy.length
+}
+
 export function createGameState(game, auth) {
   let baseBoard = Array(game.dim)
   let historyBoard = Array(game.dim)