From 9fc770d086df329af09a6ddd894179eb7f1e797a Mon Sep 17 00:00:00 2001
From: Kenneth Allen <kenneth@mostly.me>
Date: Fri, 15 Oct 2021 17:39:57 +1100
Subject: [PATCH] Fix age fields

---
 packages/wonders-common/index.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/wonders-common/index.ts b/packages/wonders-common/index.ts
index afb2b07..ebb7dcd 100644
--- a/packages/wonders-common/index.ts
+++ b/packages/wonders-common/index.ts
@@ -162,7 +162,7 @@ export function buildDeck(age: number, numPlayers: number) {
     structure.appears?.[age - 1]
       ?.filter(minPlayers => numPlayers <= minPlayers)
       ?.map(() => structure)
-      ?? []
+    ?? []
   )
   if (age === numAges - 1) {
     cards.push(...sampleSize(structuresGuilds, numPlayers + 2))
@@ -377,7 +377,7 @@ export function countPoints(state: State, playerIdx: number): number {
     }))
 }
 function beginAge(state: State): State {
-  const age = (state.age ?? minAge - 1) + 1
+  const age = state.age === undefined ? 0 : state.age + 1
   const deck = shuffle(buildDeck(age, state.players.length).map(s => s.name))
   const handSize = Math.ceil(deck.length / state.players.length)
   const hands = chunk(deck, handSize)
@@ -453,7 +453,7 @@ function doTurn(state: State): State {
   }
   if (state.turnsRemaining === 0) {
     state = endAge(state)
-    if (state.age === maxAge) {
+    if (state.age === numAges - 1) {
       return {
         ...state,
         stage: 'finished',
@@ -503,7 +503,7 @@ const reducers: { [type: string]: (state: State, action: any) => State } = {
     }
     return {
       ...state,
-      players: state.players.map(p => p.name === action.player ? { ...p, wonder: action.wonder }: p),
+      players: state.players.map(p => p.name === action.player ? { ...p, wonder: action.wonder } : p),
     }
   },
   'start game': (state, action: StartGameAction) => {