diff --git a/package-lock.json b/package-lock.json index 9fa01ddd7..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", @@ -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", 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" }, 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 1b2a7f1a0..000000000 Binary files a/src/img/items/asparagus-growing.png and /dev/null differ 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 000000000..e5eeab41d Binary files /dev/null and b/src/img/items/asparagus-growing1.png differ diff --git a/src/img/items/asparagus-growing2.piskel b/src/img/items/asparagus-growing2.piskel new file mode 100644 index 000000000..8482014f9 --- /dev/null +++ b/src/img/items/asparagus-growing2.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"asparagus-growing2","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAABB0lEQVRIS2NkoDFgpLH5DANjgbalzP+rx58QZTkhtRiGgDQoCdow3Ht/hIGQJcSoRbEApMFRyw0eLfuv7cJpCbFqMSyw8FJl4HygCLaEGAu+K9wHq8elFm4ByEUxxckMd64fgvvgxLbbeH0AcgwM4FKLYQFIw5LeuWB9IAtBbPS4gDkGpg5mCbY4Iyql4MorhFIQSB/ZFhCTgsi2gNgURJEFxETw4LAAFBwglyCnEJAYsg9UNO2wpjaCPoBFJEghctGBbAHIcFjSJimZ4opIUvIAXh8gWwAqDvDlanx1Cs58QEo4k2wBerlEKJzJtgCkEVb40SSIkF1GqPLB5QuyyyJiGws0twAApg/HGXnhJhsAAAAASUVORK5CYII=\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/asparagus-growing2.png b/src/img/items/asparagus-growing2.png new file mode 100644 index 000000000..1ff6f215c Binary files /dev/null and b/src/img/items/asparagus-growing2.png differ 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 000000000..7e8da0158 Binary files /dev/null and b/src/img/items/asparagus-growing3.png differ 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 1f3689374..d010092da 100644 Binary files a/src/img/items/asparagus.png and b/src/img/items/asparagus.png differ diff --git a/src/img/items/carrot-growing.piskel b/src/img/items/carrot-growing.piskel deleted file mode 100644 index 54e6d5574..000000000 --- a/src/img/items/carrot-growing.piskel +++ /dev/null @@ -1 +0,0 @@ -{"modelVersion":2,"piskel":{"name":"carrot-growing","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAo0lEQVRIS+2UuwqAMAxF00lc/FUnv8LJX3URp0qQQBrycigO2lU5J/c2WqDzKZ358AvChr9a0TZWmI9U+tRLwIEP4HhBtgBBeGhSAksZXbORyE/AJVKQTBJXZIG1JEqKWIAVcAmvRNaofBU5AUkkILFJeYGUJOD+FrXT3hulH3fITIK6r4NJn5bTHTQSuHCyehJL4FUS/UEbZpQggoXPf8H7FV3dtEkZ+eVjbgAAAABJRU5ErkJggg==\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/carrot-growing.png b/src/img/items/carrot-growing.png deleted file mode 100644 index 2324ebd25..000000000 Binary files a/src/img/items/carrot-growing.png and /dev/null differ diff --git a/src/img/items/carrot-growing1.piskel b/src/img/items/carrot-growing1.piskel new file mode 100644 index 000000000..7d3f5bae3 --- /dev/null +++ b/src/img/items/carrot-growing1.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"carrot-growing1","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAiElEQVRIS+2V0Q2AMAhE23Vcwp0cxJ1cwnU0mJAgATlJ+KPfeM97JekcxWcW548GhIZbUSsKDYQDqS1a9+U6thP6FhqSgX/CqZ4LoCAa4D/lYA1jR16jzwYSogFok1CRF2w1sVqEAFIgIVKJ1mitFARgiA5ANskDPBecPK9MuEES1i9aLK78Dm5gO1EZrWuxRAAAAABJRU5ErkJggg==\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/carrot-growing1.png b/src/img/items/carrot-growing1.png new file mode 100644 index 000000000..3343e704a Binary files /dev/null and b/src/img/items/carrot-growing1.png differ 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 000000000..a4ec152c2 Binary files /dev/null and b/src/img/items/carrot-growing2.png differ 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 000000000..b67821457 Binary files /dev/null and b/src/img/items/carrot-growing3.png differ 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 3ba073348..000000000 Binary files a/src/img/items/corn-growing.png and /dev/null differ 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 000000000..1dce6214b Binary files /dev/null and b/src/img/items/corn-growing1.png differ 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 000000000..89b62cdeb Binary files /dev/null and b/src/img/items/corn-growing2.png differ 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 000000000..53e3a4b7b Binary files /dev/null and b/src/img/items/corn-growing3.png differ 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 000000000..60ff177b9 Binary files /dev/null and b/src/img/items/corn-growing4.png differ 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 000000000..4bb163c45 Binary files /dev/null and b/src/img/items/corn-growing5.png differ 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 ad929a789..65a262da7 100644 Binary files a/src/img/items/corn.png and b/src/img/items/corn.png differ 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 834923842..000000000 Binary files a/src/img/items/garlic-growing.png and /dev/null differ 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 000000000..3b16909c5 Binary files /dev/null and b/src/img/items/garlic-growing1.png differ 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 000000000..a957a53ec Binary files /dev/null and b/src/img/items/garlic-growing2.png differ 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 000000000..98b703896 Binary files /dev/null and b/src/img/items/garlic-growing3.png differ diff --git a/src/img/items/grape-green-growing.piskel b/src/img/items/grape-green-growing1.piskel similarity index 100% rename from src/img/items/grape-green-growing.piskel rename to src/img/items/grape-green-growing1.piskel diff --git a/src/img/items/grape-green-growing.png b/src/img/items/grape-green-growing1.png similarity index 100% rename from src/img/items/grape-green-growing.png rename to src/img/items/grape-green-growing1.png diff --git a/src/img/items/grape-purple-growing.piskel b/src/img/items/grape-purple-growing1.piskel similarity index 100% rename from src/img/items/grape-purple-growing.piskel rename to src/img/items/grape-purple-growing1.piskel diff --git a/src/img/items/grape-purple-growing.png b/src/img/items/grape-purple-growing1.png similarity index 100% rename from src/img/items/grape-purple-growing.png rename to src/img/items/grape-purple-growing1.png diff --git a/src/img/items/jalapeno-growing.piskel b/src/img/items/jalapeno-growing.piskel deleted file mode 100644 index c5a43178e..000000000 --- a/src/img/items/jalapeno-growing.piskel +++ /dev/null @@ -1 +0,0 @@ -{"modelVersion":2,"piskel":{"name":"jalapeno-growing","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAu0lEQVRIS2NkoDFgpLH5DKMWEAxhioNIqpDhP8iWZ/3YgxunBTCN+DSD1HCqQTzx/RZ2S7BagK4RFg6/77AyvN78G6wH5gCYBbgsIcoCmPdFfVnBwcGq8hscJMgOIcsCkLeRgwhbeCMHJbbgxOkDWLDAXE9MeGNLUkSlImKCAld6HXwWoMcLoZxGlA+QkyW+fEF2HMA0wpIpLC8Qcj1InmgfgBQPKQvAOZZMgBIqJAURORaOWkAw1GgeRAARgVgZEhfADQAAAABJRU5ErkJggg==\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/jalapeno-growing.png b/src/img/items/jalapeno-growing.png deleted file mode 100644 index 8aac5f64a..000000000 Binary files a/src/img/items/jalapeno-growing.png and /dev/null differ diff --git a/src/img/items/jalapeno-growing1.piskel b/src/img/items/jalapeno-growing1.piskel new file mode 100644 index 000000000..0afd85444 --- /dev/null +++ b/src/img/items/jalapeno-growing1.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"jalapeno-growing1","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAwUlEQVRIS2NkoDFgpLH5DKMWEAzh0SAiP4hswh3+w3QfWXkAZ1DC1OFSg1UjSJO27Ue4664e5mf4/ekOnH9y+xOwPmR1IDXYLMGwAJvhMI3mnjJwX7HyqTAgOwJkITZLSLIAOTjQHUKWBcguwhYcMAthPiHKB7CwBdGwoMEXbNjUIyctojIaIQvwpVWSLcCVWnBZQpQFyMEASq6wZEowlzEwkFZcw5LpqAWgoIXnWGLCGU0NSrwSHclkWATWMvQtAAA9on8Z/HlQTAAAAABJRU5ErkJggg==\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/jalapeno-growing1.png b/src/img/items/jalapeno-growing1.png new file mode 100644 index 000000000..c26290c1e Binary files /dev/null and b/src/img/items/jalapeno-growing1.png differ 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 000000000..e9e37cc27 Binary files /dev/null and b/src/img/items/jalapeno-growing2.png differ diff --git a/src/img/items/jalapeno-growing3.piskel b/src/img/items/jalapeno-growing3.piskel new file mode 100644 index 000000000..3035d7c92 --- /dev/null +++ b/src/img/items/jalapeno-growing3.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"jalapeno-growing3","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAABH0lEQVRIS2NkoDFgpLH5DIPLAnNPmf+sfCoonj6y8gBeR+KVtAl3+A8z7fenOwwgw7VtPzJcPcwPpkEAxMZnCU4LQIbDDIEZhI1PlgXohsMsANHoloDEKPYBzJWwOEAOHlgQ4rIEbxChawZZABJDjmhCcYHVAmzhD4pkGDi5/QkjrmBE9wmGBdgMh2mC+QDmC+T4wJWiiLYAOcmCDOPmvM/w9bsi2FP4ggmvBbDIhfkKPf2DLNm54CE4uHClJpxxANOAHGToFrx/eJXh6onX5OdkkCXIrkfPzSALwGGPxxKiCjuQJaCIRk6mIL62hSg4aCi2AJY8YRaAkikxhoP0EeUDbBYQW48MXwvg9QCxQYGkDiVUSAoiMiwjLZIHpQUAD3LJGUbvuUIAAAAASUVORK5CYII=\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/jalapeno-growing3.png b/src/img/items/jalapeno-growing3.png new file mode 100644 index 000000000..7f2428bd5 Binary files /dev/null and b/src/img/items/jalapeno-growing3.png differ diff --git a/src/img/items/jalapeno.piskel b/src/img/items/jalapeno.piskel index f4155c5b4..b236f9999 100644 --- a/src/img/items/jalapeno.piskel +++ b/src/img/items/jalapeno.piskel @@ -1 +1 @@ -{"modelVersion":2,"piskel":{"name":"jalapeno","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAA2ElEQVRIS2NkoDFgJNd8pvl8/2F6/yV+wmkOWRYgG07IEoosALmckE/ItgA5WGCWYAsqsixAi7f/TPP5GP49/MPA0PANJIViJqUW/H8jFcggkrYTbOebWe4MIs/Wo1hCiQVgw7EBZEsGrQU4XQ/yEaU+wGs4pRYQNPzBs6cMJgyn4BFNShyQbDhGmsVTLpFlOLEWkG04MRZQZDghCyg2HJ8FVDEclwVUMxybBVQ1HN0CvIYjZSBCcYeS2pEzGlYLyDUYZgt6ToZX5GiZjpQcj9MH5DYw8OoDAMANeBk/a2/XAAAAAElFTkSuQmCC\"}]}"]}} \ No newline at end of file +{"modelVersion":2,"piskel":{"name":"jalapeno","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAA7klEQVRIS2NkoDFgJMH8/1C1pOhhIFbxf6cwUbD5+1a9BlHE6iNeIQMDA1mWEO0SkAV+adIMXz78IskXxFoANxwWZ8QGFdEWwOIAOVEQYwlBC9w5WP+nSUviTGyznj5n2PnjN05z8FqAbLitrgrD4ct3sFqEzxKiLMBnOMhGsiwg1vUwL+GyBKcPYBYQcj1dLPgkyMyw4soTrJFNFR9QFAeEggif6/EWWoTSPyzsybYAZAAxllAto2HLYYRcT7Bcx+cDYgwnaAGuYCLWcLIsIMVwoixA9gWphhNtAcwSEI2vaMaWEAjWByS0OrAqBQDXPaUZstITfAAAAABJRU5ErkJggg==\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/jalapeno.png b/src/img/items/jalapeno.png index 5c91ad80d..d60280c5d 100644 Binary files a/src/img/items/jalapeno.png and b/src/img/items/jalapeno.png differ 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 dfb972998..ca751a2ef 100644 Binary files a/src/img/items/olive.png and b/src/img/items/olive.png differ 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 98ef40ed3..000000000 Binary files a/src/img/items/onion-growing.png and /dev/null differ 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 000000000..fe81d78cb Binary files /dev/null and b/src/img/items/onion-growing1.png differ diff --git a/src/img/items/onion-growing2.piskel b/src/img/items/onion-growing2.piskel new file mode 100644 index 000000000..f15cec70d --- /dev/null +++ b/src/img/items/onion-growing2.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"onion-growing2","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAl0lEQVRIS2NkoDFgpLH5DKMWEAxhkoJIwpT3/4vTn+F60PnYbCNoAbIhQ9MCkLdx+YIqQUQXC5AtgbmaGNeD9BGMZFjKQDd4aFqAnM6R8wO+3EZSEJXkhYPN6pm0EkwTYwlJFiREuoANFhEVBltCMwtAlixYvmfUAtS0AUr3sDigNIj+EyzkCSuAJx6iUxFhM7GrGPoWAABQhIsZroeW7AAAAABJRU5ErkJggg==\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/onion-growing2.png b/src/img/items/onion-growing2.png new file mode 100644 index 000000000..3814615a3 Binary files /dev/null and b/src/img/items/onion-growing2.png differ 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 000000000..998461200 Binary files /dev/null and b/src/img/items/onion-growing3.png differ 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 dbea3baa2..879927321 100644 Binary files a/src/img/items/onion.png and b/src/img/items/onion.png differ diff --git a/src/img/items/pea-growing.piskel b/src/img/items/pea-growing1.piskel similarity index 100% rename from src/img/items/pea-growing.piskel rename to src/img/items/pea-growing1.piskel diff --git a/src/img/items/pea-growing.png b/src/img/items/pea-growing1.png similarity index 100% rename from src/img/items/pea-growing.png rename to src/img/items/pea-growing1.png diff --git a/src/img/items/potato-growing.piskel b/src/img/items/potato-growing.piskel deleted file mode 100644 index 33836838d..000000000 --- a/src/img/items/potato-growing.piskel +++ /dev/null @@ -1 +0,0 @@ -{"modelVersion":2,"piskel":{"name":"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,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAvklEQVRIS2NkoDFgpLH5DKMWEAzhQRxESTz/4c6f9wWnQ8nzAchwIzaI+ed+QWgclhBnAcy1IEPQDQdZBLKEbAtghsMMQnY5MpsiC3AZCrOUoiDCFiSw2CUQ/iBlpMUBSAeRkQtzA3EWwFTDfIMnUtFz3qCyAJGxEM4k6ECCCqBm/V+YC2G9+8LAIMQDoQvng4XwmkGMBWDDYQajh3H8ZPyW4LIAW3AQLDmhClDMJMYHxBqMVd2oBQSDj+ZBBABtxkgZwsS7MAAAAABJRU5ErkJggg==\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/potato-growing.png b/src/img/items/potato-growing.png deleted file mode 100644 index ee1463714..000000000 Binary files a/src/img/items/potato-growing.png and /dev/null differ 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 000000000..cb600172c Binary files /dev/null and b/src/img/items/potato-growing1.png differ 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 000000000..3e94719cb Binary files /dev/null and b/src/img/items/potato-growing2.png differ diff --git a/src/img/items/potato-growing3.piskel b/src/img/items/potato-growing3.piskel new file mode 100644 index 000000000..9ace4432d --- /dev/null +++ b/src/img/items/potato-growing3.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"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,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAABQ0lEQVRIS+WULQ7CQBSEtwLBj6nClIQEj+Ai3AKJ5R5IBHfgIgg8CQEMCsOPQJS8pdPMvnbbpoAg1PRnu/O9mX27gfnyFXxZ3/wJYDSOYolyvTpax/q9KObSiESsO2yb3eFmmmfLMfcwMP1ey5w211QbcA3LALg6eRYxXAyQb/LOMIFodw5AV8sTdGUiDICMsSNxLO5kfgpgca6Yf4YjOMEYYIgP7jIAHQeyxwQIcOUshgYA0AHoQa4mD6Cr1RFi0Z2ImFy0wOKA1wfOsQ7cUWlfcytyv+dBAUDVXIweSwGoIm+yD8ixcAPkOuBKfTvTJ8JO9IZz1sC3G3UU2uVbR0WVGD4FsAfRaBxJB0Gz9Cwr/SFRihfTgX08Xx4m7DTsfbbcy6dCjSoAKw5hHcdkvi2E+ACvc7ne5WhWcVAPk8z6fcATQYkRKFHnkOsAAAAASUVORK5CYII=\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/potato-growing3.png b/src/img/items/potato-growing3.png new file mode 100644 index 000000000..aa1886639 Binary files /dev/null and b/src/img/items/potato-growing3.png differ diff --git a/src/img/items/pumpkin-growing.piskel b/src/img/items/pumpkin-growing.piskel deleted file mode 100644 index 0ca9c5f99..000000000 --- a/src/img/items/pumpkin-growing.piskel +++ /dev/null @@ -1 +0,0 @@ -{"modelVersion":2,"piskel":{"name":"pumpkin-growing","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAArklEQVRIS+2TwQ2AIAxFyxBu4gYM4RzePXp3DodgAzdxiJoqkFDQrzHc8KTm97/2UwxVfkxlf2oAmHCLqEUEE4ACuEWdI95tciHZu8Ja0T2KxDy06CE8D/35a1o3WA8FCkDBPAA6R6SmyyL7MkEESPdirqYrnscdIEYjVb7TDLBb3HAJwDymhWa5vlX+dKNLPDUgM4d7qAS+megbXpJIvpo+6M2rXf4DbACYXvWIDkwzLxmMrIaaAAAAAElFTkSuQmCC\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/pumpkin-growing.png b/src/img/items/pumpkin-growing.png deleted file mode 100644 index 0c5f6c356..000000000 Binary files a/src/img/items/pumpkin-growing.png and /dev/null differ 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 000000000..9c4dc9741 Binary files /dev/null and b/src/img/items/pumpkin-growing1.png differ 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 000000000..c4d6ad6f9 Binary files /dev/null and b/src/img/items/pumpkin-growing2.png differ diff --git a/src/img/items/pumpkin-growing3.piskel b/src/img/items/pumpkin-growing3.piskel new file mode 100644 index 000000000..f8186e647 --- /dev/null +++ b/src/img/items/pumpkin-growing3.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"pumpkin-growing3","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAA20lEQVRIS2NkoDFgpLH5DKMWgEPYr175P3JQb2q8Cw8ZsoMI2dBX7/6gRKWYEAsDzBKyLAAZjm4oemKBWUKyBeiGf371HW42rxgnnE2WBciGwwxGNhTZF2RZYJErD45MkOHYDAYZCgMkxwHM9eiGwwxFTjnIPiE6DmCuB2kmZChFFpyY/JBoR4EswqkYFiSwyIL5gCoWwAwHGYYcNCAXUWwBsuHIYUk1H4AMwuZKqllAcx/ASkdQWYPsE2r5AKXYpaC2o7y4JtZykjINsYaSlZPJMRxvTibXQHR9AG+ifxnYavyUAAAAAElFTkSuQmCC\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/pumpkin-growing3.png b/src/img/items/pumpkin-growing3.png new file mode 100644 index 000000000..bf23e8c99 Binary files /dev/null and b/src/img/items/pumpkin-growing3.png differ diff --git a/src/img/items/pumpkin-growing4.piskel b/src/img/items/pumpkin-growing4.piskel new file mode 100644 index 000000000..190fd1f31 --- /dev/null +++ b/src/img/items/pumpkin-growing4.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"pumpkin-growing4","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAA90lEQVRIS2NkoDFgpLH5DKMWEAxhqgSRX73yf2SbNjXehZtLtgXIhr569wfFJ2JCLAwwS8iyAGQ4uqHoYQWzhGQL0A3//Oo73GxeMU44mywLkA2HGYxsKLIvyLLAIlceHJkgw7EZDDIUBkiOA5jr0Q2HGYqccpB9QnQcwFwP0kzIUIosODH5IdGOAlmEUzEsSGCRBfMBVSyAGQ4yDDloQC6i2AJkw5HDkmo+ABmEzZWyfEwo5c3jT/+IigsMRdh8ADL8YrYeSmmgP/USAzGWYHUFckFmcEscbHCBwjeqWIASDAQLe9wKKC+uibWcqIgi1jBs6mhuAQBXJIAZAYF9rQAAAABJRU5ErkJggg==\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/pumpkin-growing4.png b/src/img/items/pumpkin-growing4.png new file mode 100644 index 000000000..e73eb477c Binary files /dev/null and b/src/img/items/pumpkin-growing4.png differ diff --git a/src/img/items/pumpkin-growing5.piskel b/src/img/items/pumpkin-growing5.piskel new file mode 100644 index 000000000..a56883c3d --- /dev/null +++ b/src/img/items/pumpkin-growing5.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"pumpkin-growing5","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAA/0lEQVRIS2NkoDFgpLH5DKMWgEPYr175P3JQb2q8Cw8ZsoMI2dBX7/6gRKWYEAsDzBKyLAAZjm4oemKBWUKyBeiGf371HW42rxgnnE2WBciGwwxGNhTZF2RZYJErD45MkOHYDAYZCgMkxwHM9eiGwwxFTjnIPiE6DmCuB2kmZChFFpyY/JBoR4EswqkYFiSwyIL5gCoWwAwHGYYcNCAXUWwBsuHIYQmz6OnCxyh56vGnf3iDDEMSZBA2V4LEQYZfzNZDsUB/6iUGfJZgWIDLB7J8TP/RDYfZhM8SrN5DLsgMbonDXVyg8A1r/USMBSjFLRVrOUaS0jQ5Fo9aQDDUALfWiRlPIsF9AAAAAElFTkSuQmCC\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/pumpkin-growing5.png b/src/img/items/pumpkin-growing5.png new file mode 100644 index 000000000..14321ff9b Binary files /dev/null and b/src/img/items/pumpkin-growing5.png differ 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 88e7349ff..000000000 Binary files a/src/img/items/sunflower-growing.png and /dev/null differ 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 000000000..d780a9b7b Binary files /dev/null and b/src/img/items/sunflower-growing1.png differ diff --git a/src/img/items/sunflower-growing2.piskel b/src/img/items/sunflower-growing2.piskel new file mode 100644 index 000000000..732cef644 --- /dev/null +++ b/src/img/items/sunflower-growing2.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"sunflower-growing2","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAiUlEQVRIS2NkoDFgpLH5DKMWEAzh0SAaDSKCIUBQwTBORUomnP/vnflOsQ+xGgAyPCRMk2HNqusMxFqCy0FUsQCfgzAsACkGJQ2QD0CAkC9ghuNSi2IBsktwBRG2oCDZB7hcj8sgkiwAeZVUg2DBCtKLnihwRjIsiyJrwGcQrixNcTonVFYMfQsAMA9vGeQAgdEAAAAASUVORK5CYII=\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/sunflower-growing2.png b/src/img/items/sunflower-growing2.png new file mode 100644 index 000000000..1f6276531 Binary files /dev/null and b/src/img/items/sunflower-growing2.png differ diff --git a/src/img/items/sunflower-growing3.piskel b/src/img/items/sunflower-growing3.piskel new file mode 100644 index 000000000..d13b040cf --- /dev/null +++ b/src/img/items/sunflower-growing3.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"sunflower-growing3","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAtElEQVRIS+1UsQ2AMAxrR95gY+cUxJGIU9jZeIMRFCRLoU3SFokB0c6OndhJvXv5+Zf5XRVIOlwt+qtFbd8cNPu27NlLQDUSPiIg4DB2l7fztGaJoEbCix2WijwWQEfa+FghqyFzAhKgR5ZpdiEvDXMTQKd8ZF7Iww+JkwKcFF3zoEMbQChh+fVFE6BQ6kjzuihkKzCNqEiAxislQh7ScapbBB/5dVpE2q+X/RUkv00F8H2BE7iJwRm2RAbeAAAAAElFTkSuQmCC\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/sunflower-growing3.png b/src/img/items/sunflower-growing3.png new file mode 100644 index 000000000..850557887 Binary files /dev/null and b/src/img/items/sunflower-growing3.png differ diff --git a/src/img/items/sunflower-growing4.piskel b/src/img/items/sunflower-growing4.piskel new file mode 100644 index 000000000..44a28e3f6 --- /dev/null +++ b/src/img/items/sunflower-growing4.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"sunflower-growing4","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAA4ElEQVRIS2NkoDFgpLH5DKMWEAzh0SAiLYiUTDj/3zvznarBBjcMZHhImCbDmlXXGS5NtIK7jMd6L14LQfrwqUfRjGwJzDKQTbh8hU09uloM18E0gQwG+QZmESFLYOrRHYTV++iWEIoXfD7BawHIByDDCUU+PgcRtADkZXzBBDIcnxqMSIa5GGYosuFfjjqDDQMBvfxjYBqbOuTMgTWZwjTCIg7ZUvTIx6YWqwUgQULJDldYI+sjOZkia8BlEEkWoPuEWAtgwULQBzALsGmApRh8uRu99KNqwYataB36FgAAoCPhGfjpk7oAAAAASUVORK5CYII=\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/sunflower-growing4.png b/src/img/items/sunflower-growing4.png new file mode 100644 index 000000000..bf5fdb392 Binary files /dev/null and b/src/img/items/sunflower-growing4.png differ 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 000000000..0a210fc14 Binary files /dev/null and b/src/img/items/sunflower-growing5.png differ 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 a8f32e014..000000000 Binary files a/src/img/items/sweet-potato-growing.png and /dev/null differ diff --git a/src/img/items/sweet-potato-growing1.piskel b/src/img/items/sweet-potato-growing1.piskel new file mode 100644 index 000000000..d951f612e --- /dev/null +++ b/src/img/items/sweet-potato-growing1.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"sweet-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,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAABE0lEQVRIS+1VIQ7CQBC8fgNXQ4KrxRE0CoWo4g1oBJo3oCpQKDTBYetIMHV8o2SaTLPd7vXO1DScau72ZmZn97aJG3klI+O7P0HQ4QlblO3SmvmX16qXqTxHnBWDfdMiXN6fV+5dfhuOV/HpAOB8mc9b/xfZzF0OT5PEVCbBiSJJNAFifCQdAuviEAFIsZCNzpL3gt4ycLtJ3TF/NPGnYl3f7lUDTOW+OnhrQI+hjOAABokkoIAoixCsbfIRgIidRDEWSa8GVvdI5czAssvquJZAt6YO1iS0hvvMRr+HDoH03SoawLAv1fPbN5R6Fg29SqplJ4XAvS/ZUkP1PIsBjyVoZ9LAbPZO5QmP6+CvKjJgdIt+t2zOGYhEhSEAAAAASUVORK5CYII=\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/sweet-potato-growing1.png b/src/img/items/sweet-potato-growing1.png new file mode 100644 index 000000000..6a1b093c0 Binary files /dev/null and b/src/img/items/sweet-potato-growing1.png differ diff --git a/src/img/items/sweet-potato-growing2.piskel b/src/img/items/sweet-potato-growing2.piskel new file mode 100644 index 000000000..056208596 --- /dev/null +++ b/src/img/items/sweet-potato-growing2.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"sweet-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,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAABLElEQVRIS+WVoQ7CQBBEj9/AYUhwtTiCRqEQVXwDGoHmG1AIFApNcFgcCQbHb5RMk2m22927MxWEc727zuvOTu8Goecx6Fk//CGgWI0q2Po4vbOqdzdRiD2CIOam5ThMimE4bG5ZEBMAofV+Fp6PT5OB+/EVIM5BiA6JrqwDsMQhogGxOQlpAWiBFV0AMGQVFlTb1wBS4vwq7rOA2j6806nA+vrlYhS25bXeuzvOq/Pl3VTigTDfAUBAVsJNFAZEA7CmGw4bTYC2yQMAxBizJ9J7rNHSVg9kNCGurWEFMbvMmHq5lwBpE/sEu2Q11t9dV6B951FAAS3oPVsBaVlknTESkgJGAd694AE0zHs/60S0IL8FYIKkDYxq6srNsai+YBLD1ckBpMSj670Dvl62CygLcuKEAAAAAElFTkSuQmCC\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/sweet-potato-growing2.png b/src/img/items/sweet-potato-growing2.png new file mode 100644 index 000000000..f02a58ad7 Binary files /dev/null and b/src/img/items/sweet-potato-growing2.png differ 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 000000000..328787905 Binary files /dev/null and b/src/img/items/sweet-potato-growing3.png differ 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 000000000..4a374f9be Binary files /dev/null and b/src/img/items/sweet-potato-growing4.png differ 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 38956f4c5..452d04041 100644 Binary files a/src/img/items/sweet-potato.png and b/src/img/items/sweet-potato.png differ diff --git a/src/img/items/tomato-growing.piskel b/src/img/items/tomato-growing.piskel deleted file mode 100644 index 878b0ee53..000000000 --- a/src/img/items/tomato-growing.piskel +++ /dev/null @@ -1 +0,0 @@ -{"modelVersion":2,"piskel":{"name":"tomato-growing","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAfUlEQVRIS2NkoDFgpLH5DKMWEAzh0SAaDSKCIUBQwSBJRRM5/zPkf4c4Bhcbh1+I9wHMYHSaQCCRZgGyYTAfUcGC/5SYgc8HYIN/29vjNZ/14EGYPFazcFnwn5DB6LZCLcIwD5sFhIKEUNpHMZP4SCZkLMXJdNQCMkOAoDYAz0QfGXAb580AAAAASUVORK5CYII=\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/tomato-growing.png b/src/img/items/tomato-growing.png deleted file mode 100644 index 84eef23f1..000000000 Binary files a/src/img/items/tomato-growing.png and /dev/null differ 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 000000000..dfbf682e5 Binary files /dev/null and b/src/img/items/tomato-growing1.png differ diff --git a/src/img/items/tomato-growing2.piskel b/src/img/items/tomato-growing2.piskel new file mode 100644 index 000000000..1c1218c15 --- /dev/null +++ b/src/img/items/tomato-growing2.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"tomato-growing2","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAq0lEQVRIS2NkoDFgpLH5DANnQWyZyX+Q7xZ3naHIEXg1o1viWaAGtnT7hFso+vA5hqDrkDWjW0CMLwlaAHIxzKA3vz6B04QIGx88bRAKQqIsgFmCbAEhg2EuINoCkAZYEIF8QFML0CMZX14iywcwC6gSybhSETGGg3xGlA9wpSJi4oEoC+ieiugWycSUxEQHEXI+GPQ+AJeYFACUUCEpiMixdNQCgqFG8yACABpyZRmq84HdAAAAAElFTkSuQmCC\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/tomato-growing2.png b/src/img/items/tomato-growing2.png new file mode 100644 index 000000000..4fc68297c Binary files /dev/null and b/src/img/items/tomato-growing2.png differ 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 000000000..f6cd329a8 Binary files /dev/null and b/src/img/items/tomato-growing3.png differ 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 000000000..f013bf9d3 Binary files /dev/null and b/src/img/items/tomato-growing4.png differ diff --git a/src/img/items/tomato-growing5.piskel b/src/img/items/tomato-growing5.piskel new file mode 100644 index 000000000..e8c77d901 --- /dev/null +++ b/src/img/items/tomato-growing5.piskel @@ -0,0 +1 @@ +{"modelVersion":2,"piskel":{"name":"tomato-growing5","description":"","fps":12,"height":24,"width":24,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAABGElEQVRIS2NkoDFgpLH5DPS3ILbM5D/IV4u7zmBY7lmgBpbbPuEWXofVLY373xS9CKwGrhAkeP/iNbjBIItAliArxmcBzGHojoNbADMQOU7QxdAtgFmOrg6ZD7YAm+EPrwf+l9dcz4gsh80HMHmYepgDYZYTjGTkOEG3AJvD0FMlQQtgPgTRb359AusXYeMD0+hxhC3JE7QAOZyRLcCWysiyAFkTLIhAPsBmAXKKg+nD6gNceQFXMsWXdzAsQI44mEZFfS0GUMZBtgCUamrmP4bHBa7UiGIBuhfRDUG2AJer0c0gGMmEUhGhwpIoC2CWoKcibJFKVj6AaSK2sEO2hGgfgDSNWgALOnClQgFACXaS4oAcS4e+BQAsoN4Zr8Q2BQAAAABJRU5ErkJggg==\"}]}"]}} \ No newline at end of file diff --git a/src/img/items/tomato-growing5.png b/src/img/items/tomato-growing5.png new file mode 100644 index 000000000..d13037cda Binary files /dev/null and b/src/img/items/tomato-growing5.png differ 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 000000000..ff94e8e8c Binary files /dev/null and b/src/img/items/tomato-growing6.png differ 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 00af511b0..7d45b8c30 100644 Binary files a/src/img/items/tomato.png and b/src/img/items/tomato.png differ 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) + }) +})