add experience part 1

.env.development.local

@@ -1,2 +1,3 @@
 REACT_APP_API_ROOT=http://localhost:3001/
 REACT_APP_ENABLE_KEGS=true
+REACT_APP_ENABLE_EXPERIENCE=true

src/components/Farmhand/Farmhand.js

@@ -56,17 +56,16 @@ import NotificationSystem, {
 } from '../NotificationSystem'
 import DebugMenu from '../DebugMenu'
 import theme from '../../mui-theme'
+import { levelAchieved } from '../../utils/levelAchieved'
 import {
   computeMarketPositions,
   createNewField,
   doesMenuObstructStage,
-  farmProductsSold,
   generateCow,
   getAvailableShopInventory,
   getItemCurrentValue,
   getPeerMetadata,
   inventorySpaceRemaining,
-  levelAchieved,
   moneyTotal,
   nullArray,
   reduceByPersistedKeys,
@@ -381,7 +380,7 @@ export default class Farmhand extends FarmhandReducers {
 
   get levelEntitlements() {
     return getLevelEntitlements(
-      levelAchieved(farmProductsSold(this.state.itemsSold))
+      levelAchieved({ itemsSold: this.state.itemsSold })
     )
   }
 
@@ -425,6 +424,7 @@ export default class Farmhand extends FarmhandReducers {
       cowTradeTimeoutId: -1,
       cropsHarvested: {},
       dayCount: 0,
+      experience: 0,
       farmName: 'Unnamed',
       field: createNewField(),
       fieldMode: OBSERVE,
@@ -497,6 +497,7 @@ export default class Farmhand extends FarmhandReducers {
         [toolType.WATERING_CAN]: toolLevel.DEFAULT,
       },
       useAlternateEndDayButtonPosition: false,
+      useLegacyLevelingSystem: true,
       valueAdjustments: {},
       version: process.env.REACT_APP_VERSION ?? '',
     }
@@ -589,17 +590,30 @@ export default class Farmhand extends FarmhandReducers {
       })
       const { isCombineEnabled, newDayNotifications } = sanitizedState
 
-      this.setState({ ...sanitizedState, newDayNotifications: [] }, () => {
-        newDayNotifications.forEach(({ message, severity }) => {
-          // Defer these notifications so that notistack doesn't swallow all
-          // but the last one.
-          setTimeout(() => this.showNotification(message, severity), 0)
+      // saved games will likely have itemsSold but not experience since it's a new
+      // feature so this will "sync" them up
+      let { experience } = state
+      if (experience === 0) {
+        experience = Object.values(state.itemsSold).reduce(
+          (acc, value) => acc + value,
+          0
+        )
+      }
 
-          if (isCombineEnabled) {
-            this.forRange(reducers.harvestPlot, Infinity, 0, 0)
-          }
-        })
-      })
+      this.setState(
+        { ...sanitizedState, newDayNotifications: [], experience },
+        () => {
+          newDayNotifications.forEach(({ message, severity }) => {
+            // Defer these notifications so that notistack doesn't swallow all
+            // but the last one.
+            setTimeout(() => this.showNotification(message, severity), 0)
+
+            if (isCombineEnabled) {
+              this.forRange(reducers.harvestPlot, Infinity, 0, 0)
+            }
+          })
+        }
+      )
     } else {
       // Initialize new game
       await this.incrementDay(true)

src/components/Field/Field.js

@@ -18,12 +18,8 @@ import Plot from '../Plot'
 import QuickSelect from '../QuickSelect'
 import { fieldMode } from '../../enums'
 import tools from '../../data/tools'
-import {
-  doesInventorySpaceRemain,
-  farmProductsSold,
-  levelAchieved,
-  nullArray,
-} from '../../utils'
+import { levelAchieved } from '../../utils/levelAchieved'
+import { doesInventorySpaceRemain, nullArray } from '../../utils'
 import { getLevelEntitlements } from '../../utils/getLevelEntitlements'
 
 import './Field.sass'
@@ -74,7 +70,7 @@ export const isInHoverRange = ({
   switch (fieldMode) {
     case SET_SPRINKLER:
       hoveredPlotRangeSizeToRender = getLevelEntitlements(
-        levelAchieved(farmProductsSold(itemsSold))
+        levelAchieved({ itemsSold })
       ).sprinklerRange
 
       break

src/components/Navigation/Navigation.js

@@ -27,13 +27,13 @@ import Typography from '@material-ui/core/Typography'
 import { array, bool, func, number, object, string } from 'prop-types'
 
 import FarmhandContext from '../Farmhand/Farmhand.context'
+import { farmProductsSold } from '../../utils/farmProductsSold'
+import { levelAchieved } from '../../utils/levelAchieved'
 import {
   doesInventorySpaceRemain,
   farmProductSalesVolumeNeededForLevel,
-  farmProductsSold,
   integerString,
   inventorySpaceConsumed,
-  levelAchieved,
   scaleNumber,
 } from '../../utils'
 import { dialogView } from '../../enums'
@@ -225,7 +225,7 @@ export const Navigation = ({
   viewList,
 
   totalFarmProductsSold = farmProductsSold(itemsSold),
-  currentLevel = levelAchieved(totalFarmProductsSold),
+  currentLevel = levelAchieved({ itemsSold }),
   levelPercent = scaleNumber(
     totalFarmProductsSold,
     farmProductSalesVolumeNeededForLevel(currentLevel),

src/components/OnlinePeersView/OnlinePeer/OnlinePeer.js

@@ -7,12 +7,8 @@ import CardHeader from '@material-ui/core/CardHeader'
 import CowCard from '../../CowCard'
 
 import { moneyString } from '../../../utils/moneyString'
-import {
-  getPlayerName,
-  farmProductsSold,
-  integerString,
-  levelAchieved,
-} from '../../../utils'
+import { levelAchieved } from '../../../utils/levelAchieved'
+import { getPlayerName, integerString } from '../../../utils'
 
 import './OnlinePeer.sass'
 
@@ -28,10 +24,7 @@ const OnlinePeer = ({
             subheader: (
               <div>
                 <p>Day: {integerString(dayCount)}</p>
-                <p>
-                  Level:{' '}
-                  {integerString(levelAchieved(farmProductsSold(itemsSold)))}
-                </p>
+                <p>Level: {integerString(levelAchieved({ itemsSold }))}</p>
                 <p>Money: {moneyString(money)}</p>
               </div>
             ),

src/components/OnlinePeersView/OnlinePeersView.js

@@ -9,7 +9,8 @@ import { array, number, object, string } from 'prop-types'
 
 import BailOutErrorBoundary from '../BailOutErrorBoundary'
 
-import { getPlayerName, farmProductsSold, levelAchieved } from '../../utils'
+import { levelAchieved } from '../../utils/levelAchieved'
+import { getPlayerName } from '../../utils'
 import FarmhandContext from '../Farmhand/Farmhand.context'
 
 import CowCard from '../CowCard'
@@ -58,7 +59,7 @@ const OnlinePeersView = ({
             {sortBy(populatedPeers, [
               peerId =>
                 // Use negative value to reverse sort order
-                -levelAchieved(farmProductsSold(peers[peerId].itemsSold || 0)),
+                -levelAchieved({ itemsSold: peers[peerId].itemsSold || 0 }),
             ]).map(peerId => (
               <BailOutErrorBoundary {...{ key: peerId }}>
                 <OnlinePeer {...{ peer: peers[peerId] }} />

src/components/Recipe/Recipe.js

@@ -8,13 +8,13 @@ import CardActions from '@material-ui/core/CardActions'
 import Typography from '@material-ui/core/Typography'
 import { array, func, number, object } from 'prop-types'
 
+import { totalIngredientsInRecipe } from '../../utils/totalIngredientsInRecipe'
 import {
   canMakeRecipe,
   doesInventorySpaceRemain,
   dollarString,
   maxYieldOfRecipe,
   integerString,
-  totalIngredientsInRecipe,
 } from '../../utils'
 import { itemsMap } from '../../data/maps'
 import { craftedItems } from '../../img'

src/components/SettingsView/SettingsView.js

@@ -1,5 +1,5 @@
 import React, { useState } from 'react'
-import { bool, func } from 'prop-types'
+import { bool, func, object } from 'prop-types'
 import Button from '@material-ui/core/Button'
 import Dialog from '@material-ui/core/Dialog'
 import DialogActions from '@material-ui/core/DialogActions'
@@ -21,6 +21,7 @@ import './SettingsView.sass'
 
 const SettingsView = ({
   allowCustomPeerCowNames,
+  features,
   handleAllowCustomPeerCowNamesChange,
   handleClearPersistedDataClick,
   handleExportDataClick,
@@ -29,8 +30,10 @@ const SettingsView = ({
   handleShowNotificationsChange,
   handleUseAlternateEndDayButtonPositionChange,
   handleShowHomeScreenChange,
+  handleUseLegacyLevelSystemChange,
   showNotifications,
   useAlternateEndDayButtonPosition,
+  useLegacyLevelingSystem,
   showHomeScreen,
 }) => {
   const [isClearDataDialogOpen, setIsClearDataDialogOpen] = useState(false)
@@ -99,6 +102,19 @@ const SettingsView = ({
             }
             label="Display custom names for cows received from other players"
           />
+          {features.EXPERIENCE ? (
+            <FormControlLabel
+              control={
+                <Switch
+                  color="primary"
+                  checked={useLegacyLevelingSystem}
+                  onChange={handleUseLegacyLevelSystemChange}
+                  name="use-legacy-leveling-system"
+                />
+              }
+              label="Use legacy leveling system (experience is only gained by selling items)"
+            />
+          ) : null}
         </FormGroup>
       </FormControl>
 
@@ -199,6 +215,7 @@ const SettingsView = ({
 
 SettingsView.propTypes = {
   allowCustomPeerCowNames: bool.isRequired,
+  features: object.isRequired,
   handleAllowCustomPeerCowNamesChange: func.isRequired,
   handleClearPersistedDataClick: func.isRequired,
   handleExportDataClick: func.isRequired,
@@ -210,6 +227,7 @@ SettingsView.propTypes = {
   showHomeScreen: bool.isRequired,
   showNotifications: bool.isRequired,
   useAlternateEndDayButtonPosition: bool.isRequired,
+  useLegacyLevelingSystem: bool,
 }
 
 export default function Consumer(props) {

src/components/StatsView/StatsView.js

@@ -13,14 +13,14 @@ import sortBy from 'lodash.sortby'
 import { itemsMap } from '../../data/maps'
 import FarmhandContext from '../Farmhand/Farmhand.context'
 import { moneyString } from '../../utils/moneyString'
+import { farmProductsSold } from '../../utils/farmProductsSold'
+import { levelAchieved } from '../../utils/levelAchieved'
 import {
   farmProductSalesVolumeNeededForLevel,
-  farmProductsSold,
   get7DayAverage,
   getProfit,
   getProfitRecord,
   integerString,
-  levelAchieved,
   moneyTotal,
 } from '../../utils'
 import {
@@ -51,7 +51,7 @@ const StatsView = ({
   todaysRevenue,
 
   totalFarmProductsSold = farmProductsSold(itemsSold),
-  currentLevel = levelAchieved(totalFarmProductsSold),
+  currentLevel = levelAchieved({ itemsSold }),
 }) => (
   <div className="StatsView">
     <TableContainer {...{ component: ElevatedPaper }}>

src/components/UpgradePurchase/UpgradePurchase.js

@@ -8,11 +8,8 @@ import { array, func, number, object } from 'prop-types'
 
 import IngredientsList from '../IngredientsList'
 
-import {
-  canMakeRecipe,
-  doesInventorySpaceRemain,
-  totalIngredientsInRecipe,
-} from '../../utils'
+import { totalIngredientsInRecipe } from '../../utils/totalIngredientsInRecipe'
+import { canMakeRecipe, doesInventorySpaceRemain } from '../../utils'
 
 import { craftedItems } from '../../img'
 

src/constants.js

@@ -143,6 +143,7 @@ export const PERSISTED_STATE_KEYS = [
   'cowsTraded',
   'cropsHarvested',
   'dayCount',
+  'experience',
   'farmName',
   'field',
   'historicalDailyLosses',
@@ -182,6 +183,7 @@ export const PERSISTED_STATE_KEYS = [
   'todaysStartingInventory',
   'toolLevels',
   'useAlternateEndDayButtonPosition',
+  'useLegacyLevelingSystem',
   'valueAdjustments',
   'version',
 ]

src/game-logic/reducers/addExperience.js

@@ -0,0 +1,20 @@
+import { levelAchieved } from '../../utils/levelAchieved'
+
+import { processLevelUp } from './processLevelUp'
+
+/**
+ * @param {farmhand.state} state
+ * @param {number} amount
+ * @returns {farmhand.state}
+ */
+export const addExperience = (state, amount) => {
+  const newExperience = state.experience + amount
+  const oldLevel = levelAchieved({ itemsSold: state.itemsSold })
+
+  state = processLevelUp(state, oldLevel)
+
+  return {
+    ...state,
+    experience: newExperience,
+  }
+}

src/game-logic/reducers/addExperience.test.js

@@ -0,0 +1,20 @@
+import { addExperience } from './addExperience'
+import { processLevelUp } from './processLevelUp'
+
+jest.mock('./processLevelUp')
+
+describe('addExperience', () => {
+  const gameState = { experience: 0, itemsSold: {} }
+
+  it('adds experience to current experience', () => {
+    const newState = addExperience(gameState, 100)
+
+    expect(newState.experience).toEqual(100)
+  })
+
+  it('will check for leveling up when experience is added', () => {
+    addExperience(gameState, 100)
+
+    expect(processLevelUp).toHaveBeenCalled()
+  })
+})

src/game-logic/reducers/generatePriceEvents.js

@@ -1,9 +1,8 @@
+import { levelAchieved } from '../../utils/levelAchieved'
 import {
-  farmProductsSold,
   filterItemIdsToSeeds,
   getPriceEventForCrop,
   getRandomUnlockedCrop,
-  levelAchieved,
 } from '../../utils'
 import { getLevelEntitlements } from '../../utils/getLevelEntitlements'
 import { PRICE_EVENT_CHANCE } from '../../constants'
@@ -29,7 +28,7 @@ export const generatePriceEvents = state => {
   // less-than check.
   if (random() < PRICE_EVENT_CHANCE) {
     const { items: unlockedItems } = getLevelEntitlements(
-      levelAchieved(farmProductsSold(state.itemsSold))
+      levelAchieved({ itemsSold: state.itemsSold })
     )
 
     const cropItem = getRandomUnlockedCrop(