@jeremyckahn/farmhand 1.20.2 → 1.20.3

package/dist/index.html

@@ -75,7 +75,7 @@
         gtag('config', analyticsID)
       })()
     </script>
-    <script type="module" crossorigin src="./assets/index-dORrBwcH.js"></script>
+    <script type="module" crossorigin src="./assets/index-tSySi_OA.js"></script>
     <link rel="stylesheet" crossorigin href="./assets/index-CNcrTYN-.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:"1d9ded7b5561cf1732b221c246cd5037"},{url:"electron.js",revision:"b0456826f47539f6c1957c3add5eb959"},{url:"assets/workbox-window.prod.es5-Bd17z0YL.js",revision:null},{url:"assets/index-dORrBwcH.js",revision:null},{url:"assets/index-CNcrTYN-.css",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:"5d027ca75fa72ddc050fadee8c7bab00"},{url:"electron.js",revision:"b0456826f47539f6c1957c3add5eb959"},{url:"assets/workbox-window.prod.es5-Bd17z0YL.js",revision:null},{url:"assets/index-tSySi_OA.js",revision:null},{url:"assets/index-CNcrTYN-.css",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/176937f380891cfcd7ad2cbe4558d1d9/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\": \"1d9ded7b5561cf1732b221c246cd5037\"\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-dORrBwcH.js\",\n    \"revision\": null\n  },\n  {\n    \"url\": \"assets/index-CNcrTYN-.css\",\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,2BACPC,SAAY,MAEd,CACED,IAAO,4BACPC,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/8b70c0006c9c68a30a0afc3bb9013cc3/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\": \"5d027ca75fa72ddc050fadee8c7bab00\"\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-tSySi_OA.js\",\n    \"revision\": null\n  },\n  {\n    \"url\": \"assets/index-CNcrTYN-.css\",\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,2BACPC,SAAY,MAEd,CACED,IAAO,4BACPC,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.20.2",
+  "version": "1.20.3",
   "publishConfig": {
     "access": "public"
   },

package/src/components/Achievement/Achievement.test.tsx

@@ -43,4 +43,70 @@ describe('<Achievement />', () => {
       screen.getByText(new RegExp(achievementObject.rewardDescription))
     ).toBeInTheDocument()
   })
+
+  test('does not render a progress bar when the achievement has no getProgress', () => {
+    expect(document.querySelector('.ProgressBar')).not.toBeInTheDocument()
+  })
+})
+
+describe('<Achievement /> with getProgress', () => {
+  let achievementObject: farmhand.achievement
+
+  beforeEach(() => {
+    achievementObject = {
+      description: 'the best achievement',
+      id: 'achievement-1',
+      name: 'achievement one',
+      rewardDescription: 'the greatest reward',
+      condition: () => false,
+      reward: state => state,
+      getProgress: () => ({ currentValue: 25, goal: 100 }),
+    }
+
+    const farmhandContextValue = createContextData()
+
+    render(
+      <FarmhandContext.Provider value={farmhandContextValue}>
+        <Achievement
+          achievement={achievementObject}
+          completedAchievements={{}}
+        />
+      </FarmhandContext.Provider>
+    )
+  })
+
+  test('renders a progress bar', () => {
+    expect(document.querySelector('.ProgressBar')).toBeInTheDocument()
+  })
+})
+
+describe('<Achievement /> with getProgress and isComplete', () => {
+  let achievementObject: farmhand.achievement
+
+  beforeEach(() => {
+    achievementObject = {
+      description: 'the best achievement',
+      id: 'achievement-1',
+      name: 'achievement one',
+      rewardDescription: 'the greatest reward',
+      condition: () => false,
+      reward: state => state,
+      getProgress: () => ({ currentValue: 100, goal: 100 }),
+    }
+
+    const farmhandContextValue = createContextData()
+
+    render(
+      <FarmhandContext.Provider value={farmhandContextValue}>
+        <Achievement
+          achievement={achievementObject}
+          completedAchievements={{ 'achievement-1': true }}
+        />
+      </FarmhandContext.Provider>
+    )
+  })
+
+  test('does not render a progress bar once the achievement is complete', () => {
+    expect(document.querySelector('.ProgressBar')).not.toBeInTheDocument()
+  })
 })

package/src/components/Achievement/Achievement.tsx

@@ -9,35 +9,58 @@ import BeenhereIcon from '@mui/icons-material/Beenhere.js'
 import { bool, object, shape, string } from 'prop-types'
 
 import FarmhandContext from '../Farmhand/Farmhand.context.js'
+import { Div } from '../Elements/index.js'
+import ProgressBar from '../ProgressBar/index.js'
 
 const Achievement = ({
-  achievement: { description, id, name, rewardDescription },
+  achievement,
   completedAchievements,
+  gameState,
 
-  isComplete = Boolean(completedAchievements[id]),
+  isComplete = Boolean(completedAchievements[achievement.id]),
 }: {
   achievement: farmhand.achievement
   completedAchievements: Partial<Record<string, boolean>>
+  gameState: farmhand.state
   isComplete?: boolean
-}) => (
-  <Card
-    {...{ className: classNames('Achievement', { 'is-complete': isComplete }) }}
-    sx={{
-      '& .MuiSvgIcon-root': { color: isComplete ? '#13b747' : '#666' },
-    }}
-  >
-    <CardHeader
+}) => {
+  const { description, name, rewardDescription } = achievement
+  const progress = achievement.getProgress?.(gameState)
+
+  return (
+    <Card
       {...{
-        avatar: isComplete ? <BeenhereIcon /> : <AssignmentLateIcon />,
-        title: name,
-        subheader: <p>Reward: {rewardDescription}</p>,
+        className: classNames('Achievement', { 'is-complete': isComplete }),
+      }}
+      sx={{
+        '& .MuiSvgIcon-root': { color: isComplete ? '#13b747' : '#666' },
       }}
-    />
-    <CardContent>
-      <p>{description}</p>
-    </CardContent>
-  </Card>
-)
+    >
+      <CardHeader
+        {...{
+          avatar: isComplete ? <BeenhereIcon /> : <AssignmentLateIcon />,
+          title: name,
+          subheader: <p>Reward: {rewardDescription}</p>,
+        }}
+      />
+      <CardContent>
+        <p>{description}</p>
+        {!isComplete && progress && (
+          <Div sx={{ marginTop: '1em' }}>
+            <ProgressBar
+              {...{
+                percent: Math.min(
+                  100,
+                  (progress.currentValue / progress.goal) * 100
+                ),
+              }}
+            />
+          </Div>
+        )}
+      </CardContent>
+    </Card>
+  )
+}
 
 Achievement.propTypes = {
   achievement: shape({
@@ -47,6 +70,7 @@ Achievement.propTypes = {
     rewardDescription: string.isRequired,
   }).isRequired,
   completedAchievements: object.isRequired,
+  gameState: object.isRequired,
   isComplete: bool,
 }
 
@@ -58,7 +82,7 @@ export default function Consumer(props: {
   return (
     <FarmhandContext.Consumer>
       {({ gameState, handlers }) => (
-        <Achievement {...{ ...gameState, ...handlers, ...props }} />
+        <Achievement {...{ ...gameState, ...handlers, ...props, gameState }} />
       )}
     </FarmhandContext.Consumer>
   )

package/src/components/ProgressBar/ProgressBar.tsx

@@ -79,12 +79,21 @@ const ProgressBar = ({ percent }: { percent: number }) => {
   }, [percent, prefersReducedMotion])
 
   return (
-    <Div className="ProgressBar" sx={{ margin: '0 auto' }}>
+    <Div
+      className="ProgressBar"
+      sx={{
+        margin: '0 auto',
+        display: 'flex',
+        alignItems: 'center',
+        gap: '0.5em',
+      }}
+    >
       <Div
         className="progress-wrapper"
         sx={{
+          flexGrow: 1,
           height: '1em',
-          background: '#ddd',
+          background: 'rgba(0, 0, 0, 0.15)',
           borderRadius: '0.5em',
           overflow: 'hidden',
         }}
@@ -100,7 +109,7 @@ const ProgressBar = ({ percent }: { percent: number }) => {
           sx={{ height: '100%' }}
         ></Div>
       </Div>
-      <P sx={{ lineHeight: '2em', textAlign: 'center' }}>
+      <P sx={{ lineHeight: '1em', minWidth: '3em', textAlign: 'right' }}>
         <span>{displayedProgress}%</span>
       </P>
     </Div>

package/src/data/achievements.test.ts

@@ -5,9 +5,32 @@ import { toolLevel, toolType } from '../enums.js'
 
 import { INFINITE_STORAGE_LIMIT } from '../constants.js'
 
-import { achievementsMap } from './achievements.js'
+import { achievementsMap, progressAchievement } from './achievements.js'
 import { carrot } from './crops/index.js'
 
+describe('progressAchievement', () => {
+  test('condition is false and getProgress reflects currentValue below goal', () => {
+    const { condition, getProgress } = progressAchievement(10, () => 9)
+
+    expect(condition({} as any)).toEqual(false)
+    expect(getProgress?.({} as any)).toEqual({ currentValue: 9, goal: 10 })
+  })
+
+  test('condition is true and getProgress reflects currentValue at goal', () => {
+    const { condition, getProgress } = progressAchievement(10, () => 10)
+
+    expect(condition({} as any)).toEqual(true)
+    expect(getProgress?.({} as any)).toEqual({ currentValue: 10, goal: 10 })
+  })
+
+  test('condition is true and getProgress reflects currentValue above goal', () => {
+    const { condition, getProgress } = progressAchievement(10, () => 11)
+
+    expect(condition({} as any)).toEqual(true)
+    expect(getProgress?.({} as any)).toEqual({ currentValue: 11, goal: 10 })
+  })
+})
+
 describe('harvest-crop', () => {
   describe('condition', () => {
     let inputState: any
@@ -85,6 +108,18 @@ describe.each(iAmRichVariants)(
 
         expect(achievement.condition(state)).toEqual(false)
       })
+
+      test('reports progress toward the revenue goal', () => {
+        const achievement = achievementsMap[id]
+        const state = {
+          revenue: Number(goal) - 1,
+        } as any
+
+        expect(achievement.getProgress?.(state)).toEqual({
+          currentValue: Number(goal) - 1,
+          goal: Number(goal),
+        })
+      })
     })
   }
 )
@@ -173,6 +208,13 @@ describe('orchardist', () => {
 
     expect(saplings).toEqual({ id: 'apple-sapling', quantity: 50 })
   })
+
+  test('reports progress toward the fruits-picked goal', () => {
+    expect(achievement.getProgress?.(state)).toEqual({
+      currentValue: 999,
+      goal: 1000,
+    })
+  })
 })
 
 describe('piemaker', () => {
@@ -218,6 +260,13 @@ describe('piemaker', () => {
 
     expect(state.money).toEqual(100_000)
   })
+
+  test('reports progress toward the pies-made goal', () => {
+    expect(achievement.getProgress?.(state)).toEqual({
+      currentValue: 99,
+      goal: 100,
+    })
+  })
 })
 
 describe('deforestation', () => {
@@ -251,6 +300,13 @@ describe('deforestation', () => {
 
     expect(wood).toEqual({ id: 'wood', quantity: 500 })
   })
+
+  test('reports progress toward the trees-chopped goal', () => {
+    expect(achievement.getProgress?.(state)).toEqual({
+      currentValue: 249,
+      goal: 250,
+    })
+  })
 })
 
 describe('landscaper', () => {
@@ -290,4 +346,11 @@ describe('landscaper', () => {
 
     expect(rainbowMulch).toEqual({ id: 'rainbow-mulch', quantity: 25 })
   })
+
+  test('reports progress toward the mulch-applied goal', () => {
+    expect(achievement.getProgress?.(state)).toEqual({
+      currentValue: 99,
+      goal: 100,
+    })
+  })
 })

package/src/data/achievements.ts

@@ -48,11 +48,24 @@ const PIE_RECIPE_IDS = Object.values(recipesMap)
   .filter(recipe => recipe.isPie)
   .map(recipe => recipe.id)
 
-const sumOfPiesMade = (recipesMade: Partial<Record<string, number>>) =>
-  PIE_RECIPE_IDS.reduce((sum, id) => sum + (recipesMade[id] || 0), 0)
+const sumOfPiesMade = memoize(
+  (recipesMade: Partial<Record<string, number>>) =>
+    PIE_RECIPE_IDS.reduce((sum, id) => sum + (recipesMade[id] || 0), 0),
+  {}
+)
 
 const cowFeed = itemsMap[COW_FEED_ITEM_ID]
 
+// Derives condition and getProgress from a single source of truth so that an
+// achievement's "complete" state and its progress bar can never disagree.
+export const progressAchievement = (
+  goal: number,
+  getCurrentValue: (state: farmhand.state) => number
+): Pick<farmhand.achievement, 'condition' | 'getProgress'> => ({
+  condition: state => getCurrentValue(state) >= goal,
+  getProgress: state => ({ currentValue: getCurrentValue(state), goal }),
+})
+
 const achievements: farmhand.achievement[] = [
   ((reward = 100) => ({
     id: 'plant-crop',
@@ -112,7 +125,7 @@ const achievements: farmhand.achievement[] = [
       goal
     )}. Proven farmers get access to the Crop Price Guide, an invaluable tool for making better buying and selling decisions!`,
     rewardDescription: 'Crop Price Guide',
-    condition: state => state.revenue >= goal,
+    ...progressAchievement(goal, state => state.revenue),
     // Reward is a no-op for this achievement. The value of
     // state.completedAchievements['unlock-crop-price-guide'] (which is
     // automatically set to `true` in the achievement processing logic) is used
@@ -130,15 +143,18 @@ const achievements: farmhand.achievement[] = [
     reward: state => addItemToInventory(state, cowFeed, reward, true),
   }))(),
 
-  ((reward = 100) => ({
+  ((reward = 100, goal = Object.keys(standardCowColors).length) => ({
     id: 'purchase-all-cow-colors',
     name: 'Cows of Many Colors',
     description: 'Show that you love all cows and purchase one of every color.',
     rewardDescription: `${reward} units of ${cowFeed.name}`,
-    condition: state =>
-      Object.values(standardCowColors).every(
-        color => (state.cowColorsPurchased[color] || 0) > 0
-      ),
+    ...progressAchievement(
+      goal,
+      state =>
+        Object.values(standardCowColors).filter(
+          color => (state.cowColorsPurchased[color] || 0) > 0
+        ).length
+    ),
     reward: state => addItemToInventory(state, cowFeed, reward, true),
   }))(),
 
@@ -159,7 +175,7 @@ const achievements: farmhand.achievement[] = [
       itemsMap['jackolantern'].name
     }. That's enough to fill a whole pumpkin patch!`,
     rewardDescription: `${reward} units of ${itemsMap['scarecrow'].name}`,
-    condition: state => (state.itemsSold.jackolantern || 0) >= goal,
+    ...progressAchievement(goal, state => state.itemsSold.jackolantern || 0),
     reward: state =>
       addItemToInventory(state, itemsMap['scarecrow'], reward, true),
   }))(),
@@ -169,12 +185,13 @@ const achievements: farmhand.achievement[] = [
     name: `Daily profit: ${dollarString(goal)}`,
     description: `Earn ${dollarString(goal)} of profit in a single day.`,
     rewardDescription: `${reward} units of ${itemsMap['fertilizer'].name}`,
-    condition: state =>
+    ...progressAchievement(goal, state =>
       getProfitRecord(
         state.recordSingleDayProfit,
         state.todaysRevenue,
         state.todaysLosses
-      ) >= goal,
+      )
+    ),
     reward: state =>
       addItemToInventory(state, itemsMap['fertilizer'], reward, true),
   }))(),
@@ -184,12 +201,13 @@ const achievements: farmhand.achievement[] = [
     name: `Daily profit: ${dollarString(goal)}`,
     description: `Earn ${dollarString(goal)} of profit in a single day.`,
     rewardDescription: `${reward} units of ${itemsMap['onion-seed'].name}`,
-    condition: state =>
+    ...progressAchievement(goal, state =>
       getProfitRecord(
         state.recordSingleDayProfit,
         state.todaysRevenue,
         state.todaysLosses
-      ) >= goal,
+      )
+    ),
     reward: state =>
       addItemToInventory(state, itemsMap['onion-seed'], reward, true),
   }))(),
@@ -199,12 +217,13 @@ const achievements: farmhand.achievement[] = [
     name: `Daily profit: ${dollarString(goal)}`,
     description: `Earn ${dollarString(goal)} of profit in a single day.`,
     rewardDescription: `${reward} units of ${itemsMap['tomato-seed'].name}`,
-    condition: state =>
+    ...progressAchievement(goal, state =>
       getProfitRecord(
         state.recordSingleDayProfit,
         state.todaysRevenue,
         state.todaysLosses
-      ) >= goal,
+      )
+    ),
     reward: state =>
       addItemToInventory(state, itemsMap['tomato-seed'], reward, true),
   }))(),
@@ -214,7 +233,7 @@ const achievements: farmhand.achievement[] = [
     name: `7-day profit average: ${dollarString(goal)}`,
     description: `Reach a 7-day profit average of ${dollarString(goal)}.`,
     rewardDescription: `${reward} units of ${rewardItem.name}`,
-    condition: state => state.record7dayProfitAverage >= goal,
+    ...progressAchievement(goal, state => state.record7dayProfitAverage),
     reward: state => addItemToInventory(state, rewardItem, reward, true),
   }))(),
 
@@ -223,7 +242,7 @@ const achievements: farmhand.achievement[] = [
     name: `7-day profit average: ${dollarString(goal)}`,
     description: `Reach a 7-day profit average of ${dollarString(goal)}.`,
     rewardDescription: `${reward} units of ${rewardItem.name}`,
-    condition: state => state.record7dayProfitAverage >= goal,
+    ...progressAchievement(goal, state => state.record7dayProfitAverage),
     reward: state => addItemToInventory(state, rewardItem, reward, true),
   }))(),
 
@@ -232,7 +251,7 @@ const achievements: farmhand.achievement[] = [
     name: `7-day profit average: ${dollarString(goal)}`,
     description: `Reach a 7-day profit average of ${dollarString(goal)}.`,
     rewardDescription: `${reward} units of ${rewardItem.name}`,
-    condition: state => state.record7dayProfitAverage >= goal,
+    ...progressAchievement(goal, state => state.record7dayProfitAverage),
     reward: state => addItemToInventory(state, rewardItem, reward, true),
   }))(),
 
@@ -241,7 +260,7 @@ const achievements: farmhand.achievement[] = [
     name: `7-day profit average: ${dollarString(goal)}`,
     description: `Reach a 7-day profit average of ${dollarString(goal)}.`,
     rewardDescription: `${reward} units of ${rewardItem.name}`,
-    condition: state => state.record7dayProfitAverage >= goal,
+    ...progressAchievement(goal, state => state.record7dayProfitAverage),
     reward: state => addItemToInventory(state, rewardItem, reward, true),
   }))(),
 
@@ -250,7 +269,7 @@ const achievements: farmhand.achievement[] = [
     name: `7-day profit average: ${dollarString(goal)}`,
     description: `Reach a 7-day profit average of ${dollarString(goal)}.`,
     rewardDescription: `${reward} units of ${rewardItem.name}`,
-    condition: state => state.record7dayProfitAverage >= goal,
+    ...progressAchievement(goal, state => state.record7dayProfitAverage),
     reward: state => addItemToInventory(state, rewardItem, reward, true),
   }))(),
 
@@ -259,7 +278,7 @@ const achievements: farmhand.achievement[] = [
     name: `7-day profit average: ${dollarString(goal)}`,
     description: `Reach a 7-day profit average of ${dollarString(goal)}.`,
     rewardDescription: `${reward} units of ${rewardItem.name}`,
-    condition: state => state.record7dayProfitAverage >= goal,
+    ...progressAchievement(goal, state => state.record7dayProfitAverage),
     reward: state => addItemToInventory(state, rewardItem, reward, true),
   }))(),
 
@@ -273,7 +292,7 @@ const achievements: farmhand.achievement[] = [
     name: `Dairy Master`,
     description: `Sell ${integerString(goal)} units of ${goalItem.name}.`,
     rewardDescription: `${integerString(reward)} ${rewardItem.name} units`,
-    condition: state => (state.itemsSold[goalItem.id] || 0) >= goal,
+    ...progressAchievement(goal, state => state.itemsSold[goalItem.id] || 0),
     reward: state => addItemToInventory(state, rewardItem, reward, true),
   }))(),
 
@@ -287,7 +306,7 @@ const achievements: farmhand.achievement[] = [
     name: `A Big Average Rainbow`,
     description: `Sell ${integerString(goal)} units of ${goalItem.name}.`,
     rewardDescription: `${integerString(reward)} ${rewardItem.name} units`,
-    condition: state => (state.itemsSold[goalItem.id] || 0) >= goal,
+    ...progressAchievement(goal, state => state.itemsSold[goalItem.id] || 0),
     reward: state => addItemToInventory(state, rewardItem, reward, true),
   }))(),
 
@@ -296,7 +315,7 @@ const achievements: farmhand.achievement[] = [
     name: `Burger Master`,
     description: `Sell ${integerString(goal)} ${goalItem.name} units.`,
     rewardDescription: `${integerString(reward)} additional inventory spaces`,
-    condition: state => (state.itemsSold[goalItem.id] || 0) >= goal,
+    ...progressAchievement(goal, state => state.itemsSold[goalItem.id] || 0),
     reward: state => ({
       ...state,
       inventoryLimit: state.inventoryLimit + reward,
@@ -310,7 +329,7 @@ const achievements: farmhand.achievement[] = [
     rewardDescription: `All sales receive a ${percentageString(
       I_AM_RICH_BONUSES[0]
     )} bonus`,
-    condition: state => state.revenue >= goal,
+    ...progressAchievement(goal, state => state.revenue),
     reward: state => state,
   }))(),
 
@@ -321,7 +340,7 @@ const achievements: farmhand.achievement[] = [
     rewardDescription: `All sales receive a ${percentageString(
       I_AM_RICH_BONUSES[1]
     )} bonus`,
-    condition: state => state.revenue >= goal,
+    ...progressAchievement(goal, state => state.revenue),
     reward: state => state,
   }))(),
 
@@ -332,7 +351,7 @@ const achievements: farmhand.achievement[] = [
     rewardDescription: `All sales receive a ${percentageString(
       I_AM_RICH_BONUSES[2]
     )} bonus`,
-    condition: state => state.revenue >= goal,
+    ...progressAchievement(goal, state => state.revenue),
     reward: state => state,
   }))(),
 
@@ -364,8 +383,9 @@ const achievements: farmhand.achievement[] = [
     name: 'Orchardist',
     description: `Pick ${integerString(goal)} fruits from trees in the Forest.`,
     rewardDescription: `${reward} units of ${itemsMap['apple-sapling'].name}`,
-    condition: state =>
-      sumOfPartialRecordValues(state.treeFruitsHarvested) >= goal,
+    ...progressAchievement(goal, state =>
+      sumOfPartialRecordValues(state.treeFruitsHarvested)
+    ),
     reward: state =>
       addItemToInventory(state, itemsMap['apple-sapling'], reward, true),
   }))(),
@@ -375,7 +395,7 @@ const achievements: farmhand.achievement[] = [
     name: 'Piemaker',
     description: `Make ${integerString(goal)} pies.`,
     rewardDescription: dollarString(reward),
-    condition: state => sumOfPiesMade(state.recipesMade) >= goal,
+    ...progressAchievement(goal, state => sumOfPiesMade(state.recipesMade)),
     reward: state => addMoney(state, reward),
   }))(),
 
@@ -384,7 +404,7 @@ const achievements: farmhand.achievement[] = [
     name: 'Deforestation',
     description: `Chop down ${integerString(goal)} trees in the Forest.`,
     rewardDescription: `${reward} units of ${itemsMap['wood'].name}`,
-    condition: state => state.treesChopped >= goal,
+    ...progressAchievement(goal, state => state.treesChopped),
     reward: state => addItemToInventory(state, itemsMap['wood'], reward, true),
   }))(),
 
@@ -395,7 +415,9 @@ const achievements: farmhand.achievement[] = [
       goal
     )} bags of mulch (of any type) on trees in the Forest.`,
     rewardDescription: `${reward} units of ${itemsMap['rainbow-mulch'].name}`,
-    condition: state => sumOfPartialRecordValues(state.mulchApplied) >= goal,
+    ...progressAchievement(goal, state =>
+      sumOfPartialRecordValues(state.mulchApplied)
+    ),
     reward: state =>
       addItemToInventory(state, itemsMap['rainbow-mulch'], reward, true),
   }))(),

package/src/data/recipes.ts

@@ -780,7 +780,7 @@ export const compost = convertToRecipe({
   id: 'compost',
   name: 'Compost',
   ingredients: {
-    [items.weed.id]: 25,
+    [items.weed.id]: 10,
   },
   condition: state =>
     state.purchasedComposter > 0 &&
@@ -797,7 +797,7 @@ export const fertilizer: farmhand.item = convertToRecipe({
   id: 'fertilizer',
   name: 'Fertilizer',
   ingredients: {
-    [compost.id]: 10,
+    [compost.id]: 3,
   },
   condition: state =>
     state.purchasedComposter > 0 && (state.itemsSold[compost.id] || 0) >= 10,

package/src/farmhand.d.ts

@@ -281,6 +281,12 @@ declare namespace farmhand {
 
   type achievementCondition = (state: state, prevState?: state) => boolean
   type achievementReward = (state: state) => state
+  type achievementProgress = (
+    state: state
+  ) => {
+    currentValue: number
+    goal: number
+  }
 
   interface achievement {
     id: string
@@ -289,6 +295,7 @@ declare namespace farmhand {
     rewardDescription: string
     condition: achievementCondition
     reward: achievementReward
+    getProgress?: achievementProgress
   }
 
   interface level {