diff --git a/common/script/src/content/food/base.js b/common/script/src/content/food/base.js index 0d523d296d..27a84c22d2 100644 --- a/common/script/src/content/food/base.js +++ b/common/script/src/content/food/base.js @@ -1,5 +1,7 @@ -import {each, defaults} from 'lodash'; -import {translator as t} from '../helpers'; +import { + translator as t, + setFoodDefaults +} from '../helpers'; const CAN_BUY = true; const CAN_DROP = true; @@ -47,12 +49,6 @@ let baseFood = { }, }; -each(baseFood, (food, name) => { - defaults(food, { - canBuy: CAN_BUY, - canDrop: CAN_DROP, - text: t(`food${name}`), - }); -}); +setFoodDefaults(baseFood, {canBuy: CAN_BUY, canDrop: CAN_DROP}); export default baseFood; diff --git a/common/script/src/content/food/birthday.js b/common/script/src/content/food/birthday.js index 816fc89598..598373a860 100644 --- a/common/script/src/content/food/birthday.js +++ b/common/script/src/content/food/birthday.js @@ -1,7 +1,7 @@ -import {each, defaults} from 'lodash'; -import capitalize from 'lodash.capitalize'; -import camelCase from 'lodash.camelcase'; -import {translator as t} from '../helpers'; +import { + translator as t, + setFoodDefaults +} from '../helpers'; const CAN_BUY = false; const CAN_DROP = false; @@ -49,15 +49,6 @@ let cake = { }, }; -each(cake, (food, name) => { - let camelName = camelCase(name); - let capitalizedName = capitalize(camelName); - - defaults(food, { - canBuy: CAN_BUY, - canDrop: CAN_DROP, - text: t(`food${capitalizedName}`), - }); -}); +setFoodDefaults(cake, {canBuy: CAN_BUY, canDrop: CAN_DROP}); export default cake; diff --git a/common/script/src/content/food/fall.js b/common/script/src/content/food/fall.js index d90e47f99b..385b7c2d34 100644 --- a/common/script/src/content/food/fall.js +++ b/common/script/src/content/food/fall.js @@ -1,7 +1,7 @@ -import {each, defaults} from 'lodash'; -import capitalize from 'lodash.capitalize'; -import camelCase from 'lodash.camelcase'; -import {translator as t} from '../helpers'; +import { + translator as t, + setFoodDefaults +} from '../helpers'; const CAN_BUY = false; const CAN_DROP = false; @@ -49,15 +49,6 @@ let candy = { } }; -each(candy, (food, name) => { - let camelName = camelCase(name); - let capitalizedName = capitalize(camelName); - - defaults(food, { - canBuy: CAN_BUY, - canDrop: CAN_DROP, - text: t(`food${capitalizedName}`), - }); -}); +setFoodDefaults(candy, {canBuy: CAN_BUY, canDrop: CAN_DROP}); export default candy; diff --git a/common/script/src/content/food/index.js b/common/script/src/content/food/index.js index 09485d3124..4ef9828858 100644 --- a/common/script/src/content/food/index.js +++ b/common/script/src/content/food/index.js @@ -13,12 +13,4 @@ assign(allFood, saddle); assign(allFood, cake); assign(allFood, candy); -each(allFood, (food, key) => { - defaults(food, { - value: 1, - key: key, - notes: t('foodNotes') - }); -}); - export default allFood; diff --git a/common/script/src/content/food/saddle.js b/common/script/src/content/food/saddle.js index 261425150d..76f2c7154c 100644 --- a/common/script/src/content/food/saddle.js +++ b/common/script/src/content/food/saddle.js @@ -1,13 +1,15 @@ -import {translator as t} from '../helpers'; +import { + translator as t, + setFoodDefaults +} from '../helpers'; + +const CAN_BUY = true; +const CAN_DROP = false; let saddle = { - Saddle: { - canBuy: true, - canDrop: false, - text: t('foodSaddleText'), - value: 5, - notes: t('foodSaddleNotes'), - }, + Saddle: { value: 5 }, }; +setFoodDefaults(saddle, {canBuy: CAN_BUY, canDrop: CAN_DROP}); + export default saddle; diff --git a/common/script/src/content/helpers.js b/common/script/src/content/helpers.js index d476e9910f..8075bca50d 100644 --- a/common/script/src/content/helpers.js +++ b/common/script/src/content/helpers.js @@ -54,3 +54,22 @@ export function setSpellDefaults (className, spells) { defaults(spell, spellDefaults); }); }; + +//---------------------------------------- +// Food Helpers +//---------------------------------------- + +export function setFoodDefaults(food, options={}) { + each(food, (item, name) => { + let formattedName = formatForTranslator(name); + + defaults(item, { + canBuy: options.canBuy || false, + canDrop: options.canDrop || false, + text: translator(`food${formattedName}`), + value: 1, + key: name, + notes: translator('foodNotes'), + }); + }); +};