fix played years

benguaraldi · Jan 26, 2022 · c6302b1 · c6302b1
1 parent 14f9beb
commit c6302b1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/components/board.tsx b/components/board.tsx
@@ -45,10 +45,6 @@ export default function Board(props: Props) {
     if (source.droppableId === "next" && destination.droppableId === "played") {
       const newDeck = [...state.deck];
       const newPlayed = [...state.played];
-      const newNext = state.nextButOne;
-      const newNextButOne = getRandomItem(newDeck, newPlayed);
-      const newImageCache = [preloadImage(newNextButOne.image)];
-
       const { correct, delta } = checkCorrect(
         newPlayed,
         item,
@@ -58,6 +54,10 @@ export default function Board(props: Props) {
         ...state.next,
         played: { correct },
       });
+
+      const newNext = state.nextButOne;
+      const newNextButOne = getRandomItem(newDeck, newNext ? [...newPlayed, newNext] : newPlayed);
+      const newImageCache = [preloadImage(newNextButOne.image)];
 
       setState({
         ...state,

diff --git a/lib/create-state.ts b/lib/create-state.ts
@@ -3,10 +3,10 @@ import { Item } from "../types/item";
 import { getRandomItem, preloadImage } from "./items";
 
 export default async function createState(deck: Item[]): Promise<GameState> {
-  const next = getRandomItem(deck, []);
-  const nextButOne = getRandomItem(deck, []);
-  const imageCache = [preloadImage(next.image), preloadImage(nextButOne.image)];
   const played = [{ ...getRandomItem(deck, []), played: { correct: true } }];
+  const next = getRandomItem(deck, played);
+  const nextButOne = getRandomItem(deck, [...played, next]);
+  const imageCache = [preloadImage(next.image), preloadImage(nextButOne.image)];
 
   return {
     badlyPlaced: null,