@jeremyckahn/farmhand 1.24.1 → 1.24.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (50) hide show
  1. package/dist/assets/{index-B03HVYBS.js → index-CUCDQafy.js} +12 -12
  2. package/dist/assets/{index-B03HVYBS.js.map → index-CUCDQafy.js.map} +1 -1
  3. package/dist/index.html +1 -1
  4. package/dist/service-worker.js +1 -1
  5. package/dist/service-worker.js.map +1 -1
  6. package/package.json +1 -1
  7. package/src/components/Cellar/Keg.tsx +4 -1
  8. package/src/components/ContextPane/ContextPane.test.tsx +57 -0
  9. package/src/components/ContextPane/ContextPane.tsx +38 -2
  10. package/src/components/CowPen/Cow.tsx +50 -6
  11. package/src/components/Farmhand/FarmhandService.test.ts +23 -0
  12. package/src/components/Farmhand/FarmhandService.ts +12 -16
  13. package/src/components/Item/Item.test.tsx +29 -0
  14. package/src/components/Item/Item.tsx +14 -2
  15. package/src/components/Navigation/Navigation.test.tsx +0 -3
  16. package/src/components/Navigation/Navigation.tsx +3 -34
  17. package/src/components/OnlinePeersView/OnlinePeer/OnlinePeer.tsx +1 -2
  18. package/src/data/items.ts +17 -0
  19. package/src/farmhand.d.ts +1 -0
  20. package/src/game-logic/reducers/harvestPlot.test.ts +18 -0
  21. package/src/game-logic/reducers/harvestPlot.ts +5 -6
  22. package/src/game-logic/reducers/modifyCow.test.ts +33 -0
  23. package/src/game-logic/reducers/modifyCow.ts +4 -9
  24. package/src/game-logic/reducers/purchaseItem.test.ts +129 -0
  25. package/src/game-logic/reducers/purchaseItem.ts +9 -2
  26. package/src/img/animals/cows/cow-variation-1-blinking.piskel +1 -0
  27. package/src/img/animals/cows/cow-variation-1-blinking.png +0 -0
  28. package/src/img/animals/cows/cow-variation-2-blinking.piskel +1 -0
  29. package/src/img/animals/cows/cow-variation-2-blinking.png +0 -0
  30. package/src/img/animals/cows/cow-variation-3-blinking.piskel +1 -0
  31. package/src/img/animals/cows/cow-variation-3-blinking.png +0 -0
  32. package/src/img/animals/cows/cow-variation-4-blinking.piskel +1 -0
  33. package/src/img/animals/cows/cow-variation-4-blinking.png +0 -0
  34. package/src/img/animals/cows/cow-variation-5-blinking.piskel +1 -0
  35. package/src/img/animals/cows/cow-variation-5-blinking.png +0 -0
  36. package/src/img/animals/cows/cow-variation-6-blinking.piskel +1 -0
  37. package/src/img/animals/cows/cow-variation-6-blinking.png +0 -0
  38. package/src/img/animals/cows/cow-variation-7-blinking.piskel +1 -0
  39. package/src/img/animals/cows/cow-variation-7-blinking.png +0 -0
  40. package/src/img/animals/cows/rainbow-cow-blinking.piskel +1 -0
  41. package/src/img/animals/cows/rainbow-cow-blinking.png +0 -0
  42. package/src/img/index.ts +21 -0
  43. package/src/utils/__snapshots__/getCowImage.test.ts.snap +2 -0
  44. package/src/utils/getCowImage.test.ts +14 -0
  45. package/src/utils/getCowImage.ts +20 -6
  46. package/src/utils/getItemById.test.ts +18 -0
  47. package/src/utils/getItemById.ts +14 -0
  48. package/src/utils/getPlotImage.ts +1 -3
  49. package/src/utils/transformStateDataForImport.test.ts +9 -0
  50. package/src/utils/transformStateDataForImport.ts +9 -12
@@ -7,6 +7,7 @@ import {
7
7
  } from '../../enums.js'
8
8
  import { itemsMap } from '../../data/maps.js'
9
9
  import { doesInventorySpaceRemain } from '../../utils/doesInventorySpaceRemain.js'
10
+ import { inventorySpaceRemaining } from '../../utils/inventorySpaceRemaining.js'
10
11
  import { getCropLifeStage } from '../../utils/getCropLifeStage.js'
11
12
  import { getPlotContentType } from '../../utils/getPlotContentType.js'
12
13
  import { getSeedItemIdFromFinalStageCropItemId } from '../../utils/getSeedItemIdFromFinalStageCropItemId.js'
@@ -43,7 +44,10 @@ function getHarvestedQuantity(state: farmhand.state): number {
43
44
  amount = 1
44
45
  }
45
46
 
46
- return amount
47
+ // Cap the yield to the space actually available so that callers only count
48
+ // crops the player received, not crops that addItemToInventory would
49
+ // silently drop because the inventory is nearly full.
50
+ return Math.min(amount, inventorySpaceRemaining(state))
47
51
  }
48
52
 
49
53
  function harvestCrops(
@@ -94,11 +98,6 @@ function harvestCrops(
94
98
 
95
99
  const { cropsHarvested } = state
96
100
 
97
- // TODO: cropsHarvested is incremented by the full harvestedQuantity even
98
- // when addItemToInventory silently caps how much is actually added because
99
- // the inventory is nearly full, so this counter can over-count relative to
100
- // what the player actually received. See the equivalent fix applied to
101
- // treeFruitsHarvested in harvestForestPlot.ts for the pattern to follow.
102
101
  return {
103
102
  ...state,
104
103
  cropsHarvested: {
@@ -0,0 +1,33 @@
1
+ import { getCowStub } from '../../test-utils/stubs/cowStub.js'
2
+ import { testState } from '../../test-utils/index.js'
3
+
4
+ import { modifyCow } from './modifyCow.js'
5
+
6
+ describe('modifyCow', () => {
7
+ test('updates the matching cow', () => {
8
+ const cow1 = getCowStub({ id: 'cow-1', name: 'Bessie' })
9
+ const cow2 = getCowStub({ id: 'cow-2', name: 'Daisy' })
10
+ const state = testState({ cowInventory: [cow1, cow2] })
11
+
12
+ const { cowInventory } = modifyCow(state, 'cow-2', () => ({
13
+ name: 'Clover',
14
+ }))
15
+
16
+ expect(cowInventory).toEqual([cow1, { ...cow2, name: 'Clover' }])
17
+ })
18
+
19
+ test('does not mutate the original cowInventory', () => {
20
+ const cow = getCowStub({ id: 'cow-1' })
21
+ const state = testState({ cowInventory: [cow] })
22
+
23
+ modifyCow(state, 'cow-1', () => ({ name: 'Clover' }))
24
+
25
+ expect(state.cowInventory).toEqual([cow])
26
+ })
27
+
28
+ test('no-ops if the cow does not exist', () => {
29
+ const state = testState({ cowInventory: [getCowStub({ id: 'cow-1' })] })
30
+
31
+ expect(modifyCow(state, 'missing', () => ({ name: 'x' }))).toBe(state)
32
+ })
33
+ })
@@ -1,4 +1,5 @@
1
- // TODO: Add tests for this reducer
1
+ import { findCowById } from '../../utils/findCowById.js'
2
+
2
3
  /**
3
4
  * @param fn Function that takes a cow and returns the modified cow or undefined.
4
5
  */
@@ -7,21 +8,15 @@ export const modifyCow = (
7
8
  cowId: string,
8
9
  fn: (cow: farmhand.cow) => Partial<farmhand.cow>
9
10
  ): farmhand.state => {
10
- const cowInventory = [...state.cowInventory]
11
-
12
- // TODO: Use the findCowById util here.
13
- const cow = cowInventory.find(({ id }) => id === cowId)
11
+ const cow = findCowById(state.cowInventory, cowId)
14
12
 
15
13
  if (!cow) {
16
14
  return state
17
15
  }
18
16
 
17
+ const cowInventory = [...state.cowInventory]
19
18
  const cowIndex = cowInventory.indexOf(cow)
20
19
 
21
- if (cowIndex === -1) {
22
- return state
23
- }
24
-
25
20
  cowInventory[cowIndex] = {
26
21
  ...cow,
27
22
  ...fn(cow),
@@ -1,4 +1,6 @@
1
1
  import { INFINITE_STORAGE_LIMIT } from '../../constants.js'
2
+ import { huggingMachine } from '../../data/items.js'
3
+ import { generateCow } from '../../utils/generateCow.js'
2
4
  import { testItem, testState } from '../../test-utils/index.js'
3
5
 
4
6
  import { purchaseItem } from './purchaseItem.js'
@@ -81,5 +83,132 @@ describe('purchaseItem', () => {
81
83
  })
82
84
  })
83
85
  })
86
+
87
+ test('respects an item maximum purchase quantity', () => {
88
+ const item = testItem({
89
+ id: 'sample-item-1',
90
+ getMaxPurchaseQuantity: () => 2,
91
+ })
92
+
93
+ expect(purchaseItem(state, item, 5)).toMatchObject({
94
+ inventory: [{ id: 'sample-item-1', quantity: 2 }],
95
+ todaysPurchases: { 'sample-item-1': 2 },
96
+ money: 8,
97
+ })
98
+ })
99
+
100
+ test('does not purchase when an item maximum is negative', () => {
101
+ const item = testItem({
102
+ id: 'sample-item-1',
103
+ getMaxPurchaseQuantity: () => -2,
104
+ })
105
+
106
+ expect(purchaseItem(state, item, 1)).toMatchObject({
107
+ inventory: [],
108
+ todaysPurchases: {},
109
+ money: 10,
110
+ })
111
+ })
112
+
113
+ describe('the item has a maximum purchase quantity', () => {
114
+ test.each([
115
+ [1, 10],
116
+ [2, 20],
117
+ [3, 30],
118
+ ])(
119
+ 'limits Hugging Machines to the Cow Pen capacity of %i cows',
120
+ (purchasedCowPen, cowCapacity) => {
121
+ state = testState({
122
+ inventory: [],
123
+ money: 10_000,
124
+ purchasedCowPen,
125
+ valueAdjustments: { [huggingMachine.id]: 1 },
126
+ })
127
+
128
+ expect(huggingMachine.getMaxPurchaseQuantity?.(state)).toEqual(
129
+ cowCapacity
130
+ )
131
+ }
132
+ )
133
+
134
+ test('limits the purchase to the remaining Cow Pen capacity', () => {
135
+ state = testState({
136
+ inventory: [{ id: huggingMachine.id, quantity: 9 }],
137
+ money: 10_000,
138
+ purchasedCowPen: 1,
139
+ valueAdjustments: { [huggingMachine.id]: 1 },
140
+ })
141
+
142
+ expect(purchaseItem(state, huggingMachine, 2)).toMatchObject({
143
+ inventory: [{ id: huggingMachine.id, quantity: 10 }],
144
+ todaysPurchases: { [huggingMachine.id]: 1 },
145
+ money: 9_500,
146
+ pendingPeerMessages: [
147
+ { message: 'purchased 1 unit of Hugging Machine.' },
148
+ ],
149
+ })
150
+ })
151
+
152
+ test('does not purchase a Hugging Machine when capacity is full', () => {
153
+ state = testState({
154
+ inventory: [{ id: huggingMachine.id, quantity: 10 }],
155
+ money: 10_000,
156
+ purchasedCowPen: 1,
157
+ valueAdjustments: { [huggingMachine.id]: 1 },
158
+ })
159
+
160
+ expect(purchaseItem(state, huggingMachine, 1)).toMatchObject({
161
+ inventory: [{ id: huggingMachine.id, quantity: 10 }],
162
+ todaysPurchases: {},
163
+ money: 10_000,
164
+ })
165
+ })
166
+
167
+ test('does not purchase a Hugging Machine when already over capacity', () => {
168
+ state = testState({
169
+ inventory: [{ id: huggingMachine.id, quantity: 11 }],
170
+ money: 10_000,
171
+ purchasedCowPen: 1,
172
+ valueAdjustments: { [huggingMachine.id]: 1 },
173
+ })
174
+
175
+ expect(purchaseItem(state, huggingMachine, 1)).toMatchObject({
176
+ inventory: [{ id: huggingMachine.id, quantity: 11 }],
177
+ todaysPurchases: {},
178
+ money: 10_000,
179
+ })
180
+ })
181
+
182
+ test('does not purchase a Hugging Machine when all capacity is in use', () => {
183
+ state = testState({
184
+ cowInventory: Array.from({ length: 6 }, () =>
185
+ generateCow({ isUsingHuggingMachine: true })
186
+ ),
187
+ inventory: [{ id: huggingMachine.id, quantity: 4 }],
188
+ money: 10_000,
189
+ purchasedCowPen: 1,
190
+ valueAdjustments: { [huggingMachine.id]: 1 },
191
+ })
192
+
193
+ expect(purchaseItem(state, huggingMachine, 1)).toMatchObject({
194
+ inventory: [{ id: huggingMachine.id, quantity: 4 }],
195
+ todaysPurchases: {},
196
+ money: 10_000,
197
+ })
198
+ })
199
+
200
+ test('does not purchase a Hugging Machine without a Cow Pen', () => {
201
+ state = testState({
202
+ money: 10_000,
203
+ valueAdjustments: { [huggingMachine.id]: 1 },
204
+ })
205
+
206
+ expect(purchaseItem(state, huggingMachine, 1)).toMatchObject({
207
+ inventory: [],
208
+ todaysPurchases: {},
209
+ money: 10_000,
210
+ })
211
+ })
212
+ })
84
213
  })
85
214
  })
@@ -13,7 +13,14 @@ export const purchaseItem = (
13
13
  howMany: number = 1
14
14
  ): farmhand.state => {
15
15
  const { money, todaysPurchases, valueAdjustments } = state
16
- const numberOfItemsToAdd = Math.min(howMany, inventorySpaceRemaining(state))
16
+
17
+ const getMaxPurchaseQuantity =
18
+ item.getMaxPurchaseQuantity?.(state) ?? Infinity
19
+
20
+ const numberOfItemsToAdd = Math.max(
21
+ 0,
22
+ Math.min(howMany, inventorySpaceRemaining(state), getMaxPurchaseQuantity)
23
+ )
17
24
 
18
25
  if (numberOfItemsToAdd === 0) {
19
26
  return state
@@ -28,7 +35,7 @@ export const purchaseItem = (
28
35
 
29
36
  state = prependPendingPeerMessage(
30
37
  state,
31
- PURCHASED_ITEM_PEER_NOTIFICATION('', howMany, item)
38
+ PURCHASED_ITEM_PEER_NOTIFICATION('', numberOfItemsToAdd, item)
32
39
  )
33
40
 
34
41
  return addItemToInventory(
@@ -0,0 +1 @@
1
+ {"modelVersion":2,"piskel":{"name":"cow-variation-1-blinking","description":"","fps":12,"height":48,"width":48,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAC4klEQVR4AeyXDXLqMAyEnXfJ3gDOBDfoKfP0ZbxUceTYSaCUmXSy6F/W2g5T/qUP/zsJvPsAzxM4T+DgDpxX6OAGHi4/T+DwFh5scJ7AwQ08XM4JjLmLZDY/Q0AgXS6XjxyeLZ4IoLwQbI7HnqV8PfqjBwSG+/2OY+BjI2jWQtmSfPnQ10AecaQHPpAg4AMtnaIH7Opx/UI0Gk09VD+OY/KQ33qQZ6L+9BKg0ajGkvW27Qg9Wlk9OS0Cs8FbC/bGy8Gu1+uj1Os4y1x8GdOVXyPw2PFcsEmwMCiL5MvvXRme2cpRjQUZWjAzVd+Bafgp4+AHiwPaSErXgNgliPn8Mi7bnwDXBX9leELPAwPSTdJfHfkkyatBBIac8CvDsxa7K2B7yI/0/kgXAWIigf7ruN1uu9b0BHY1UNHeAVSP9NcIuwdPI7Bn8Z4BWzmrBLSrSNBqthbnPq+9lHs3YEGAQQUNRHOAHx8SSEcK8st+tVwQiBYsh4IMIFdSOd6WjzyvY3twMhGUQ8z08EumJDDYn+X+PFpYkoh0JMCnwdHxYQPZyPIaMRgYv79TBGKA2hpKAmEegwCCGg6JDaQjgXIVwwbERILBNPTw9ZUA+QAdKI6vhi4CLAzKJgyFD+nj6ALxCAwX+SNfztV/CrOULgKzCjMYzkTyEhL4kEA6EigXvQQDAvnRgew1uUqA9wGsNSDGwAwoiQ/g87LUsQHXBekR+Xxc+ioBktgJSADsCOWgsqNcfPz68gNOa+T3AD/ARy7ANtn1LWR5y0fNIOGxzGx7VC8SebjFtxCdiAHTw+HNX/09QGwCDQAGiyINNLRZhmQfm5BrTaTpdzAK/SNYbMgwET/NK2RlNHksZrZ/iG2Fr5dOj2mNYpMUr8oeAtXivxDoJqCr8sqh96wREtjTaCuxZ60REgiG4Y56BCmHXb4/elfDiADFHl2NZkltw/dHb1dUMiICldS/6T4JvPtczhN49wn8BwAA//82HUsEAAAABklEQVQDAG3UeHBCTVueAAAAAElFTkSuQmCC\"}]}"]}}
@@ -0,0 +1 @@
1
+ {"modelVersion":2,"piskel":{"name":"cow-variation-2-blinking","description":"","fps":12,"height":48,"width":48,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAC5ElEQVR4AeyXC3LbMAxEtb1kbmCfyb5BTunysYIGhkFKjOS6nVFGG/xBLEk58a/pP/85CXz6AM8TOE9g5w6cV2jnBu4uP09g9xbubHCewM4N3F1+nsDuLdzZ4G+cwKPM6FHM4cfXoy8N9hKg2RqWxWaF/Fmd0HsgjzjSAx+YRglQtOByuUwt+NUSvfZ4PB5TD6WOvCLaz1YCNHrEYdtt1yP0ul6vE4jZ+AA5MRbtNQJPg8fin9pbBrPenVyR0yOw7DiJo2Bhrkesw4/vfr8jurAcqynJDG0o5tR8B+rwNeOHv263W70ekLABTNIS3QbEjiBGTvRHOzuBxvCxtG9zh8kwie7BgNgm0Q3mM2n+TEYChwzP7meLeR+7a/B+dPMjsXvwBHhh01wGAmkwOLfmhbInc6SHEWB4PXWZjZFmc0m9+6a/WxqBd68z3H/rxjUJ8AIBScuO9poSA61Juc/0i/FeTS9mfYwA14drNLEIIIFFATafJgC/B4uA6PN2S491Wd5ajhGgFhLL/zY4GBxAAttAU4P5RiX1ViNpkl5hcWYougpeHk+AoObkhUgcniROwgNfhB/QYvSy/vgk1cEf399TBulPnNwWIoFWXtcPmSyhR0LSMrS+viZgPdCBkTJ/Jg8hkDVe8zHcWo7F59z6jprP5GEERk7BFjfJgKBlmz+TXQLcV5AVZr4eCa6TIdZyXbb4Yg52lwAJ7AwkAPYR4D9UPzRrYHvgs7XwF10FL09KgJ3ymdYMEh4+Z4suqX7qSOUFLl8nGQxQyxoe+IiBoqsgfVICPpMGAB8fg8gCGtaPXE8IXdIypPSsW12R9eEkUOifocQ0o4j8aRJwp0CT+nfB+awbsRFYXZT0WL7gz8Hqm/WmaBKIFcnwMeUj9mYCkurVeOeU0vgaKQFpvNEoMemYNVICyTAqPo9iHv74/uibFsgIUOyxqdFT0rrh+6OvVzQyMgKN1H/TfRL49LmcJ/DpE/gNAAD//3r5kyQAAAAGSURBVAMAr+1rcNRc4p4AAAAASUVORK5CYIIA\"}]}"]}}
@@ -0,0 +1 @@
1
+ {"modelVersion":2,"piskel":{"name":"cow-variation-3-blinking","description":"","fps":12,"height":48,"width":48,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAChUlEQVR4AeyXjXEqMQyEjzSZDiiKDlIl0eewN8LIf/gSyIzf3CJZWsla+2BePrZ//m8JePUFrhtYNzB5AusVmjzA6fJ1A9NHONlg3cDkAU6XrxuYPsLJBn9xA1eb0cOWw4+vx98bzAqgWQv7ZjcH/s3d8GuARx7rQQxsowIo2nE+n7cS/G6Bn3qUahW3Onhmyk+vABpd1Vi23LadoUeL1cNpCbgbvLVhb75nMPWqcE9wagL2E4c4CjYGeV0Uyzn52tUwtJBoJQFp+MSwj8vlsgm2HHrYHFAki38UIgEPw/9sdtynDgMbdSUuRHkfywXcDe+JR/rcBKAng2IFrckDxUvWC+ALW+KleN6QzSIkcscH/YCnsgY+VvMlgOH5cjxwaSY8JN8gIAFDo+jUh4p+iTwsgOFrs3BbUZ54qzaqa8WGBbQa/nX+LQRwMxF0GOTMD7+juYDTjWz845/8NWIvcP362iKQA7VJEKDffn6JatxmjgE9ic2Bj8EhBjT06fNzA+LhA+UVjywCongxxgBRMo8zoHj4QGssw2F7cOOGB5wEWPPw/So1Z9gcJW5PnAGBuPhA65pFgIaX3fkmLP0nbg8MOAgcoCcqr42QAh0fCKjSOIlnhXgRuc+gfmPW7CXkOVs/HLDF+v6kpClkCZEl1gKDA3iqwxJjaEBOe+AL5ICtw+Et3hZAAwCZTbEGGqafXIbpherMpkf96B/BSGkfs8Wn+QpZJU3SH+/m5w+5EeT1WtMj7SFRlkgxs9WnR0C1wauT3QL0mvzmwM/sEQp4ptGosKP2CAUEw/A+egSU6ZDvj9/VMBJAsUdXoztSe+H747crCoxIQIH6nuEl4NX3sm7g1TfwDQAA//9EngZ8AAAABklEQVQDAPmFUXBZV/YBAAAAAElFTkSuQmCC\"}]}"]}}
@@ -0,0 +1 @@
1
+ {"modelVersion":2,"piskel":{"name":"cow-variation-4-blinking","description":"","fps":12,"height":48,"width":48,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAADCklEQVR4AeyXi3HjMAxExWsyHdg12R2kSh0ew9VBFEhJw3OczCijDcDFhwtSzsR/pl/+cw3w7gu8buC6gcETuF6hwQMcLr9uYPgIBxtcNzB4gMPl1w0MH+Fgg++4gdk0etjy9OPr8ZcGowPQbA/LZsUhv7gTfg/kEcd6wIHp7AAULZjneWrB7xb4ucftdgvr4YHVkWem/RwdgEZgtaFve7/f/XLXLwKnXp1yes32BkA0WITXzRAA4LEC6xaOCFNtJzeR0xsgC6cBrwnJER6PR0RP1IE6GHF1Tr12NYgWclprgEV8zrJfnKyZ5WEtLGTgMLwEyD6fz1VmSmj6olL658PUuXAe0QAb8RQ8Hl8nfUQ0+QL58l9h6wFC8f97Y26CkxW4Je2BLx5LrmKR9QPsio9Os/UZiDbzHMIEz+OLx7LuQQMgfv3ylaqewF6slL/caIDNRogDm0BFRLdSpbx0uRkA0aDeVUKJCeR4nzWIOF4H3mnie6B+L0fxzQAKRPZM46g+4lo9W3zd4/AAdUNuRKCp4rLE4IE4fA/xKaUppS0ULzeXfK38eoBkP4qFVsJoDkjynF/je/jXiFr2AvPn5xSBWBHv26x8BphpbCx/icz0HzauM2qOtYfPZy9EIU6i08fHBJSHDxQXH1kGiPgNxymDOoBQcYpjgfjIIi7iI67khgecB7ATCd8v3wyhAK4ljngvRm0EBALF8IHWPcsAEi+75HPNYCGKg1BcL9b7xM6A16XOj7g6hzUDYJvgJBgC1EkaxPNwAjyDAXzxfA68wLxH+RzAAzhqAGuzmwM27thXSjVjCA8aCIiT7y08gFOtvbL5+wLCADH28IAjBswPxRu/PwANAMn8p4g10ND0pPDvtwVCXnVm88NN4NA/gsVSgZn42X2FrIwm+Sul+fVD7Azqeq3pkW9FQ1kgc2a7z5EBug3eHTw8gF6LVwrmswHO7BEO8FPFRoOFAwSJvI8eQcow5fvjH2oYDUCxx6FGq6T9he+Pv1/RyIgGaKT+TPoa4N33ct3Au2/gLwAAAP//wOsxRAAAAAZJREFUAwCUT5Bw3sIsRgAAAABJRU5ErkJgggAA\"}]}"]}}
@@ -0,0 +1 @@
1
+ {"modelVersion":2,"piskel":{"name":"cow-variation-5-blinking","description":"","fps":12,"height":48,"width":48,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAACz0lEQVR4AeyXCXLCMAxFrV6yN4AzwQ16yjTPRCA78kZSoDNh+GiX9W2H0q/wz18HgXcf4HECxwls3IHjCm3cwM3lxwls3sKNDY4TGNzAac4Hs+h+k69YFb3yBBhiNUDD0ayBgCapbPTcJfzsWqs6CITT6bQK7DLmo8mf9Y8EHusMawzWg1LjVm2p7u6HgFyvVxzCRwPJgvPJcXpFTNMUQKHnpPXkWKi/UJe4IZA4CkYcXBurLOTe3efzOeoMFxXzQQ9juqqTs9rkFoE4OAMAd5WGU0nYNGcwG070Vm6NQDxiO/jlckmaP2PYgZarGyxJ1TXGGrYG26JEIA5vE/fQ80Gw7aC6Bj5iatekRyAZXnckhJDsVK1pT4whAbkqrY4P4KshJ5AMXyvsjZWuHTtsof24sp5f47lUAjzdPLB5PLFLwyRJLzaUAMtCArkbXkHYEtht8NFGOdHcrvVrEsibYStqjYnZLwDudc9DSd0ImgRKzexwpRz1j+RqTa8sEvB2mUEULEAO0iL3kW/jni4iQSSFPa1FF682JxB/2OVDeIWao9LLyX35NWIwMP38BA/EQN7H2jkBG4u67qDK6Mw+IKHIQitTSTCYDi3f3wFoMjrQuPo9WSVQGpphvWYjPobrzV9y3b9TVQJ2AYZWWL+nax7Si+c+BgTqRwdq12SVAMcMag32jHFtwEjPKgEasRMiEr8lsEfBKVhQz3OQD2ptq5O/2IKeo0mAAkggRSQSEblJfCMQkcCJAiWxDBe/hbTXfb3Hwy0ay2WTAAsACvmliJxBQ5lfCaGWrXWzjG9IoNAfoAN0MOtxnVkW300CcyVNSv+cExvB3O721mt1swI94hrZJi3hsughUK7+gEg3Ab0efznzM2u4BJ5pNEpsrzVcAs4w3FELJ2Wzy/ZH72roEaDYoqtRktQ2bH/0dkUhwyNQSP1M90Hg3edynMC7T+AXAAD//zgj3voAAAAGSURBVAMA67xIcBP9HhIAAAAASUVORK5CYIIA\"}]}"]}}
@@ -0,0 +1 @@
1
+ {"modelVersion":2,"piskel":{"name":"cow-variation-6-blinking","description":"","fps":12,"height":48,"width":48,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAACjUlEQVR4AeyXC1LDMAxEUy7JDXqo3oBTFj/TzWw88id1S2AmTBbL0molxW4ZPpZ//nMOcPQBnidwnsDkGziv0OQLnE4/T2D6FU4KnCcw+QKn088TmH6FkwK/cQL31KMjbXc/no+9CswOgFgPa7GHAf9hLtgtwCPO6sAHlr0DkORw0dW+Xq+rXTGyBrwWUi68tNSf0QEQAnWlnREa76WMcHoD0DTo1VrjI0VHOBJscC9wWgPsahwxB4WB+15g07SQ5WoD3CkOMmviFxrAJW6321JC8dLPXrFojQbIzYtM8R90P5hKGV6ly6okbEG+1loOsGm+TES49Pm+F3cuNm8XYDvwAffVbB9g+s7XirzTrwFong9Ht5a/ZWyhm/gmggbYJf/KptEqi0e+kqP9UwMo2VfubAt7mkIXPsBuoTqAN9MSEK/FiWI0B6KY+3ocDcD953Owfj+TKNCki8qu+RWvreh6DJ0Izkk2PaZl+2gAvBDAQgEXZA9hFqWOaty/vpYIirfq+gAbHsWETeDJDc2QiiY2UNOXz88FEAfYQHF8NVQHqCW8yk9zo1oPbr7iZc5hA3gjNAjkwwbat9bmABwzqAlwHWqx0t/icl1KfuQrOeybA0DgTTAEYF+CxgSPyae1jHmD1GDvwKcc/MnOXzBp3TzdAWBLjCEcxBxqltX9sj0XDo0B4tRw4CMGkh02n/z9/4kRAJApypqA4MUbGrGVl9b8SA/9CImU66S1+oycACL5b0OgQmwPAonsQiPX0FDJm31pbT4jAzQFjg4OD6Ar8s6Gn6kRDvCM0N7BXlUjHCBohvvoCCjTLtfHHhKMBiDZMSS0IfU3ro/dz6gwogEq1L/pPgc4+lzOEzj6BL4BAAD//9HdgZsAAAAGSURBVAMAlBRicJihbigAAAAASUVORK5CYIIA\"}]}"]}}
@@ -0,0 +1 @@
1
+ {"modelVersion":2,"piskel":{"name":"cow-variation-7-blinking","description":"","fps":12,"height":48,"width":48,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAACsklEQVR4AeyXAXLrIAxE4V+yN0jOlNygp/TXY7wehYANJk3aGTreSohl0YKbtv/CH/+aBj59gfMG5g0MnsB8hQYPcHj5vIHhIxwUmDcweIDDy+cNDB/hoMA7bmCxHj1s2P349eSbwKgBxI6wbbYm8Nc0kO8BHvNED2og9BpgkYcX3fLL5bLllSRpwAPLsgQPasDWwrNQf1oNILQgKtQl22bQEfN6vSp9iJ7zMOEGRwZS4/BzMcaAuVcBI8Dr7ewR4e0ZoHk4Cff7PcWWb3DZGOR8aiCv5437ecenaSFRagYemk/Mzm+YAGwOWK5InbHgxz5nPh9T8ygZqDQfQi6Wj72w8haOuGdibqDa/Bnx2hpuAmMCY7i32y2Qq05kzFwN3sBh80ditU1KdbQE5mmeCFQnMt6DDNA8PxxVbi7G6VTJnRO+eZ+3yMjAxqVRsBUsycdW+jXPkwF1RtOCaiMRrVfemnqpGhChFmmoNtdb53cA6F0H/7QBFmMCkJfAHCjN+Ro3A2KMIcaYPq4Zi7PmUWMfcwNxJXvOYV5qslbz+uRg+f4OJTAH9hrAQPojzUh8Elk49/iGfZ6rMUdTQE3Hr68AxCUHmle9FDFQqp+q0RxoWUxzLTw4K7d4wMmAnUbx/WLxO0CDQHuRA433IgbUvOLGN2PpB2orvDHhFWrZDgO7PE7i1UZ4zfIGGXuwrxqjbvnTAVut7V9KicmIIgI90DqiTKzNPX0KocscsLzYvNWPDSAAILMp0YBg+silmVZoncX0SA/9EoyU9rFYfQ5fIVuJSPoz1/L8Ya4H+XqN0Uh7yJRNpJrF3afFwK7ApyebDeg1+cmGz+xRNHBGqNfYq/YoGig0w/voUaAMl7w+eZNgyQCLPZqEHkjHA69PfryiwigZqFB/Z3ka+PS9zBv49A38BwAA//+PREyqAAAABklEQVQDAJH+TnAyO6DCAAAAAElFTkSuQmCC\"}]}"]}}
@@ -0,0 +1 @@
1
+ {"modelVersion":2,"piskel":{"name":"rainbow-cow-blinking","description":"","fps":12,"height":48,"width":48,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAC50lEQVR4AeyYPZLUMBCF2yQUBfcg4BZcYrkBMRkJEQkZMTdgT0DGLQi4B1UUkdEnqz1tqzWSV96Z2SpP+Y1aLXXrPf15d57JE/8cAq69gMcKHCvQOQPHFuqcwO7wYwW6p7AzwbECnRPYHX6sQPcUdia4xAqMgaNFqG5+bDz2nKBXAMlqmAdLBv2TKdjnQD/aKS3wAdkqgKAZH8f3soaM/yTCDpfbMcf4560AmyPGnnLQL482nlYBJAImtM+EeDXDp/qQNQFkANlYTQSyqMkxfn0zGS3fZRED4ecEuMQJasJpGyy6W/LDq5+LtkVleH6qnkRAWhHbSwLOkt80+whJBCx5RiePKwLyxNGpAk9AgfyUiUEnq+8b4oAsX4ZvFBMgj0X5mcmmUsZawEXIQ4eJUHAL4Ytg5hVp5aK/8GUF7EOembMoDLyXWwVA3l0v9i1oGXCxFTQAMQ1bQbtvLVVAFgdpkDUUHC75Qt893ZkASIM9B9Fcw4dfau5WZgJ2y3yhRDchgO2nEM6MQidhOkPuGV0LGB5jmZUHpc3PewCM9/fiQSAOCCwAASP3cWjnJgrFIz/hbkeEJT7c3QnQkbGBilK/VyJAhpc/vLZNvsXLyIsMxAWkNsgls1qkvu4ERwFh37n7q5p51SGK4C268lvi6ybqEATYABtg14AAJa/lHBOX+iFXHyIs5oy+wXZZt3i+dR/qCKAsgpmIQs796VuMLjSErWQJxjHSOcAP8Gk09WBnExx8bf9SajIOngUJNoEbJeGF/I4HN5HLbiHy0gaC7ZIP/roAEgA6mzc0CQe9u20ZzpNkSKRFJMZJ+iACk/weQtuif6hnT3ULhQiSiCEfXPND2xbMgSuDHPI9/EgBUlv0JbtYtAgoBt9CQ7OAeJAfciNtUPku7DCwIcQ/A5cg+1deC9hC1uvbugLsRwsvV6/P5sduyucJINiiKdGiU71i82PXIwo9PAGFrrfpPgRce12OFbj2CvwHAAD//7rOgnEAAAAGSURBVAMAF6QgcGBcpGoAAAAASUVORK5CYIIA\"}]}"]}}
package/src/img/index.ts CHANGED
@@ -269,6 +269,15 @@ import cowVariation5 from './animals/cows/cow-variation-5.png?dataUri'
269
269
  import cowVariation6 from './animals/cows/cow-variation-6.png?dataUri'
270
270
  import cowVariation7 from './animals/cows/cow-variation-7.png?dataUri'
271
271
 
272
+ import cowVariation1Blinking from './animals/cows/cow-variation-1-blinking.png?dataUri'
273
+ import cowVariation2Blinking from './animals/cows/cow-variation-2-blinking.png?dataUri'
274
+ import cowVariation3Blinking from './animals/cows/cow-variation-3-blinking.png?dataUri'
275
+ import cowVariation4Blinking from './animals/cows/cow-variation-4-blinking.png?dataUri'
276
+ import cowVariation5Blinking from './animals/cows/cow-variation-5-blinking.png?dataUri'
277
+ import cowVariation6Blinking from './animals/cows/cow-variation-6-blinking.png?dataUri'
278
+ import cowVariation7Blinking from './animals/cows/cow-variation-7-blinking.png?dataUri'
279
+ import rainbowCowBlinking from './animals/cows/rainbow-cow-blinking.png'
280
+
272
281
  export { default as pixel } from './pixel.png?dataUri'
273
282
 
274
283
  export const plotStates = {
@@ -581,6 +590,8 @@ export const tools = {
581
590
  export const animals = {
582
591
  cow: {
583
592
  rainbow: rainbowCow,
593
+ rainbowBlinking: rainbowCowBlinking,
594
+
584
595
  variations: [
585
596
  cowVariation1,
586
597
  cowVariation2,
@@ -590,5 +601,15 @@ export const animals = {
590
601
  cowVariation6,
591
602
  cowVariation7,
592
603
  ],
604
+
605
+ blinkingVariations: [
606
+ cowVariation1Blinking,
607
+ cowVariation2Blinking,
608
+ cowVariation3Blinking,
609
+ cowVariation4Blinking,
610
+ cowVariation5Blinking,
611
+ cowVariation6Blinking,
612
+ cowVariation7Blinking,
613
+ ],
593
614
  },
594
615
  }
@@ -1,3 +1,5 @@
1
1
  // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
2
2
 
3
+ exports[`getCowImage > colors a blinking cow template image 1`] = `"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAB3RJTUUH4goFDRc7VmYGWwAAABl0RVh0Q29tbWVudABDcmVhdGVkIHdpdGggR0lNUFeBDhcAAAALSURBVAjXY2AAAgAABQAB4iYFmwAAAABJRU5ErkJggg=="`;
4
+
3
5
  exports[`getCowImage > colors a cow template image 1`] = `"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAB3RJTUUH4goFDRc7VmYGWwAAABl0RVh0Q29tbWVudABDcmVhdGVkIHdpdGggR0lNUFeBDhcAAAALSURBVAjXY2AAAgAABQAB4iYFmwAAAABJRU5ErkJggg=="`;
@@ -13,10 +13,24 @@ describe('getCowImage', () => {
13
13
  expect(image).toMatchSnapshot()
14
14
  })
15
15
 
16
+ test('colors a blinking cow template image', async () => {
17
+ const cow = generateCow({ color: cowColors.GREEN, id: '1' })
18
+ const image = await getCowImage(cow, { isBlinking: true })
19
+
20
+ expect(image).toMatchSnapshot()
21
+ })
22
+
16
23
  test('does not modify rainbow cow image', async () => {
17
24
  const cow = generateCow({ color: cowColors.RAINBOW })
18
25
  const image = await getCowImage(cow)
19
26
 
20
27
  expect(image).toEqual(animals.cow.rainbow)
21
28
  })
29
+
30
+ test('does not modify blinking rainbow cow image', async () => {
31
+ const cow = generateCow({ color: cowColors.RAINBOW })
32
+ const image = await getCowImage(cow, { isBlinking: true })
33
+
34
+ expect(image).toEqual(animals.cow.rainbowBlinking)
35
+ })
22
36
  })
@@ -37,8 +37,13 @@ const colorizeCowTemplate = (() => {
37
37
  * @param color
38
38
  * @returns Base64 representation of an image
39
39
  */
40
- return async (cowTemplate: string, color: cowColors) => {
41
- if (color === cowColors.RAINBOW) return animals.cow.rainbow
40
+ return async (
41
+ cowTemplate: string,
42
+ color: cowColors,
43
+ { isBlinking = false }: { isBlinking?: boolean } = {}
44
+ ) => {
45
+ if (color === cowColors.RAINBOW)
46
+ return isBlinking ? animals.cow.rainbowBlinking : animals.cow.rainbow
42
47
 
43
48
  const imageKey = `${color}_${cowTemplate}`
44
49
 
@@ -93,10 +98,19 @@ const colorizeCowTemplate = (() => {
93
98
  }
94
99
  })()
95
100
 
96
- export const getCowImage = async (cow: farmhand.cow): Promise<string> => {
101
+ export const getCowImage = async (
102
+ cow: farmhand.cow,
103
+ { isBlinking = false }: { isBlinking?: boolean } = {}
104
+ ): Promise<string> => {
97
105
  const cowIdNumber = convertStringToInteger(cow.id)
98
- const { variations } = animals.cow
99
- const cowTemplate = variations[cowIdNumber % variations.length]
100
106
 
101
- return await colorizeCowTemplate(cowTemplate, cow.color as cowColors)
107
+ const { variations, blinkingVariations } = animals.cow
108
+
109
+ const cowVariations = isBlinking ? blinkingVariations : variations
110
+
111
+ const cowTemplate = cowVariations[cowIdNumber % cowVariations.length]
112
+
113
+ return await colorizeCowTemplate(cowTemplate, cow.color as cowColors, {
114
+ isBlinking,
115
+ })
102
116
  }
@@ -0,0 +1,18 @@
1
+ import { carrot } from '../data/items.js'
2
+
3
+ import { getItemById } from './getItemById.js'
4
+
5
+ vitest.mock('../data/maps.js')
6
+ vitest.mock('../data/items.js')
7
+
8
+ describe('getItemById', () => {
9
+ test('returns the item for a known id', () => {
10
+ expect(getItemById('carrot')).toEqual(carrot)
11
+ })
12
+
13
+ test('throws an informative error for an unknown id', () => {
14
+ expect(() => getItemById('not-a-real-item')).toThrow(
15
+ 'Unknown item id: not-a-real-item'
16
+ )
17
+ })
18
+ })
@@ -0,0 +1,14 @@
1
+ import { itemsMap } from '../data/maps.js'
2
+
3
+ /**
4
+ * @throws If no item exists for the provided id.
5
+ */
6
+ export const getItemById = (id: string): farmhand.item => {
7
+ const item = itemsMap[id as keyof typeof itemsMap]
8
+
9
+ if (!item) {
10
+ throw new Error(`Unknown item id: ${id}`)
11
+ }
12
+
13
+ return item
14
+ }
@@ -64,9 +64,7 @@ export const getPlotImage = (
64
64
 
65
65
  if (getPlotContentType(plotContents) === itemType.WEED) {
66
66
  const weedColors = ['yellow', 'orange', 'pink']
67
- // TODO: Handle negative coordinates by using Math.abs(x * y) to avoid
68
- // negative modulo index.
69
- const color = weedColors[(x * y) % weedColors.length]
67
+ const color = weedColors[Math.abs(x * y) % weedColors.length]
70
68
 
71
69
  return (itemImages as Record<string, string>)[`weed-${color}`]
72
70
  }
@@ -27,6 +27,15 @@ describe('transformStateDataForImport', () => {
27
27
  expect(sanitizedState).toEqual(stateWithoutVersion)
28
28
  })
29
29
 
30
+ test('it does not throw if cowBreedingPen and cowInventory are missing', () => {
31
+ delete state.cowBreedingPen
32
+ delete state.cowInventory
33
+
34
+ const sanitizedState = transformStateDataForImport(state as any)
35
+
36
+ expect(sanitizedState.cowBreedingPen).toBeUndefined()
37
+ })
38
+
30
39
  test('it calculates experience from itemsSold if experience is 0', () => {
31
40
  state.experience = 0
32
41
  state.itemsSold = {
@@ -34,20 +34,17 @@ export const transformStateDataForImport = (
34
34
  // cowInventory, but at least one player's game somehow got into that state.
35
35
  // This block detects such an invalid state and corrects it.
36
36
  {
37
- // TODO: Add defensive check safeguards for sanitizedState.cowBreedingPen
38
- // and sanitizedState.cowInventory to prevent TypeError crashes during
39
- // corrupt/legacy state imports.
40
- const { cowId1, cowId2 } =
41
- sanitizedState.cowBreedingPen as farmhand.state['cowBreedingPen']
37
+ const { cowId1, cowId2 } = (sanitizedState.cowBreedingPen ?? {}) as Partial<
38
+ farmhand.state['cowBreedingPen']
39
+ >
42
40
 
43
- const cowPenIdMap = (sanitizedState.cowInventory as farmhand.cow[]).reduce(
44
- (acc: Record<string, farmhand.cow>, cow: farmhand.cow) => {
45
- acc[cow.id] = cow
41
+ const cowPenIdMap = (
42
+ (sanitizedState.cowInventory ?? []) as farmhand.cow[]
43
+ ).reduce((acc: Record<string, farmhand.cow>, cow: farmhand.cow) => {
44
+ acc[cow.id] = cow
46
45
 
47
- return acc
48
- },
49
- {}
50
- )
46
+ return acc
47
+ }, {})
51
48
 
52
49
  const isCowInBreedingPenMissingFromInventory = [cowId1, cowId2].some(
53
50
  cowId => {