From a830c8f28fbf67ee9c8e3aadcba4ea4278eed39e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jan 2024 10:58:08 -0600 Subject: [PATCH 1/3] chore(deps): bump follow-redirects from 1.15.2 to 1.15.4 (#472) Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.2 to 1.15.4. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.2...v1.15.4) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9fa01ddd7..50e27589f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15160,14 +15160,15 @@ "license": "ISC" }, "node_modules/follow-redirects": { - "version": "1.15.2", + "version": "1.15.4", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", + "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", "funding": [ { "type": "individual", "url": "https://github.com/sponsors/RubenVerborgh" } ], - "license": "MIT", "engines": { "node": ">=4.0" }, @@ -43270,7 +43271,9 @@ "dev": true }, "follow-redirects": { - "version": "1.15.2" + "version": "1.15.4", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", + "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==" }, "for-each": { "version": "0.3.3", From 71f78406fcaed235a9a94253c88446569bc83f42 Mon Sep 17 00:00:00 2001 From: Luke Stebner Date: Mon, 15 Jan 2024 19:11:17 -0800 Subject: [PATCH 2/3] feat: add the ability for crops to have more than 1 growing phase (#473) this change converts the `cropTimetable` property into a `cropTimeline` which allows for each crop to have a varying number of growing phases, each represented by a different image. the majority of crops have been updated with new art to take advantage of this new capability. this commit also has several updates to fix type warnings, and improve tests that were mocking crops and constants where it was not necessary. * refactor(types): fix all type errors for utils/index.js --------- Co-authored-by: Jeremy Kahn --- src/constants.js | 11 ++ src/data/__mocks__/items.js | 19 +-- src/data/crop.js | 12 +- src/data/crops/asparagus.js | 11 +- src/data/crops/carrot.js | 9 +- src/data/crops/corn.js | 11 +- src/data/crops/garlic.js | 11 +- src/data/crops/grape.js | 9 +- src/data/crops/jalapeno.js | 11 +- src/data/crops/olive.js | 11 +- src/data/crops/onion.js | 11 +- src/data/crops/pea.js | 11 +- src/data/crops/potato.js | 11 +- src/data/crops/pumpkin.js | 11 +- src/data/crops/soybean.js | 11 +- src/data/crops/spinach.js | 11 +- src/data/crops/strawberry.js | 11 +- src/data/crops/sunflower.js | 11 +- src/data/crops/sweet-potato.js | 11 +- src/data/crops/tomato.js | 11 +- src/data/crops/watermelon.js | 11 +- src/data/crops/wheat.js | 11 +- .../reducers/processWeather.test.js | 24 ++- src/game-logic/reducers/purchaseField.test.js | 30 ++-- src/img/index.js | 160 ++++++++++++------ src/img/items/asparagus-growing.piskel | 1 - src/img/items/asparagus-growing.png | Bin 419 -> 0 bytes src/img/items/asparagus-growing1.piskel | 1 + src/img/items/asparagus-growing1.png | Bin 0 -> 222 bytes src/img/items/asparagus-growing2.piskel | 1 + src/img/items/asparagus-growing2.png | Bin 0 -> 333 bytes src/img/items/asparagus-growing3.piskel | 1 + src/img/items/asparagus-growing3.png | Bin 0 -> 390 bytes src/img/items/asparagus.piskel | 2 +- src/img/items/asparagus.png | Bin 460 -> 421 bytes src/img/items/carrot-growing.piskel | 1 - src/img/items/carrot-growing.png | Bin 193 -> 0 bytes src/img/items/carrot-growing1.piskel | 1 + src/img/items/carrot-growing1.png | Bin 0 -> 151 bytes src/img/items/carrot-growing2.piskel | 1 + src/img/items/carrot-growing2.png | Bin 0 -> 179 bytes src/img/items/carrot-growing3.piskel | 1 + src/img/items/carrot-growing3.png | Bin 0 -> 185 bytes src/img/items/corn-growing.piskel | 1 - src/img/items/corn-growing.png | Bin 261 -> 0 bytes src/img/items/corn-growing1.piskel | 1 + src/img/items/corn-growing1.png | Bin 0 -> 152 bytes src/img/items/corn-growing2.piskel | 1 + src/img/items/corn-growing2.png | Bin 0 -> 206 bytes src/img/items/corn-growing3.piskel | 1 + src/img/items/corn-growing3.png | Bin 0 -> 279 bytes src/img/items/corn-growing4.piskel | 1 + src/img/items/corn-growing4.png | Bin 0 -> 303 bytes src/img/items/corn-growing5.piskel | 1 + src/img/items/corn-growing5.png | Bin 0 -> 321 bytes src/img/items/corn.piskel | 2 +- src/img/items/corn.png | Bin 350 -> 506 bytes src/img/items/garlic-growing.piskel | 1 - src/img/items/garlic-growing.png | Bin 300 -> 0 bytes src/img/items/garlic-growing1.piskel | 1 + src/img/items/garlic-growing1.png | Bin 0 -> 129 bytes src/img/items/garlic-growing2.piskel | 1 + src/img/items/garlic-growing2.png | Bin 0 -> 227 bytes src/img/items/garlic-growing3.piskel | 1 + src/img/items/garlic-growing3.png | Bin 0 -> 258 bytes ...ing.piskel => grape-green-growing1.piskel} | 0 ...n-growing.png => grape-green-growing1.png} | Bin ...ng.piskel => grape-purple-growing1.piskel} | 0 ...-growing.png => grape-purple-growing1.png} | Bin src/img/items/jalapeno-growing.piskel | 1 - src/img/items/jalapeno-growing.png | Bin 252 -> 0 bytes src/img/items/jalapeno-growing1.piskel | 1 + src/img/items/jalapeno-growing1.png | Bin 0 -> 252 bytes src/img/items/jalapeno-growing2.piskel | 1 + src/img/items/jalapeno-growing2.png | Bin 0 -> 312 bytes src/img/items/jalapeno-growing3.piskel | 1 + src/img/items/jalapeno-growing3.png | Bin 0 -> 345 bytes src/img/items/jalapeno.piskel | 2 +- src/img/items/jalapeno.png | Bin 263 -> 297 bytes ...e-growing.piskel => olive-growing1.piskel} | 0 .../{olive-growing.png => olive-growing1.png} | Bin src/img/items/olive.piskel | 2 +- src/img/items/olive.png | Bin 432 -> 432 bytes src/img/items/onion-growing.piskel | 1 - src/img/items/onion-growing.png | Bin 237 -> 0 bytes src/img/items/onion-growing1.piskel | 1 + src/img/items/onion-growing1.png | Bin 0 -> 146 bytes src/img/items/onion-growing2.piskel | 1 + src/img/items/onion-growing2.png | Bin 0 -> 210 bytes src/img/items/onion-growing3.piskel | 1 + src/img/items/onion-growing3.png | Bin 0 -> 297 bytes src/img/items/onion.piskel | 2 +- src/img/items/onion.png | Bin 305 -> 306 bytes ...pea-growing.piskel => pea-growing1.piskel} | 0 .../{pea-growing.png => pea-growing1.png} | Bin src/img/items/potato-growing.piskel | 1 - src/img/items/potato-growing.png | Bin 246 -> 0 bytes src/img/items/potato-growing1.piskel | 1 + src/img/items/potato-growing1.png | Bin 0 -> 222 bytes src/img/items/potato-growing2.piskel | 1 + src/img/items/potato-growing2.png | Bin 0 -> 323 bytes src/img/items/potato-growing3.piskel | 1 + src/img/items/potato-growing3.png | Bin 0 -> 381 bytes src/img/items/pumpkin-growing.piskel | 1 - src/img/items/pumpkin-growing.png | Bin 222 -> 0 bytes src/img/items/pumpkin-growing1.piskel | 1 + src/img/items/pumpkin-growing1.png | Bin 0 -> 189 bytes src/img/items/pumpkin-growing2.piskel | 1 + src/img/items/pumpkin-growing2.png | Bin 0 -> 276 bytes src/img/items/pumpkin-growing3.piskel | 1 + src/img/items/pumpkin-growing3.png | Bin 0 -> 276 bytes src/img/items/pumpkin-growing4.piskel | 1 + src/img/items/pumpkin-growing4.png | Bin 0 -> 306 bytes src/img/items/pumpkin-growing5.piskel | 1 + src/img/items/pumpkin-growing5.png | Bin 0 -> 312 bytes ...growing.piskel => soybean-growing1.piskel} | 0 ...ybean-growing.png => soybean-growing1.png} | Bin ...growing.piskel => spinach-growing1.piskel} | 0 ...inach-growing.png => spinach-growing1.png} | Bin ...wing.piskel => strawberry-growing1.piskel} | 0 ...ry-growing.png => strawberry-growing1.png} | Bin src/img/items/sunflower-growing.piskel | 1 - src/img/items/sunflower-growing.png | Bin 309 -> 0 bytes src/img/items/sunflower-growing1.piskel | 1 + src/img/items/sunflower-growing1.png | Bin 0 -> 175 bytes src/img/items/sunflower-growing2.piskel | 1 + src/img/items/sunflower-growing2.png | Bin 0 -> 183 bytes src/img/items/sunflower-growing3.piskel | 1 + src/img/items/sunflower-growing3.png | Bin 0 -> 239 bytes src/img/items/sunflower-growing4.piskel | 1 + src/img/items/sunflower-growing4.png | Bin 0 -> 279 bytes src/img/items/sunflower-growing5.piskel | 1 + src/img/items/sunflower-growing5.png | Bin 0 -> 313 bytes src/img/items/sweet-potato-growing.piskel | 1 - src/img/items/sweet-potato-growing.png | Bin 324 -> 0 bytes src/img/items/sweet-potato-growing1.piskel | 1 + src/img/items/sweet-potato-growing1.png | Bin 0 -> 333 bytes src/img/items/sweet-potato-growing2.piskel | 1 + src/img/items/sweet-potato-growing2.png | Bin 0 -> 357 bytes src/img/items/sweet-potato-growing3.piskel | 1 + src/img/items/sweet-potato-growing3.png | Bin 0 -> 387 bytes src/img/items/sweet-potato-growing4.piskel | 1 + src/img/items/sweet-potato-growing4.png | Bin 0 -> 378 bytes src/img/items/sweet-potato.piskel | 2 +- src/img/items/sweet-potato.png | Bin 294 -> 291 bytes src/img/items/tomato-growing.piskel | 1 - src/img/items/tomato-growing.png | Bin 165 -> 0 bytes src/img/items/tomato-growing1.piskel | 1 + src/img/items/tomato-growing1.png | Bin 0 -> 172 bytes src/img/items/tomato-growing2.piskel | 1 + src/img/items/tomato-growing2.png | Bin 0 -> 215 bytes src/img/items/tomato-growing3.piskel | 1 + src/img/items/tomato-growing3.png | Bin 0 -> 270 bytes src/img/items/tomato-growing4.piskel | 1 + src/img/items/tomato-growing4.png | Bin 0 -> 324 bytes src/img/items/tomato-growing5.piskel | 1 + src/img/items/tomato-growing5.png | Bin 0 -> 339 bytes src/img/items/tomato-growing6.piskel | 1 + src/img/items/tomato-growing6.png | Bin 0 -> 345 bytes src/img/items/tomato.piskel | 2 +- src/img/items/tomato.png | Bin 215 -> 319 bytes ...wing.piskel => watermelon-growing1.piskel} | 0 ...on-growing.png => watermelon-growing1.png} | Bin ...t-growing.piskel => wheat-growing1.piskel} | 0 .../{wheat-growing.png => wheat-growing1.png} | Bin src/index.js | 17 +- src/scripts/generate-crop-table.js | 5 +- src/utils/getCropLifecycleDuration.js | 12 +- src/utils/getCropLifecycleDuration.test.js | 6 +- src/utils/index.js | 63 +++++-- src/utils/index.test.js | 112 ++++++------ 171 files changed, 402 insertions(+), 342 deletions(-) delete mode 100644 src/img/items/asparagus-growing.piskel delete mode 100644 src/img/items/asparagus-growing.png create mode 100644 src/img/items/asparagus-growing1.piskel create mode 100644 src/img/items/asparagus-growing1.png create mode 100644 src/img/items/asparagus-growing2.piskel create mode 100644 src/img/items/asparagus-growing2.png create mode 100644 src/img/items/asparagus-growing3.piskel create mode 100644 src/img/items/asparagus-growing3.png delete mode 100644 src/img/items/carrot-growing.piskel delete mode 100644 src/img/items/carrot-growing.png create mode 100644 src/img/items/carrot-growing1.piskel create mode 100644 src/img/items/carrot-growing1.png create mode 100644 src/img/items/carrot-growing2.piskel create mode 100644 src/img/items/carrot-growing2.png create mode 100644 src/img/items/carrot-growing3.piskel create mode 100644 src/img/items/carrot-growing3.png delete mode 100644 src/img/items/corn-growing.piskel delete mode 100644 src/img/items/corn-growing.png create mode 100644 src/img/items/corn-growing1.piskel create mode 100644 src/img/items/corn-growing1.png create mode 100644 src/img/items/corn-growing2.piskel create mode 100644 src/img/items/corn-growing2.png create mode 100644 src/img/items/corn-growing3.piskel create mode 100644 src/img/items/corn-growing3.png create mode 100644 src/img/items/corn-growing4.piskel create mode 100644 src/img/items/corn-growing4.png create mode 100644 src/img/items/corn-growing5.piskel create mode 100644 src/img/items/corn-growing5.png delete mode 100644 src/img/items/garlic-growing.piskel delete mode 100644 src/img/items/garlic-growing.png create mode 100644 src/img/items/garlic-growing1.piskel create mode 100644 src/img/items/garlic-growing1.png create mode 100644 src/img/items/garlic-growing2.piskel create mode 100644 src/img/items/garlic-growing2.png create mode 100644 src/img/items/garlic-growing3.piskel create mode 100644 src/img/items/garlic-growing3.png rename src/img/items/{grape-green-growing.piskel => grape-green-growing1.piskel} (100%) rename src/img/items/{grape-green-growing.png => grape-green-growing1.png} (100%) rename src/img/items/{grape-purple-growing.piskel => grape-purple-growing1.piskel} (100%) rename src/img/items/{grape-purple-growing.png => grape-purple-growing1.png} (100%) delete mode 100644 src/img/items/jalapeno-growing.piskel delete mode 100644 src/img/items/jalapeno-growing.png create mode 100644 src/img/items/jalapeno-growing1.piskel create mode 100644 src/img/items/jalapeno-growing1.png create mode 100644 src/img/items/jalapeno-growing2.piskel create mode 100644 src/img/items/jalapeno-growing2.png create mode 100644 src/img/items/jalapeno-growing3.piskel create mode 100644 src/img/items/jalapeno-growing3.png rename src/img/items/{olive-growing.piskel => olive-growing1.piskel} (100%) rename src/img/items/{olive-growing.png => olive-growing1.png} (100%) delete mode 100644 src/img/items/onion-growing.piskel delete mode 100644 src/img/items/onion-growing.png create mode 100644 src/img/items/onion-growing1.piskel create mode 100644 src/img/items/onion-growing1.png create mode 100644 src/img/items/onion-growing2.piskel create mode 100644 src/img/items/onion-growing2.png create mode 100644 src/img/items/onion-growing3.piskel create mode 100644 src/img/items/onion-growing3.png rename src/img/items/{pea-growing.piskel => pea-growing1.piskel} (100%) rename src/img/items/{pea-growing.png => pea-growing1.png} (100%) delete mode 100644 src/img/items/potato-growing.piskel delete mode 100644 src/img/items/potato-growing.png create mode 100644 src/img/items/potato-growing1.piskel create mode 100644 src/img/items/potato-growing1.png create mode 100644 src/img/items/potato-growing2.piskel create mode 100644 src/img/items/potato-growing2.png create mode 100644 src/img/items/potato-growing3.piskel create mode 100644 src/img/items/potato-growing3.png delete mode 100644 src/img/items/pumpkin-growing.piskel delete mode 100644 src/img/items/pumpkin-growing.png create mode 100644 src/img/items/pumpkin-growing1.piskel create mode 100644 src/img/items/pumpkin-growing1.png create mode 100644 src/img/items/pumpkin-growing2.piskel create mode 100644 src/img/items/pumpkin-growing2.png create mode 100644 src/img/items/pumpkin-growing3.piskel create mode 100644 src/img/items/pumpkin-growing3.png create mode 100644 src/img/items/pumpkin-growing4.piskel create mode 100644 src/img/items/pumpkin-growing4.png create mode 100644 src/img/items/pumpkin-growing5.piskel create mode 100644 src/img/items/pumpkin-growing5.png rename src/img/items/{soybean-growing.piskel => soybean-growing1.piskel} (100%) rename src/img/items/{soybean-growing.png => soybean-growing1.png} (100%) rename src/img/items/{spinach-growing.piskel => spinach-growing1.piskel} (100%) rename src/img/items/{spinach-growing.png => spinach-growing1.png} (100%) rename src/img/items/{strawberry-growing.piskel => strawberry-growing1.piskel} (100%) rename src/img/items/{strawberry-growing.png => strawberry-growing1.png} (100%) delete mode 100644 src/img/items/sunflower-growing.piskel delete mode 100644 src/img/items/sunflower-growing.png create mode 100644 src/img/items/sunflower-growing1.piskel create mode 100644 src/img/items/sunflower-growing1.png create mode 100644 src/img/items/sunflower-growing2.piskel create mode 100644 src/img/items/sunflower-growing2.png create mode 100644 src/img/items/sunflower-growing3.piskel create mode 100644 src/img/items/sunflower-growing3.png create mode 100644 src/img/items/sunflower-growing4.piskel create mode 100644 src/img/items/sunflower-growing4.png create mode 100644 src/img/items/sunflower-growing5.piskel create mode 100644 src/img/items/sunflower-growing5.png delete mode 100644 src/img/items/sweet-potato-growing.piskel delete mode 100644 src/img/items/sweet-potato-growing.png create mode 100644 src/img/items/sweet-potato-growing1.piskel create mode 100644 src/img/items/sweet-potato-growing1.png create mode 100644 src/img/items/sweet-potato-growing2.piskel create mode 100644 src/img/items/sweet-potato-growing2.png create mode 100644 src/img/items/sweet-potato-growing3.piskel create mode 100644 src/img/items/sweet-potato-growing3.png create mode 100644 src/img/items/sweet-potato-growing4.piskel create mode 100644 src/img/items/sweet-potato-growing4.png delete mode 100644 src/img/items/tomato-growing.piskel delete mode 100644 src/img/items/tomato-growing.png create mode 100644 src/img/items/tomato-growing1.piskel create mode 100644 src/img/items/tomato-growing1.png create mode 100644 src/img/items/tomato-growing2.piskel create mode 100644 src/img/items/tomato-growing2.png create mode 100644 src/img/items/tomato-growing3.piskel create mode 100644 src/img/items/tomato-growing3.png create mode 100644 src/img/items/tomato-growing4.piskel create mode 100644 src/img/items/tomato-growing4.png create mode 100644 src/img/items/tomato-growing5.piskel create mode 100644 src/img/items/tomato-growing5.png create mode 100644 src/img/items/tomato-growing6.piskel create mode 100644 src/img/items/tomato-growing6.png rename src/img/items/{watermelon-growing.piskel => watermelon-growing1.piskel} (100%) rename src/img/items/{watermelon-growing.png => watermelon-growing1.png} (100%) rename src/img/items/{wheat-growing.piskel => wheat-growing1.piskel} (100%) rename src/img/items/{wheat-growing.png => wheat-growing1.png} (100%) diff --git a/src/constants.js b/src/constants.js index 916f16dad..75700c39a 100644 --- a/src/constants.js +++ b/src/constants.js @@ -3,6 +3,10 @@ * @ignore */ +/** + * @typedef {import('./index').farmhand.purchaseableFieldSize} farmhand.purchaseableFieldSize + */ + import { cowColors, fieldMode, stageFocusType, toolLevel } from './enums' const { freeze } = Object @@ -34,6 +38,9 @@ export const STORAGE_EXPANSION_SCALE_PREMIUM = 50 export const INITIAL_FIELD_WIDTH = 6 export const INITIAL_FIELD_HEIGHT = 10 +/** + * @type Map + */ export const PURCHASEABLE_FIELD_SIZES = freeze( new Map([ [1, { columns: 8, rows: 12, price: 1_000 }], @@ -42,6 +49,10 @@ export const PURCHASEABLE_FIELD_SIZES = freeze( ]) ) +export const LARGEST_PURCHASABLE_FIELD_SIZE = /** @type {farmhand.purchaseableFieldSize} */ (PURCHASEABLE_FIELD_SIZES.get( + PURCHASEABLE_FIELD_SIZES.size +)) + export const PURCHASEABLE_COMBINES = freeze( new Map([[1, { type: 'Basic', price: 500_000 }]]) ) diff --git a/src/data/__mocks__/items.js b/src/data/__mocks__/items.js index 0afa9da2e..d9eed4854 100644 --- a/src/data/__mocks__/items.js +++ b/src/data/__mocks__/items.js @@ -1,7 +1,5 @@ import { testItem } from '../../test-utils' -import { cropLifeStage, itemType } from '../../enums' - -const { SEED, GROWING } = cropLifeStage +import { itemType } from '../../enums' // Patch the original items data into the mock. This has the potential to break // with future versions of Webpack (keep an eye on @@ -87,10 +85,7 @@ export const sampleCropItem1 = testItem({ name: 'Sample Crop Item 1', type: itemType.CROP, value: 2, - cropTimetable: { - [SEED]: 1, - [GROWING]: 2, - }, + cropTimeline: [1, 2], }) export const sampleCropSeedsItem2 = testItem({ @@ -111,10 +106,7 @@ export const sampleCropItem2 = testItem({ name: 'Sample Crop Item 2', type: itemType.CROP, value: 3, - cropTimetable: { - [SEED]: 2, - [GROWING]: 3, - }, + cropTimeline: [2, 3], }) export const sampleCropSeedsItem3 = testItem({ @@ -134,10 +126,7 @@ export const sampleCropItem3 = testItem({ name: 'Sample Crop Item 3', type: itemType.CROP, value: 4, - cropTimetable: { - [SEED]: 5, - [GROWING]: 5, - }, + cropTimeline: [5, 5], }) export const sampleFieldTool1 = testItem({ diff --git a/src/data/crop.js b/src/data/crop.js index 140adc575..13d9a7bac 100644 --- a/src/data/crop.js +++ b/src/data/crop.js @@ -10,17 +10,17 @@ const { freeze } = Object * @returns {farmhand.item} */ export const crop = ({ - cropTimetable, + cropTimeline, growsInto, tier, isSeed = Boolean(growsInto), - cropLifecycleDuration = getCropLifecycleDuration({ cropTimetable }), + cropLifecycleDuration = getCropLifecycleDuration({ cropTimeline }), ...rest }) => freeze({ - cropTimetable, + cropTimeline, doesPriceFluctuate: true, tier, type: itemType.CROP, @@ -41,20 +41,20 @@ export const crop = ({ * @returns {farmhand.item} */ export const fromSeed = ( - { cropTimetable, cropType, growsInto, tier }, + { cropTimeline, cropType, growsInto, tier }, { variantIdx = 0, canBeFermented = false } = {} ) => { const variants = Array.isArray(growsInto) ? growsInto : [growsInto] return { - cropTimetable, + cropTimeline, cropType, doesPriceFluctuate: true, id: variants[variantIdx], tier, type: itemType.CROP, ...(canBeFermented && { - daysToFerment: getCropLifecycleDuration({ cropTimetable }) * tier, + daysToFerment: getCropLifecycleDuration({ cropTimeline }) * tier, }), } } diff --git a/src/data/crops/asparagus.js b/src/data/crops/asparagus.js index 2fc8ea2ea..a43f482fb 100644 --- a/src/data/crops/asparagus.js +++ b/src/data/crops/asparagus.js @@ -1,7 +1,7 @@ -import { crop, fromSeed } from '../crop' -import { cropLifeStage, cropType } from '../../enums' +/** @typedef {import('../../components/Farmhand/Farmhand').farmhand.item} farmhand.item */ -const { SEED, GROWING } = cropLifeStage +import { crop, fromSeed } from '../crop' +import { cropType } from '../../enums' /** * @property farmhand.module:items.asparagusSeed @@ -9,10 +9,7 @@ const { SEED, GROWING } = cropLifeStage */ export const asparagusSeed = crop({ cropType: cropType.ASPARAGUS, - cropTimetable: { - [SEED]: 4, - [GROWING]: 5, - }, + cropTimeline: [4, 2, 2, 1], growsInto: 'asparagus', id: 'asparagus-seed', name: 'Asparagus Seed', diff --git a/src/data/crops/carrot.js b/src/data/crops/carrot.js index 7e70a4d44..cb585bcd4 100644 --- a/src/data/crops/carrot.js +++ b/src/data/crops/carrot.js @@ -1,9 +1,7 @@ /** @typedef {import("../../index").farmhand.item} item */ import { crop, fromSeed } from '../crop' -import { cropLifeStage, cropType } from '../../enums' - -const { SEED, GROWING } = cropLifeStage +import { cropType } from '../../enums' /** * @property farmhand.module:items.carrotSeed @@ -11,10 +9,7 @@ const { SEED, GROWING } = cropLifeStage */ export const carrotSeed = crop({ cropType: cropType.CARROT, - cropTimetable: { - [SEED]: 2, - [GROWING]: 3, - }, + cropTimeline: [2, 1, 1, 1], growsInto: 'carrot', id: 'carrot-seed', name: 'Carrot Seed', diff --git a/src/data/crops/corn.js b/src/data/crops/corn.js index d8f9b1b52..00d1ed3b7 100644 --- a/src/data/crops/corn.js +++ b/src/data/crops/corn.js @@ -1,7 +1,7 @@ -import { crop, fromSeed } from '../crop' -import { cropLifeStage, cropType } from '../../enums' +/** @typedef {import('../../components/Farmhand/Farmhand').farmhand.item} farmhand.item */ -const { SEED, GROWING } = cropLifeStage +import { crop, fromSeed } from '../crop' +import { cropType } from '../../enums' /** * @property farmhand.module:items.cornSeed @@ -9,10 +9,7 @@ const { SEED, GROWING } = cropLifeStage */ export const cornSeed = crop({ cropType: cropType.CORN, - cropTimetable: { - [SEED]: 3, - [GROWING]: 7, - }, + cropTimeline: [3, 1, 1, 1, 2, 2], growsInto: 'corn', id: 'corn-seed', name: 'Corn Kernels', diff --git a/src/data/crops/garlic.js b/src/data/crops/garlic.js index 3a4a05809..db5f90924 100644 --- a/src/data/crops/garlic.js +++ b/src/data/crops/garlic.js @@ -1,7 +1,7 @@ -import { crop, fromSeed } from '../crop' -import { cropLifeStage, cropType } from '../../enums' +/** @typedef {import('../../components/Farmhand/Farmhand').farmhand.item} farmhand.item */ -const { SEED, GROWING } = cropLifeStage +import { crop, fromSeed } from '../crop' +import { cropType } from '../../enums' /** * @property farmhand.module:items.garlicSeed @@ -9,10 +9,7 @@ const { SEED, GROWING } = cropLifeStage */ export const garlicSeed = crop({ cropType: cropType.GARLIC, - cropTimetable: { - [SEED]: 2, - [GROWING]: 3, - }, + cropTimeline: [2, 1, 1, 1], growsInto: 'garlic', id: 'garlic-seed', name: 'Garlic Bulb', diff --git a/src/data/crops/grape.js b/src/data/crops/grape.js index dda086e11..0a64c7d5a 100644 --- a/src/data/crops/grape.js +++ b/src/data/crops/grape.js @@ -2,9 +2,7 @@ /** @typedef {import("../../index").farmhand.cropVariety} farmhand.cropVariety */ import { crop, fromSeed } from '../crop' -import { cropLifeStage, cropType } from '../../enums' - -const { SEED, GROWING } = cropLifeStage +import { cropType } from '../../enums' /** * @property farmhand.module:items.grapeSeed @@ -12,10 +10,7 @@ const { SEED, GROWING } = cropLifeStage */ export const grapeSeed = crop({ cropType: cropType.GRAPE, - cropTimetable: { - [SEED]: 3, - [GROWING]: 4, - }, + cropTimeline: [3, 4], growsInto: [ 'grape-chardonnay', 'grape-sauvignon-blanc', diff --git a/src/data/crops/jalapeno.js b/src/data/crops/jalapeno.js index 08c33f52d..28f6e9b6e 100644 --- a/src/data/crops/jalapeno.js +++ b/src/data/crops/jalapeno.js @@ -1,7 +1,7 @@ -import { crop, fromSeed } from '../crop' -import { cropLifeStage, cropType } from '../../enums' +/** @typedef {import('../../components/Farmhand/Farmhand').farmhand.item} farmhand.item */ -const { SEED, GROWING } = cropLifeStage +import { crop, fromSeed } from '../crop' +import { cropType } from '../../enums' /** * @property farmhand.module:items.jalapenoSeed @@ -9,10 +9,7 @@ const { SEED, GROWING } = cropLifeStage */ export const jalapenoSeed = crop({ cropType: cropType.JALAPENO, - cropTimetable: { - [SEED]: 2, - [GROWING]: 3, - }, + cropTimeline: [2, 1, 1, 1], growsInto: 'jalapeno', id: 'jalapeno-seed', name: 'Jalapeño Seed', diff --git a/src/data/crops/olive.js b/src/data/crops/olive.js index a6cc312ce..6e30f5f87 100644 --- a/src/data/crops/olive.js +++ b/src/data/crops/olive.js @@ -1,7 +1,7 @@ -import { crop, fromSeed } from '../crop' -import { cropLifeStage, cropType } from '../../enums' +/** @typedef {import('../../components/Farmhand/Farmhand').farmhand.item} farmhand.item */ -const { SEED, GROWING } = cropLifeStage +import { crop, fromSeed } from '../crop' +import { cropType } from '../../enums' /** * @property farmhand.module:items.oliveSeed @@ -9,10 +9,7 @@ const { SEED, GROWING } = cropLifeStage */ export const oliveSeed = crop({ cropType: cropType.OLIVE, - cropTimetable: { - [SEED]: 3, - [GROWING]: 6, - }, + cropTimeline: [3, 6], growsInto: 'olive', id: 'olive-seed', name: 'Olive Seed', diff --git a/src/data/crops/onion.js b/src/data/crops/onion.js index d280936d9..a1afebd21 100644 --- a/src/data/crops/onion.js +++ b/src/data/crops/onion.js @@ -1,7 +1,7 @@ -import { crop, fromSeed } from '../crop' -import { cropLifeStage, cropType } from '../../enums' +/** @typedef {import('../../components/Farmhand/Farmhand').farmhand.item} farmhand.item */ -const { SEED, GROWING } = cropLifeStage +import { crop, fromSeed } from '../crop' +import { cropType } from '../../enums' /** * @property farmhand.module:items.onionSeed @@ -9,10 +9,7 @@ const { SEED, GROWING } = cropLifeStage */ export const onionSeed = crop({ cropType: cropType.ONION, - cropTimetable: { - [SEED]: 3, - [GROWING]: 4, - }, + cropTimeline: [3, 1, 2, 1], growsInto: 'onion', id: 'onion-seed', name: 'Onion Seeds', diff --git a/src/data/crops/pea.js b/src/data/crops/pea.js index a56646967..767f3b67c 100644 --- a/src/data/crops/pea.js +++ b/src/data/crops/pea.js @@ -1,7 +1,7 @@ -import { crop, fromSeed } from '../crop' -import { cropLifeStage, cropType } from '../../enums' +/** @typedef {import("../../index").farmhand.item} farmhand.item */ -const { SEED, GROWING } = cropLifeStage +import { crop, fromSeed } from '../crop' +import { cropType } from '../../enums' /** * @property farmhand.module:items.peaSeed @@ -9,10 +9,7 @@ const { SEED, GROWING } = cropLifeStage */ export const peaSeed = crop({ cropType: cropType.PEA, - cropTimetable: { - [SEED]: 2, - [GROWING]: 3, - }, + cropTimeline: [2, 3], growsInto: 'pea', id: 'pea-seed', name: 'Pea Seed', diff --git a/src/data/crops/potato.js b/src/data/crops/potato.js index 01e2aadf0..39db04548 100644 --- a/src/data/crops/potato.js +++ b/src/data/crops/potato.js @@ -1,7 +1,7 @@ -import { crop, fromSeed } from '../crop' -import { cropLifeStage, cropType } from '../../enums' +/** @typedef {import('../../components/Farmhand/Farmhand').farmhand.item} farmhand.item */ -const { SEED, GROWING } = cropLifeStage +import { crop, fromSeed } from '../crop' +import { cropType } from '../../enums' /** * @property farmhand.module:items.potatoSeed @@ -9,10 +9,7 @@ const { SEED, GROWING } = cropLifeStage */ export const potatoSeed = crop({ cropType: cropType.POTATO, - cropTimetable: { - [SEED]: 2, - [GROWING]: 3, - }, + cropTimeline: [2, 1, 1, 1], growsInto: 'potato', id: 'potato-seed', name: 'Potato Seeds', diff --git a/src/data/crops/pumpkin.js b/src/data/crops/pumpkin.js index 4799cadec..883e6d1ba 100644 --- a/src/data/crops/pumpkin.js +++ b/src/data/crops/pumpkin.js @@ -1,7 +1,7 @@ -import { crop, fromSeed } from '../crop' -import { cropLifeStage, cropType } from '../../enums' +/** @typedef {import('../../components/Farmhand/Farmhand').farmhand.item} farmhand.item */ -const { SEED, GROWING } = cropLifeStage +import { crop, fromSeed } from '../crop' +import { cropType } from '../../enums' /** * @property farmhand.module:items.pumpkinSeed @@ -9,10 +9,7 @@ const { SEED, GROWING } = cropLifeStage */ export const pumpkinSeed = crop({ cropType: cropType.PUMPKIN, - cropTimetable: { - [SEED]: 3, - [GROWING]: 5, - }, + cropTimeline: [3, 1, 1, 1, 1, 1], growsInto: 'pumpkin', id: 'pumpkin-seed', name: 'Pumpkin Seed', diff --git a/src/data/crops/soybean.js b/src/data/crops/soybean.js index 12aab473c..b7645969d 100644 --- a/src/data/crops/soybean.js +++ b/src/data/crops/soybean.js @@ -1,7 +1,7 @@ -import { crop, fromSeed } from '../crop' -import { cropLifeStage, cropType } from '../../enums' +/** @typedef {import('../../components/Farmhand/Farmhand').farmhand.item} farmhand.item */ -const { SEED, GROWING } = cropLifeStage +import { crop, fromSeed } from '../crop' +import { cropType } from '../../enums' /** * @property farmhand.module:items.soybeanSeed @@ -9,10 +9,7 @@ const { SEED, GROWING } = cropLifeStage */ export const soybeanSeed = crop({ cropType: cropType.SOYBEAN, - cropTimetable: { - [SEED]: 2, - [GROWING]: 2, - }, + cropTimeline: [2, 2], growsInto: 'soybean', id: 'soybean-seed', name: 'Soybean Seeds', diff --git a/src/data/crops/spinach.js b/src/data/crops/spinach.js index d25419e6d..804d266ba 100644 --- a/src/data/crops/spinach.js +++ b/src/data/crops/spinach.js @@ -1,7 +1,7 @@ -import { crop, fromSeed } from '../crop' -import { cropLifeStage, cropType } from '../../enums' +/** @typedef {import('../../components/Farmhand/Farmhand').farmhand.item} farmhand.item */ -const { SEED, GROWING } = cropLifeStage +import { crop, fromSeed } from '../crop' +import { cropType } from '../../enums' /** * @property farmhand.module:items.spinachSeed @@ -9,10 +9,7 @@ const { SEED, GROWING } = cropLifeStage */ export const spinachSeed = crop({ cropType: cropType.SPINACH, - cropTimetable: { - [SEED]: 2, - [GROWING]: 4, - }, + cropTimeline: [2, 4], growsInto: 'spinach', id: 'spinach-seed', name: 'Spinach Seed', diff --git a/src/data/crops/strawberry.js b/src/data/crops/strawberry.js index e0114b1b2..6c6daf08b 100644 --- a/src/data/crops/strawberry.js +++ b/src/data/crops/strawberry.js @@ -1,7 +1,7 @@ -import { crop, fromSeed } from '../crop' -import { cropLifeStage, cropType } from '../../enums' +/** @typedef {import("../../index").farmhand.item} item */ -const { SEED, GROWING } = cropLifeStage +import { crop, fromSeed } from '../crop' +import { cropType } from '../../enums' /** * @property farmhand.module:items.strawberrySeed @@ -9,10 +9,7 @@ const { SEED, GROWING } = cropLifeStage */ export const strawberrySeed = crop({ cropType: cropType.STRAWBERRY, - cropTimetable: { - [SEED]: 6, - [GROWING]: 2, - }, + cropTimeline: [6, 2], growsInto: 'strawberry', id: 'strawberry-seed', name: 'Strawberry Seed', diff --git a/src/data/crops/sunflower.js b/src/data/crops/sunflower.js index b0b4828fc..69d2eccff 100644 --- a/src/data/crops/sunflower.js +++ b/src/data/crops/sunflower.js @@ -1,7 +1,7 @@ -import { crop, fromSeed } from '../crop' -import { cropLifeStage, cropType } from '../../enums' +/** @typedef {import('../../components/Farmhand/Farmhand').farmhand.item} farmhand.item */ -const { SEED, GROWING } = cropLifeStage +import { crop, fromSeed } from '../crop' +import { cropType } from '../../enums' /** * @property farmhand.module:items.sunflowerSeed @@ -9,10 +9,7 @@ const { SEED, GROWING } = cropLifeStage */ export const sunflowerSeed = crop({ cropType: cropType.SUNFLOWER, - cropTimetable: { - [SEED]: 3, - [GROWING]: 3, - }, + cropTimeline: [1, 1, 1, 1, 1, 1], growsInto: 'sunflower', id: 'sunflower-seed', name: 'Sunflower Seed', diff --git a/src/data/crops/sweet-potato.js b/src/data/crops/sweet-potato.js index c3c80e51a..a879da993 100644 --- a/src/data/crops/sweet-potato.js +++ b/src/data/crops/sweet-potato.js @@ -1,7 +1,7 @@ -import { crop, fromSeed } from '../crop' -import { cropLifeStage, cropType } from '../../enums' +/** @typedef {import('../../components/Farmhand/Farmhand').farmhand.item} farmhand.item */ -const { SEED, GROWING } = cropLifeStage +import { crop, fromSeed } from '../crop' +import { cropType } from '../../enums' /** * @property farmhand.module:items.sweetPotatoSeed @@ -9,10 +9,7 @@ const { SEED, GROWING } = cropLifeStage */ export const sweetPotatoSeed = crop({ cropType: cropType.SWEET_POTATO, - cropTimetable: { - [SEED]: 2, - [GROWING]: 6, - }, + cropTimeline: [2, 1, 1, 2, 2], growsInto: 'sweet-potato', id: 'sweet-potato-seed', name: 'Sweet Potato Slip', diff --git a/src/data/crops/tomato.js b/src/data/crops/tomato.js index bd52de735..b95b7c9e1 100644 --- a/src/data/crops/tomato.js +++ b/src/data/crops/tomato.js @@ -1,7 +1,7 @@ -import { crop, fromSeed } from '../crop' -import { cropLifeStage, cropType } from '../../enums' +/** @typedef {import('../../components/Farmhand/Farmhand').farmhand.item} farmhand.item */ -const { SEED, GROWING } = cropLifeStage +import { crop, fromSeed } from '../crop' +import { cropType } from '../../enums' /** * @property farmhand.module:items.tomatoSeed @@ -9,10 +9,7 @@ const { SEED, GROWING } = cropLifeStage */ export const tomatoSeed = crop({ cropType: cropType.TOMATO, - cropTimetable: { - [SEED]: 5, - [GROWING]: 6, - }, + cropTimeline: [2, 1, 1, 1, 2, 2, 2], growsInto: 'tomato', id: 'tomato-seed', name: 'Tomato Seeds', diff --git a/src/data/crops/watermelon.js b/src/data/crops/watermelon.js index c348c8d26..8fa194060 100644 --- a/src/data/crops/watermelon.js +++ b/src/data/crops/watermelon.js @@ -1,7 +1,7 @@ -import { crop, fromSeed } from '../crop' -import { cropLifeStage, cropType } from '../../enums' +/** @typedef {import("../../index").farmhand.item} item */ -const { SEED, GROWING } = cropLifeStage +import { crop, fromSeed } from '../crop' +import { cropType } from '../../enums' /** * @property farmhand.module:items.watermelonSeed @@ -9,10 +9,7 @@ const { SEED, GROWING } = cropLifeStage */ export const watermelonSeed = crop({ cropType: cropType.WATERMELON, - cropTimetable: { - [SEED]: 2, - [GROWING]: 10, - }, + cropTimeline: [2, 10], growsInto: 'watermelon', id: 'watermelon-seed', name: 'Watermelon Seed', diff --git a/src/data/crops/wheat.js b/src/data/crops/wheat.js index 380679ad8..3b79fd9dc 100644 --- a/src/data/crops/wheat.js +++ b/src/data/crops/wheat.js @@ -1,7 +1,7 @@ -import { crop, fromSeed } from '../crop' -import { cropLifeStage, cropType } from '../../enums' +/** @typedef {import('../../components/Farmhand/Farmhand').farmhand.item} farmhand.item */ -const { SEED, GROWING } = cropLifeStage +import { crop, fromSeed } from '../crop' +import { cropType } from '../../enums' /** * @property farmhand.module:items.wheatSeed @@ -9,10 +9,7 @@ const { SEED, GROWING } = cropLifeStage */ export const wheatSeed = crop({ cropType: cropType.WHEAT, - cropTimetable: { - [SEED]: 1, - [GROWING]: 1, - }, + cropTimeline: [1, 1], growsInto: 'wheat', id: 'wheat-seed', name: 'Wheat Seeds', diff --git a/src/game-logic/reducers/processWeather.test.js b/src/game-logic/reducers/processWeather.test.js index bfe72bcea..e7175343b 100644 --- a/src/game-logic/reducers/processWeather.test.js +++ b/src/game-logic/reducers/processWeather.test.js @@ -1,17 +1,18 @@ import { testCrop } from '../../test-utils' -jest.mock('../../data/maps') +import { shouldPrecipitateToday } from '../../utils' + +import { processWeather } from './processWeather' -// TODO: Dependency-inject external constants rather than mocking them out. +jest.mock('../../data/maps') +jest.mock('../../utils', () => ({ + ...jest.requireActual('../../utils'), + shouldPrecipitateToday: jest.fn(), +})) describe('processWeather', () => { test('does not water plants when there is no precipitation', () => { - jest.resetModules() - jest.mock('../../constants', () => ({ - PRECIPITATION_CHANCE: 0, - })) - - const { processWeather } = jest.requireActual('./processWeather') + shouldPrecipitateToday.mockReturnValue(false) const state = processWeather({ field: [[testCrop()]], @@ -22,12 +23,7 @@ describe('processWeather', () => { }) test('does water plants on a rainy day', () => { - jest.resetModules() - jest.mock('../../constants', () => ({ - PRECIPITATION_CHANCE: 1, - })) - - const { processWeather } = jest.requireActual('./processWeather') + shouldPrecipitateToday.mockReturnValue(true) const state = processWeather({ field: [[testCrop()]], diff --git a/src/game-logic/reducers/purchaseField.test.js b/src/game-logic/reducers/purchaseField.test.js index 7c4edca8b..eee0eac5d 100644 --- a/src/game-logic/reducers/purchaseField.test.js +++ b/src/game-logic/reducers/purchaseField.test.js @@ -1,5 +1,5 @@ import { testCrop } from '../../test-utils' -import { EXPERIENCE_VALUES } from '../../constants' +import { EXPERIENCE_VALUES, PURCHASEABLE_FIELD_SIZES } from '../../constants' import { purchaseField } from './purchaseField' @@ -27,15 +27,16 @@ describe('purchaseField', () => { describe('field expansion', () => { test('field expands without destroying existing data', () => { - jest.resetModules() - jest.mock('../../constants', () => ({ - EXPERIENCE_VALUES: {}, - PURCHASEABLE_FIELD_SIZES: new Map([ - [1, { columns: 3, rows: 4, price: 1000 }], - ]), - })) + const expectedField = [] + const fieldSize = PURCHASEABLE_FIELD_SIZES.get(1) - const { purchaseField } = jest.requireActual('./purchaseField') + for (let y = 0; y < fieldSize.rows; y++) { + const row = [] + for (let x = 0; x < fieldSize.columns; x++) { + row.push(null) + } + expectedField.push(row) + } const { field } = purchaseField( { @@ -46,12 +47,11 @@ describe('purchaseField', () => { }, 1 ) - expect(field).toEqual([ - [testCrop(), null, null], - [null, testCrop(), null], - [null, null, null], - [null, null, null], - ]) + + expectedField[0][0] = testCrop() + expectedField[1][1] = testCrop() + + expect(field).toEqual(expectedField) }) }) }) diff --git a/src/img/index.js b/src/img/index.js index 5c362250f..8a1859f9c 100644 --- a/src/img/index.js +++ b/src/img/index.js @@ -40,64 +40,96 @@ import vegetableOil from './dishes/vegetable-oil.png' // Crops import asparagus from './items/asparagus.png' -import asparagusGrowing from './items/asparagus-growing.png' +import asparagusGrowing1 from './items/asparagus-growing1.png' +import asparagusGrowing2 from './items/asparagus-growing2.png' +import asparagusGrowing3 from './items/asparagus-growing3.png' import asparagusSeed from './items/asparagus-seed.png' import carrot from './items/carrot.png' -import carrotGrowing from './items/carrot-growing.png' +import carrotGrowing1 from './items/carrot-growing1.png' +import carrotGrowing2 from './items/carrot-growing2.png' +import carrotGrowing3 from './items/carrot-growing3.png' import carrotSeed from './items/carrot-seed.png' import garlic from './items/garlic.png' -import garlicGrowing from './items/garlic-growing.png' +import garlicGrowing1 from './items/garlic-growing1.png' +import garlicGrowing2 from './items/garlic-growing2.png' +import garlicGrowing3 from './items/garlic-growing3.png' import garlicSeed from './items/garlic-seed.png' import grapeSeed from './items/grape-seed.png' -import grapeGreenGrowing from './items/grape-green-growing.png' -import grapePurpleGrowing from './items/grape-purple-growing.png' +import grapeGreenGrowing1 from './items/grape-green-growing1.png' +import grapePurpleGrowing1 from './items/grape-purple-growing1.png' import grapeGreen from './items/grape-green.png' import grapePurple from './items/grape-purple.png' import jalapeno from './items/jalapeno.png' -import jalapenoGrowing from './items/jalapeno-growing.png' +import jalapenoGrowing1 from './items/jalapeno-growing1.png' +import jalapenoGrowing2 from './items/jalapeno-growing2.png' +import jalapenoGrowing3 from './items/jalapeno-growing3.png' import jalapenoSeed from './items/jalapeno-seed.png' import pea from './items/pea.png' -import peaGrowing from './items/pea-growing.png' +import peaGrowing1 from './items/pea-growing1.png' import peaSeed from './items/pea-seed.png' import pumpkin from './items/pumpkin.png' -import pumpkinGrowing from './items/pumpkin-growing.png' +import pumpkinGrowing1 from './items/pumpkin-growing1.png' +import pumpkinGrowing2 from './items/pumpkin-growing2.png' +import pumpkinGrowing3 from './items/pumpkin-growing3.png' +import pumpkinGrowing4 from './items/pumpkin-growing4.png' +import pumpkinGrowing5 from './items/pumpkin-growing5.png' import pumpkinSeed from './items/pumpkin-seed.png' import spinach from './items/spinach.png' -import spinachGrowing from './items/spinach-growing.png' +import spinachGrowing1 from './items/spinach-growing1.png' import spinachSeed from './items/spinach-seed.png' import strawberry from './items/strawberry.png' -import strawberryGrowing from './items/strawberry-growing.png' +import strawberryGrowing1 from './items/strawberry-growing1.png' import strawberrySeed from './items/strawberry-seed.png' import compost from './items/compost.png' import corn from './items/corn.png' -import cornGrowing from './items/corn-growing.png' +import cornGrowing1 from './items/corn-growing1.png' +import cornGrowing2 from './items/corn-growing2.png' +import cornGrowing3 from './items/corn-growing3.png' +import cornGrowing4 from './items/corn-growing4.png' +import cornGrowing5 from './items/corn-growing5.png' import cornSeed from './items/corn-seed.png' import potato from './items/potato.png' -import potatoGrowing from './items/potato-growing.png' +import potatoGrowing1 from './items/potato-growing1.png' +import potatoGrowing2 from './items/potato-growing2.png' +import potatoGrowing3 from './items/potato-growing3.png' import potatoSeed from './items/potato-seed.png' import sweetPotato from './items/sweet-potato.png' -import sweetPotatoGrowing from './items/sweet-potato-growing.png' +import sweetPotatoGrowing1 from './items/sweet-potato-growing1.png' +import sweetPotatoGrowing2 from './items/sweet-potato-growing2.png' +import sweetPotatoGrowing3 from './items/sweet-potato-growing3.png' +import sweetPotatoGrowing4 from './items/sweet-potato-growing4.png' import sweetPotatoSeed from './items/sweet-potato-seed.png' import olive from './items/olive.png' -import oliveGrowing from './items/olive-growing.png' +import oliveGrowing1 from './items/olive-growing1.png' import oliveSeed from './items/olive-seed.png' import onion from './items/onion.png' -import onionGrowing from './items/onion-growing.png' +import onionGrowing1 from './items/onion-growing1.png' +import onionGrowing2 from './items/onion-growing2.png' +import onionGrowing3 from './items/onion-growing3.png' import onionSeed from './items/onion-seed.png' import soybean from './items/soybean.png' -import soybeanGrowing from './items/soybean-growing.png' +import soybeanGrowing1 from './items/soybean-growing1.png' import soybeanSeed from './items/soybean-seed.png' import sunflower from './items/sunflower.png' -import sunflowerGrowing from './items/sunflower-growing.png' +import sunflowerGrowing1 from './items/sunflower-growing1.png' +import sunflowerGrowing2 from './items/sunflower-growing2.png' +import sunflowerGrowing3 from './items/sunflower-growing3.png' +import sunflowerGrowing4 from './items/sunflower-growing4.png' +import sunflowerGrowing5 from './items/sunflower-growing5.png' import sunflowerSeed from './items/sunflower-seed.png' import watermelon from './items/watermelon.png' -import watermelonGrowing from './items/watermelon-growing.png' +import watermelonGrowing1 from './items/watermelon-growing1.png' import watermelonSeed from './items/watermelon-seed.png' import wheat from './items/wheat.png' -import wheatGrowing from './items/wheat-growing.png' +import wheatGrowing1 from './items/wheat-growing1.png' import wheatSeed from './items/wheat-seed.png' import tomato from './items/tomato.png' -import tomatoGrowing from './items/tomato-growing.png' +import tomatoGrowing1 from './items/tomato-growing1.png' +import tomatoGrowing2 from './items/tomato-growing2.png' +import tomatoGrowing3 from './items/tomato-growing3.png' +import tomatoGrowing4 from './items/tomato-growing4.png' +import tomatoGrowing5 from './items/tomato-growing5.png' +import tomatoGrowing6 from './items/tomato-growing6.png' import tomatoSeed from './items/tomato-seed.png' import fertilizer from './items/fertilizer.png' import rainbowFertilizer from './items/rainbow-fertilizer.png' @@ -230,89 +262,121 @@ export const craftedItems = { export const items = { // Crops asparagus, - 'asparagus-growing': asparagusGrowing, + 'asparagus-growing-1': asparagusGrowing1, + 'asparagus-growing-2': asparagusGrowing2, + 'asparagus-growing-3': asparagusGrowing3, 'asparagus-seed': asparagusSeed, carrot, - 'carrot-growing': carrotGrowing, + 'carrot-growing-1': carrotGrowing1, + 'carrot-growing-2': carrotGrowing2, + 'carrot-growing-3': carrotGrowing3, 'carrot-seed': carrotSeed, garlic, - 'garlic-growing': garlicGrowing, + 'garlic-growing-1': garlicGrowing1, + 'garlic-growing-2': garlicGrowing2, + 'garlic-growing-3': garlicGrowing3, 'garlic-seed': garlicSeed, 'grape-seed': grapeSeed, 'grape-cabernet-sauvignon': grapePurple, - 'grape-cabernet-sauvignon-growing': grapePurpleGrowing, + 'grape-cabernet-sauvignon-growing-1': grapePurpleGrowing1, 'grape-cabernet-sauvignon-seed': grapeSeed, 'grape-chardonnay': grapeGreen, - 'grape-chardonnay-growing': grapeGreenGrowing, + 'grape-chardonnay-growing-1': grapeGreenGrowing1, 'grape-chardonnay-seed': grapeSeed, // 'grape-merlot': grapePurple, - // 'grape-merlot-growing': grapePurpleGrowing, + // 'grape-merlot-growing-1': grapePurpleGrowing1, // 'grape-merlot-seed': grapeSeed, // 'grape-muscat': grapeGreen, - // 'grape-muscat-growing': grapeGreenGrowing, + // 'grape-muscat-growing-1': grapeGreenGrowing1, // 'grape-muscat-seed': grapeSeed, 'grape-nebbiolo': grapePurple, - 'grape-nebbiolo-growing': grapePurpleGrowing, + 'grape-nebbiolo-growing-1': grapePurpleGrowing1, 'grape-nebbiolo-seed': grapeSeed, // 'grape-pinot-blanc': grapeGreen, - // 'grape-pinot-blanc-growing': grapeGreenGrowing, + // 'grape-pinot-blanc-growing-1': grapeGreenGrowing1, // 'grape-pinot-blanc-seed': grapeSeed, // 'grape-riesling': grapeGreen, - // 'grape-riesling-growing': grapeGreenGrowing, + // 'grape-riesling-growing-1': grapeGreenGrowing1, // 'grape-riesling-seed': grapeSeed, 'grape-sauvignon-blanc': grapeGreen, - 'grape-sauvignon-blanc-growing': grapeGreenGrowing, + 'grape-sauvignon-blanc-growing-1': grapeGreenGrowing1, 'grape-sauvignon-blanc-seed': grapeSeed, // 'grape-syrah': grapePurple, - // 'grape-syrah-growing': grapePurpleGrowing, + // 'grape-syrah-growing-1': grapePurpleGrowing1, // 'grape-syrah-seed': grapeSeed, 'grape-tempranillo': grapePurple, - 'grape-tempranillo-growing': grapePurpleGrowing, + 'grape-tempranillo-growing-1': grapePurpleGrowing1, 'grape-tempranillo-seed': grapeSeed, jalapeno, - 'jalapeno-growing': jalapenoGrowing, + 'jalapeno-growing-1': jalapenoGrowing1, + 'jalapeno-growing-2': jalapenoGrowing2, + 'jalapeno-growing-3': jalapenoGrowing3, 'jalapeno-seed': jalapenoSeed, pumpkin, - 'pumpkin-growing': pumpkinGrowing, + 'pumpkin-growing-1': pumpkinGrowing1, + 'pumpkin-growing-2': pumpkinGrowing2, + 'pumpkin-growing-3': pumpkinGrowing3, + 'pumpkin-growing-4': pumpkinGrowing4, + 'pumpkin-growing-5': pumpkinGrowing5, 'pumpkin-seed': pumpkinSeed, pea, - 'pea-growing': peaGrowing, + 'pea-growing-1': peaGrowing1, 'pea-seed': peaSeed, spinach, - 'spinach-growing': spinachGrowing, + 'spinach-growing-1': spinachGrowing1, 'spinach-seed': spinachSeed, corn, - 'corn-growing': cornGrowing, + 'corn-growing-1': cornGrowing1, + 'corn-growing-2': cornGrowing2, + 'corn-growing-3': cornGrowing3, + 'corn-growing-4': cornGrowing4, + 'corn-growing-5': cornGrowing5, 'corn-seed': cornSeed, potato, - 'potato-growing': potatoGrowing, + 'potato-growing-1': potatoGrowing1, + 'potato-growing-2': potatoGrowing2, + 'potato-growing-3': potatoGrowing3, 'potato-seed': potatoSeed, olive, - 'olive-growing': oliveGrowing, + 'olive-growing-1': oliveGrowing1, 'olive-seed': oliveSeed, onion, - 'onion-growing': onionGrowing, + 'onion-growing-1': onionGrowing1, + 'onion-growing-2': onionGrowing2, + 'onion-growing-3': onionGrowing3, 'onion-seed': onionSeed, soybean, - 'soybean-growing': soybeanGrowing, + 'soybean-growing-1': soybeanGrowing1, 'soybean-seed': soybeanSeed, 'sweet-potato': sweetPotato, - 'sweet-potato-growing': sweetPotatoGrowing, + 'sweet-potato-growing-1': sweetPotatoGrowing1, + 'sweet-potato-growing-2': sweetPotatoGrowing2, + 'sweet-potato-growing-3': sweetPotatoGrowing3, + 'sweet-potato-growing-4': sweetPotatoGrowing4, 'sweet-potato-seed': sweetPotatoSeed, wheat, - 'wheat-growing': wheatGrowing, + 'wheat-growing-1': wheatGrowing1, 'wheat-seed': wheatSeed, tomato, - 'tomato-growing': tomatoGrowing, + 'tomato-growing-1': tomatoGrowing1, + 'tomato-growing-2': tomatoGrowing2, + 'tomato-growing-3': tomatoGrowing3, + 'tomato-growing-4': tomatoGrowing4, + 'tomato-growing-5': tomatoGrowing5, + 'tomato-growing-6': tomatoGrowing6, 'tomato-seed': tomatoSeed, strawberry, - 'strawberry-growing': strawberryGrowing, + 'strawberry-growing-1': strawberryGrowing1, 'strawberry-seed': strawberrySeed, sunflower, - 'sunflower-growing': sunflowerGrowing, + 'sunflower-growing-1': sunflowerGrowing1, + 'sunflower-growing-2': sunflowerGrowing2, + 'sunflower-growing-3': sunflowerGrowing3, + 'sunflower-growing-4': sunflowerGrowing4, + 'sunflower-growing-5': sunflowerGrowing5, 'sunflower-seed': sunflowerSeed, watermelon, - 'watermelon-growing': watermelonGrowing, + 'watermelon-growing-1': watermelonGrowing1, 'watermelon-seed': watermelonSeed, weed: weedPink, // this one is used for the inventory 'weed-yellow': weedYellow, diff --git a/src/img/items/asparagus-growing.piskel b/src/img/items/asparagus-growing.piskel deleted file mode 100644 index 2971b0814..000000000 --- a/src/img/items/asparagus-growing.piskel +++ /dev/null @@ -1 +0,0 @@ -{"modelVersion":2,"piskel":{"name":"asparagus-growing","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAABSUlEQVRIS7WVMQoCMRBFY21jI9iIooUsdpZaiYWgtRfwDB7DM3gBKwsFCxGbLe1ksVCwEyz0BspfmCVmk8zsiimTSd7PzJ+koP48CrbzW93K+xzerWtmPBebOgQbWqW+Or/2ioNIYr8A2DAMRonIbbRxQqSxKUBnXFPlazuGSACPximOd8UmACiazKbqEu2SGxzXN+8NIIaGKzYFwAaCNIOBWs4XKUgWMdYUAYLDMXwAiRgnAJu5FMFtxd7VKyYXwOYgCLLZ2toHKB6nXlJgQNlOhlpTHeZ+ApD1qFNjgNbZJsDlNucNsODrVB3gc5sYgG6lmmTpARag55nSgE3oeL0Hqs+6WoUHmYsoPfqzYabBrEFugK5Sty0BMEfD9bQ7PxXOKdxHQ2ARgHOK79cVAbh3KReAis09G77DvTbVu5n7m3PfgFMnWf8AAp4qKITT420AAAAASUVORK5CYII=\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/asparagus-growing.png b/src/img/items/asparagus-growing.png deleted file mode 100644 index 1b2a7f1a09ac013eac1765de9d5377b0f45b8166..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 419 zcmV;U0bKrxP)FFXZYA-bT56fFX;2q%B+3$E)H0%LaM$#L^LJj~ z#&Gl43q}lGB&fyk!E2?fgd9$idbkDZRucb1OOoK4h_MK!2A^6CA1G@&!`Y!FNm#=d z*)fCw+=83OUNElina6PV`d$o+Z~L2)m!JmEyimBRKb5EZ+V=qhXIs`y^h^*3=5DgfoXt+D?ZEc0gP0HY#2PJ z63DH%BA9^zPaL4<)SDl$t0R=!u=)TUAcr@49=LmbFT?7dc{qa*uLa0C8a)`0UG8sX zk28p{T7d3KWW&%iBq4w|A1G@&Gu*wt7iXqBxAh@}X26}KaV9-=D~bO`-ts7xA&0fP zmBfEyk}gq^j4h=Qn=gneD)5y{6ajTBiT{zU=Ko2lqsg*_W`iWt3ZVc1 N002ovPDHLkV1m=euu}j4 diff --git a/src/img/items/asparagus-growing1.piskel b/src/img/items/asparagus-growing1.piskel new file mode 100644 index 000000000..091649dae --- /dev/null +++ b/src/img/items/asparagus-growing1.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"asparagus-growing1","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAtElEQVRIS2NkoDFgpLH5DKMWEAxhrEGkbSnz/+rxJ0QFHyG1GIaANCgJ2jDce3+EgZAlxKhFsQCkwVHLDe7t/dd24bSEWLUYFqAHKi5fgCwgRi1R4UwwJvEoGNwWEEpBII+R7QNiUhDZFhCbgiiywMJLFR61J7bdxpmcyQoiYpMoUT6AGUYoV+NKqXh9AItIkGZiig5sluC0gJSIxJcR8VpATFFAKJeTFcmEDEWWH7WAYGgBACe4XxkI8logAAAAAElFTkSuQmCC\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/asparagus-growing1.png b/src/img/items/asparagus-growing1.png new file mode 100644 index 0000000000000000000000000000000000000000..e5eeab41d8c18536b332c4e44b13e097f4d27924 GIT binary patch literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|W_Y?dhIn)) zCrGd=3$KXw{Ih&olv<9|6;_$fO)U~zdtON0G2Q#%&)nJX=Jpe^Oc=Q(B;2~29x^e+EwG&y Tn!5KG(2We9u6{1-oD!M4!t)<(UufTx;ifzRfO$L)Y_=)INjb2d>P$ z{cFO4!1Yb(omVILl#&=7xv#8M`6tYk z9<#D{0qcj3Bf>LJ%{o^h+hNRiLHW}&_LhnaPocxF=2h~5!1HZR8C^<0w_XaZaJgsm zt!bm`ie8Capae@3$IcT6#LuZjH^k@}8VK;EPttWT|MBkYUY^y}&mQum*Dx$+`|?2H d_=ks#3{hGYFQ)o!v< literal 0 HcmV?d00001 diff --git a/src/img/items/asparagus-growing3.piskel b/src/img/items/asparagus-growing3.piskel new file mode 100644 index 000000000..dd1b3f1c6 --- /dev/null +++ b/src/img/items/asparagus-growing3.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"asparagus-growing3","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAABPklEQVRIS2NkoDFgxGa+tqXM/6vHn2CVQ1dPSC2GISANSoI2DPfeH2EgZAkxalEsAGlw1HKDO3L/tV04LSFWLYYFFl6qDJwPFMGWEGPBd4X7YPW41MItALkopjiZ4c71Q3AfnNh2G68PQI6BAVxqMSwAaYBZoqJpx7Ckdy6GJaQ4BmsQgSwBGQ4C+CwAycF8gcsxOC0AGU4oiGCpDRS0uBxDlgXYUhDIAmzJmmwLiIlgkKVYMxosZYBcBHItuutAYmRbgFwUwHIqSAw5Z6NbgCuCsfoAZgG+nIpsAb7URrQFoNwKS1Gk5AGCFiCHMywYQJpgyRKWIYU/SjJsPXqIcCpCDh7kYgM9GNDjgGwLkIsN5ExHlVREKKXAki+uDAYLDZy1FikpBV+tS5QFhMqlwWkByFXEhjNZPsCniRQ5AH/XLCgFbNIAAAAAAElFTkSuQmCC\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/asparagus-growing3.png b/src/img/items/asparagus-growing3.png new file mode 100644 index 0000000000000000000000000000000000000000..7e8da0158bd2ac132432cc2b720217485324bd2c GIT binary patch literal 390 zcmV;10eSw3P)Px$KuJVFR7i=%Q$5PUKoFgX2e6ElqQzosnMTAy(89_Kcm|J=GvorPEb@Ux3Y(Pa zWJ!@CUBJd0#Kv95{hQTK@IfFUGxOg3Jb+(-MPc`?*q$kY4VGRcKCywCu%2z?_nH4e zRkVSY^+v4L!EJJ-gufLp30M?%`{O|-`4EX1SFF~-bheW3`{ThlUo3`#B&douNaF-* zo@+!llvzWH(K-;Qc@Alu7#AnRu)z|_tZ|CzlQIp!7c?GjAdM4A{1pNKWwG2`TqAe} zb@*G%)mDIlwu7o@1Mx_w5^l9ESnB{ob!v4t$5Gd2y&?=eZ`A{?Ya%2jpk7(_C7^L;wH)07*qoM6N<$f>na70RR91 literal 0 HcmV?d00001 diff --git a/src/img/items/asparagus.piskel b/src/img/items/asparagus.piskel index d7e033c46..aae2afd0b 100644 --- a/src/img/items/asparagus.piskel +++ b/src/img/items/asparagus.piskel @@ -1 +1 @@ -{"modelVersion":2,"piskel":{"name":"asparagus","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAABaElEQVRIS62WPYoCQRCFe25gsmAiyhoMYmZoJgbCbuwFPIPH8AjiBYwMFAxETAwNhEUMVjETDFz2AsobqKGsqf4ZtaMBq/urevW67MgoK24Wb/v1OdJ+yxufOQSHx4WW2f8tTQjEF/8AQHCn9pUmOd/NnJCQ+Ayg8V02H4d6AgkFXD5/kj1afApANt1+z/zuFmkFm+nJWwESoqXFZwAIJki11jbjwUiFhCakSgQIDsfyAXwJWQHYiJJpaY6iJqMHtoScAGzaDo8JQ9pWOgiQoB5w/f+nZ6tlnwZwTcmuWnYAcAeRpFJKp0R8LEhHSYDNcU4XcbmkozjA5Th1FqF02kQQ3kDtDgRJRJLgAHxzjbkEBOD9Kl0rZrJeZS6ldST7JJA9eAmgle9LgNRQK/DNGSmRa2Y5AVxjeUtlErbJG9QDGn588MkevATQfP5WgM3jHJK7AhxKB7j+2ejO2B4I3qdJ3ieMfNbcAUzRfChJlzkHAAAAAElFTkSuQmCC\"}]}"]}} \ No newline at end of file +{"modelVersion":2,"piskel":{"name":"asparagus","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAABWElEQVRIS7WWPWoCURDHn2VKewsTtFAvkIAEbCw8g51H8Bw5gp1nULAJiKAXMCkUFdTa0tLwF2aZnZ15s6tkm12Yj9+8+XpbCv/8lDT/rY/Kbb08qTIrHssm4wSKb+V22F0WIS8kZpMCQLHT7CZBfv/MXIhnkwCgCM/94SCcp8c7pAjgWt2Hl8NrxiYFgHM829/5/V1rfIbx18g8BYKCDenDZjXZpPQzKXrv1RPn+PAA0CEbLSgTQNHgbRWbFxcQnFgG5QKsjtKKC4iZIplPKMY66mEAFZkD0CEyMgB47iGPngCOuREZ0FDIjpIAq+PUGsA5bz+teBygySkwdVXQwPGZ4CnK0/8mgASxFBDACoAvRHNjeinQiqzNSy6AtgK8AKIp8nIsUxTbWeaFIxefNge806T8qSLLmdFSWAjgzcHTAMsBXVKxjRu92PM44D2vfRf6c/CcafI/mGxoKDCvE94AAAAASUVORK5CYII=\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/asparagus.png b/src/img/items/asparagus.png index 1f3689374c760ec63c32111c554fb976703782fd..d010092daec74aa40566ffd570800fe37adf828f 100644 GIT binary patch delta 395 zcmV;60d)S%1Em9yB!2;OQb$4nuFf3k0004BNklhag4rkg=b^pp`OJ9KX-J89xDh0*+_* z|CO`h0-fz?QIn}0OAhqiU^rjv3!1XCPXv)sYk`(v40011_vk~(wNk?aylwvaBUKdI-2WNXimA6__ zUnT|M{q?fhqPhEBfNOpMP@u|Ny~*SO091Jk-wm+eeZzNyRl6~2K;XvIy%2f~y8BTB z*<`T*pqeKmjDI6V9(DrYC66fA+>4sJSGJT`QUjVuWJi99({k+D37WFAIJr29Om;=P z2UCSO0y@m@0q~MZCjk*Sx?D4_2AH p1glMc|L&!;g4xgET!D|{3Epnm+^|PFzW@LL07*qoL*p~N(UFx|2Qw3Q5nX79=1&Oz0naXUFrkab425DmxFwsRLm@w)4y}YL zozAM?Wam!4_wKz200HBnzOaGp*~P8*kg@*2Y`%-{)qneQ`vhGx1lFm4^jiu( zuit!#d!JDQ7!O5~rRsq1Alc{Yw-hYnje1V9)VW)o5Ct`$YlfiA3+UV08bo1?kflJP zZ)+&?La{aLlF+FdNJ8fnyCh5Db@%b}!uLW?h@PO!_Z#S;hC_99r^wvtGTy+c8X%g_ zAezr89weM5OMfo_+zF9s^NOiyvi<=8I#D{YQ3cq6u|!dI>l$D@6szsRT9s~~^h;N3 z_Ba)E%@7=_Bbe*LR-`k(`if8m=!#4h<_a*sTp<4k5`Bwj+#=AtST$6^*gYfby0S7a zPy)^r{b6Q6u1JDfmD2+slYKlO6-fBrtQaPn{QE3c+bhN7;lOw(9v;_%x*`}4$-38& c$%g^p87{t@;^Kq~1_qutTH4%gq1r&h89ZJ6T-G@yGywp7c{5f3 literal 0 HcmV?d00001 diff --git a/src/img/items/carrot-growing2.piskel b/src/img/items/carrot-growing2.piskel new file mode 100644 index 000000000..ebc322169 --- /dev/null +++ b/src/img/items/carrot-growing2.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"carrot-growing2","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAApElEQVRIS+2UsQ2AMAwEkznYgJ6amWAQmImang2YI8hIlowV20+RLmkT3flfVnJqfHJjfuqCsOFeUZuK5m0sx3pB9UKPJPAPnOKZAgLRA56UwVrGHVmJ3ARSogVokrAiC1xLUksRCqgCKZGV6BprKwUJWKIByCbBAi1B4O4WqWnfjTKOOySSoNz7ZNKH5XQHtQTexNH38GEiCSKge98FYX3NK3oA6MtaGdTMSX4AAAAASUVORK5CYII=\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/carrot-growing2.png b/src/img/items/carrot-growing2.png new file mode 100644 index 0000000000000000000000000000000000000000..a4ec152c2851efb5a71fa851ae721a3c3b999e08 GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|ay?xfLp(Z@ z6C_v{Cx}d7S1bCrd~RciagEaR`Za8eyBDrjzAY4E!g!!1-0Z)#@<~2LZiU@acf(nD z)Xue@n5Mw2RO7LS^~E#+$(kck4f+xvW;yn-{ aWni#nGtvt_TyGAvn8DN4&t;ucLK6VC;yXwH literal 0 HcmV?d00001 diff --git a/src/img/items/carrot-growing3.piskel b/src/img/items/carrot-growing3.piskel new file mode 100644 index 000000000..7812fe75a --- /dev/null +++ b/src/img/items/carrot-growing3.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"carrot-growing3","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAqUlEQVRIS+2UsQ2AMAwEkznYgJ6amWAQmImang2YI8hIloIV208RUZC0RHf+T0IMlVeszA9N4Db804rGpU/bfEDpoU058A2cDkgVEIg28KQMljI+ZS2RmSCXSAGaxK1IA5eSlFK4Aqogl+SVyBpLjwISsEQCkJsEC6QEgZu3SEx73yhlmUMiCdK5Diq9m3ZzUE9gwtlqSTSBVYn3B30wvQQezP3eBN9XdAGJ914ZuXH3UgAAAABJRU5ErkJggg==\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/carrot-growing3.png b/src/img/items/carrot-growing3.png new file mode 100644 index 0000000000000000000000000000000000000000..b678214578b483b17fc36fffc7b37309916b8365 GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|ialK%Lp(Z@ z6C_v{C(LN-obx|3UEwOv{1ZRrS08+l^y1ZtZ7kxx32O4}~WH_8?rq3}=o*igCgQu&X%Q~loCIA&pL5BbU literal 0 HcmV?d00001 diff --git a/src/img/items/corn-growing.piskel b/src/img/items/corn-growing.piskel deleted file mode 100644 index ce19cee81..000000000 --- a/src/img/items/corn-growing.piskel +++ /dev/null @@ -1 +0,0 @@ -{"modelVersion":2,"piskel":{"name":"corn-growing","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAv0lEQVRIS+2UUQ5AMBBE+SThSE7lGE7lSCR8kpWMjE1rWzQh4avSdN7u7LR5lvjLE+tn7wRUbb2g87EbTosM6oAFRXhq5t3Zsi+2tQ9kAkTcJegCuSCnABZHpWyN3r8MEHEchl2+f53KIIu4Mg2wYm4CtIAe+CMpYggAGPztFEFcV/5IilhcR1Ws4W44CNyxOQNfVPXgb180VJgkRSIamvvoe+CLqRVPnDNn8FnA/t5bT4Fj/+BKtEWxwB9gOrYCC/SFGVIWk28AAAAASUVORK5CYII=\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/corn-growing.png b/src/img/items/corn-growing.png deleted file mode 100644 index 3ba07334841666a6dc00bef5a139cb5f5d6a2639..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-#dc2@ z#}JRsw;`wbnhkh9tLZ6hoqr_!tMRwc8X=F{8)X8v1T6KGpS|Njuxra(3GoMQjqazt z^?rCff4g;+jI*vH!=C5o%iEHt2^*Og9CY`y&|R!y0>q2*4xF?!v@Eme_SWd?*zNs! zyOPnwXYZT(UmEjXU8VWcKT4%>)B8L@$F8NjUFXCoDSwZe?8CTv)d9g^y+zC4{(loS zD^vc~orXmjZ!0gdot?fSWC44<_=&Y~f3#OT*i$H2CQzIFD0=qw`#>)+c)I$ztaD0e F0sz_&XZ-*G diff --git a/src/img/items/corn-growing1.piskel b/src/img/items/corn-growing1.piskel new file mode 100644 index 000000000..d4952a129 --- /dev/null +++ b/src/img/items/corn-growing1.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"corn-growing1","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAdUlEQVRIS2NkoDFgpLH5DKMWEAzh0SAaDSKCIUBQAdmpKLhe+T/I9LWNd/GaQZYFIMPPX/7MYKjLS30LYIaDXE8TC5SCxMBBQ4zhIHUkBxHIAmINJ8sCUBARiljkpEWyD4aMBeCIJBOghArJQUSqpaMWEAwxAD85JxkWps1dAAAAAElFTkSuQmCC\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/corn-growing1.png b/src/img/items/corn-growing1.png new file mode 100644 index 0000000000000000000000000000000000000000..1dce6214bdedfb911d202509c7a4270ae76045d2 GIT binary patch literal 152 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|f;?RuLp(Z@ z6C_v{Cy4Yg-C~^X*7jeom*+p{%4DVMA8e=J>Za>xpA3qcUHi*CC1NGZ!Z`Ffi!ah|Ff&I(H(_bOujXKbLh*2~7awyD-xL literal 0 HcmV?d00001 diff --git a/src/img/items/corn-growing2.piskel b/src/img/items/corn-growing2.piskel new file mode 100644 index 000000000..c3ba59291 --- /dev/null +++ b/src/img/items/corn-growing2.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"corn-growing2","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAl0lEQVRIS2NkoDFgpLH5DKMWEAzhgQ+i4Hrl/yBnrm28S5Zj8GqCGX7+8mcGQ11esiwhaAHIcBggxxKiva0UJAYOKlItIdoCkOEgS2hqAcgSULzAIpyYBECSD5AtABkOix98viLLApBFyIbjS8ZkWQBLtsTkD7IsIMZgWNImywJScvXwtQCca8kEKKFCchCRaumoBQRDDABp2EwZSEGE4QAAAABJRU5ErkJggg==\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/corn-growing2.png b/src/img/items/corn-growing2.png new file mode 100644 index 0000000000000000000000000000000000000000..89b62cdeb9ac297df2372df537ec9b8c12696a7d GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|Iy_w*Lp(a) zPC3Zipupq0|5%Ci_7@y)l5ZRr+{Jpk;GnQfPmspLW7dc3FPO24b-&!;p46YRcYpRn z28G6isUfVEH6fSU7PGkDeHv6Bu;cNyzbo_(wl7I#_{FlmfOE;WV=5;eG8{->GtX9s zi8G|>snb?-HOBdYyk^GvKD|ETf36m$sGfOw_RtyTi8*>=94Vn72QqlN`njxgN@xNA D9gk0w literal 0 HcmV?d00001 diff --git a/src/img/items/corn-growing3.piskel b/src/img/items/corn-growing3.piskel new file mode 100644 index 000000000..675fc6312 --- /dev/null +++ b/src/img/items/corn-growing3.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"corn-growing3","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAA3UlEQVRIS9WVsQ3CMBREnQFoGQBqiqxCBkIMxCwU1JkiA4Au0kUfy/Y/W7EQaVLY/u/f3XcyhM7P0Ll++C1gup3fVPi4z8lmuCe3XlSAw8/XsjLGyyHYIiycW2djkkWn63FVQohaHGckADZaCLtOKYuHRgYQAhUAxJblptEFxCF6oVYpsF5b/3MTk1IhTxH9xns3ADsqjav3JXAziCFquFX3wEKsRUrgsgILQQaqbU0AwOwnohR8E4AXTZmoJoBSuClkHIL3u98DO+t/A9j+ZN5NTax/5Vodci2wO+ADXJmJGbhBn08AAAAASUVORK5CYII=\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/corn-growing3.png b/src/img/items/corn-growing3.png new file mode 100644 index 0000000000000000000000000000000000000000..53e3a4b7b2f66f313281884672fa462e6ed2e88a GIT binary patch literal 279 zcmV+y0qFjTP)PZ@&Nl literal 0 HcmV?d00001 diff --git a/src/img/items/corn-growing4.piskel b/src/img/items/corn-growing4.piskel new file mode 100644 index 000000000..7acb9dfb4 --- /dev/null +++ b/src/img/items/corn-growing4.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"corn-growing4","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAA9ElEQVRIS2NkoDFgpLH5DANrQXC98n+YD9c23mXcMtnnv0/uFjgNkoOpAcljCw28PgBpPn/5M1ifoS4vA7IlMIPR5dEtISqIlILEwD4BWWL6kJ3htPxPsDmEDAepIcoCkEJkS2AGI/sMV2Ih2gKYJSBfgCyABRmhVEjQAvRIJBSpJMUBckTCXAwSw5ViKEpFsPAG0VSzAOYibMmVUNjD5AnGAbolxEYuyRZgy7XERDjRPkD2CSgOiA02sixAz8X4Ip4sC2AZjZgURZYFxBhMViTDIprq+QA5zVM1J2PLTNSyAF6TEZtjkdShxCvJkUyqhTS3AADroZQZ0g/6xwAAAABJRU5ErkJggg==\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/corn-growing4.png b/src/img/items/corn-growing4.png new file mode 100644 index 0000000000000000000000000000000000000000..60ff177b9456cc9491ee1c1f4d4fae5c836e1038 GIT binary patch literal 303 zcmV+~0nq-5P)Cbp)M~2 zvL!Hs(dE%CAu5QJg2cc+0a;@Dke%VQ{70&&Bv6o-7Ms8I70}MV1A`7)(|q!y=mM`2ac1 zQ#B`J%S_a=0A7<3n`4pGp~Nf6kxZ(EG`9c%>!Fkx(hvH_00000NkvXXu0mjf006N) BcAWqK literal 0 HcmV?d00001 diff --git a/src/img/items/corn-growing5.piskel b/src/img/items/corn-growing5.piskel new file mode 100644 index 000000000..618f34ee9 --- /dev/null +++ b/src/img/items/corn-growing5.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"corn-growing5","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAABBklEQVRIS2NkoDFgpLH5DANrQXC98n+YD9c23mXcMtnnv0/uFjgNkoOpAcljCw28PgBpPn/5M1ifoS4vA7IlMIPR5dEtISqIlILEwD4BWWL6kJ3htPxPsDmEDAepIcoCkEJkS2AGI/sMV2Ih2gKYJSBfgCyABRmhVEjQAlhYJ4poMoAimFCkkhQHyBEJcjG7KB/Dz9efwJFNyOUweaJTESy8QTTVLIC5AltypYoPkA2BWUJs5BIVROiuRI5gUK6e/+Y6WAm+ICM6spCDCxbZVM1oyBag52J8viDLB7CMRih4SCoq0H1AbFIlywfEGk62D4aEBfCajNgci6QOJdhJjgNSLaS5BQCfTpUZV5cHzQAAAABJRU5ErkJggg==\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/corn-growing5.png b/src/img/items/corn-growing5.png new file mode 100644 index 0000000000000000000000000000000000000000..4bb163c4500e8175c3ec8527a8f258fe83ae40ca GIT binary patch literal 321 zcmV-H0lxl;P)Cbp)M~2 zvL!Hs(dE%CAu5QJg2cc+0a;@Dke%VQ{7Si=+-E*h!89QZ1yp1puE;l^Iu; T2h9Kg002ovPDHLkV1fVu@T7X9 literal 0 HcmV?d00001 diff --git a/src/img/items/corn.piskel b/src/img/items/corn.piskel index 39a10fc2a..8ab2355f7 100644 --- a/src/img/items/corn.piskel +++ b/src/img/items/corn.piskel @@ -1 +1 @@ -{"modelVersion":2,"piskel":{"name":"corn","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAABJUlEQVRIS7VWuwrCMBRNJxFa8AOcHAURV3/EHygujn5LF/F7XEUERyc3FyEBcarcYm5v0iTNo3ZpC+U87jm5NGN/vrKB8GuCo2AOQVC/LmvEnyxP8Iy4qQT1+16yD7+xUTHH+3h2RJIUAkW5PmrpJJbAqJw6SSFwKpdOYgl6lUMWsRkEKZdOfDMIVm4kyHcFHhhRcUkepbxDAOD5Kse2ibNgouLM1HNX7/W6Nip1cPkRkDy2C+c20U9uMMFzv+mcVOmAtsWmAkM2uXA56FPulQGMR+6Y6eHa5lNxZaG5ZmjNgKoHcEMBvCreG3JTAtIueP81LI0AQHRg2i5yTpwtMzoYClwJirbIRhAyGueqMI0mBtxaNbqTcO7tbgr6T/BqQhCi9vEXi7TUGbmvUAcAAAAASUVORK5CYII=\"}]}"]}} \ No newline at end of file +{"modelVersion":2,"piskel":{"name":"corn","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAABm0lEQVRIS2NkoDFgpLH5DNSw4D+SIzHMo9SC/5/vlTP8+PyIgYNXjoFXqRNkF4qZlFjw//XFSLDj/754xsAsIYXVEnIt+P/y/mIGpk/bGP7xeYFpXJaQY8H/FzvtwS6GGQqyhOv/FXBQgYCo/nJ4UJFqAUqYw8IeZjDMN1gtMPUXAqeG0xvf4bIUHizoSRvmE3TXw70BMjw+Vo/BUcuTIaGyE5slOF0OczXeVASzAGQjFkvgYQ4y5BujDkp4w1KRhPtBjCSK4QOY15EsYUBO58hhDrIMX/qHmQUOb2QfIPtic5YuOLXgCnNQ8IgrxmJ1OVEWbGtyB2ceclyOYgG6L2BBtK8/FZ62QWqQMxWuMEf3LTxJYotomA9AEetTkA/Xe3rjO7zBgmwJXgtgceBVt5NhQXs5iuNwJGeM+MJrAUw1yPD917ajaMaTZ1DUYbUApGLh4ktgV6MbjO5EkDo8uR9RdiPHAUgTKGdjAyA5ZIDPcJSIImQBzGBCBuJMRbCkCqKRXU+uwRj5ANlmWMkKEiPVxXh9gDXQKRQEAFROAijbCV/EAAAAAElFTkSuQmCC\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/corn.png b/src/img/items/corn.png index ad929a789d10369d3f815852be99174dab355ba2..65a262da7362696618cdaa39423cbffed2516626 100644 GIT binary patch delta 480 zcmV<60U!R}0{R1xB!2;OQb$4nuFf3k0005BNklyF>As=7=|CEC>?@Mg>I#8 zLg`o#I=OW0>LLodckN=KOa4MZK@r5&QU5@oqX=uDtjI~(9EhdFG^gnzk#ZJA2QsQ_m&s{^n} zmEk(K7jkiu^FFX@!rUO?K{PFkZJBOIJM~k5vz}J4Et8~{#RigE7FJDc50qFneILlF z-#xo+je2|kEN3yRhXeqa8*WTM`rh#A#)WvPn4zoJBuM2vv1+=Gg>$wuNNU-TxCDqA zj5{ibv+N^dv47$ZZaiMr32zpcw~df^2%vyC>uE(gv@H|u>r=u+C+R1Y;t(-p;T!_b zxgm#|zNzjNS9ahl&$)0apWgaagt!EZdc<1oNoaF7Yuhr}q{^~`eVGUAU_`rv&A(Iu z1JBS=;*kK6b^fhESFdf?btt^PI|t6pae&7U0E4bxV_7in`1ZPbjRMgS-$^bNGjgNV zo+yQb)oM=;oqlx(t@eacF{2a@{tQta9DUgd;bU^&E#J%HiU>w^im(z81f3)NXY~#K WDDi>Vp!73GdTP0{j@kmw0L$ z=QjlE+i9zd<>qMc&V0%5mmL5glraF{RqI4P2@K~=a1z%9Eq~|DmEn@0*Ez#A!JzX{ z#>PQUNifMd*JBe*cFr&gkxD&Ylqv2xIcMkuB9*mB1oZb5b9QbdVDcuYAYAurC+DpM zHn=)B1SnGh71X(*Qf245SRDq*0bp)x@b3v_j7pV=^7FfwsZr!wz;*`gILgm3`l%Kf zC(s3v2<_S??mQ(x1$hxOI;W_QoC^B9gyRJIrpSjJusjvEOE;CgCD0Ty1RTi!f(Myx Vg~8Cy;bi~-002ovPDHLkV1hW6j5YuO diff --git a/src/img/items/garlic-growing.piskel b/src/img/items/garlic-growing.piskel deleted file mode 100644 index 285072eb2..000000000 --- a/src/img/items/garlic-growing.piskel +++ /dev/null @@ -1 +0,0 @@ -{"modelVersion":2,"piskel":{"name":"garlic-growing","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAA8klEQVRIS2NkoDFgpLH5DBRbMHVD4n+QI7MD5mM1C6sgTBM+jSA5kDqYwchs5FBBsQCba3C5EJuB2MSIDiKYZkJBgh6nZFmAK7yxJRiSLIAZQDMLVKXNGG4/PQVPMcQkBrw+QA5vEBvZAvQIJSoVIYchehIEycEswJV8KU5F6EGEHqlD3wKykilySkGOA0LFCMwygqkIuazBlkwJ5QmiLViyp+y/GL8iw6uP9xliXLqIzqBEKwRZoC5nznDz0ckhasGWk13/xQWVGV6+v8vgY15GtM+JVgiywEozhuHY9SVUtwBcJeIABB1IUAGljQKaWwAAguO8GYY/tUoAAAAASUVORK5CYII=\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/garlic-growing.png b/src/img/items/garlic-growing.png deleted file mode 100644 index 834923842a8f3e7dc9700644a90e50366675c275..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 300 zcmV+{0n`48P)V0`v$aDitAz zA$k%7$-ykZm3%2qMd(3<9;rj$0~?VqCh2&Y(mq1X-XiXU=f*(a9ld!IqO<|HTEB8D74>%iv>PMzqg~RtU1d yN;8Jx*!3k;w*Xuv;s694NKgT#jRKlm004sHycvc+wMqa0002ovPDHLkV1fV->T+%X diff --git a/src/img/items/garlic-growing1.piskel b/src/img/items/garlic-growing1.piskel new file mode 100644 index 000000000..f1759a11f --- /dev/null +++ b/src/img/items/garlic-growing1.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"garlic-growing1","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAYElEQVRIS2NkoDFgpLH5DKMWEAzh0SAaDSKCIUBQwWgqGmJBVDDV6v+E7GMkxRvRikGG6+ipM1y5dJOBFEtGLaBeKgLFQX3sWobGxcFUj4P/eJxJMA4JKiAYBgQU0NwCAFh1KBm5mfFiAAAAAElFTkSuQmCC\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/garlic-growing1.png b/src/img/items/garlic-growing1.png new file mode 100644 index 0000000000000000000000000000000000000000..3b16909c585292e0d3c2f54eb145b93bcabea8fe GIT binary patch literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|tUX;ELp(Z@ z6C_v{Cy4Yk1sdFOcvZ6X|B_dUN=FN1Yjr2-D&Ar$I>@nEAuL_$q?m!wLbmuNLW}D= am>Hz4IfcK6{#pt&hQZU-&t;ucLK6U@dnVxk literal 0 HcmV?d00001 diff --git a/src/img/items/garlic-growing2.piskel b/src/img/items/garlic-growing2.piskel new file mode 100644 index 000000000..658d2773e --- /dev/null +++ b/src/img/items/garlic-growing2.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"garlic-growing2","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAv0lEQVRIS2NkoDFgpLH5DKMWEAzh0SAaaUEU2eb0H+Tn5VX7sEY+SB6bHEwfNr1wg5AVYVMIkhfn/8Hw8iMHigPwGQ4yB2wBNpeh+wafBbh8DLcAX1KAWY7NAlxBhmweURkN5hvkICLGcKJ8AHMNsg/wJQT00CDKB7B4whbJhHIa0RYUTLUCJ2H0VER1C0AGTsg+RrTDiFYI8oGOnjrDlUs3aWdBfexahsbFwVS3ABz2OADBECCogFAkEpKnuQUAaGVvGRrYcq4AAAAASUVORK5CYII=\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/garlic-growing2.png b/src/img/items/garlic-growing2.png new file mode 100644 index 0000000000000000000000000000000000000000..a957a53ec979ac8d4a0e81b56eb7361219457978 GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|=6bp~hIn)) zCrGd^P7vWSesDAK-~G*p|Jd7A*8JLV(m3&QkMF|t_Mi2V|GrBUo%r)sR9*7o*Nq26 z7J45tNxIy^*Adt(d_d>Z8-xGztzzHWE6!iUtmeeEEqqSO5z&+*JLY7pKltduNq5H` zM~}Qve!-m6FvURq78B64Cp%h8DPYx<9DjR!iE!PC{xWt~$(6956nTg3nX literal 0 HcmV?d00001 diff --git a/src/img/items/garlic-growing3.piskel b/src/img/items/garlic-growing3.piskel new file mode 100644 index 000000000..b4dc79937 --- /dev/null +++ b/src/img/items/garlic-growing3.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"garlic-growing3","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAA8UlEQVRIS2NkoDFgpJb5kW1O/5dX7cMwjyoWwAzHZglOC0CKQb5DdhU2A9DF0PkEfYDsOnH+HwwvP3LALcUVLMjBjmIBzNUwBTDXw8SRLSDGcJA5cAsIeR8kD7MAW9Chi8EcCbYAn2vwBRG6XpIiGTkcsQURLoeRHMkwg0A0RXFAKMPhiwN8enGmIvRciWwBNjn0lIcSydjCEz2j4bKAqIxGbirCpQ9ZnGBOJjeSYZYQZQHMElwZjehIxqcQXySPWgAOAVAQOdvKM+w9/BCljiCUQUmK5Gk5SxmypkRT3QJwzYYDEHQgQQWEgoCQPM0tAACWsPwZ3Za7BgAAAABJRU5ErkJggg==\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/garlic-growing3.png b/src/img/items/garlic-growing3.png new file mode 100644 index 0000000000000000000000000000000000000000..98b703896f4276cf20f8c29e9dd753969f4e275e GIT binary patch literal 258 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|_ISEDhIn)) zCrD@=*nIep{aIf1lS1eDKL39qwL#LMM`}^*bgNk2qd`eL$p_Paf9smub6eZb=uy#6 z5L0Eh$aINK{2N%g&khK%Es{0)&#IWh~n4JW25GrzNN5LdREWMh5i|LG6= z(*9_DBG{pk*z ze{%a1us&pUAT`)5!LR_E;V_Nno-%M>vGS=fAUgtNAvQ}$vH&?a&>cdS1;{SK7921O zVLl1<1hwO0KYEN-&o(FpySU z!;MBWLN~&GW0C~06n6A8T@%rOaK4?07*qoM6N<$f&c)h C#b7`H literal 0 HcmV?d00001 diff --git a/src/img/items/jalapeno-growing2.piskel b/src/img/items/jalapeno-growing2.piskel new file mode 100644 index 000000000..7ea077ba1 --- /dev/null +++ b/src/img/items/jalapeno-growing2.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"jalapeno-growing2","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAA/klEQVRIS+VUMQoCQQzcK2z1A5Z2PsBGwdYX+EZfcK2gjQ+ws/QD2lqczMHAXMwtWeREMc3BksxMMrlUaeCoBsZP30Ww2Eyb0XjmNn3c7V2x2Q6W23VDtMf9kgA+X93S+TBpvxp480h6CQCuIBY0SuISWHAoBSDCkvLtrQ5YTA9IwncIKvKAHVA15q/hGR0m8GYPcACgA0uk3TBPc1488AiojgSn+trW5XJJkiVQ47iyXFdVaT3JdkBl2q4q9daVgEX/AYv6PLHrGjbZ3oGPEmA88AAm6xnpUw+xoWuqBqOIWxQ59SECAtk1/W+CzkmIjEJyOmMv8qCQqE3/fYInGwy8GfZ6sOcAAAAASUVORK5CYII=\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/jalapeno-growing2.png b/src/img/items/jalapeno-growing2.png new file mode 100644 index 0000000000000000000000000000000000000000..e9e37cc27e5ecbbb315263e0a26cd2250835d461 GIT binary patch literal 312 zcmV-80muG{P)`Aj7BouY z5?F931t7wb^6jk-SWFK{!gmNN@_-#sHRiA38676@W)E-xpaV;!-7rscUOey!sE!1u z`r6jza!HaUP~*6=Tvt_TJ;`=JW!kPP_12YuMgIYd`aH4g8aCP9fsYbkJn#S}>lx`& z53!+Zss^KoTNF9lvho04N8**V33vDpGwt`MI}9MhwQWB#Ts_PWra=J2 z#%Bpm3qXd$41pPhjZc;Z=!U~A0MY1{fW#>F0nC-KI6w{_SP35EsO42Nlg`2gk%*G+@3}$%0000OY{Qpq3r08KFR`GwQFj27i`&PXMQN-#a zULgYm16h_3?Glg$ereJSUq1XI$rr?005=>KXT$~-(H6ks069?*V+lbE+&NhPr%6lV zOl-5BK4;kZ<2O!o@LGUuxUH@V!{N(!uv&!A5~3`?XE?}4vVSZf*7Yzi;j#p$4`3D$ zay?xv_$0{8u;R)StdUI>A5atrgn|g4>+u#^gwj7O?8&wOWB@UiP%Wcj%VC6EPq19a z=L2F4Cujk#U?SFVvMeCQaH1?g_64bi6Kw&^5)h5AXvUTh2-XKAv^uaV1pwDQr5Uo) U6MO&w002ovP6tG;LSTXb0IE=Npa1{> delta 235 zcmV2Kt*Nk09BZPo9y~+G*y^{=jCq(;K$>{o>=wu66SOFN;*^^ z#v;oJ|v>y@rD`X0|G%n+9v%Pnq4mOay z`Vs*%&IDBaF%G-qZ(gzqzv8}gtpN(R258(8aN%0Ojpr7M;Hkx8xU``te%zGBBiM`s lz**bC!l@I)-yQ@1ZLI10XV2N-Zqxt(002ovPDHLkV1iIOYw`d9 diff --git a/src/img/items/olive-growing.piskel b/src/img/items/olive-growing1.piskel similarity index 100% rename from src/img/items/olive-growing.piskel rename to src/img/items/olive-growing1.piskel diff --git a/src/img/items/olive-growing.png b/src/img/items/olive-growing1.png similarity index 100% rename from src/img/items/olive-growing.png rename to src/img/items/olive-growing1.png diff --git a/src/img/items/olive.piskel b/src/img/items/olive.piskel index 785573959..9a96c9e53 100644 --- a/src/img/items/olive.piskel +++ b/src/img/items/olive.piskel @@ -1 +1 @@ -{"modelVersion":2,"piskel":{"name":"olive","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAABdklEQVRIS2NkoDFgpLH5DKMWMORV6f2HBfOktksYIUJREIEM1zUSgUfj5XNvGNAtIdsCmOFv33yEW6CVcYXBj+Enipk4LUD2OsgEZJeB5KTkWDESINEWbGTg+H99hjbYAGERfjAN8j7MIlwWPHv0m7ggQrYA5kxki7C5HpvhIL1YgwiXC2GWgQwDWQKisQHk4MQbB9hcCjIQbDDjXwYpWS4U84VFeMH8x/e/MjSVngSbjWEBeuRCTPjHICXHDmY9e/SHgYEBnvSh4v/gRoGCUjzkCDw1oViQV6X7H2IQTPg/JJL/szBcPv8cLA7xFSMDzLWgyIfoAVkK0vePATk1oVgAiVxdjGAVFhZCsoCNQSvjEljNyzU2DJfPvYZa8JeBgYEZ7stJbecxgwiXBZCg+Qn1AcKCazN0wPEB8sGzh3/A8YKeZwgEEcIzEAv+Q12L0AaKE5hrsaUoIiMZkZPx5XCiLMCasCkQJLuwI9bOUQsIhhTNgwgA2+icGQjLpFQAAAAASUVORK5CYII=\"}]}"]}} \ No newline at end of file +{"modelVersion":2,"piskel":{"name":"olive","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAABdklEQVRIS2NkoDFgpLH5DKMWEAxhioMor0rvP8yWSW2XMMyjyAKQ4bpGInBfXD73hgHdErItgBn+9s1HuAVaGVcY/Bh+opiJ0wJkr4NMQHYZSE5KjhUj/Im2YCMDx//rM7TBBgiL8INpkPdhFuGy4Nmj38QFEbIFMGciW4TN9dgMB+nFGkS4XAizDGQYyBIQjQ0gByfeOMDmUpCBYIMZ/zJIyXKhmC8swgvmP77/laGp9CTYbAwL0CMXYsI/Bik5djDr2aM/DAwM8KQPFf8HNwoUlOIhR+CpCcWCvCrd/xCDYML/IZH8n4Xh8vnnYHGIrxgZYK4FRT5ED8hSkL5/DMipCcUCSOTqYgSrsLAQkgVsDFoZl8BqXq6xYbh87jXUgr8MDAzMcF9OajuPGUS4LIAEzU+oDxAWXJuhA44PkA+ePfwDjhf0PEMgiBCegVjwH+pahDZQnMBciy1FERnJiJyML4cTZQHWhE2BINmFHbF2jlpAMKQAvHOcGReApVIAAAAASUVORK5CYII=\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/olive.png b/src/img/items/olive.png index dfb972998372d497fe5c9ba0885b2225e57c1ab1..ca751a2ef4327694100eb47b879d0a1ba19961f2 100644 GIT binary patch delta 387 zcmV-}0et?j1F!>-Hh&NdVTyw&uS)Mf%$7-QmoUtu$O4ezx<(>!UtB)-h5_9YvMqoa z{`SpBxCL4nR~Y;lexjI((*k6#gG@kn8Awh_juj*PiMC)P1IPdCGqk}52#fH8X^{6} z7U8ns*`wdY1rf3ZFlQoLgw6HX3S6?|u&@x41$=A_S{awXYF@6fVYqzmHPnK?3=9m+a9>VpJC7MexGaDK%}=Ng5EfjU zp#zQ&kPn_c`~!{`^gKf#h!CEESnwa}T7))GoWNX*EkzL-$%vecFNYIl0oH^~fgst1 h9kF(fT0k(Q0K9XY85e-1QUCw|07*qoM6N<$f&ksis8j#| delta 387 zcmV-}0et?j1F!>-Hh(bWRq6eQ1@ok~OBf+SQ4oO)*EJG>N8{ylZy3-mA=?6&;cwr3 zgj=AMafQK;;U|ijI4wZ-I>-cMmx1J@sC@#S!$EWnzuDG(&Pup`#a hQ40u$6wQMO0Nd!C83@ayQ~&?~07*qoM6N<$f&l4Itatzb diff --git a/src/img/items/onion-growing.piskel b/src/img/items/onion-growing.piskel deleted file mode 100644 index 53bf1e3d8..000000000 --- a/src/img/items/onion-growing.piskel +++ /dev/null @@ -1 +0,0 @@ -{"modelVersion":2,"piskel":{"name":"onion-growing","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAA0UlEQVRIS2NkoDFgpLH5DCPVgklC/xny3hHle8KKsBlGVwsIWEacD0BJDTlIkA0l2wJchqAbSMAy3D4AaYS5nBjLcPgEfxBhMxgmhssBaDmXuDgAhT+ywch8kIF44oFyC8iOZGSvogcHtrjBUagR9gFMI8wSZIOIyM3EWgBJUdgBXjMIWQA2+P8KYwYGYV0GhreXMWjGiLMwa7Gahc+C//93J2AaCjMOzTJG1wUgGQzzsFmALziIrZ/g5hIKImINJC+CKDYdW5hRw1BkM4Z+EAEATmiKGQys5BEAAAAASUVORK5CYII=\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/onion-growing.png b/src/img/items/onion-growing.png deleted file mode 100644 index 98ef40ed304af5ad07b46d528d0d001a887569de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-#e7c} z#}JRs1%qm4HmWTVm`{q66Jr%W%E!`_8cX{wh<+M$ZFfnl0bM^+0@}Z|kq8iRGtvIWY zaDH^3P_yq9LZ? f6S_FTgOTChL$7mxx92$noyy?p>gTe~DWM4fO%+hK diff --git a/src/img/items/onion-growing1.piskel b/src/img/items/onion-growing1.piskel new file mode 100644 index 000000000..0749049a2 --- /dev/null +++ b/src/img/items/onion-growing1.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"onion-growing1","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAbElEQVRIS2NkoDFgpLH5DKMWEAzh0SAaDSKCIUBQwQhMRRKmvP9B4fLi9GeifE+UIlhAgwwvyQsHc3smrSTKEqItgBn+5vVbsAULlu+hvgUJkS7wVDOoLQBHIoUAHvRExwG5Fo5aQDDkaB5EAEeQJBnmlvUbAAAAAElFTkSuQmCC\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/onion-growing1.png b/src/img/items/onion-growing1.png new file mode 100644 index 0000000000000000000000000000000000000000..fe81d78cb284c8bdd11d55ee2d4f86d88efcbd54 GIT binary patch literal 146 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|d^}woLp(Z@ z6C_v{Cy4Yk1vYT*I1}-|c;?1`%V$1Z>z({>yI!y2Eg`WWp7rPW(<^@e;`QuHQgSt1 s*)}+}rLp;2bQx+H|EZO*zXR(+7 zPvWE|k3&`93@ zDb!pWSTVk$1X8hFJ7McJaAjJX}A=|t>H zzru873!~Tf4HgSbI{pdkJmJ)CP?uX2ESPA#aka!RF$RW!mTt*)?bF@>oyg$n>gTe~ JDWQph0RX!hP0IiP literal 0 HcmV?d00001 diff --git a/src/img/items/onion-growing3.piskel b/src/img/items/onion-growing3.piskel new file mode 100644 index 000000000..a4e62636a --- /dev/null +++ b/src/img/items/onion-growing3.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"onion-growing3","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAA70lEQVRIS2NkoDFgpLH5DIPDAglT3v8vTn8GOwYXG1dI4PQBMYbC1CCrRbdocFiAHDTYXE2WD3CFN1UtwOdyYiObYDJFdzGID7IYW6rClpIosgDdMoosIBTRJOcDZA3YggkURPhSD0w/wSBCdzlMI1UtgFlSkhcONr9n0kowDYtofAUmUT6AWZAQ6QI2S0RUGGwJzSwAWbJg+R6qWgBO+zgA3lAgFERggz+v9mNgElJk+PfuPgbNG7oJb4LBZ8H/r3vzMQyFmYZuGbfzRJAUhnnYLMAXHPgSDLIc3FxCQUSsgeRFEMWmYwszahiKbAYAYw7wGetnhO0AAAAASUVORK5CYII=\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/onion-growing3.png b/src/img/items/onion-growing3.png new file mode 100644 index 0000000000000000000000000000000000000000..9984612007d28e7aef02e9a1cb67fbc9cdbdc6e2 GIT binary patch literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj?>$`{Lp;2bQx+H|EZO*zr};1w zXYjrM`hN9n)@eph@C< zX8Y4Gc^U9_XVkE&1==-4P7rv>WajM>B9X&+R)-;SQ^HTVRZ$FnzbzQ<1t^HPBsANv z|CXE}6qNGg`#U?fv(mdb^P3K)AN;?*`m-TV>&&)1$?czACWy3E-q1N9F7rc(XOqmG t7$--UHH}YP1&%ID<~Gif=*nSZNap(>`8vJjEzs)>p00i_>zopr7ywCYZ1eyC literal 0 HcmV?d00001 diff --git a/src/img/items/onion.piskel b/src/img/items/onion.piskel index dcc2e3e96..5448371d8 100644 --- a/src/img/items/onion.piskel +++ b/src/img/items/onion.piskel @@ -1 +1 @@ -{"modelVersion":2,"piskel":{"name":"onion","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAABEUlEQVRIS81UwRGDIBA8W9A6fKWG9OAzFaQYK8gzPaSGvKzDtEDmgBM44PDMOBM/wo3s3u6tdHDy052MD39MMPcG7p+8Qar79zEFMXhpHdV+I2iA43z1BBJowbbjBMxr4HsfT4nAZBGee1fC4SJgvKYaG3yNwJjXLeCvi1130xuASDgR7VlXJYIiOAyjI7k+UpIYOFZVsciY5wUIDHzn2x4PrUuqhNslKNgFbs8PY6qk9MMVFASCSucETk1auxpRj2cQvEcC77kFk6xSE3AwQY1N1SEC6r5hld4iKUFE5oe8RVahAM+4QdMjKNnTfc2/Zpr2eL8ljf0XtA1KWJo04K0E5Jedo1fdwKqPK2rF8ukEX6++uBn9nzRNAAAAAElFTkSuQmCC\"}]}"]}} \ No newline at end of file +{"modelVersion":2,"piskel":{"name":"onion","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAA7ElEQVRIS2NkoDFgJGS+hCnv/xenP4PVIbOx8bGZRdACZINobgE+y3CFBEk+oLkFoCCCuRQWL4TikCgfwFyeEOkCNm/B8j0MQ8cCFiYGcLD01nqghEZx8w4w/88/BryhgFcSZPjH3fl4g5nfdSJeS3BagGz4v3f3GZiEFFEsQhbDZwlWC/AZjmwwMZaQZAHMQHQa5DVcvsCwAJfrcbmckC9GLWAgOYhAEQaLB2LCHaaG6EhGtgDERrcEJAbLE4RcD1I7MBkNlmVpWlQgWwJio5dJoDCnuLBDLnxgpSpMjFApClNHdIVDqObCJQ8AoF0DKFSYAwcAAAAASUVORK5CYII=\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/onion.png b/src/img/items/onion.png index dbea3baa29ce1a0bc07e2771620d437102213f33..879927321c1c3d286d8db55670b0e712965811fd 100644 GIT binary patch delta 279 zcmV+y0qFj*0-B!2;OQb$4nuFf3k0002&Nkl>yK|Y)1@#tq%SeBWcEW5zBv0BUCb#^_w5QP$& zS_ux(EVx{7MS~9JVv@kH`leQb^9?IWlkRt00KoZj1y^A4D}M@B5l83&;B?rG;>Ga> z0BAd!gM1lB=v9@I1<0%mlix^4D5}DRyE#`9MfhFLr z-gE-6T>RD~|A#=^LCCC}Oyrvf+QIOT(dSU(4R|MzoCPCBP4nWbg1ziaA>F50%g!aF d5hDH=p0bK?Vh}@|OE3Tc002ovPDHLkV1nqrg9HEo delta 278 zcmV+x0qOp-0<&pJ9f4Ht%Oi0Ql=`8XRSP?fJ`a z>AniCfj$nGpw;jk^oi5x`yt(JjCMfW~eM(f1Jm(6Uhs%)psf zP`h)|i4|};Ach%URY`mgmRX0#t2V*`?U<$@Vbzum)(XOL&3y+3c&;dPQUNa&YJWvD c{5SLfhs%tioDXyl|_SX!df zL9KYYQf2DmGxhJbUY;y=L8I9}^?ByEwmlgO-~7;+e$&zOWMim^I{OXbA1*-`*D{1> zEU0f-x#BwOhTVotitI`G6Kfu1@^!U->GDYOD_GYVah`3)#;u3_ne$WU-&cH-z;xzD r-XrDG=ihh4#aul&>0kY6o5`$6=Z&}<-V4P6-OS+W>gTe~DWM4fT&QF% diff --git a/src/img/items/potato-growing1.piskel b/src/img/items/potato-growing1.piskel new file mode 100644 index 000000000..63abe077c --- /dev/null +++ b/src/img/items/potato-growing1.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"potato-growing1","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAp0lEQVRIS2NkoDFgpLH5DKMWEAzhwRtERv4y/0HOP7fxCV5HkuUDkOHietzg4Hl56SteS4iyANm1IPZ3QYQ2BVkuvJYQtADm2gePvzFwvv/PgGw4LIZB4riCiigLYIZiswCf4SAHEG0ByCAQQPYBIcOJsgCkCBRMoCBADn9iDCfaAlhYwywg1vBRCwgmkAENIkiaJA+g+Iwob5JnD0TXqAUEQ4/mQQQARy5mGakxERwAAAAASUVORK5CYII=\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/potato-growing1.png b/src/img/items/potato-growing1.png new file mode 100644 index 0000000000000000000000000000000000000000..cb600172c0f3aecb1c25842ac8295759ee42e3e4 GIT binary patch literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|W_Y?dhIn+o zonpv!*nr1%|Ku{>7YsA^mcDkZ36fWdHalzEpqTA(XWb8B9TSe`m-<8J+22WQ%mvv4FO#orLSknLi literal 0 HcmV?d00001 diff --git a/src/img/items/potato-growing2.piskel b/src/img/items/potato-growing2.piskel new file mode 100644 index 000000000..c3b498a6c --- /dev/null +++ b/src/img/items/potato-growing2.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"potato-growing2","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAA8ElEQVRIS+2UOw7CMBBEnRKoqGhA4gQUXISzchEKToCUNFRUQBk0oIHxssYkkgVFXEX+7JsZr1OFwqMqXD/8B2C9mbdwuts2nQVlD6D4bDUJh/oSRqc2gig4JeINYA9dp68tCsA+rC0X43Dcn+9XCSH4VqcRwFNLoNcMAACKQSEEEvIEaHEWw2EWwQGqxroqt2vqNALYOJg9ClqlhKtiCnABKKIb1LYCOE+AuqGT5B0QYi1bB1SokdkOY8wf29Ra9iLw5rQhvnoHtJwqhvnUI8wCVE1OrdfKAyD7t/9ZRI8fTL8Rie7koA9vAGRTKx7RDbMp5hm0imMtAAAAAElFTkSuQmCC\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/potato-growing2.png b/src/img/items/potato-growing2.png new file mode 100644 index 0000000000000000000000000000000000000000..3e94719cb4445065d1bdbca47e0a0f7b068ba9f8 GIT binary patch literal 323 zcmV-J0lfZ+P)Px#{YgYYR7i>Klsyi@FbsuX3*As9AAs3gHx803aKRpgjV&_=h{PI|Fcb$jB$U4i z^-WP@`?Ft?0*ihjHWb)U_$0S}rFh#7u;h_KG`Q5nI#&IO7ncy~&e7EGs zZl!qdDp^auXmSR6lU;+h8zwLvdp@r2AT!z`kSst4l)BM-x~UYR&tNh^E+CcoUa}?4 zeYmF4>tv!Fv}DU$(%!S7fc@s-zCXKZvk&c=U9ZH<0>0G(m{sX;KKeD!)Lithx&orh6Vu80q8-lCJ&&i)e&ORorsuRw7}wk*9XqA4%|^`Uvn#Rzvn># zK-FA~9!mkJB5$$}$gyw(@@6sw%p67LX9c_D-K~D$7H@Og!lljbGhE-XjXAh50lLL beZUhzi4iDK=aB0F0000xbpYYWc+?wSjj2v~Q zCpXRcTs=7@WhcYL^I-*cx?FOTcFA=*KRR;ckIuULzx1TPZnvKOeZu;WYH2H6loLvo S3Rr<|WAJqKb6Mw<&;$U17E{*% diff --git a/src/img/items/pumpkin-growing1.piskel b/src/img/items/pumpkin-growing1.piskel new file mode 100644 index 000000000..cafbba101 --- /dev/null +++ b/src/img/items/pumpkin-growing1.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"pumpkin-growing1","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAgklEQVRIS2NkoDFgpLH5DKMWEAzh0SAaDSLsIVC1zu7/lYtPGTY13iWYSHAq8KtX/q+jLw22oS3oEFwdzHCQOMUWwNwPsghkCchSmBgxhoPUEvQisqGkGk6UBTBDYRYR63KYPoI+GLUAPYjgqYRgGYBfAdxcouOAXAtHLSAYcjQPIgAOZi8ZT91aaQAAAABJRU5ErkJggg==\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/pumpkin-growing1.png b/src/img/items/pumpkin-growing1.png new file mode 100644 index 0000000000000000000000000000000000000000..9c4dc97416d2dd4518b2e7e9cb45004a64d1e228 GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjO`a}}As*hzDGLk}mTdgVvsg@k z=ix;KDPE;FiUC{Cz5744+h5Ym^q%Srj{>a^tHb}TU#!o&ZK3W9ff(5{1rsceiXFJa zzlkG-^F+`L3B$JLD?(qCHZ5Etzopr7#IL4EI}jy literal 0 HcmV?d00001 diff --git a/src/img/items/pumpkin-growing2.piskel b/src/img/items/pumpkin-growing2.piskel new file mode 100644 index 000000000..7b64207b3 --- /dev/null +++ b/src/img/items/pumpkin-growing2.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"pumpkin-growing2","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAA2UlEQVRIS2NkoDFgpLH5DKMWEAxhqgSRX73yf2SbNjXehZtLkQUwg1+9+4PiEzEhFgaYJWRZgMtgZFtglpBsAchwdBeDDP786jvcfF4xTgayLMBmOMxgkKEU+QCX4egGgywhKg5g4QyLLGQL8LkaZAHBVIRsGMg1IAALd5DhyK6GyaMbDAsujEiGGY5uEHqOghmM7FpsuQ7FAnTDkcPSIlcenJmINRivD2CSyK6DWXBi8kOSkjbRioeMBSiFFsGiErcC6hR2xDiA6DggxjCCyZRcQ/DpG/o+AACfiHQZOpMMxAAAAABJRU5ErkJggg==\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/pumpkin-growing2.png b/src/img/items/pumpkin-growing2.png new file mode 100644 index 0000000000000000000000000000000000000000..c4d6ad6f9d285d49d11f76fa548cff0248e27bbe GIT binary patch literal 276 zcmV+v0qg#WP)IDxg_}!}1u%nOz59dW6EPtc2ACyeS%Ax6WLsdC zkZb|SaC8@g4F3G;JKTI;F-``uEWl@1PLp;2bQx+H|EZO*zXR%m= z^Nsa!KkbVG^0W4E^Gj}O=D2ww{QbWLE=y+!a5J9~+N8rE*_WqLmDCvNw2AdaTYcSE z**vrL66$k&r?H-BJIv!|CUR3eB{E^6Hh-VbgoihH*d)1_RgN>B`T7DV>*{BD!cNhO zFJT>frdo=ItJs_weIDxg_}#Z1;~cJdiMv#Ct^Y@3@}T`vH)Z_x}oS{ z1+#=?3(yV!{OUX0Y+f-=IGZdBkPU|!jBF^fFUYdMB3B+9nIOZl84NNM21t$rnCsCE zhZ%~Ta*%yObR58357JD?P>L)#G5I0UjsjVPQ!y+^V37s$0aYx384fZGIcPvGqSyjt z!;!<1YCZrNgw2(*d`u|i&Err1h>8mgMc8}*GW=q;9!hDTKlKs=F_vI;1#&@Va7!F) zaDl=%s#t&$3B7e-dFt_}e|UooLlR^VHdlhgL55$<)B+0lF~Fe7LQs$Fw_9I)`=NUBEfwC0000< KMNUMnLSTZ4%6UKl literal 0 HcmV?d00001 diff --git a/src/img/items/soybean-growing.piskel b/src/img/items/soybean-growing1.piskel similarity index 100% rename from src/img/items/soybean-growing.piskel rename to src/img/items/soybean-growing1.piskel diff --git a/src/img/items/soybean-growing.png b/src/img/items/soybean-growing1.png similarity index 100% rename from src/img/items/soybean-growing.png rename to src/img/items/soybean-growing1.png diff --git a/src/img/items/spinach-growing.piskel b/src/img/items/spinach-growing1.piskel similarity index 100% rename from src/img/items/spinach-growing.piskel rename to src/img/items/spinach-growing1.piskel diff --git a/src/img/items/spinach-growing.png b/src/img/items/spinach-growing1.png similarity index 100% rename from src/img/items/spinach-growing.png rename to src/img/items/spinach-growing1.png diff --git a/src/img/items/strawberry-growing.piskel b/src/img/items/strawberry-growing1.piskel similarity index 100% rename from src/img/items/strawberry-growing.piskel rename to src/img/items/strawberry-growing1.piskel diff --git a/src/img/items/strawberry-growing.png b/src/img/items/strawberry-growing1.png similarity index 100% rename from src/img/items/strawberry-growing.png rename to src/img/items/strawberry-growing1.png diff --git a/src/img/items/sunflower-growing.piskel b/src/img/items/sunflower-growing.piskel deleted file mode 100644 index c95a7fc20..000000000 --- a/src/img/items/sunflower-growing.piskel +++ /dev/null @@ -1 +0,0 @@ -{"modelVersion":2,"piskel":{"name":"sunflower-growing","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAA+klEQVRIS+1VsQ3CQAx0JLaAgiXoaCjpkZiDSZgDiZ6SJh1LUMAWSEEndOA49jsp0kSkeSm6853tS76SkZ9q5PryF0gnPNERvWpp2PtsnQehhG+NaLGS5n4UuV5+o91sRTIRCIDjYb8CKL7bz+V8egpE+nZAUxG+0wFFeIL4uPlj0qaIt9hOikhCYXQTEenY4q0hN6aWFHVgRTxDRQEQUByCOKO0lAylAnCpl2/TguIaU9wBnUbL0x0sD58B2VCEArooiVw0x4RidvkeVv+g0phqR9GstbnBMfUEuHwvRakASJGj0nuK9RbwCExM6eu2F8RE74P0HhwAeAORRdQZL4CW8wAAAABJRU5ErkJggg==\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/sunflower-growing.png b/src/img/items/sunflower-growing.png deleted file mode 100644 index 88e7349ffb785cc57c3772e5fdf42f9869a41984..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 309 zcmV-50m}Y~P)QxU$?0Y!L%__+CF(x!;F*iMQ_LSb|h5$V|Ctsyt2mK1ehMLa`A0T56ef;gkJ zlnkW;aH*GX(}Lm}Q``ZaM$6M3EDxUn*-(T6x+sZUG{=NucKIGw|De*CYDdwmwYkAD z^#r(lFGZ;UNRgw`dy4fI@CZyy>Fc%^#6<6d^d1}lcmt6|)EO^;mh%7r002ovPDHLk HV1fVuRiuMy diff --git a/src/img/items/sunflower-growing1.piskel b/src/img/items/sunflower-growing1.piskel new file mode 100644 index 000000000..94961871a --- /dev/null +++ b/src/img/items/sunflower-growing1.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"sunflower-growing1","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAd0lEQVRIS2NkoDFgpLH5DKMWEAzh0SAaDSKCIUBQwWgqGqRBpGTC+R/ktHtnvhMdRyA92NRjGABSGBKmCfb6mlXXibIEpgebeqwuJNUSsi3A5iJsQUE1C3AZBIszbPGGM4hg6Q854vAZhCu9Ep1KCCZ4HAqGvgUAW3JQGeCgWGcAAAAASUVORK5CYII=\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/sunflower-growing1.png b/src/img/items/sunflower-growing1.png new file mode 100644 index 0000000000000000000000000000000000000000..d780a9b7b709867389f659595f5e1a82ea7203c2 GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|GCf@!Lp(a) zUO32kK!Jz#LjLs&rgvNl+z$H2I6vQ@u6SgL!rP@2%6U5Pvltwc_#Cd7)YegHrF>O? zrD1CSl)Y9<&U*ZfcE~T-%EMs6buouAM3;H*!H@Ur#17cbP0BrMxza;^fpkXc=Tp3C WWlCwPEyW-gFnGH9xvXZLBA{IzF%2aYR zJIpS%qG(p5;B;mQAec8NEg@#}C(S~!10s)$1T71j1zlQVTDTuvI^5waaI^J;;WwTZuPx#(Md!>R7i>KQb7vCAP^j-ztBTJ;ZFkjMhkgHKN9d6IRyNM{-R({rW?DPSlXil zL89aCjI%&TN5>AyaytFFF8#7@+)|FpOr~ zE3UW(9KYsj=~5}~=Y$xbBo~y=3HoS2QHr;Q&j~tg0PMq;&TB#RTuWq56`htc0QCJi zuw%*!5b>Eu=fF3Yr5| dD(!dtgcoh~qDmC;fY<;4002ovPDHLkV1i2YcG3U< literal 0 HcmV?d00001 diff --git a/src/img/items/sunflower-growing5.piskel b/src/img/items/sunflower-growing5.piskel new file mode 100644 index 000000000..e264da78e --- /dev/null +++ b/src/img/items/sunflower-growing5.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"sunflower-growing5","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAABB0lEQVRIS2NkoDFgpLH5DKMWEAzhgQmiL0ed/8OcxmO9l6Aj8KnH0AxSvG/Hc7jXnTwkGfBZQkg9igVKJpz/L020YqCJBSDDQ8I0Gdasus4AsoTYIII5Cpd6DB/ALIHRII33znzHGg/IjoKpR1eLoRGmCWQwyDe4NMJcjK4e3UF4XQazBJcP0C3B5iCCXgcZDnIliMaVHNF9gewgghaAXIkc+aAUhpx0QYYjq8EbBzCX4oo8ZB/o5R8DhxB6osBpAbKhMI3IcYAr8rGpRS6gCCZTZBfhCmtkx5GcTLFZAEotxIiDfEIwkokxCBbR2DIlTgtg4YhuATZxfJUCwaKYYI1CQMHQtwAAJ8UIKCprM9QAAAAASUVORK5CYII=\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/sunflower-growing5.png b/src/img/items/sunflower-growing5.png new file mode 100644 index 0000000000000000000000000000000000000000..0a210fc147f88dcbf60be373d58d48ded8dd9992 GIT binary patch literal 313 zcmV-90mlA`P)Px#^GQTOR7i>KR51>NFbq5pzet9DB3qY^-I4f4EAfne1c|+47X~E00lz>>hbqLl zPC`XTPC`I(_MKxZz<~pMkx7el2kX9zv&`AbFC_Box&Dudr1&`{YvY~#9ooR&9?EJ1 zJ9qxs61SO8Mcg}9mBiytOkL5Dbo<;8-A|4wcXhdXt`m=85#UaFa&2JiUZL(4PIoMg zNE1Pwhnmlu%(1#E#sOK2DOq-Evcw8_CBGsRBf6k{piV>U2X^5N50ttIHFN9F00000 LNkvXXu0mjffu(?r literal 0 HcmV?d00001 diff --git a/src/img/items/sweet-potato-growing.piskel b/src/img/items/sweet-potato-growing.piskel deleted file mode 100644 index 241409b11..000000000 --- a/src/img/items/sweet-potato-growing.piskel +++ /dev/null @@ -1 +0,0 @@ -{"modelVersion":2,"piskel":{"name":"sweet-potato-growing","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAABC0lEQVRIS+1VwQ3CQAzrLcGDDwswERLTITERC/DhwRJUQfLhM871kNof/bRcgx3HSVqmja+yMf70J/iq8OG0e+Hwfn2W1UoE4ON5X0lvl8fHA2aOiGDX9DQGcXHOwHEe4FVBFqAECgKgDDzev7NUgmB3f8oINBFWX0bAe5n2sm8UIAuXJQjiriZmqqCiGul8ACmXDM9xV0IuVWMyXrgucSBKmMXYOWAlzuyeH1zmVEGvxigLlwLxAERXYkZSDzT7ETVMgiTsHGgZeoY6Vc0c8KC5YDbwF1XDbepa1LWvTvPiLlqaXgC4LcoJdD1wkxvSA1S3bbYwmy5imQDQD4iWgn+7lb/aBycj3pxgBhPS+cOkl2J2AAAAAElFTkSuQmCC\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/sweet-potato-growing.png b/src/img/items/sweet-potato-growing.png deleted file mode 100644 index a8f32e01477693632cbce14105813c9ed0de0384..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 324 zcmV-K0lWT*P)bD`HB5pe>>OwrdWJex%^dKcxnMT%7gfV; z>RQybuTJygE?Syi0Jts633NShlN-_lRJU!mFq&$0000-;Z&{N^2BGIM=vhDfA)r`|D%kosy|b!!H&KW^f*|Im%9ZMUbYJ;3v%Lw00000NkvXXu0mjf D!sM3x literal 0 HcmV?d00001 diff --git a/src/img/items/sweet-potato-growing3.piskel b/src/img/items/sweet-potato-growing3.piskel new file mode 100644 index 000000000..df055235d --- /dev/null +++ b/src/img/items/sweet-potato-growing3.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"sweet-potato-growing3","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAABSUlEQVRIS+WVoW4CURBFZ38Dh2lSh8WR6qqqChTfgK5A8w1VK6qqqpu6WhwJBsdv0NxN7ubu7Oy8Lckq1gDz3jt35s7so7KJn2pivt2hwOJ1fqWth49z0YHBDQoCEDDEluuHhv+4mNn79qeJZ30MFwHa7Fd2PFzas7/1yQhnkCIq4AV7AhEcgEjAx6KqOgJqgS8bMDxaRVYVK2kFSnCCCY0EvXUQ6VUQNUyzpg2IaQ98f5BATwBwrUSzzazxzcbeUMDblAmw0mhswQl7oKOpDaTfbLJf0/6EY5rNPWAvz3N7W39Xu/rp+vl17rx0ak/00jVN9r4jBihhAFNAhbLMaWFnTHkl4JNQ/Y4YfkOEiemZaALTe8SLKNwnMXQfFW/DqBLCdO1mgcwuWvXv2zQ6QP+5NgaOvUWLzKz9g0kyHeSMEcgcKK5NLvAHBzcHKPX7AFMAAAAASUVORK5CYII=\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/sweet-potato-growing3.png b/src/img/items/sweet-potato-growing3.png new file mode 100644 index 0000000000000000000000000000000000000000..32878790585fc63cf0cfa1685dc10057ab3791a7 GIT binary patch literal 387 zcmV-}0et?6P)6_E5JhKy1BYo+hsBZVs;UYU-+-<_^9@xis;a7+x>_6w2FGvE+)eK0?(FQmEy*g@ z0Q25EcjnIQqq2#gYGS_Kp}^vGexxYK_xR}}d_NR$weGC@? z+U!?$JY3qdzxBxoXOJQ);01dE5gdR>z{jGhIs$5eFB>pCT18eBD`^EvaDoYq1if_- z=~WOlOtYp9h-nXee~>^=0C25Dv(2pW&BoqPz}u7wu+nI3!3leyqp1y~-)yp9)Bc2G zn$106FVAy(TYp!(`sw=lb?&@$YESgiHBI)uBL*m808>DPvdn2=XH0n|;FD1Oju?JJ zgo){yXaduF#EU50Coyy%6>r0+62f%tW`WEuTJ`VSG&(^4xi$uly+w=6to?&YG9BcM h5y%`Uu1zlR2M0F?DE0dQQvd(}07*qoM6N<$f&lPGt(pJ; literal 0 HcmV?d00001 diff --git a/src/img/items/sweet-potato-growing4.piskel b/src/img/items/sweet-potato-growing4.piskel new file mode 100644 index 000000000..8a8947dc2 --- /dev/null +++ b/src/img/items/sweet-potato-growing4.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"sweet-potato-growing4","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAABQElEQVRIS92ULQ7CQBCFt9fA1ZDganEEjUIhqjgDGoHmDKgKFApNcNg6Ekwd1yiZJm8znZ3ubCA1rIHuz3z73sxs5kYe2cjx3Z8Cik3ewrr63PykMjhMwbfHhXvW747xqF6OQzic1q0L9ABacK6E1ufl1NfFrJi40+4ehXiAPEw358HkNyg0z4dUFCjAZm4TrOJAbU5TpOZABkIw+rVUSUigYCg4zeMw/efWDJ0hu3o5IFsoaXJoicUch/JzqL4OIKtH+mslHBBuYQCIeasBcFtNHe8PrwAbtXKUfmOPZo9szB6AFrXylJ3NrZAQFRDLgwyOQrCsgYVfdXKKNQEAKnip8bysV7m7XBvfaNYToQJk/ePlpIY5VMtWAqyXlOKZbz0F3pe3bh8gKc90kgJsosBcHYBByysTpoKUILE9owM+Bp4PKJgW4PEAAAAASUVORK5CYII=\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/sweet-potato-growing4.png b/src/img/items/sweet-potato-growing4.png new file mode 100644 index 0000000000000000000000000000000000000000..4a374f9bea2c24e96ed92ce43963941c2f033359 GIT binary patch literal 378 zcmV-=0fqjFP)IucAB*C?4LZ!?{p?rb16tby*& zeEZ(aZ01HD*~szTp8|?a-om>2-29|6I84E}$Ax>=?~d`PUXDXJoYt)i^Z;6Lu7uX- z<5lV20}3UwNyz+pkOFC z&Eqir=hh6JA-j4xAX_MDa%hRg9Eb9AsJ;#$t4I24B^(fLVE~AEs{wFZO&#wKuK*jh za+H2!k7kc-%pQOiwepmm&8?6S6%fmV430vutbv7Jb#jU|0RSp^sqwt5SGl`f8{cTw z6QKfR{p01NhB;KrRsyV-l;W9hJq6yEw{9OGDbIA00&JqdTpfTx%PSM6f|MY!J);9Y Y2A&Tnm=@si00000NkvXXu0mjf0LKob^Z)<= literal 0 HcmV?d00001 diff --git a/src/img/items/sweet-potato.piskel b/src/img/items/sweet-potato.piskel index 80f3a7e36..fe6370c5d 100644 --- a/src/img/items/sweet-potato.piskel +++ b/src/img/items/sweet-potato.piskel @@ -1 +1 @@ -{"modelVersion":2,"piskel":{"name":"sweet-potato","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAA7UlEQVRIS2NkoDFgpLH5DKMWEAxhioMoyoD3P7otyy58hptLlgXIhjYHaYLNv3rnMoO2ii6YXbvuOgPMEpIsgBkMMxRX+JBsAbEGwywkyQKQ4bhcDAoWGIAFD0lBhM1wXIYiBxdRPsBlOLJLKYoDdAuQUwmhxE/QB8QYjmwhriQKcghGMiXGcHw+QHY9hgUww3EFB6FgQjccxQKQ4Z0FaQy/Hh0mFMRY5bEZTpEF6L4hyQJ0zfiCBmQwCCAXcMheRIlkfLkWW7jgcjVOC0AS2EpK9FwK4+NyNV4LkCUJlfXEpAaSimtiDERXQ3MLANJApBnOiL6/AAAAAElFTkSuQmCC\"}]}"]}} \ No newline at end of file +{"modelVersion":2,"piskel":{"name":"sweet-potato","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAA6klEQVRIS2NkoDFgpLH5DKMWMEQZ8P5HD+ZlFz7DQ4asIEI2tDlIE2z+1TuXGbRVdMHs2nXXGWCWkGQBzGCYobgSCMkWEGswzEKSLAAZjsvFoGCBAVjwkBRE2AzHZShycBHlA1yGI7uUojhAtwA5lRDK/QR9QIzhyBbiSqIgh2AkU2IMx+cDZNdjWAAzHFdwEAomdMNRLAAZ3lmQxvDr0WFCQYxVHpvhFFmA7huSLEDXjC9oQAaDAHIBh+xFlEjGl2uxhQsuV+O0ACSBraREz6UwPi5X47UAWZJQWU9MaiCpuCbGQHQ1Q98CAPnipBlXIGtSAAAAAElFTkSuQmCC\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/sweet-potato.png b/src/img/items/sweet-potato.png index 38956f4c5c3adb59082e2be1a1de367836af38f4..452d0404136fc0cf31b63cdc910c253262fb215a 100644 GIT binary patch delta 264 zcmV+j0r&o<0;2+uB!B8jL_t(YOJii9F<_*z`3$2LFhm*f{znhyWfwlfLx!v%LN>HH zNE2-S)jO9Nv{iJ$?AmqL8DN%>WC6@zn4!252+0-@YcR}0k}Lojj?2ZMV1WTx@Q@Tl z*bK*IC~|NSJQ7ix%-dT{w@axfGLP3mG9-HA5S%B^vk}N>ij4x@{0f+2Glt{*x zYq5n3E?48U03?B}q(sl9Fg`9<tl5H9Q delta 267 zcmV+m0rdW(0;U3xB!BHmL_t(YOJii9F<_*z`3$2L5Da08gDA>?_dmKV%PxF|n@g4j z$c8otX@bqadgn5Owu&y8UAyi&1I!YVEPxpdGZa_&kZb|52E!~Q$pVn!xLgbh78rm9 z4@p6U&2U_XA_o^yKEP!-vP&t719S_JQwgEOPtXU%7>;Zqu74y7atKB;CB|@kK0tOo zh6OOgaRmpVU_v(>#R8DwodszOzaAYX6vSBNu^CR01?avZ$pUoE_<{yxFbE(QaL8Un ziDZ1a7F)RBay3p1KoZzWO7vU`^-8P^dx9c+Jnh|&L22% z;KS{Ea_e8NVdsBj$~~R+Kc{5RVI`i=8zLPtPbt{NxgY$%z|hMiHpf*qBM)c=gQu&X J%Q~loCIIR7HmCpq diff --git a/src/img/items/tomato-growing1.piskel b/src/img/items/tomato-growing1.piskel new file mode 100644 index 000000000..6930b0633 --- /dev/null +++ b/src/img/items/tomato-growing1.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"tomato-growing1","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAhElEQVRIS2NkoDFgpLH5DKMWEAzh0SAaDSL8IRBbZvIfpGJx1xmciYVgKkI2xLNADWzg9gm3GIkxHKSWoAUgRTDD3vz6BPaSCBsfmMbncpjfibIAZgmyBcQYTrQPYK5BDiKC6ROqgGgfgNSPWgALVnBSpACgBDtJcUCOpaMWEAw1mgcRAFYaLxlUlp/bAAAAAElFTkSuQmCC\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/tomato-growing1.png b/src/img/items/tomato-growing1.png new file mode 100644 index 0000000000000000000000000000000000000000..dfbf682e5584dfe4541fd4bde8dfe5060314449f GIT binary patch literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|(mY)pLp(Z@ z6C_v{Cy4YE2t+OXXurkjvHew^jhaG#^Mh4>%@;W=*}1i)v9a;t&-L4RKwwhNAuzq# zI#1xrd6yp68$3$K3MMfY2?%m`d}35hcoE&8yGXHb5Gb5f zNZesy(Aw#txo$sOJzopr0MhD7*#H0l literal 0 HcmV?d00001 diff --git a/src/img/items/tomato-growing3.piskel b/src/img/items/tomato-growing3.piskel new file mode 100644 index 000000000..a8c329a52 --- /dev/null +++ b/src/img/items/tomato-growing3.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"tomato-growing3","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAA1UlEQVRIS2NkoDFgpLH5DIPLAs8Ctf8gH2+fcItoh6EojC0zARsAA4u7zqDI47MAl164ASAFyAbCNCCL4bIAXS/IgTAxsAXYFMDEQTTMEmwW4NILCwWCYYnsE3QLCBkOsoSgBcg+efPrE9hhImx8YBo9jrAleaIsgFmCbAExhhPtA5jLYEEE8gFFFmBLQSBL8KUiXEGGEUTIEYduEbZIRjYYW6QTjANcqQiXL9EjmqAFwzMVkV3YEaobKC5Nh40FKHUCIV9hkUdJmUQlUzIsgWsZ+hYAAF7KnRnkpkjpAAAAAElFTkSuQmCC\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/tomato-growing3.png b/src/img/items/tomato-growing3.png new file mode 100644 index 0000000000000000000000000000000000000000..f6cd329a8b1ca08d1950ad9c07a82a5fd97ac3c1 GIT binary patch literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjS3O-ELp;2bQx+H|EZO*zr};F~ zd8V!Z73A~h7j$Q|FVyJKHD;7%VD8?1Zo!Gin;E9Z?O;@3J;8R!M4|iPCWcu36O9Ij z8(43M95~`=az-de?7<~&Zq}y6&Nsp(+#Hg8n_3pIp0KO@{95=%qEb#xf|PCF2Gz<% zIt`IcIgEyF!f%;poKA3L`NZfdmf-EE;Qe8#QjBAppvwut_B_FD9&Tn5(MyDTm}6FQ zOxM4tJZk~#VPnyWu{Q))No(l&w)e7XlrkyCCr)(toav$(Y^2keE%{4~fg$eHT*)WP SJYE7l$l&Sf=d#Wzp$P!0=wBTG literal 0 HcmV?d00001 diff --git a/src/img/items/tomato-growing4.piskel b/src/img/items/tomato-growing4.piskel new file mode 100644 index 000000000..bc8936e66 --- /dev/null +++ b/src/img/items/tomato-growing4.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"tomato-growing4","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAABC0lEQVRIS2NkoDFgpLH5DPS3ILbM5D/IV4u7zmBY7lmgBpbbPuEWXofVLY373xS9CKwGrhAkeP/iNbjBIItAliArxmcBzGHojoNbADMQOU7QxdAtgFmOrg6ZD7YAm+HYNGPzATafgsyE6ScYychxgm4BNoehp0qCFsB8CKLf/PoE1i/Cxgem0eMIW5InaAFyUCFbgC2VkWUBsiZYEIF8gM0C5BQH04fVB7jyAq5kii/vYFiAHHEwjYr6WgygjINsASzfIKd7bJGOYgG6F9ENQbYAl6vRzSAYyYRSEaHCkigLYJagpyJskUpWPoBpIrawQ7aEaB+ANI1aAAs6cKVCAUAJdpLigBxLh74FACQg3hnrDTBLAAAAAElFTkSuQmCC\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/tomato-growing4.png b/src/img/items/tomato-growing4.png new file mode 100644 index 0000000000000000000000000000000000000000..f013bf9d3fe3f97aa71375099ecc76c9d11b29b4 GIT binary patch literal 324 zcmV-K0lWT*P)I5%wgz`gIfSI5IIiJ#n3H)S&ps_nGd!Ao8j0rWAgzvpMuPU=_eS;$Z>*h z0XB!Br%HkrzI5%wgz`gIfSI5IIiJ#n3H)S&ps_nGd!Ao8b?y2mY7WT+fIshs_5td6;^b z17VgEjAZ0ELAL;#!_ZSDK?`6$1krDPeFEzjVdDeS=y8NC$rH2yIh>I#z?RC$vH)2V zEQmlpz-9q*ii7FH>H}PP0ar4`mv=BMK#n+=Mn!!s22jR9wg8lBYUV$N#|5s`h++Y{ z7tswtwg8u_(aj(j$%Il7p~8|V3t*O@ry^{TN>)CAX(G0;L$-uyAAmHCS^x_=aHT>4 lKnZq|;(#1WhrR^>ETG;Quf#S500000NkvXXu0mjf002S{hOhtt literal 0 HcmV?d00001 diff --git a/src/img/items/tomato-growing6.piskel b/src/img/items/tomato-growing6.piskel new file mode 100644 index 000000000..6c770bc01 --- /dev/null +++ b/src/img/items/tomato-growing6.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"tomato-growing6","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAABIElEQVRIS2NkoDFgpLH5DMPQgtgyk/+gYFvcdQbDd54FamC57RNu4fV53dK4/03Ri8Bq4ApBgvcvXoMbDLIIZAmyYnwWwByG7ji4BTADkSMdXQzdApjl6OqQ+WALsBn+IsDjv8SGHYzIcth8AJOHqYc5EGY5wVSEHCfoFmBzGHqyJ2gBzIcg+s2vT2D9Imx8YBo9jrDlKYIWIIczsgXYUhlZFiBrggURyAfYLEBOcTB9WH2AKy/gSqb48g6GBcgRB9OoqK/FAMo4yBY8vB74v2b+Y3hc4EqNKBagexGU9ErV3sANQbYAl6vRzSAYyYRSEaHSmCgLYJagpyJskUpWPoBpIrawQ7aEaB+ANI1aAAs6cKVCAUAJdpLigBxLaW4BAFsM3RnfTMpLAAAAAElFTkSuQmCC\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/tomato-growing6.png b/src/img/items/tomato-growing6.png new file mode 100644 index 0000000000000000000000000000000000000000..ff94e8e8c7ec6b51b6cf2b99d46b4300a8aec314 GIT binary patch literal 345 zcmV-f0jB)4dEL^u|4q@0z-r(ML4x-$UV|G9 zvIt}evSNG|z#N9|IJgBc1Cb*gT@2juo?a$z~jHfh8>K^a@c$TlZUB? zIS^(!!Bm7CC+HSna~OKECujl8hamdRuTNn8B5ZtM8a)CAX(G0;L$-uyAAmHC rS^x_=aHT>4KnZq|;(#1WX>I`kTMXS9-%QF&00000NkvXXu0mjfd1;M2 literal 0 HcmV?d00001 diff --git a/src/img/items/tomato.piskel b/src/img/items/tomato.piskel index 1d2790c3f..9912b05da 100644 --- a/src/img/items/tomato.piskel +++ b/src/img/items/tomato.piskel @@ -1 +1 @@ -{"modelVersion":2,"piskel":{"name":"tomato","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAs0lEQVRIS+2VMQ6AIAxFy+DgqTiSZ/FInMrBAVO1Biu0VYKDkcnE8l4o9eug8XKN+XBfMPYRhsm8Ty9MgfiMiwQGmU1A0FTAZYVe6wLcSDAOMbRKE2wt0VeRU3qxgmfvdTQAdCFQ3YWXE0QrmNt30YnJBY/hJOOSVFANz0l+QXbK0nv4VovwuNWTJI3pK4IqieVLpqm43aocHGFSmpoCTwo6TXCcRolUMfK1/4EprqWi5oIFeH1SGQcYvZEAAAAASUVORK5CYII=\"}]}"]}} \ No newline at end of file +{"modelVersion":2,"piskel":{"name":"tomato","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAABAElEQVRIS2NkoDFgpLH5DCRboOoo9v/2/ldE6yNaIcinIMNB9NCzAOZy9PgixieEgui/qqMYKEjgZoP40GACBRlMDqc5uCTAYQ0yYPpnNhSHZ/L+AvNh4iA+kgMwzMNmwf89JjIMII3ohsNsQpZDZruceQJSgmImugVgwwkBdF8YBCUyXFg3H6wN3RJkC4gyHJsvQGK4LCHbAmy+hFmC7IuhZQHMVzTzwYBbAHIASSkJW0TjS6ZgC0r0hBg82LgIZQWc8oQsoMgSYnIyzGUk+WTHr28MPZfeYRQTWAWQ/A4u8PAFGZLBOM0iVFyDg4xAhOA1gxgLyI5wQkFEkcEwzQAOm3oZ/DHg4wAAAABJRU5ErkJggg==\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/tomato.png b/src/img/items/tomato.png index 00af511b0b7a85724ea34956d4c41053c2576317..7d45b8c307d6985aaa9e3073bc6edb8f625785a3 100644 GIT binary patch delta 292 zcmV+<0o(r90lxx}B!2;OQb$4nuFf3k0002_NklST5IiDFRGxqa(WOe0 z30Qy)vPX(k6xkyicmXD$Nktc>VFId1NKO&te4Gbt5GYbka^rvQ{@&&d{2iiHYM=bg zlH}e3QxLc$^;KRMjnnr-&>gv1Q7X+IiS?qd0u2CBDxvPpM}HuTB>&L zoq;YBo}3a>l*wy>abpYUE|DdopiXv&qY<)2sDL3KgDrl&oO?wkU(+EGidFvu=N64& ze|vK;?qKy%F}qE)JpkiCg<_t91#VR6(^epRwBBTP^#FecL0+|9PE;sZa(0721Hh0Q q6$<2)iLqQR^BsKb6`TDg{5GEWu~@9diH_6&0000jN|_0y6ySUDYpf}stAIJ2kl6waM4n`7768DuoBOQ- z_P$k)wh#f}aE_ucA*eh_5LvJyN|?Ez8LmmLf^N7Z;o7t#zck=^!SFV{{RF_^m)tCo p;3WY-4!qK!vjmB#5bjTTZBCF(F0$IykWByp002ovPDHLkV1h9oO?3bO diff --git a/src/img/items/watermelon-growing.piskel b/src/img/items/watermelon-growing1.piskel similarity index 100% rename from src/img/items/watermelon-growing.piskel rename to src/img/items/watermelon-growing1.piskel diff --git a/src/img/items/watermelon-growing.png b/src/img/items/watermelon-growing1.png similarity index 100% rename from src/img/items/watermelon-growing.png rename to src/img/items/watermelon-growing1.png diff --git a/src/img/items/wheat-growing.piskel b/src/img/items/wheat-growing1.piskel similarity index 100% rename from src/img/items/wheat-growing.piskel rename to src/img/items/wheat-growing1.piskel diff --git a/src/img/items/wheat-growing.png b/src/img/items/wheat-growing1.png similarity index 100% rename from src/img/items/wheat-growing.png rename to src/img/items/wheat-growing1.png diff --git a/src/index.js b/src/index.js index 80a5461f9..28ae1aaa2 100644 --- a/src/index.js +++ b/src/index.js @@ -15,14 +15,6 @@ * @typedef {import("./enums").fertilizerType} fertilizerType */ -/** - * Lookup table for the lifecycle durations of a crop (in days). - * @typedef farmhand.cropTimetable - * @property {number} seed - * @property {number} growing - * @readonly - */ - /** * Reference object for an item. * @typedef farmhand.item @@ -30,7 +22,7 @@ * @property {string} name * @property {string} type * @property {number} value - * @property {farmhand.cropTimetable} [cropTimetable] + * @property {Array.} [cropTimeline] The number of days for each growing phase * @property {cropType} [cropType] * @property {string} [description] A user-friendly description of the item. * @property {string} [enablesFieldMode] The fieldMode that this item enables. @@ -232,6 +224,13 @@ * @property {Object.} tools */ +/** + * @typedef {Object} farmhand.purchaseableFieldSize + * @property {number} columns + * @property {number} rows + * @property {number} price + */ + import './polyfills' import React from 'react' import ReactDOM from 'react-dom' diff --git a/src/scripts/generate-crop-table.js b/src/scripts/generate-crop-table.js index 7f9815020..d45a41615 100755 --- a/src/scripts/generate-crop-table.js +++ b/src/scripts/generate-crop-table.js @@ -9,10 +9,7 @@ import { itemsMap } from '../data/maps' import { moneyString } from '../utils/moneyString.js' const getDaysToMature = seedItem => { - return Object.values(seedItem.cropTimetable).reduce( - (days, acc) => days + acc, - 0 - ) + return seedItem.cropTimeline.reduce((days, acc) => days + acc) } /** diff --git a/src/utils/getCropLifecycleDuration.js b/src/utils/getCropLifecycleDuration.js index 588f4bff7..78b2236a7 100644 --- a/src/utils/getCropLifecycleDuration.js +++ b/src/utils/getCropLifecycleDuration.js @@ -1,11 +1,11 @@ import { memoize } from './memoize' -// TODO: Refactor this to accept just a plain cropTimetable -// https://github.com/jeremyckahn/farmhand/issues/415 /** - * @param {{ cropTimetable: Object }} crop + * @param {{ cropTimeline: number[] }} crop * @returns {number} */ -export const getCropLifecycleDuration = memoize(({ cropTimetable }) => - Object.values(cropTimetable).reduce((acc, value) => acc + value, 0) -) +export const getCropLifecycleDuration = memoize(({ cropTimeline }) => { + return cropTimeline.reduce((acc, value) => { + return acc + value + }, 0) +}) diff --git a/src/utils/getCropLifecycleDuration.test.js b/src/utils/getCropLifecycleDuration.test.js index c49047575..9199cde51 100644 --- a/src/utils/getCropLifecycleDuration.test.js +++ b/src/utils/getCropLifecycleDuration.test.js @@ -1,11 +1,9 @@ -import { sampleCropItem1 } from '../data/items' +import { carrot } from '../data/items' import { getCropLifecycleDuration } from './getCropLifecycleDuration' -jest.mock('../data/items') - describe('getCropLifecycleDuration', () => { test('computes lifecycle duration', () => { - expect(getCropLifecycleDuration(sampleCropItem1)).toEqual(3) + expect(getCropLifecycleDuration(carrot)).toEqual(5) }) }) diff --git a/src/utils/index.js b/src/utils/index.js index 74de5f279..c524ca0b6 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -2,7 +2,6 @@ /** @typedef {import("../index").farmhand.item} farmhand.item */ /** @typedef {import("../index").farmhand.plotContent} farmhand.plotContent */ /** @typedef {import("../index").farmhand.shoveledPlot} farmhand.shoveledPlot */ -/** @typedef {import("../index").farmhand.cropTimetable} farmhand.cropTimetable */ /** @typedef {import("../index").farmhand.cow} farmhand.cow */ /** @typedef {import("../index").farmhand.recipe} farmhand.recipe */ /** @typedef {import("../index").farmhand.priceEvent} farmhand.priceEvent */ @@ -72,6 +71,7 @@ import { INITIAL_FIELD_HEIGHT, INITIAL_FIELD_WIDTH, INITIAL_STORAGE_LIMIT, + LARGEST_PURCHASABLE_FIELD_SIZE, MALE_COW_WEIGHT_MULTIPLIER, PEER_METADATA_STATE_KEYS, PERSISTED_STATE_KEYS, @@ -293,15 +293,49 @@ export const doesPlotContainCrop = plot => plot !== null && getPlotContentType(plot) === itemType.CROP export const getLifeStageRange = memoize(( - /** @type {farmhand.cropTimetable} */ cropTimetable -) => - [SEED, GROWING].reduce( - /** - * @param {farmhand.cropLifeStage[]} acc - */ - (acc, stage) => acc.concat(Array(cropTimetable[stage]).fill(stage)), - [] + /** @type {number[]} */ cropTimeline +) => { + let lifeStageRange = Array(cropTimeline[0]).fill(SEED) + + lifeStageRange = lifeStageRange.concat( + cropTimeline + .slice(1) + .reduce( + (/** @type {number[]} */ acc, value) => + acc.concat(Array(value).fill(GROWING)), + [] + ) ) + + return lifeStageRange +}) + +/** + * @param {farmhand.crop} crop + * @returns {number} + */ +export const getGrowingPhase = memoize( + crop => { + const { itemId, daysWatered } = crop + const { cropTimeline = [] } = itemsMap[itemId] + + let daysGrowing = daysWatered + 1 + let phase = 0 + + for (let value of cropTimeline) { + if (daysGrowing - value <= 0) break + + daysGrowing -= value + phase += 1 + } + + return phase + }, + { + cacheSize: + LARGEST_PURCHASABLE_FIELD_SIZE.columns * + LARGEST_PURCHASABLE_FIELD_SIZE.rows, + } ) /** @@ -310,13 +344,13 @@ export const getLifeStageRange = memoize(( */ export const getCropLifeStage = crop => { const { itemId, daysWatered } = crop - const { cropTimetable } = itemsMap[itemId] + const { cropTimeline } = itemsMap[itemId] - if (!cropTimetable) { - throw new Error(`${itemId} has no cropTimetable`) + if (!cropTimeline) { + throw new Error(`${itemId} has no cropTimeline`) } - return getLifeStageRange(cropTimetable)[Math.floor(daysWatered)] || GROWN + return getLifeStageRange(cropTimeline)[Math.floor(daysWatered)] || GROWN } /** @@ -335,7 +369,8 @@ export const getPlotImage = (plotContents, x, y) => { break case GROWING: - itemImageId = `${plotContents.itemId}-growing` + const phase = getGrowingPhase(plotContents) + itemImageId = `${plotContents.itemId}-growing-${phase}` break default: diff --git a/src/utils/index.test.js b/src/utils/index.test.js index aabac0929..fa3e2685c 100644 --- a/src/utils/index.test.js +++ b/src/utils/index.test.js @@ -1,14 +1,8 @@ import { testCrop } from '../test-utils' import { items as itemImages, animals } from '../img' import { cowColors, cropLifeStage, genders, standardCowColors } from '../enums' -import { - sampleCropItem1, - sampleCropSeedsItem1, - craftedItem1, - sampleItem1, - sampleFieldTool1, - milk1, -} from '../data/items' +import { rainbowFertilizer, carrot, carrotSeed, milk1 } from '../data/items' +import { carrotSoup } from '../data/recipes' import { COW_FERTILIZER_PRODUCTION_RATE_FASTEST, COW_FERTILIZER_PRODUCTION_RATE_SLOWEST, @@ -46,6 +40,7 @@ import { getCowWeight, getCropLifeStage, getFinalCropItemIdFromSeedItemId, + getGrowingPhase, getSeedItemIdFromFinalStageCropItemId, getItemCurrentValue, getLifeStageRange, @@ -108,28 +103,13 @@ describe('integerString', () => { }) describe('isItemAFarmProduct', () => { - describe('item is a seed', () => { - test('returns correct result', () => { - expect(isItemAFarmProduct(sampleCropSeedsItem1)).toBe(false) - }) - }) - - describe('item is grown crop', () => { - test('returns correct result', () => { - expect(isItemAFarmProduct(sampleCropItem1)).toBe(true) - }) - }) - - describe('item is milk', () => { - test('returns correct result', () => { - expect(isItemAFarmProduct(milk1)).toBe(true) - }) - }) - - describe('item is a crafted item', () => { - test('returns correct result', () => { - expect(isItemAFarmProduct(craftedItem1)).toBe(true) - }) + test.each([ + ['seed', carrotSeed, false], + ['crop', carrot, true], + ['milk', milk1, true], + ['crafted item', carrotSoup, true], + ])('when item is a %s', (_itemType, item, isAFarmProduct) => { + expect(isItemAFarmProduct(item)).toBe(isAFarmProduct) }) }) @@ -138,24 +118,24 @@ describe('getItemCurrentValue', () => { beforeEach(() => { valueAdjustments = { - 'sample-item-1': 1.5, - 'sample-field-tool-1': 1.5, + carrot: 1.5, + 'rainbow-fertilizer': 1.5, } }) describe('stable value item', () => { test('computes value', () => { - expect( - getItemCurrentValue({ id: 'sample-item-1' }, valueAdjustments) - ).toEqual(sampleItem1.value * 1.5) + expect(getItemCurrentValue({ id: 'carrot' }, valueAdjustments)).toEqual( + carrot.value * 1.5 + ) }) }) describe('fluctuating value item', () => { test('computes value', () => { expect( - getItemCurrentValue({ id: 'sample-field-tool-1' }, valueAdjustments) - ).toEqual(sampleFieldTool1.value) + getItemCurrentValue({ id: 'rainbow-fertilizer' }, valueAdjustments) + ).toEqual(rainbowFertilizer.value) }) }) }) @@ -526,9 +506,16 @@ describe('getCowWeight', () => { }) describe('getLifeStageRange', () => { - test('converts a cropTimetable to an array of stages', () => { - expect(getLifeStageRange({ [SEED]: 1, [GROWING]: 2 })).toEqual([ + test('converts a cropTimeline to an array of stages', () => { + expect(getLifeStageRange([1, 2])).toEqual([SEED, GROWING, GROWING]) + }) + + test('converts a multi-stage growing cycle into the expected stages', () => { + expect(getLifeStageRange([2, 1, 2, 1])).toEqual([ SEED, + SEED, + GROWING, + GROWING, GROWING, GROWING, ]) @@ -537,11 +524,11 @@ describe('getLifeStageRange', () => { describe('getCropLifeStage', () => { test('maps a life cycle label to an image name chunk', () => { - const itemId = 'sample-crop-1' + const itemId = 'carrot' expect(getCropLifeStage({ itemId, daysWatered: 0 })).toBe(SEED) - expect(getCropLifeStage({ itemId, daysWatered: 1.5 })).toBe(GROWING) - expect(getCropLifeStage({ itemId, daysWatered: 3 })).toBe(GROWN) + expect(getCropLifeStage({ itemId, daysWatered: 2.5 })).toBe(GROWING) + expect(getCropLifeStage({ itemId, daysWatered: 5 })).toBe(GROWN) }) }) @@ -550,17 +537,17 @@ describe('getPlotImage', () => { expect(getPlotImage(null)).toBe(null) }) - test('returns a plot images for a crop', () => { - const itemId = 'sample-crop-1' + test('returns plot images for a crop', () => { + const itemId = 'carrot' expect(getPlotImage(testCrop({ itemId, daysWatered: 0 }))).toBe( - itemImages['sample-crop-1-seed'] + itemImages['carrot-seed'] ) expect(getPlotImage(testCrop({ itemId, daysWatered: 1 }))).toBe( - itemImages['sample-crop-1-growing'] + itemImages['carrot-growing'] ) expect(getPlotImage(testCrop({ itemId, daysWatered: 3 }))).toBe( - itemImages['sample-crop-1'] + itemImages['carrot'] ) }) @@ -751,9 +738,9 @@ describe('getRandomUnlockedCrop', () => { describe('getPriceEventForCrop', () => { test('returns price event', () => { - expect(getPriceEventForCrop(sampleCropItem1)).toEqual({ - itemId: sampleCropItem1.id, - daysRemaining: 2, + expect(getPriceEventForCrop(carrot)).toEqual({ + itemId: carrot.id, + daysRemaining: 4, }) }) }) @@ -762,8 +749,8 @@ describe('farmProductsSold', () => { test('sums products sold', () => { expect( farmProductsSold({ - [sampleCropItem1.id]: 3, - [sampleCropSeedsItem1.id]: 2, + [carrot.id]: 3, + [carrotSeed.id]: 2, }) ).toEqual(3) }) @@ -1057,8 +1044,8 @@ describe('transformStateDataForImport', () => { test('it calculates experience from itemsSold if experience is 0', () => { state.experience = 0 state.itemsSold = { - 'sample-crop-1': 5, - 'sample-crop-1-seed': 10, + carrot: 5, + 'carrot-seed': 10, } const sanitizedState = transformStateDataForImport(state) @@ -1068,11 +1055,24 @@ describe('transformStateDataForImport', () => { experience: 5, inventoryLimit: 1000, itemsSold: { - 'sample-crop-1': 5, - 'sample-crop-1-seed': 10, + carrot: 5, + 'carrot-seed': 10, }, loanBalance: 100, money: 1234, }) }) }) + +describe('getGrowingPhase', () => { + test.each([ + [0, 0], + [0, 1], + [1, 2], + [2, 3], + ])('it returns phase %s when days watered is %s', (phase, daysWatered) => { + const crop = { itemId: 'potato', daysWatered } + + expect(getGrowingPhase(crop)).toEqual(phase) + }) +}) From de83ce7042b81facbba1fac4fd16ca4d4b186964 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 16 Jan 2024 03:18:34 +0000 Subject: [PATCH 3/3] 1.18.8 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 50e27589f..75f0c6e7a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@jeremyckahn/farmhand", - "version": "1.18.7", + "version": "1.18.8", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@jeremyckahn/farmhand", - "version": "1.18.7", + "version": "1.18.8", "license": "GPL-2.0-or-later", "dependencies": { "@emotion/react": "^11.11.1", diff --git a/package.json b/package.json index 4ee83c75f..faf0b423e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@jeremyckahn/farmhand", - "version": "1.18.7", + "version": "1.18.8", "publishConfig": { "access": "public" },