navigation state

Author: stefanseifert

src/components/round/SideBar.vue

@@ -2,6 +2,7 @@
   <div class="sidebar">
     <div>
       <span>{{t('sideBar.round', {round})}}</span><br/>
+      <span class="fw-bold">{{t(`season.${season}`)}}</span><br/>
       <span>{{t('sideBar.turn', {turn})}}</span>
     </div>
   </div>
@@ -12,6 +13,7 @@ import { defineComponent } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useStateStore } from '@/store/state'
 import NavigationState from '@/util/NavigationState'
+import Season from '@/services/enum/Season'
 
 export default defineComponent({
   name: 'SideBar',
@@ -30,6 +32,9 @@ export default defineComponent({
     round() : number {
       return this.navigationState.round
     },
+    season() : Season {
+      return this.navigationState.season
+    },
     turn() : number {
       return this.navigationState.turn
     }

src/locales/en.json

@@ -32,6 +32,16 @@
       "validationHint": "Please select the flower colors you planted in your garden."
     }
   },
+  "sideBar": {
+    "round": "Year {round}",
+    "turn": "Turn {turn}"
+  },
+  "season": {
+    "autumn": "Autumn",
+    "winter": "Winter",
+    "spring": "Spring",
+    "summer": "Summer"
+  },
   "notfound": {
     "title": "Not Found"
   },

src/services/enum/Season.ts

@@ -2,9 +2,9 @@
  * Season
  */
 enum Season {
-  SPRING = 'spring',
-  SUMMER = 'summer',
   AUTUMN = 'autumn',
-  WINTER = 'winter'
+  WINTER = 'winter',
+  SPRING = 'spring',
+  SUMMER = 'summer'
 }
 export default Season

src/store/state.ts

@@ -20,7 +20,7 @@ export const useStateStore = defineStore(`${name}.state`, {
     resetGame() {
       this.rounds = []
       this.setup.initialMarketPrices = undefined
-      this.setup.initialBotGarden = undefined
+      this.setup.initialBotPersistence = undefined
       this.gameStatsSend = false
     },
     storeRound(round : Round) {
@@ -49,7 +49,7 @@ export interface State {
 export interface Setup {
   botMode: BotMode,
   initialMarketPrices?: FlowerPrice[]
-  initialBotGarden?: GardenSeason[]
+  initialBotPersistence?: BotPersistence
   debugMode?: boolean
 }
 

src/util/NavigationState.ts

@@ -1,18 +1,79 @@
-import { State } from '@/store/state'
+import { BotPersistence, FlowerPrice, RoundTurn, State } from '@/store/state'
 import { RouteLocation } from 'vue-router'
 import getIntRouteParam from '@brdgm/brdgm-commons/src/util/router/getIntRouteParam'
-import BotMode from '@/services/enum/BotMode'
+import Season from '@/services/enum/Season'
+import CardDeck from '@/services/CardDeck'
+import BotGarden from '@/services/BotGarden'
+import getAllEnumValues from '@brdgm/brdgm-commons/src/util/enum/getAllEnumValues'
+import Flower from '@/services/enum/Flower'
+import MarketPrices from '@/services/MarketPrices'
 
 export default class NavigationState {
 
   readonly round : number
   readonly turn : number
-  readonly botMode : BotMode
+  readonly season : Season
+
+  readonly marketPrices : MarketPrices
+  readonly cardDeck : CardDeck
+  readonly botGarden : BotGarden
 
   constructor(route: RouteLocation, state: State) {    
     this.round = getIntRouteParam(route, 'round')
+    this.season = getSeason(this.round, state)
     this.turn = getIntRouteParam(route, 'turn')
-    this.botMode = state.setup.botMode
+
+    this.marketPrices = MarketPrices.fromPersistence(getFlowerPrices(this.round, this.turn, state))
+    this.cardDeck = CardDeck.fromPersistence(getBotPersistence(this.round, this.turn, state).cardDeck)
+    this.botGarden = BotGarden.fromPersistence(getBotPersistence(this.round, this.turn, state).garden, this.marketPrices.flowerOrder)
   }
 
 }
+
+function getSeason(round: number, state: State) : Season {
+  const roundData = state.rounds.find(r => r.round === round)
+  return roundData ? roundData.season : Season.AUTUMN
+}
+
+function getFlowerPrices(round: number, turn: number, state: State) : FlowerPrice[] {
+  const prices = getTurns(round, turn, state).find(t => t.botPersistence)?.marketPrices
+  if (prices) {
+    return prices
+  }
+  if (round > 1) {
+    return getFlowerPrices(round - 1, 0, state)
+  }
+  else {
+    return state.setup.initialMarketPrices ?? MarketPrices.new().toPersistence()
+  }
+}
+
+function getBotPersistence(round: number, turn: number, state: State) : BotPersistence {
+  const botPersistence = getTurns(round, turn, state).find(t => t.botPersistence)?.botPersistence
+  if (botPersistence) {
+    return botPersistence
+  }
+  if (round > 1) {
+    return getBotPersistence(round - 1, 0, state)
+  }
+  else {
+    return state.setup.initialBotPersistence ?? {
+      cardDeck: CardDeck.new().toPersistence(),
+      garden: BotGarden.new([], getAllEnumValues(Flower)).toPersistence()
+    }
+  }
+}
+
+/**
+ * Get previous turns of round in reverse turn order.
+ * If turn=0 gets all turns.
+ */
+function getTurns(round: number, turn: number, state: State) : RoundTurn[] {
+  const roundData = state.rounds.find(r => r.round === round)
+  if (!roundData) {
+    return []
+  }
+  return roundData.turns
+    .filter(t => t.turn < turn || turn == 0)
+    .toSorted((a, b) => b.turn - a.turn)
+}

src/views/SetupBot.vue

@@ -40,6 +40,7 @@ import Flower from '@/services/enum/Flower'
 import Season from '@/services/enum/Season'
 import PlayerFlowerSelection from '@/components/setup/PlayerFlowerSelection.vue'
 import BotGarden from '@/services/BotGarden'
+import CardDeck from '@/services/CardDeck'
 
 export default defineComponent({
   name: 'SetupBot',
@@ -75,7 +76,10 @@ export default defineComponent({
   methods: {
     startGame() : void {
       const botGarden = BotGarden.new(this.playerFlowers, this.flowerOrder)
-      this.state.setup.initialBotGarden = botGarden.toPersistence()
+      this.state.setup.initialBotPersistence = {
+        cardDeck: CardDeck.new().toPersistence(),
+        garden: botGarden.toPersistence()
+      }
       this.state.storeRound({round:1, year:1, season:Season.AUTUMN, turns:[]})
       this.$router.push('/round/1/turn/1/player')
     }

tests/unit/helper/mockBotGarden.ts

@@ -0,0 +1,29 @@
+import BotGarden from '@/services/BotGarden'
+import Flower from '@/services/enum/Flower'
+import Season from '@/services/enum/Season'
+import getAllEnumValues from '@brdgm/brdgm-commons/src/util/enum/getAllEnumValues'
+
+export default function mockBotGarden(params?: BotGardenParams) : BotGarden {
+  const seasons = getAllEnumValues(Season).map(season => {
+    const item = params?.seasons?.find(p => p.season === season)
+    return {
+      season,
+      flowers: item?.flowers ?? [],
+      bigExtension: item?.bigExtension ?? 0,
+      smallExtensions: item?.smallExtensions ?? 0
+    }
+  })
+  return BotGarden.fromPersistence(seasons, params?.flowerOrder ?? getAllEnumValues(Flower))
+}
+
+export interface BotGardenParams {
+  seasons?: GardenSeasonParams[]
+  flowerOrder?: Flower[]
+}
+
+export interface GardenSeasonParams {
+  season?: Season
+  flowers?: Flower[]
+  bigExtension?: number
+  smallExtensions?: number
+}

tests/unit/helper/mockBotPersistence.ts

@@ -0,0 +1,17 @@
+import { BotPersistence } from '@/store/state'
+import CardDeck from '@/services/CardDeck'
+import BotGarden from '@/services/BotGarden'
+import mockCardDeck from './mockCardDeck'
+import mockBotGarden from './mockBotGarden'
+
+export default function mockBotPersistence(params?: MockBotPersistenceParams) : BotPersistence {
+  return {
+    cardDeck: (params?.cardDeck ?? mockCardDeck()).toPersistence(),
+    garden: (params?.garden ?? mockBotGarden()).toPersistence()
+  }
+}
+
+export interface MockBotPersistenceParams {
+  cardDeck?: CardDeck,
+  garden?: BotGarden
+}

tests/unit/helper/mockCardDeck.ts

@@ -0,0 +1,15 @@
+import CardDeck from '@/services/CardDeck'
+
+export default function mockCardDeck(params?: MockCardDeckParams) : CardDeck {  
+  return CardDeck.fromPersistence({
+    pile: params?.pile ?? [],
+    played: params?.played ?? [],
+    discard: params?.discard ?? []
+  })
+}
+
+export interface MockCardDeckParams {
+  pile?: string[]
+  played?: string[]
+  discard?: string[]
+}

tests/unit/helper/mockMarketPrices.ts

@@ -0,0 +1,12 @@
+import Flower from '@/services/enum/Flower'
+import { FlowerPrice } from '@/store/state'
+import getAllEnumValues from '@brdgm/brdgm-commons/src/util/enum/getAllEnumValues'
+
+export default function mockMarketPrices(params?: FlowerPrice[]) : FlowerPrice[] {
+  return getAllEnumValues(Flower).map(flower => {
+    return {
+      flower,
+      price: params?.find(p => p.flower === flower)?.price ?? 4
+    }
+  })
+}