@jeremyckahn/farmhand 1.20.0 → 1.20.2

package/src/components/Stage/Stage.tsx

@@ -18,11 +18,11 @@ import { Div } from '../Elements/index.js'
 import { breakpoints, layout } from '../../styles/tokens.js'
 
 import brownDotBg from '../../img/ui/brown-dot-bg.png'
+import floorboardBg from '../../img/ui/floorboard.png'
 import jackOLanternBg from '../../img/ui/jack-o-lantern-bg.png'
 import winterBg from '../../img/ui/winter-bg.png'
 import yellowDotBg from '../../img/ui/yellow-dot-bg.png'
 import lavenderDotBg from '../../img/ui/lavender-dot-bg.png'
-import greenDotBg from '../../img/ui/green-dot-bg.png'
 import grassBg from '../../img/ui/grass.png'
 import forestFloorBg from '../../img/ui/forest-floor.png'
 
@@ -67,7 +67,7 @@ export const Stage = ({
       : brownDotBg,
     [stageFocusType.SHOP]: yellowDotBg,
     [stageFocusType.WORKSHOP]: lavenderDotBg,
-    [stageFocusType.CELLAR]: greenDotBg,
+    [stageFocusType.CELLAR]: floorboardBg,
     [stageFocusType.FIELD]: grassBg,
     [stageFocusType.COW_PEN]: grassBg,
     [stageFocusType.FOREST]: forestFloorBg,
@@ -111,6 +111,13 @@ export const Stage = ({
               },
             }
           : {}),
+        // floorboard.png is a 144x48 (3:1) tile, unlike every other
+        // background image here which is square - keep it at the same 2x
+        // pixel-art scale as the rest (48px source -> 96px displayed) by
+        // matching that same ratio instead of the shared square size.
+        ...(stageFocus === stageFocusType.CELLAR
+          ? { backgroundSize: '288px 96px' }
+          : {}),
         '& h3': { textAlign: 'center' },
         '& h2': { fontSize: '1.2em' },
         '& .view-title': {

package/src/components/Workshop/Workshop.tsx

@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import React from 'react'
 import { number, object } from 'prop-types'
 import Tab from '@mui/material/Tab/index.js'
 import Tabs from '@mui/material/Tabs/index.js'
@@ -12,6 +12,7 @@ import FarmhandContext from '../Farmhand/Farmhand.context.js'
 import { Div } from '../Elements/index.js'
 
 import { centerTabsSx } from '../../styles/sx.js'
+import { useTabQueryParam } from '../../hooks/useTabQueryParam.js'
 
 import { a11yProps } from './TabPanel/index.js'
 
@@ -35,8 +36,6 @@ const Workshop = ({
   purchasedWoodChipper,
   toolLevels,
 }: WorkshopProps) => {
-  const [currentTab, setCurrentTab] = useState(0)
-
   const learnedKitchenRecipes = Object.keys(learnedRecipes).filter(
     recipeId => recipesMap[recipeId].recipeType === recipeType.KITCHEN
   )
@@ -58,6 +57,15 @@ const Workshop = ({
   const recyclingTabIndex = showForge ? 2 : 1
   const woodChipperTabIndex = recyclingTabIndex + (purchasedComposter ? 1 : 0)
 
+  const [currentTab, setCurrentTab] = useTabQueryParam(
+    [
+      'Kitchen',
+      showForge ? 'Forge' : '',
+      purchasedComposter ? 'Recycling' : '',
+      purchasedWoodChipper ? 'Wood Chipper' : '',
+    ].filter(Boolean)
+  )
+
   return (
     <Div className="Workshop" sx={centerTabsSx}>
       <Tabs

package/src/data/recipes.ts

@@ -587,6 +587,36 @@ export const applePie: farmhand.recipe = convertToRecipe({
   isPie: true,
 })
 
+/**
+ * @property farmhand.module:recipes.appleJuice
+ */
+export const appleJuice: farmhand.recipe = convertToRecipe({
+  id: 'apple-juice',
+  name: 'Apple Juice',
+  ingredients: {
+    [items.apple.id]: 6,
+    [sugar.id]: 2,
+  },
+  condition: state =>
+    (state.itemsSold[items.apple.id] || 0) >= 60 &&
+    (state.itemsSold[sugar.id] || 0) >= 10,
+  recipeType: recipeType.KITCHEN,
+})
+
+/**
+ * @property farmhand.module:recipes.grapeSyrup
+ */
+export const grapeSyrup: farmhand.recipe = convertToRecipe({
+  id: 'grape-syrup',
+  name: 'Grape Syrup',
+  ingredients: {
+    [items.grapeCabernetSauvignon.id]: 8,
+  },
+  condition: state =>
+    (state.itemsSold[items.grapeCabernetSauvignon.id] || 0) >= 25,
+  recipeType: recipeType.KITCHEN,
+})
+
 /**
  * @property farmhand.module:recipes.bananaBread
  */

package/src/game-logic/reducers/processCellar.test.ts

@@ -1,5 +1,7 @@
 import { testState } from '../../test-utils/index.js'
 import { carrot, garlic } from '../../data/items.js'
+import { wineChardonnay } from '../../data/recipes.js'
+import { KEGS_READY_TO_SELL } from '../../templates.js'
 
 import { processCellar } from './processCellar.js'
 
@@ -23,4 +25,72 @@ describe('processCellar', () => {
       })
     )
   })
+
+  test('notifies when a wine keg becomes ready', () => {
+    const result = processCellar(
+      testState({
+        cellarInventory: [
+          { itemId: wineChardonnay.id, daysUntilMature: 1, id: 'wine-id' },
+        ],
+      })
+    )
+
+    expect(result.newDayNotifications).toEqual([
+      {
+        message: KEGS_READY_TO_SELL('', {
+          [wineChardonnay.name]: 1,
+        }),
+        severity: 'success',
+      },
+    ])
+  })
+
+  test('does not notify for a fermented crop keg becoming ready', () => {
+    const result = processCellar(
+      testState({
+        cellarInventory: [
+          { itemId: carrot.id, daysUntilMature: 1, id: 'carrot-id' },
+        ],
+      })
+    )
+
+    expect(result.newDayNotifications).toEqual([])
+  })
+
+  test('does not notify for a keg that is already ready or not yet ready', () => {
+    const result = processCellar(
+      testState({
+        cellarInventory: [
+          { itemId: carrot.id, daysUntilMature: 4, id: 'carrot-id' },
+          { itemId: garlic.id, daysUntilMature: 0, id: 'garlic-id' },
+        ],
+      })
+    )
+
+    expect(result.newDayNotifications).toEqual([])
+  })
+
+  test('does not re-notify for a wine keg that is already ready', () => {
+    const result = processCellar(
+      testState({
+        cellarInventory: [
+          { itemId: wineChardonnay.id, daysUntilMature: 0, id: 'wine-id' },
+        ],
+      })
+    )
+
+    expect(result.newDayNotifications).toEqual([])
+  })
+
+  test('does not notify for a wine keg that is not yet ready', () => {
+    const result = processCellar(
+      testState({
+        cellarInventory: [
+          { itemId: wineChardonnay.id, daysUntilMature: 5, id: 'wine-id' },
+        ],
+      })
+    )
+
+    expect(result.newDayNotifications).toEqual([])
+  })
 })

package/src/game-logic/reducers/processCellar.ts

@@ -1,3 +1,8 @@
+import { itemsMap } from '../../data/maps.js'
+import { wineService } from '../../services/wine.js'
+import { KEGS_READY_TO_SELL } from '../../templates.js'
+import { getKegDisplayName } from '../../utils/getKegDisplayName.js'
+
 import { processCellarSpoilage } from './processCellarSpoilage.js'
 
 /**
@@ -8,17 +13,42 @@ export const processCellar = (state: farmhand.state) => {
   const { cellarInventory } = state
 
   const newCellarInventory = [...cellarInventory]
+  const kegsReady: Record<string, number> = {}
 
   for (let i = 0; i < newCellarInventory.length; i++) {
     const keg = newCellarInventory[i]
+    const daysUntilMature = keg.daysUntilMature - 1
+    const item = itemsMap[keg.itemId]
+
+    // Only wine is worth calling out here - it's a deliberate long-term
+    // investment (kegs that never spoil and appreciate in value). Generic
+    // fermented crops still spoil if left too long, so their own spoilage
+    // notification already covers that urgency without needing a separate
+    // "ready" notification too.
+    const isNotifiableKeg = wineService.isWineRecipe(item)
+
+    if (isNotifiableKeg && keg.daysUntilMature > 0 && daysUntilMature <= 0) {
+      const displayName = getKegDisplayName(item)
+
+      kegsReady[displayName] = (kegsReady[displayName] || 0) + 1
+    }
 
     newCellarInventory[i] = {
       ...keg,
-      daysUntilMature: keg.daysUntilMature - 1,
+      daysUntilMature,
     }
   }
 
-  state = { ...state, cellarInventory: newCellarInventory }
+  const newDayNotifications = [...state.newDayNotifications]
+
+  if (Object.keys(kegsReady).length) {
+    newDayNotifications.push({
+      message: KEGS_READY_TO_SELL('', kegsReady),
+      severity: 'success',
+    })
+  }
+
+  state = { ...state, cellarInventory: newCellarInventory, newDayNotifications }
 
   return state
 }

package/src/handlers/ui-events.tsx

@@ -15,6 +15,7 @@ import {
   UPDATE_AVAILABLE,
 } from '../strings.js'
 import { getTreeLifeStage } from '../utils/getTreeLifeStage.js'
+import { withCurrentHashQuery } from '../utils/hashQueryParams.js'
 import { isPlantedTree } from '../utils/isPlantedTree.js'
 import { moneyTotal } from '../utils/moneyTotal.js'
 import { reduceByPersistedKeys } from '../utils/reduceByPersistedKeys.js'
@@ -474,12 +475,14 @@ export default {
     this.setState(({ room, cowIdOfferedForTrade }: farmhand.state) =>
       goOnline
         ? {
-            redirect: `/online/${encodeURIComponent(room)}`,
+            redirect: withCurrentHashQuery(
+              `/online/${encodeURIComponent(room)}`
+            ),
             cowIdOfferedForTrade,
             isOnline: true,
           }
         : {
-            redirect: '/',
+            redirect: withCurrentHashQuery('/'),
             cowIdOfferedForTrade: '',
           }
     )
@@ -488,7 +491,9 @@ export default {
   handleRoomChange(this: Farmhand, room: string) {
     this.setState(() => ({
       room,
-      redirect: `/online/${encodeURIComponent(room.trim() || DEFAULT_ROOM)}`,
+      redirect: withCurrentHashQuery(
+        `/online/${encodeURIComponent(room.trim() || DEFAULT_ROOM)}`
+      ),
     }))
   },
 

package/src/hooks/useTabQueryParam.test.tsx

@@ -0,0 +1,86 @@
+import React from 'react'
+import { render, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+
+import { useTabQueryParam } from './useTabQueryParam.js'
+
+const TestComponent = ({ tabLabels }: { tabLabels: string[] }) => {
+  const [currentTab, setCurrentTab] = useTabQueryParam(tabLabels)
+
+  return (
+    <div>
+      <span data-testid="current-tab">{currentTab}</span>
+      {tabLabels.map((label, index) => (
+        <button key={label} onClick={() => setCurrentTab(index)}>
+          {label}
+        </button>
+      ))}
+    </div>
+  )
+}
+
+describe('useTabQueryParam', () => {
+  test('defaults to tab 0 when the hash has no tab param', () => {
+    render(<TestComponent tabLabels={['Seeds', 'Supplies', 'Upgrades']} />)
+
+    expect(screen.getByTestId('current-tab')).toHaveTextContent('0')
+  })
+
+  test('restores the tab index matching the hash tab param', () => {
+    window.history.replaceState(
+      {},
+      '',
+      `${window.location.pathname}#?tab=Upgrades`
+    )
+
+    render(<TestComponent tabLabels={['Seeds', 'Supplies', 'Upgrades']} />)
+
+    expect(screen.getByTestId('current-tab')).toHaveTextContent('2')
+  })
+
+  test('falls back to tab 0 when the hash tab param does not match any label', () => {
+    window.history.replaceState(
+      {},
+      '',
+      `${window.location.pathname}#?tab=NotARealTab`
+    )
+
+    render(<TestComponent tabLabels={['Seeds', 'Supplies', 'Upgrades']} />)
+
+    expect(screen.getByTestId('current-tab')).toHaveTextContent('0')
+  })
+
+  test('changing tabs updates both the rendered state and the hash', async () => {
+    render(<TestComponent tabLabels={['Seeds', 'Supplies', 'Upgrades']} />)
+
+    await userEvent.click(screen.getByRole('button', { name: 'Upgrades' }))
+
+    expect(screen.getByTestId('current-tab')).toHaveTextContent('2')
+    expect(window.location.hash).toEqual('#?tab=Upgrades')
+  })
+
+  test('re-derives the tab index when a tab is inserted after mount (e.g. save data loading asynchronously adds a tab)', () => {
+    window.history.replaceState(
+      {},
+      '',
+      `${window.location.pathname}#?tab=Upgrades`
+    )
+
+    const { rerender } = render(
+      <TestComponent tabLabels={['Seeds', 'Supplies', 'Upgrades']} />
+    )
+
+    // Upgrades starts at index 2, matching the initial (pre-load) label list.
+    expect(screen.getByTestId('current-tab')).toHaveTextContent('2')
+
+    // A "Saplings" tab appears after unlock-dependent save data loads,
+    // shifting Upgrades from index 2 to index 3.
+    rerender(
+      <TestComponent
+        tabLabels={['Seeds', 'Saplings', 'Supplies', 'Upgrades']}
+      />
+    )
+
+    expect(screen.getByTestId('current-tab')).toHaveTextContent('3')
+  })
+})

package/src/hooks/useTabQueryParam.ts

@@ -0,0 +1,57 @@
+import { useEffect, useState } from 'react'
+
+import {
+  getHashQueryParams,
+  setHashQueryParam,
+} from '../utils/hashQueryParams.js'
+
+const TAB_QUERY_PARAM_NAME = 'tab'
+
+const getTabIndexFromHash = (tabLabels: readonly string[]): number => {
+  const tabLabelFromUrl = getHashQueryParams().get(TAB_QUERY_PARAM_NAME)
+  const tabIndexFromUrl = tabLabels.indexOf(tabLabelFromUrl ?? '')
+
+  return tabIndexFromUrl === -1 ? 0 : tabIndexFromUrl
+}
+
+/**
+ * Drop-in replacement for `useState(0)` for a MUI `Tabs`/`Tab` `value`,
+ * that also mirrors the active tab's label into the URL hash's `tab`
+ * query param so a page reload restores the same tab. Tabs are matched by
+ * label rather than raw index, since some screens conditionally omit tabs
+ * (e.g. Shop's Saplings tab), which shifts indices around depending on
+ * what's unlocked.
+ *
+ * `tabLabels` can legitimately change shape after the initial render (e.g.
+ * a screen mounts before its unlock-dependent tabs are known, then a
+ * persisted save loads a moment later and adds one) - re-deriving the
+ * index whenever the label list itself changes keeps the restored tab
+ * pointing at the right label instead of freezing on its first-render
+ * position.
+ */
+export const useTabQueryParam = (
+  tabLabels: readonly string[]
+): [number, (tabIndex: number) => void] => {
+  const [currentTab, setCurrentTabState] = useState(() =>
+    getTabIndexFromHash(tabLabels)
+  )
+
+  const tabLabelsKey = tabLabels.join('|')
+
+  useEffect(() => {
+    setCurrentTabState(getTabIndexFromHash(tabLabels))
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [tabLabelsKey])
+
+  const setCurrentTab = (tabIndex: number) => {
+    setCurrentTabState(tabIndex)
+
+    const tabLabel = tabLabels[tabIndex]
+
+    if (tabLabel) {
+      setHashQueryParam(TAB_QUERY_PARAM_NAME, tabLabel)
+    }
+  }
+
+  return [currentTab, setCurrentTab]
+}

package/src/img/dishes/apple-juice.piskel

@@ -0,0 +1 @@
+{"modelVersion":2,"piskel":{"name":"apple-juice","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAQJJREFUSIljYBgFo4CBgYHhxo0b/2/cuPGfLhbRxGAWFpb/MHzjxo3/yHwWFha8ljISY/i+nRPhfDFpZ4ZXT/eiqHFyz2f48+cPQbPwuhwbPrR3KgqN1QxCllw81sDALaCBIf71ww0Gfat8BmTfYQNMhCzAZjhM/OKxBgYn93zKLMAGnCd04bUcGRAMImRQmFLLcEmHl2FvQRnReoj2wY28OQyRj74ztG97xXDKrYS6FtzIm8Pw6cYNFLFVDnnUswDdcAYGBgYFNjbqWUAJINuCB79+Uc8Cs109GIaHHZhElAV4yw8WFpb/uHIyAzw3NzAwMDDgLIuIKuwIqSGroBsyAADMgGh66tN3lAAAAABJRU5ErkJggg==\"}]}"]}}

package/src/img/dishes/grape-syrup.piskel

@@ -0,0 +1 @@
+{"modelVersion":2,"piskel":{"name":"grape-syrup","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAUtJREFUSIljYBjqgJFYhSmBBv+R+XPWXyBKLwuxhvuavmVQMSliuHOmDypq8J8YS5iIsYASQHQQ1bpLoARR884XROslCtx/8Oj/wiTd/wuTdP/ff/DoPxFaGBjoEURERTIMqBVuIdkConxw/8Gj/y8+I0LlxLGTDMQGE8GIQjccBh5cPsVgYWXOoKggh9cMvJK4DCfFEooiWUHXjKAanJF8/8Gj/zUGPQxXvp9mYGBgYNDhNGXw+PCQQeXyJBR1RxRyGe4/ePQfly/wpiKY4TD2FXYGBh3bXgYGBgYGjw8PGXYIyDMwCMgz2OAxA6ut6K7HBnQ4TVHkN9xciTUucMYBPsOJkSdoAbXAwFkg/V+JaEPwqR24+uD+g0f/s9UqGZ4y3sNrgPR/JYapt9px5maCRUW2WiUDAwMDhkWwYMFnOEELYJbgkydU2AEARkyHfSdIwAwAAAAASUVORK5CYII=\"}]}"]}}

package/src/img/index.ts

@@ -9,6 +9,7 @@ import rainbowMulchedPlot from './plot-states/rainbow-mulched-plot.png'
 import shoveledPlot from './plot-states/shoveled-plot.png'
 
 // Recipes
+import appleJuice from './dishes/apple-juice.png'
 import applePie from './dishes/apple-pie.png'
 import bananaBread from './dishes/banana-bread.png'
 import bananaCreamPie from './dishes/banana-cream-pie.png'
@@ -24,6 +25,7 @@ import garlicFries from './dishes/garlic-fries.png'
 import flour from './dishes/flour.png'
 import frenchOnionSoup from './dishes/french-onion-soup.png'
 import friedTofu from './dishes/fried-tofu.png'
+import grapeSyrup from './dishes/grape-syrup.png'
 import jackolantern from './items/jackolantern.png'
 import hotSauce from './dishes/hot-sauce.png'
 import rainbowCheese from './dishes/rainbow-cheese.png'
@@ -327,6 +329,8 @@ export const craftedItems = {
   'olive-oil': oliveOil,
   'onion-rings': onionRings,
   popcorn,
+  'apple-juice': appleJuice,
+  'grape-syrup': grapeSyrup,
   'pumpkin-pie': pumpkinPie,
   rainbowCheese,
   'rainbow-mulch': rainbowMulch,

package/src/img/ui/floorboard.piskel

@@ -0,0 +1 @@
+{"modelVersion":2,"piskel":{"name":"floorboard","description":"","fps":12,"height":48,"width":144,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJAAAAAwCAYAAAD+WvNWAAAAAXNSR0IArs4c6QAAATxJREFUeJzt3bFKA0EUBdCNDFZ2iliIkFI7G5v8jt/il/gp2tjYGbAJBAsJSZcqjbaaxMYbMrubc8qpHjMX3gy7zAzeH++/GvZuNh0351fXtcuIHdUugG4TICJlNh3XruFg9WHuy/HJ2a+B1XLerI/BX7QwIgJERICIlNVyvjG4bQy22dhE025tO+RoYUQEiIgAEdm6iabd2rRm5eJmVLsGfvh8e266tCZaGBEBIiJARASIiAARGTw9jPwTzb+V08th7RoO0uJj0vRh7rUwIgJERICICBARASJSFh+T2jUcrD7MfRne3tWugT2bvL40u1p3LYyIABERICICRMTHVCJOYZXt8kRUgxZGRICICBARASIiQEQc44m4H6jl2nYf0DotjIgAEREgIgJExAVTHdDmNSp9eHKoi/ry3NM3VSVEUv4Dzh4AAAAASUVORK5CYII=\"}]}"]}}

package/src/setupTests.ts

@@ -52,4 +52,10 @@ beforeEach(() => {
 
 afterEach(() => {
   cleanup()
+  // Farmhand mirrors navigation state (current view, tabbed screens' active
+  // tab) into the real window.location.hash (see src/utils/hashQueryParams.ts),
+  // which - unlike React/component state - isn't reset between tests on its
+  // own and would otherwise leak into whichever test runs next in the same
+  // file.
+  window.history.replaceState({}, '', window.location.pathname)
 })

package/src/shell/hash-view-restoration.test.ts

@@ -0,0 +1,89 @@
+import { waitFor, within } from '@testing-library/react'
+
+import { saveDataStubFactory } from '../test-utils/stubs/saveDataStubFactory.js'
+import { farmhandStub } from '../test-utils/stubs/farmhandStub.js'
+
+describe('restoring stageFocus from the URL hash on boot', () => {
+  const getHeader = () => {
+    const [header] = Array.from(document.getElementsByTagName('header'))
+
+    return header
+  }
+
+  test('restores a view named in the URL hash when a fresh game has it unlocked', async () => {
+    window.history.replaceState(
+      {},
+      '',
+      `${window.location.pathname}#?view=FIELD`
+    )
+
+    await farmhandStub()
+
+    await waitFor(() => {
+      expect(within(getHeader()).getByText('Field')).toBeInTheDocument()
+    })
+  })
+
+  test('falls back to Home when a fresh game does not have the hash view unlocked', async () => {
+    window.history.replaceState(
+      {},
+      '',
+      `${window.location.pathname}#?view=FOREST`
+    )
+
+    await farmhandStub()
+
+    await waitFor(() => {
+      expect(within(getHeader()).getByText('Home')).toBeInTheDocument()
+    })
+    expect(within(getHeader()).queryByText('Forest')).not.toBeInTheDocument()
+  })
+
+  test('falls back to Home when the loaded save does not have the hash view unlocked', async () => {
+    window.history.replaceState(
+      {},
+      '',
+      `${window.location.pathname}#?view=FOREST`
+    )
+
+    const loadedState = saveDataStubFactory({
+      experience: 0,
+      purchasedForest: 0,
+    })
+
+    await farmhandStub({
+      localforage: {
+        getItem: () => Promise.resolve(loadedState),
+        setItem: (_key: string, data: unknown) => Promise.resolve(data),
+      },
+    })
+
+    await waitFor(() => {
+      expect(within(getHeader()).getByText('Home')).toBeInTheDocument()
+    })
+    expect(within(getHeader()).queryByText('Forest')).not.toBeInTheDocument()
+  })
+
+  test('restores the hash view when the loaded save does have it unlocked', async () => {
+    window.history.replaceState(
+      {},
+      '',
+      `${window.location.pathname}#?view=FOREST`
+    )
+
+    const loadedState = saveDataStubFactory({
+      experience: 20_000,
+    })
+
+    await farmhandStub({
+      localforage: {
+        getItem: () => Promise.resolve(loadedState),
+        setItem: (_key: string, data: unknown) => Promise.resolve(data),
+      },
+    })
+
+    await waitFor(() => {
+      expect(within(getHeader()).getByText('Forest')).toBeInTheDocument()
+    })
+  })
+})

package/src/shell/navigation.test.ts

@@ -13,7 +13,7 @@ describe('navigation', () => {
       await nextView()
       expect(within(header).getByText(viewName)).toBeInTheDocument()
     }
-  })
+  }, 10000)
 
   test('cycles backwards through the standard views', async () => {
     await farmhandStub()
@@ -23,7 +23,7 @@ describe('navigation', () => {
       await previousView()
       expect(within(header).getByText(viewName)).toBeInTheDocument()
     }
-  })
+  }, 10000)
 
   test('cycles forwards through the unlocked views', async () => {
     const loadedState = saveDataStubFactory({
@@ -43,7 +43,7 @@ describe('navigation', () => {
       await nextView()
       expect(within(header).getByText(viewName)).toBeInTheDocument()
     }
-  })
+  }, 10000)
 
   test('cycles backwards through the unlocked views', async () => {
     const loadedState = saveDataStubFactory({
@@ -63,5 +63,5 @@ describe('navigation', () => {
       await previousView()
       expect(within(header).getByText(viewName)).toBeInTheDocument()
     }
-  })
+  }, 10000)
 })

package/src/templates.ts

@@ -310,6 +310,26 @@ export const FERMENTED_CROP_NAME = (_: any, item: farmhand.item): string =>
 export const KEG_SPOILED_MESSAGE = (_: any, keg: farmhand.keg): string =>
   `Oh no! Your ${FERMENTED_CROP_NAME(_, itemsMap[keg.itemId])} has spoiled!`
 
+export const KEGS_READY_TO_SELL = (
+  _: any,
+  kegsReady: Record<string, number>
+): string => {
+  let message = `Kegs are ready to sell in the cellar:
+`
+
+  Object.keys(kegsReady)
+    .sort()
+    .forEach(
+      name =>
+        (message += `  - ${kegsReady[name]} ${name}${
+          kegsReady[name] > 1 ? 's' : ''
+        }
+`)
+    )
+
+  return message
+}
+
 export const NEW_COW_OFFERED_FOR_TRADE = (
   _: any,
   peerMetadata: farmhand.peerMetadata

package/src/utils/getGrowingPhase.test.ts

@@ -11,4 +11,19 @@ describe('getGrowingPhase', () => {
 
     expect(getGrowingPhase(crop as any)).toEqual(phase)
   })
+
+  test.each([
+    [0, 2.5],
+    [4, 6.5],
+    [5, 7.5],
+    [6, 8.5],
+  ])(
+    'it handles fractional daysWatered correctly (returns phase %s when days watered is %s for pumpkin)',
+    (phase, daysWatered) => {
+      // pumpkin cropTimeline: [3, 1, 1, 1, 1, 1]
+      const crop = { itemId: 'pumpkin', daysWatered }
+
+      expect(getGrowingPhase(crop as any)).toEqual(phase)
+    }
+  )
 })