@jeremyckahn/farmhand 1.24.1 → 1.24.2

package/dist/index.html

@@ -75,7 +75,7 @@
         gtag('config', analyticsID)
       })()
     </script>
-    <script type="module" crossorigin src="./assets/index-B03HVYBS.js"></script>
+    <script type="module" crossorigin src="./assets/index-C9kG86vs.js"></script>
     <link rel="stylesheet" crossorigin href="./assets/index-CaYdR-lC.css">
   <link rel="manifest" href="./manifest.webmanifest"></head>
   <body>

package/dist/service-worker.js

@@ -1,3 +1,3 @@
-if(!self.define){let e,s={};const i=(i,n)=>(i=new URL(i+".js",n).href,s[i]||new Promise(s=>{if("document"in self){const e=document.createElement("script");e.src=i,e.onload=s,document.head.appendChild(e)}else e=i,importScripts(i),s()}).then(()=>{let e=s[i];if(!e)throw new Error(`Module ${i} didn’t register its module`);return e}));self.define=(n,o)=>{const r=e||("document"in self?document.currentScript.src:"")||location.href;if(s[r])return;let d={};const l=e=>i(e,r),t={module:{uri:r},exports:d,require:l};s[r]=Promise.all(n.map(e=>t[e]||l(e))).then(e=>(o(...e),d))}}define(["./workbox-2fbc6a65"],function(e){"use strict";self.addEventListener("message",e=>{e.data&&"SKIP_WAITING"===e.data.type&&self.skipWaiting()}),e.precacheAndRoute([{url:"index.html",revision:"8f7a31c2cb5a071e7d839eac539d63e0"},{url:"electron.js",revision:"b0456826f47539f6c1957c3add5eb959"},{url:"assets/workbox-window.prod.es5-Bd17z0YL.js",revision:null},{url:"assets/index-CaYdR-lC.css",revision:null},{url:"assets/index-B03HVYBS.js",revision:null},{url:"favicon.ico",revision:"445bb19d4a8fd46eb433dd43cbdce691"},{url:"logo192.png",revision:"70746d790b8990639d1390337d77d81a"},{url:"logo512.png",revision:"b044ab46b3f33f0e2d313d961bf1f654"},{url:"logoMaskable.png",revision:"23be58ccf16df9f43658aad3da30056d"},{url:"manifest.webmanifest",revision:"3ad071a00582451c9cdeb827b37b9ebe"}],{}),e.cleanupOutdatedCaches(),e.registerRoute(new e.NavigationRoute(e.createHandlerBoundToURL("index.html")))});
+if(!self.define){let e,s={};const i=(i,n)=>(i=new URL(i+".js",n).href,s[i]||new Promise(s=>{if("document"in self){const e=document.createElement("script");e.src=i,e.onload=s,document.head.appendChild(e)}else e=i,importScripts(i),s()}).then(()=>{let e=s[i];if(!e)throw new Error(`Module ${i} didn’t register its module`);return e}));self.define=(n,o)=>{const r=e||("document"in self?document.currentScript.src:"")||location.href;if(s[r])return;let d={};const l=e=>i(e,r),t={module:{uri:r},exports:d,require:l};s[r]=Promise.all(n.map(e=>t[e]||l(e))).then(e=>(o(...e),d))}}define(["./workbox-2fbc6a65"],function(e){"use strict";self.addEventListener("message",e=>{e.data&&"SKIP_WAITING"===e.data.type&&self.skipWaiting()}),e.precacheAndRoute([{url:"index.html",revision:"f5ce8c2d4c7358bc1ce3bb4838506540"},{url:"electron.js",revision:"b0456826f47539f6c1957c3add5eb959"},{url:"assets/workbox-window.prod.es5-Bd17z0YL.js",revision:null},{url:"assets/index-CaYdR-lC.css",revision:null},{url:"assets/index-C9kG86vs.js",revision:null},{url:"favicon.ico",revision:"445bb19d4a8fd46eb433dd43cbdce691"},{url:"logo192.png",revision:"70746d790b8990639d1390337d77d81a"},{url:"logo512.png",revision:"b044ab46b3f33f0e2d313d961bf1f654"},{url:"logoMaskable.png",revision:"23be58ccf16df9f43658aad3da30056d"},{url:"manifest.webmanifest",revision:"3ad071a00582451c9cdeb827b37b9ebe"}],{}),e.cleanupOutdatedCaches(),e.registerRoute(new e.NavigationRoute(e.createHandlerBoundToURL("index.html")))});
 //# sourceMappingURL=service-worker.js.map
 //# sourceMappingURL=service-worker.js.map

package/dist/service-worker.js.map

@@ -1 +1 @@
-{"version":3,"file":"service-worker.js","sources":["../../../../../tmp/e11c5a6afdb2093b6b4b31cba4d4ce43/service-worker.js"],"sourcesContent":["import {precacheAndRoute as workbox_precaching_precacheAndRoute} from '/home/runner/work/farmhand/farmhand/node_modules/workbox-precaching/precacheAndRoute.mjs';\nimport {cleanupOutdatedCaches as workbox_precaching_cleanupOutdatedCaches} from '/home/runner/work/farmhand/farmhand/node_modules/workbox-precaching/cleanupOutdatedCaches.mjs';\nimport {registerRoute as workbox_routing_registerRoute} from '/home/runner/work/farmhand/farmhand/node_modules/workbox-routing/registerRoute.mjs';\nimport {NavigationRoute as workbox_routing_NavigationRoute} from '/home/runner/work/farmhand/farmhand/node_modules/workbox-routing/NavigationRoute.mjs';\nimport {createHandlerBoundToURL as workbox_precaching_createHandlerBoundToURL} from '/home/runner/work/farmhand/farmhand/node_modules/workbox-precaching/createHandlerBoundToURL.mjs';/**\n * Welcome to your Workbox-powered service worker!\n *\n * You'll need to register this file in your web app.\n * See https://goo.gl/nhQhGp\n *\n * The rest of the code is auto-generated. Please don't update this file\n * directly; instead, make changes to your Workbox build configuration\n * and re-run your build process.\n * See https://goo.gl/2aRDsh\n */\n\n\n\n\nself.addEventListener('message', (event) => {\n  if (event.data && event.data.type === 'SKIP_WAITING') {\n    self.skipWaiting();\n  }\n});\n\n/**\n * The precacheAndRoute() method efficiently caches and responds to\n * requests for URLs in the manifest.\n * See https://goo.gl/S9QRab\n */\nworkbox_precaching_precacheAndRoute([\n  {\n    \"url\": \"index.html\",\n    \"revision\": \"8f7a31c2cb5a071e7d839eac539d63e0\"\n  },\n  {\n    \"url\": \"electron.js\",\n    \"revision\": \"b0456826f47539f6c1957c3add5eb959\"\n  },\n  {\n    \"url\": \"assets/workbox-window.prod.es5-Bd17z0YL.js\",\n    \"revision\": null\n  },\n  {\n    \"url\": \"assets/index-CaYdR-lC.css\",\n    \"revision\": null\n  },\n  {\n    \"url\": \"assets/index-B03HVYBS.js\",\n    \"revision\": null\n  },\n  {\n    \"url\": \"favicon.ico\",\n    \"revision\": \"445bb19d4a8fd46eb433dd43cbdce691\"\n  },\n  {\n    \"url\": \"logo192.png\",\n    \"revision\": \"70746d790b8990639d1390337d77d81a\"\n  },\n  {\n    \"url\": \"logo512.png\",\n    \"revision\": \"b044ab46b3f33f0e2d313d961bf1f654\"\n  },\n  {\n    \"url\": \"logoMaskable.png\",\n    \"revision\": \"23be58ccf16df9f43658aad3da30056d\"\n  },\n  {\n    \"url\": \"manifest.webmanifest\",\n    \"revision\": \"3ad071a00582451c9cdeb827b37b9ebe\"\n  }\n], {});\nworkbox_precaching_cleanupOutdatedCaches();workbox_routing_registerRoute(new workbox_routing_NavigationRoute(workbox_precaching_createHandlerBoundToURL(\"index.html\")));\n\n\n"],"names":["self","addEventListener","event","data","type","skipWaiting","workbox_precaching_precacheAndRoute","url","revision","workbox_precaching_cleanupOutdatedCaches","workbox_routing_registerRoute","workbox_routing_NavigationRoute","workbox_precaching_createHandlerBoundToURL"],"mappings":"inBAmBAA,KAAKC,iBAAiB,UAAYC,IAC5BA,EAAMC,MAA4B,iBAApBD,EAAMC,KAAKC,MAC3BJ,KAAKK,gBASTC,EAAAA,iBAAoC,CAClC,CACEC,IAAO,aACPC,SAAY,oCAEd,CACED,IAAO,cACPC,SAAY,oCAEd,CACED,IAAO,6CACPC,SAAY,MAEd,CACED,IAAO,4BACPC,SAAY,MAEd,CACED,IAAO,2BACPC,SAAY,MAEd,CACED,IAAO,cACPC,SAAY,oCAEd,CACED,IAAO,cACPC,SAAY,oCAEd,CACED,IAAO,cACPC,SAAY,oCAEd,CACED,IAAO,mBACPC,SAAY,oCAEd,CACED,IAAO,uBACPC,SAAY,qCAEb,CAAA,GACHC,EAAAA,wBAA2CC,EAAAA,cAA8B,IAAIC,EAAAA,gBAAgCC,0BAA2C"}
+{"version":3,"file":"service-worker.js","sources":["../../../../../tmp/5a47feca681fd14fa867c579d860224e/service-worker.js"],"sourcesContent":["import {precacheAndRoute as workbox_precaching_precacheAndRoute} from '/home/runner/work/farmhand/farmhand/node_modules/workbox-precaching/precacheAndRoute.mjs';\nimport {cleanupOutdatedCaches as workbox_precaching_cleanupOutdatedCaches} from '/home/runner/work/farmhand/farmhand/node_modules/workbox-precaching/cleanupOutdatedCaches.mjs';\nimport {registerRoute as workbox_routing_registerRoute} from '/home/runner/work/farmhand/farmhand/node_modules/workbox-routing/registerRoute.mjs';\nimport {NavigationRoute as workbox_routing_NavigationRoute} from '/home/runner/work/farmhand/farmhand/node_modules/workbox-routing/NavigationRoute.mjs';\nimport {createHandlerBoundToURL as workbox_precaching_createHandlerBoundToURL} from '/home/runner/work/farmhand/farmhand/node_modules/workbox-precaching/createHandlerBoundToURL.mjs';/**\n * Welcome to your Workbox-powered service worker!\n *\n * You'll need to register this file in your web app.\n * See https://goo.gl/nhQhGp\n *\n * The rest of the code is auto-generated. Please don't update this file\n * directly; instead, make changes to your Workbox build configuration\n * and re-run your build process.\n * See https://goo.gl/2aRDsh\n */\n\n\n\n\nself.addEventListener('message', (event) => {\n  if (event.data && event.data.type === 'SKIP_WAITING') {\n    self.skipWaiting();\n  }\n});\n\n/**\n * The precacheAndRoute() method efficiently caches and responds to\n * requests for URLs in the manifest.\n * See https://goo.gl/S9QRab\n */\nworkbox_precaching_precacheAndRoute([\n  {\n    \"url\": \"index.html\",\n    \"revision\": \"f5ce8c2d4c7358bc1ce3bb4838506540\"\n  },\n  {\n    \"url\": \"electron.js\",\n    \"revision\": \"b0456826f47539f6c1957c3add5eb959\"\n  },\n  {\n    \"url\": \"assets/workbox-window.prod.es5-Bd17z0YL.js\",\n    \"revision\": null\n  },\n  {\n    \"url\": \"assets/index-CaYdR-lC.css\",\n    \"revision\": null\n  },\n  {\n    \"url\": \"assets/index-C9kG86vs.js\",\n    \"revision\": null\n  },\n  {\n    \"url\": \"favicon.ico\",\n    \"revision\": \"445bb19d4a8fd46eb433dd43cbdce691\"\n  },\n  {\n    \"url\": \"logo192.png\",\n    \"revision\": \"70746d790b8990639d1390337d77d81a\"\n  },\n  {\n    \"url\": \"logo512.png\",\n    \"revision\": \"b044ab46b3f33f0e2d313d961bf1f654\"\n  },\n  {\n    \"url\": \"logoMaskable.png\",\n    \"revision\": \"23be58ccf16df9f43658aad3da30056d\"\n  },\n  {\n    \"url\": \"manifest.webmanifest\",\n    \"revision\": \"3ad071a00582451c9cdeb827b37b9ebe\"\n  }\n], {});\nworkbox_precaching_cleanupOutdatedCaches();workbox_routing_registerRoute(new workbox_routing_NavigationRoute(workbox_precaching_createHandlerBoundToURL(\"index.html\")));\n\n\n"],"names":["self","addEventListener","event","data","type","skipWaiting","workbox_precaching_precacheAndRoute","url","revision","workbox_precaching_cleanupOutdatedCaches","workbox_routing_registerRoute","workbox_routing_NavigationRoute","workbox_precaching_createHandlerBoundToURL"],"mappings":"inBAmBAA,KAAKC,iBAAiB,UAAYC,IAC5BA,EAAMC,MAA4B,iBAApBD,EAAMC,KAAKC,MAC3BJ,KAAKK,gBASTC,EAAAA,iBAAoC,CAClC,CACEC,IAAO,aACPC,SAAY,oCAEd,CACED,IAAO,cACPC,SAAY,oCAEd,CACED,IAAO,6CACPC,SAAY,MAEd,CACED,IAAO,4BACPC,SAAY,MAEd,CACED,IAAO,2BACPC,SAAY,MAEd,CACED,IAAO,cACPC,SAAY,oCAEd,CACED,IAAO,cACPC,SAAY,oCAEd,CACED,IAAO,cACPC,SAAY,oCAEd,CACED,IAAO,mBACPC,SAAY,oCAEd,CACED,IAAO,uBACPC,SAAY,qCAEb,CAAA,GACHC,EAAAA,wBAA2CC,EAAAA,cAA8B,IAAIC,EAAAA,gBAAgCC,0BAA2C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jeremyckahn/farmhand",
-  "version": "1.24.1",
+  "version": "1.24.2",
   "publishConfig": {
     "access": "public"
   },

package/src/components/Cellar/Keg.tsx

@@ -24,7 +24,10 @@ export function Keg({ keg }: { keg: farmhand.keg }) {
 
   const item = itemsMap[keg.itemId]
 
-  // TODO: Add a defensive check in case item is undefined (e.g. keg.itemId is invalid) to prevent runtime crash when accessing item.id
+  if (!item) {
+    throw new Error(`Keg references unknown item id: ${keg.itemId}`)
+  }
+
   let imageSrc = items[item.id as keyof typeof items]
 
   const recipeName = getKegDisplayName(item)

package/src/components/ContextPane/ContextPane.test.tsx

@@ -24,6 +24,8 @@ vi.mock('../Inventory/index.js', () => ({
 const defaultProps = {
   playerInventory: [],
   stageFocus: stageFocusType.NONE,
+  inventory: [],
+  inventoryLimit: INFINITE_STORAGE_LIMIT,
 }
 
 const baseItemProps = {
@@ -69,6 +71,61 @@ describe('ContextPane', () => {
     expect(screen.getByText('Corn')).toBeInTheDocument()
   })
 
+  test('displays inventory capacity for a limited inventory', () => {
+    const inventory = [
+      testItem({ id: 'carrot', name: 'Carrot', quantity: 5 }),
+      testItem({ id: 'corn', name: 'Corn', quantity: 3 }),
+    ] as unknown as farmhand.state['inventory']
+
+    render(
+      <ContextPane
+        {...defaultProps}
+        inventory={inventory}
+        inventoryLimit={10}
+      />
+    )
+
+    const capacity = screen.getByText('Capacity: 8 / 10')
+
+    expect(capacity).toBeInTheDocument()
+    expect(capacity).not.toHaveClass('is-inventory-full')
+  })
+
+  test('marks inventory capacity as full when the limit is reached', () => {
+    const inventory = [
+      testItem({ id: 'carrot', name: 'Carrot', quantity: 5 }),
+      testItem({ id: 'corn', name: 'Corn', quantity: 5 }),
+    ] as unknown as farmhand.state['inventory']
+
+    render(
+      <ContextPane
+        {...defaultProps}
+        inventory={inventory}
+        inventoryLimit={10}
+      />
+    )
+
+    expect(screen.getByText('Capacity: 10 / 10')).toHaveClass(
+      'is-inventory-full'
+    )
+  })
+
+  test('does not display inventory capacity for unlimited storage', () => {
+    const inventory = [
+      testItem({ id: 'carrot', name: 'Carrot', quantity: 5 }),
+    ] as unknown as farmhand.state['inventory']
+
+    render(
+      <ContextPane
+        {...defaultProps}
+        inventory={inventory}
+        inventoryLimit={INFINITE_STORAGE_LIMIT}
+      />
+    )
+
+    expect(screen.queryByText(/Capacity:/)).not.toBeInTheDocument()
+  })
+
   describe('conditional UI based on stageFocus', () => {
     test('shows inventory view when stageFocus is SHOP', () => {
       const playerInventory = [

package/src/components/ContextPane/ContextPane.tsx

@@ -1,12 +1,19 @@
 import React, { memo } from 'react'
+import classNames from 'classnames'
 
 import FarmhandContext from '../Farmhand/Farmhand.context.js'
 import Inventory from '../Inventory/index.js'
 import CowPenContextMenu from '../CowPenContextMenu/index.js'
 import FarmhandShuffleContextMenu from '../FarmhandShuffleContextMenu/index.js'
 import { stageFocusType } from '../../enums.js'
-import { Div } from '../Elements/index.js'
+import { Div, H3 } from '../Elements/index.js'
 import { centerTabsSx } from '../../styles/sx.js'
+import { colors } from '../../styles/tokens.js'
+
+import { integerString } from '../../utils/integerString.js'
+import { doesInventorySpaceRemain } from '../../utils/doesInventorySpaceRemain.js'
+import { inventorySpaceConsumed } from '../../utils/inventorySpaceConsumed.js'
+import { INFINITE_STORAGE_LIMIT } from '../../constants.js'
 
 export const PlayerInventory = memo<{ playerInventory: farmhand.item[] }>(
   /**
@@ -29,10 +36,19 @@ player's inventory.
 export const ContextPane = ({
   playerInventory,
   stageFocus,
+  inventory,
+  inventoryLimit,
 }: {
   playerInventory: farmhand.item[]
   stageFocus: string
+  inventory: farmhand.state['inventory']
+  inventoryLimit: number
 }) => {
+  const isInventoryFull = !doesInventorySpaceRemain({
+    inventory,
+    inventoryLimit,
+  })
+
   return (
     <Div
       className="ContextPane"
@@ -40,6 +56,8 @@ export const ContextPane = ({
         ...centerTabsSx,
         margin: 0,
         '& h2': { margin: '0.5em 0 1em', textAlign: 'center' },
+        '& .inventory-info': { fontSize: '1em' },
+        '& .inventory-title': { marginBottom: '0.5em' },
       }}
     >
       {stageFocus === stageFocusType.COW_PEN ? (
@@ -48,7 +66,25 @@ export const ContextPane = ({
         <FarmhandShuffleContextMenu />
       ) : (
         <>
-          <h2>Inventory</h2>
+          <h2 className="inventory-title">Inventory</h2>
+
+          {inventoryLimit > INFINITE_STORAGE_LIMIT && (
+            <H3
+              {...{
+                className: classNames('inventory-info', {
+                  'is-inventory-full': isInventoryFull,
+                }),
+              }}
+              sx={{
+                color: isInventoryFull ? colors.error : undefined,
+                textAlign: 'center',
+              }}
+            >
+              Capacity: {integerString(inventorySpaceConsumed(inventory))} /{' '}
+              {integerString(inventoryLimit)}
+            </H3>
+          )}
+
           {/*
           // NOTE: Weird ignore comment syntax and formatting is needed here.
           // See: https://stackoverflow.com/a/56913087/470685 */}

package/src/components/Farmhand/FarmhandService.test.ts

@@ -33,6 +33,29 @@ describe('FarmhandService', () => {
     })
   })
 
+  describe('inventory containing an unknown item id', () => {
+    const inventory = [{ quantity: 1, id: 'not-a-real-item' }]
+    const message = 'Unknown item id: not-a-real-item'
+
+    test('computePlayerInventory throws an informative error', () => {
+      expect(() =>
+        FarmhandService.computePlayerInventory(inventory, {})
+      ).toThrow(message)
+    })
+
+    test('getFieldToolInventory throws an informative error', () => {
+      expect(() => FarmhandService.getFieldToolInventory(inventory)).toThrow(
+        message
+      )
+    })
+
+    test('getPlantableCropInventory throws an informative error', () => {
+      expect(() =>
+        FarmhandService.getPlantableCropInventory(inventory)
+      ).toThrow(message)
+    })
+  })
+
   describe('getFieldToolInventory', () => {
     test('selects field tools from inventory', () => {
       const fieldToolInventory = FarmhandService.getFieldToolInventory([

package/src/components/Farmhand/FarmhandService.ts

@@ -1,5 +1,6 @@
 import { itemsMap } from '../../data/maps.js'
 import { fieldMode, itemType } from '../../enums.js'
+import { getItemById } from '../../utils/getItemById.js'
 import { getItemCurrentValue } from '../../utils/getItemCurrentValue.js'
 import { memoize } from '../../utils/memoize.js'
 
@@ -12,23 +13,22 @@ export class FarmhandService {
       inventory: farmhand.state['inventory'],
       valueAdjustments: Record<string, number>
     ): farmhand.item[] =>
-      // TODO: Add a defensive check if itemsMap[id] is undefined to prevent runtime crash on invalid items
-      inventory.map(({ quantity, id }: { quantity: number; id: string }) => ({
-        quantity,
-        ...itemsMap[id as keyof typeof itemsMap],
-        value: getItemCurrentValue(
-          itemsMap[id as keyof typeof itemsMap],
-          valueAdjustments
-        ),
-      }))
+      inventory.map(({ quantity, id }: { quantity: number; id: string }) => {
+        const item = getItemById(id)
+
+        return {
+          quantity,
+          ...item,
+          value: getItemCurrentValue(item, valueAdjustments),
+        }
+      })
   )
 
   static getFieldToolInventory = memoize(
     (inventory: farmhand.state['inventory']): farmhand.item[] =>
       inventory
         .filter(({ id }: { id: string }) => {
-          // TODO: Defensive check if item exists in itemsMap to prevent crashes on undefined itemsMap[id]
-          const item = itemsMap[id as keyof typeof itemsMap]
+          const item = getItemById(id)
 
           return (
             typeof item.enablesFieldMode === 'string' &&
@@ -48,11 +48,7 @@ export class FarmhandService {
   static getPlantableCropInventory = memoize(
     (inventory: farmhand.state['inventory']): farmhand.item[] =>
       inventory
-        .filter(
-          ({ id }: { id: string }) =>
-            // TODO: Add a defensive check to verify itemsMap[id] exists before accessing isPlantableCrop
-            itemsMap[id as keyof typeof itemsMap].isPlantableCrop
-        )
+        .filter(({ id }: { id: string }) => getItemById(id).isPlantableCrop)
         .map(({ id, quantity }: { id: string; quantity: number }) => ({
           ...itemsMap[id as keyof typeof itemsMap],
           quantity,

package/src/components/Item/Item.test.tsx

@@ -3,8 +3,10 @@ import { render, screen, waitFor, within } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 
 import { testItem } from '../../test-utils/index.js'
+import { testState } from '../../test-utils/index.js'
 import { season } from '../../enums.js'
 import { carrotSeed } from '../../data/crops/index.js'
+import { huggingMachine } from '../../data/items.js'
 
 import { INFINITE_STORAGE_LIMIT } from '../../constants.js'
 
@@ -74,6 +76,33 @@ describe('Item', () => {
         })
       })
 
+      test('limits the purchase quantity using the item maximum', async () => {
+        render(
+          <Item
+            {...{
+              ...props,
+              adjustedValue: 500,
+              item: huggingMachine,
+              money: 10_000,
+              purchaseState: testState({
+                inventory: [],
+                inventoryLimit: INFINITE_STORAGE_LIMIT,
+                purchasedCowPen: 1,
+              }),
+            }}
+          />
+        )
+
+        const quantity = screen.getByRole('textbox')
+        const increment = screen.getByRole('button', { name: 'Increment' })
+
+        for (let clickCount = 0; clickCount < 9; clickCount += 1) {
+          await userEvent.click(increment)
+        }
+
+        expect(quantity).toHaveValue('10')
+      })
+
       describe('prices', () => {
         beforeEach(() => {
           render(<Item {...{ ...props, money: 100 }} />)

package/src/components/Item/Item.tsx

@@ -117,6 +117,7 @@ export interface ItemProps {
   adjustedValue?: number
   previousDayAdjustedValue?: number | null
   maxQuantityPlayerCanPurchase?: number
+  purchaseState?: farmhand.state
 }
 
 export const Item = ({
@@ -137,6 +138,7 @@ export const Item = ({
   playerInventoryQuantities,
   showQuantity,
   valueAdjustments,
+  purchaseState,
 
   item: {
     description,
@@ -163,7 +165,10 @@ export const Item = ({
     0,
     Math.min(
       Math.floor(money / adjustedValue),
-      inventorySpaceRemaining({ inventory, inventoryLimit })
+      inventorySpaceRemaining({ inventory, inventoryLimit }),
+      purchaseState && item?.getMaxPurchaseQuantity
+        ? item.getMaxPurchaseQuantity(purchaseState)
+        : Infinity
     )
   ),
 }: ItemProps) => {
@@ -461,7 +466,14 @@ export default function Consumer(props: Partial<ItemProps>) {
   return (
     <FarmhandContext.Consumer>
       {({ gameState, handlers }) => (
-        <Item {...{ ...gameState, ...handlers, ...props }} />
+        <Item
+          {...{
+            ...gameState,
+            ...handlers,
+            ...props,
+            purchaseState: gameState,
+          }}
+        />
       )}
     </FarmhandContext.Consumer>
   )

package/src/components/Navigation/Navigation.test.tsx

@@ -4,7 +4,6 @@ import userEvent from '@testing-library/user-event'
 import { vi } from 'vitest'
 
 import { dialogView, stageFocusType } from '../../enums.js'
-import { INFINITE_STORAGE_LIMIT } from '../../constants.js'
 import { noop } from '../../utils/noop.js'
 import FarmhandContext, {
   createContextData,
@@ -27,8 +26,6 @@ const defaultProps = {
   handleOnlineToggleChange: noop,
   handleRoomChange: noop,
   handleViewChange: noop,
-  inventory: [],
-  inventoryLimit: INFINITE_STORAGE_LIMIT,
   itemsSold: {},
   isChatAvailable: false,
   isDialogViewOpen: false,

package/src/components/Navigation/Navigation.tsx

@@ -27,21 +27,15 @@ import {
 } from '../PixelIcon/index.js'
 
 import { MAX_ROOM_NAME_LENGTH } from '../../common/constants.js'
-import {
-  DEFAULT_ROOM,
-  INFINITE_STORAGE_LIMIT,
-  STAGE_TITLE_MAP,
-} from '../../constants.js'
+import { DEFAULT_ROOM, STAGE_TITLE_MAP } from '../../constants.js'
 import { dialogView } from '../../enums.js'
-import { doesInventorySpaceRemain } from '../../utils/doesInventorySpaceRemain.js'
 import { integerString } from '../../utils/integerString.js'
-import { inventorySpaceConsumed } from '../../utils/inventorySpaceConsumed.js'
 import FarmhandContext from '../Farmhand/Farmhand.context.js'
 
-import { breakpoints, colors, fonts } from '../../styles/tokens.js'
+import { breakpoints, fonts } from '../../styles/tokens.js'
 import AccountingView from '../AccountingView/index.js'
 import AchievementsView from '../AchievementsView/index.js'
-import { H3, Header } from '../Elements/index.js'
+import { Header } from '../Elements/index.js'
 import KeybindingsView from '../KeybindingsView/index.js'
 import LogView from '../LogView/index.js'
 import OnlinePeersView from '../OnlinePeersView/index.js'
@@ -260,8 +254,6 @@ export const Navigation = ({
   handleOnlineToggleChange,
   handleRoomChange,
   handleViewChange,
-  inventory,
-  inventoryLimit,
   isChatAvailable,
   isDialogViewOpen,
   isOnline,
@@ -286,8 +278,6 @@ export const Navigation = ({
   handleOnlineToggleChange: (checked: boolean) => void
   handleRoomChange: (newRoom: string) => void
   handleViewChange: (event: any) => void
-  inventory: farmhand.state['inventory']
-  inventoryLimit: number
   isChatAvailable: boolean
   isDialogViewOpen: boolean
   isOnline: boolean
@@ -369,7 +359,6 @@ export const Navigation = ({
             position: 'relative',
           },
         },
-        '& .inventory-info': { fontSize: '1em' },
         '& .MuiSelect-select': { padding: '1em' },
         '& .chat-placeholder': {
           fontSize: '0.75em',
@@ -396,26 +385,6 @@ export const Navigation = ({
           room,
         }}
       />
-      {inventoryLimit > INFINITE_STORAGE_LIMIT && (
-        <H3
-          {...{
-            className: classNames('inventory-info', {
-              'is-inventory-full': !doesInventorySpaceRemain({
-                inventory,
-                inventoryLimit,
-              }),
-            }),
-          }}
-          sx={{
-            color: !doesInventorySpaceRemain({ inventory, inventoryLimit })
-              ? colors.error
-              : undefined,
-          }}
-        >
-          Inventory: {integerString(inventorySpaceConsumed(inventory))} /{' '}
-          {integerString(inventoryLimit)}
-        </H3>
-      )}
 
       <Select
         variant="standard"

package/src/components/OnlinePeersView/OnlinePeer/OnlinePeer.tsx

@@ -30,8 +30,7 @@ const OnlinePeer = ({
             subheader: (
               <div>
                 <p>Day: {integerString(dayCount)}</p>
-                {/* TODO: Remove `?? 0` after 10/24 */}
-                <p>Level: {integerString(levelAchieved(experience ?? 0))}</p>
+                <p>Level: {integerString(levelAchieved(experience))}</p>
                 <p>Money: {moneyString(money)}</p>
               </div>
             ),

package/src/data/items.ts

@@ -3,6 +3,7 @@ import {
   COW_FEED_ITEM_ID,
   HUGGING_MACHINE_ITEM_ID,
   INITIAL_SPRINKLER_RANGE,
+  PURCHASEABLE_COW_PENS,
 } from '../constants.js'
 
 const { freeze } = Object
@@ -197,6 +198,22 @@ export const huggingMachine: farmhand.item = freeze({
   name: 'Hugging Machine',
   type: HUGGING_MACHINE,
   value: 500,
+  getMaxPurchaseQuantity: (state: farmhand.state) => {
+    const huggingMachinesInInventory =
+      state.inventory.find(i => i.id === HUGGING_MACHINE_ITEM_ID)?.quantity ?? 0
+
+    const huggingMachinesInUse = state.cowInventory.filter(
+      cow => cow.isUsingHuggingMachine
+    ).length
+
+    const cowCapacity =
+      PURCHASEABLE_COW_PENS.get(state.purchasedCowPen)?.cows ?? 0
+
+    return Math.max(
+      0,
+      cowCapacity - huggingMachinesInInventory - huggingMachinesInUse
+    )
+  },
 })
 
 /**

package/src/farmhand.d.ts

@@ -63,6 +63,7 @@ declare namespace farmhand {
     // ore - see applyDestructionYield in reducers/helpers.tsx for the
     // shared logic that applies it.
     destructionYield?: { itemId: string; quantity: number }
+    getMaxPurchaseQuantity?: (state: state) => number
   }
 
   interface seedItem extends item {

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

@@ -99,6 +99,24 @@ describe('harvestPlot', () => {
       })
     })
 
+    describe('inventory has less space than the harvest yield', () => {
+      test('only counts the crops that were actually received', () => {
+        const inputState = testState({
+          field: [[testCrop({ itemId: 'sample-crop-1', daysWatered: 4 })]],
+          inventory: [{ id: 'sample-crop-2', quantity: 4 }],
+          inventoryLimit: 5,
+          toolLevels: toolLevelsBronze,
+        })
+        // The bronze scythe yields 2 crops but only 1 slot is free
+        const { cropsHarvested } = harvestPlot(inputState, 0, 0)
+
+        expect(cropsHarvested).toEqual({
+          ...testState().cropsHarvested,
+          SAMPLE_CROP_TYPE_1: 1,
+        })
+      })
+    })
+
     describe('there is insufficient inventory space', () => {
       test('no-ops', () => {
         const inputState = testState({

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

@@ -7,6 +7,7 @@ import {
 } from '../../enums.js'
 import { itemsMap } from '../../data/maps.js'
 import { doesInventorySpaceRemain } from '../../utils/doesInventorySpaceRemain.js'
+import { inventorySpaceRemaining } from '../../utils/inventorySpaceRemaining.js'
 import { getCropLifeStage } from '../../utils/getCropLifeStage.js'
 import { getPlotContentType } from '../../utils/getPlotContentType.js'
 import { getSeedItemIdFromFinalStageCropItemId } from '../../utils/getSeedItemIdFromFinalStageCropItemId.js'
@@ -43,7 +44,10 @@ function getHarvestedQuantity(state: farmhand.state): number {
       amount = 1
   }
 
-  return amount
+  // Cap the yield to the space actually available so that callers only count
+  // crops the player received, not crops that addItemToInventory would
+  // silently drop because the inventory is nearly full.
+  return Math.min(amount, inventorySpaceRemaining(state))
 }
 
 function harvestCrops(
@@ -94,11 +98,6 @@ function harvestCrops(
 
   const { cropsHarvested } = state
 
-  // TODO: cropsHarvested is incremented by the full harvestedQuantity even
-  // when addItemToInventory silently caps how much is actually added because
-  // the inventory is nearly full, so this counter can over-count relative to
-  // what the player actually received. See the equivalent fix applied to
-  // treeFruitsHarvested in harvestForestPlot.ts for the pattern to follow.
   return {
     ...state,
     cropsHarvested: {

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

@@ -0,0 +1,33 @@
+import { getCowStub } from '../../test-utils/stubs/cowStub.js'
+import { testState } from '../../test-utils/index.js'
+
+import { modifyCow } from './modifyCow.js'
+
+describe('modifyCow', () => {
+  test('updates the matching cow', () => {
+    const cow1 = getCowStub({ id: 'cow-1', name: 'Bessie' })
+    const cow2 = getCowStub({ id: 'cow-2', name: 'Daisy' })
+    const state = testState({ cowInventory: [cow1, cow2] })
+
+    const { cowInventory } = modifyCow(state, 'cow-2', () => ({
+      name: 'Clover',
+    }))
+
+    expect(cowInventory).toEqual([cow1, { ...cow2, name: 'Clover' }])
+  })
+
+  test('does not mutate the original cowInventory', () => {
+    const cow = getCowStub({ id: 'cow-1' })
+    const state = testState({ cowInventory: [cow] })
+
+    modifyCow(state, 'cow-1', () => ({ name: 'Clover' }))
+
+    expect(state.cowInventory).toEqual([cow])
+  })
+
+  test('no-ops if the cow does not exist', () => {
+    const state = testState({ cowInventory: [getCowStub({ id: 'cow-1' })] })
+
+    expect(modifyCow(state, 'missing', () => ({ name: 'x' }))).toBe(state)
+  })
+})

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

@@ -1,4 +1,5 @@
-// TODO: Add tests for this reducer
+import { findCowById } from '../../utils/findCowById.js'
+
 /**
  * @param fn Function that takes a cow and returns the modified cow or undefined.
  */
@@ -7,21 +8,15 @@ export const modifyCow = (
   cowId: string,
   fn: (cow: farmhand.cow) => Partial<farmhand.cow>
 ): farmhand.state => {
-  const cowInventory = [...state.cowInventory]
-
-  // TODO: Use the findCowById util here.
-  const cow = cowInventory.find(({ id }) => id === cowId)
+  const cow = findCowById(state.cowInventory, cowId)
 
   if (!cow) {
     return state
   }
 
+  const cowInventory = [...state.cowInventory]
   const cowIndex = cowInventory.indexOf(cow)
 
-  if (cowIndex === -1) {
-    return state
-  }
-
   cowInventory[cowIndex] = {
     ...cow,
     ...fn(cow),