feat: add weeds and compost

src/components/Farmhand/Farmhand.js

@@ -421,6 +421,7 @@ export default class Farmhand extends Component {
       redirect: '',
       room: decodeURIComponent(this.props.match.params.room || DEFAULT_ROOM),
       purchasedCombine: 0,
+      purchasedComposter: 0,
       purchasedCowPen: 0,
       purchasedField: 0,
       purchasedSmelter: 0,
@@ -539,6 +540,7 @@ export default class Farmhand extends Component {
       'plantInPlot',
       'prependPendingPeerMessage',
       'purchaseCombine',
+      'purchaseComposter',
       'purchaseCow',
       'purchaseCowPen',
       'purchaseField',

src/components/Inventory/Inventory.js

@@ -23,6 +23,7 @@ const {
   STONE,
   FUEL,
   TOOL_UPGRADE,
+  WEEDS,
 } = itemType
 
 export const categoryIds = enumify([
@@ -61,6 +62,7 @@ const itemTypeCategoryMap = Object.freeze({
   [SPRINKLER]: FIELD_TOOLS,
   [STONE]: MINED_RESOURCES,
   [TOOL_UPGRADE]: UPGRADES,
+  [WEEDS]: CROPS,
 })
 
 const getItemCategories = () =>

src/components/Plot/Plot.js

@@ -27,7 +27,11 @@ export const getBackgroundStyles = plotContent => {
 
   const backgroundImages = []
 
-  if (plotContent.fertilizerType === fertilizerType.STANDARD) {
+  if (
+    [fertilizerType.STANDARD, fertilizerType.COMPOST].includes(
+      plotContent.fertilizerType
+    )
+  ) {
     backgroundImages.push(`url(${plotStates['fertilized-plot']})`)
   } else if (plotContent.fertilizerType === fertilizerType.RAINBOW) {
     backgroundImages.push(`url(${plotStates['rainbow-fertilized-plot']})`)

src/components/Shop/Shop.js

@@ -24,6 +24,7 @@ import { itemType, toolType } from '../../enums'
 import {
   INFINITE_STORAGE_LIMIT,
   PURCHASEABLE_COMBINES,
+  PURCHASEABLE_COMPOSTERS,
   PURCHASEABLE_COW_PENS,
   PURCHASEABLE_FIELD_SIZES,
   PURCHASEABLE_SMELTERS,
@@ -55,13 +56,15 @@ const categorizeShopInventory = memoize(shopInventory =>
 
 export const Shop = ({
   handleCombinePurchase,
+  handleComposterPurchase,
   handleCowPenPurchase,
   handleFieldPurchase,
   handleSmelterPurchase,
   handleStorageExpansionPurchase,
   inventoryLimit,
   money,
   purchasedCombine,
+  purchasedComposter,
   purchasedCowPen,
   purchasedField,
   purchasedSmelter,
@@ -211,6 +214,21 @@ export const Shop = ({
               />
             </li>
           ) : null}
+          <li>
+            <TierPurchase
+              {...{
+                description:
+                  'You can purchase a Composter to turn weeds into fertilizer.',
+                onBuyClick: handleComposterPurchase,
+                maxedOutPlaceholder: "You've already purchased the composter!",
+                purchasedTier: purchasedComposter,
+                renderTierLabel: ({ type, price }) =>
+                  `${dollarString(price)}: ${type} Composter`,
+                tiers: PURCHASEABLE_COMPOSTERS,
+                title: 'Buy composter',
+              }}
+            />
+          </li>
         </ul>
       </TabPanel>
     </div>

src/constants.js

@@ -46,6 +46,10 @@ export const PURCHASEABLE_COMBINES = freeze(
   new Map([[1, { type: 'Basic', price: 500_000 }]])
 )
 
+export const PURCHASEABLE_COMPOSTERS = freeze(
+  new Map([[1, { type: 'Bin', price: 1_000 }]])
+)
+
 export const PURCHASEABLE_SMELTERS = freeze(
   new Map([[1, { type: 'Basic', price: 500_000 }]])
 )
@@ -149,6 +153,7 @@ export const PERSISTED_STATE_KEYS = [
   'priceSurges',
   'profitabilityStreak',
   'purchasedCombine',
+  'purchasedComposter',
   'purchasedCowPen',
   'purchasedField',
   'purchasedSmelter',
@@ -231,3 +236,5 @@ export const COW_COLORS_HEX_MAP = {
 }
 
 export const COW_TRADE_TIMEOUT = 10000
+
+export const WEEDS_SPAWN_CHANCE = 0.15

src/data/__mocks__/items.js

@@ -145,13 +145,6 @@ export const sampleFieldTool1 = testItem({
   value: 5,
 })
 
-export const fertilizer = testItem({
-  id: 'fertilizer',
-  value: 60,
-  enablesFieldMode: 'FERTILIZE',
-  type: itemType.FERTILIZER,
-})
-
 export const sprinkler = testItem({
   enablesFieldMode: 'SET_SPRINKLER',
   id: 'sprinkler',

src/data/items.js

@@ -17,6 +17,7 @@ const {
   MILK,
   SCARECROW,
   SPRINKLER,
+  WEEDS,
 } = itemType
 
 export {
@@ -50,6 +51,16 @@ export {
   wheatSeed,
 } from './crops'
 
+const weeds = freeze({
+  id: 'weeds',
+  name: 'Weeds',
+  value: 0.1,
+  doesPriceFluctuate: false,
+  type: WEEDS,
+})
+
+export { weeds }
+
 export { bronzeOre, coal, goldOre, ironOre, silverOre, stone } from './ores'
 
 ////////////////////////////////////////
@@ -58,19 +69,6 @@ export { bronzeOre, coal, goldOre, ironOre, silverOre, stone } from './ores'
 //
 ////////////////////////////////////////
 
-/**
- * @property farmhand.module:items.fertilizer
- * @type {farmhand.item}
- */
-export const fertilizer = freeze({
-  description: 'Helps crops grow and mature a little faster.',
-  enablesFieldMode: fieldMode.FERTILIZE,
-  id: 'fertilizer',
-  name: 'Fertilizer',
-  type: FERTILIZER,
-  value: 25,
-})
-
 /**
  * @property farmhand.module:items.rainbowFertilizer
  * @type {farmhand.item}

src/data/levels.js

@@ -3,6 +3,7 @@ import { toolType } from '../enums'
 import { features } from '../config'
 
 import * as items from './items'
+import * as recipes from './recipes'
 
 export const levels = []
 
@@ -15,7 +16,7 @@ levels[2] = {
 }
 
 levels[3] = {
-  unlocksShopItem: items.fertilizer.id,
+  unlocksShopItem: recipes.fertilizer.id,
 }
 
 levels[4] = {

src/data/maps.js

@@ -20,6 +20,7 @@ const {
   TOMATO,
   WATERMELON,
   WHEAT,
+  WEEDS,
 } = cropType
 
 export const recipeCategories = {
@@ -64,4 +65,5 @@ export const cropIdToTypeMap = {
   [TOMATO]: 'tomato',
   [WATERMELON]: 'watermelon',
   [WHEAT]: 'wheat',
+  [WEEDS]: 'weeds',
 }

src/data/recipes.js

@@ -1,7 +1,7 @@
 /**
  * @module farmhand.recipes
  */
-import { itemType, recipeType } from '../enums'
+import { itemType, fieldMode, recipeType } from '../enums'
 import { RECIPE_INGREDIENT_VALUE_MULTIPLIER } from '../constants'
 
 import * as items from './items'
@@ -11,7 +11,6 @@ const itemsMap = { ...baseItemsMap }
 
 const itemify = recipe => {
   const item = Object.freeze({
-    ...recipe,
     type: itemType.CRAFTED_ITEM,
     value: Object.keys(recipe.ingredients).reduce(
       (sum, itemId) =>
@@ -21,6 +20,7 @@ const itemify = recipe => {
           recipe.ingredients[itemId],
       0
     ),
+    ...recipe,
   })
 
   itemsMap[recipe.id] = item
@@ -392,3 +392,34 @@ export const goldIngot = itemify({
     state.purchasedSmelter && state.itemsSold[items.goldOre.id] >= 50,
   recipeType: recipeType.FORGE,
 })
+
+export const compost = itemify({
+  id: 'compost',
+  name: 'Compost',
+  ingredients: {
+    [items.weeds.id]: 100,
+  },
+  condition: state =>
+    state.purchasedComposter && state.itemsSold[items.weeds.id] >= 100,
+  recipeType: recipeType.KITCHEN,
+  type: itemType.CRAFTED_ITEM,
+})
+
+/**
+ * @property farmhand.module:recipes.fertilizer
+ * @type {farmhand.item}
+ */
+export const fertilizer = itemify({
+  id: 'fertilizer',
+  name: 'Fertilizer',
+  ingredients: {
+    [compost.id]: 10,
+  },
+  condition: state =>
+    state.purchasedComposter && state.itemsSold[compost.id] >= 10,
+  description: 'Helps crops grow and mature a little faster.',
+  enablesFieldMode: fieldMode.FERTILIZE,
+  recipeType: recipeType.KITCHEN,
+  type: itemType.FERTILIZER,
+  value: 25,
+})

src/data/shop-inventory.js

@@ -16,11 +16,12 @@ import {
   wheatSeed,
 
   // Field items
-  fertilizer,
   scarecrow,
   sprinkler,
 } from './items'
 
+import { fertilizer } from './recipes'
+
 const inventory = [
   // Plantable crops
   asparagusSeed,

src/enums.js

@@ -29,6 +29,7 @@ export const cropType = enumify([
   'TOMATO',
   'WATERMELON',
   'WHEAT',
+  'WEEDS',
 ])
 
 /**
@@ -90,13 +91,19 @@ export const itemType = enumify([
   'SPRINKLER',
   'STONE',
   'TOOL_UPGRADE',
+  'WEEDS',
 ])
 
 /**
  * @property farmhand.module:enums.fertilizerType
  * @enum {string}
  */
-export const fertilizerType = enumify(['NONE', 'STANDARD', 'RAINBOW'])
+export const fertilizerType = enumify([
+  'NONE',
+  'STANDARD',
+  'RAINBOW',
+  'COMPOST',
+])
 
 /**
  * @property farmhand.module:enums.genders

src/game-logic/reducers/computeStateForNextDay.js

@@ -37,7 +37,7 @@ const adjustItemValues = state => ({
  */
 export const computeStateForNextDay = (state, isFirstDay = false) =>
   (isFirstDay
-    ? []
+    ? [processField]
     : [
         computeCowInventoryForNextDay,
         processCowBreeding,