Move food defaults function into helpers

This commit is contained in:
Blade Barringer
2015-09-22 12:34:07 -05:00
parent 8eeffeb2a9
commit ed5abf44e1
6 changed files with 44 additions and 53 deletions

View File

@@ -1,5 +1,7 @@
import {each, defaults} from 'lodash'; import {
import {translator as t} from '../helpers'; translator as t,
setFoodDefaults
} from '../helpers';
const CAN_BUY = true; const CAN_BUY = true;
const CAN_DROP = true; const CAN_DROP = true;
@@ -47,12 +49,6 @@ let baseFood = {
}, },
}; };
each(baseFood, (food, name) => { setFoodDefaults(baseFood, {canBuy: CAN_BUY, canDrop: CAN_DROP});
defaults(food, {
canBuy: CAN_BUY,
canDrop: CAN_DROP,
text: t(`food${name}`),
});
});
export default baseFood; export default baseFood;

View File

@@ -1,7 +1,7 @@
import {each, defaults} from 'lodash'; import {
import capitalize from 'lodash.capitalize'; translator as t,
import camelCase from 'lodash.camelcase'; setFoodDefaults
import {translator as t} from '../helpers'; } from '../helpers';
const CAN_BUY = false; const CAN_BUY = false;
const CAN_DROP = false; const CAN_DROP = false;
@@ -49,15 +49,6 @@ let cake = {
}, },
}; };
each(cake, (food, name) => { setFoodDefaults(cake, {canBuy: CAN_BUY, canDrop: CAN_DROP});
let camelName = camelCase(name);
let capitalizedName = capitalize(camelName);
defaults(food, {
canBuy: CAN_BUY,
canDrop: CAN_DROP,
text: t(`food${capitalizedName}`),
});
});
export default cake; export default cake;

View File

@@ -1,7 +1,7 @@
import {each, defaults} from 'lodash'; import {
import capitalize from 'lodash.capitalize'; translator as t,
import camelCase from 'lodash.camelcase'; setFoodDefaults
import {translator as t} from '../helpers'; } from '../helpers';
const CAN_BUY = false; const CAN_BUY = false;
const CAN_DROP = false; const CAN_DROP = false;
@@ -49,15 +49,6 @@ let candy = {
} }
}; };
each(candy, (food, name) => { setFoodDefaults(candy, {canBuy: CAN_BUY, canDrop: CAN_DROP});
let camelName = camelCase(name);
let capitalizedName = capitalize(camelName);
defaults(food, {
canBuy: CAN_BUY,
canDrop: CAN_DROP,
text: t(`food${capitalizedName}`),
});
});
export default candy; export default candy;

View File

@@ -13,12 +13,4 @@ assign(allFood, saddle);
assign(allFood, cake); assign(allFood, cake);
assign(allFood, candy); assign(allFood, candy);
each(allFood, (food, key) => {
defaults(food, {
value: 1,
key: key,
notes: t('foodNotes')
});
});
export default allFood; export default allFood;

View File

@@ -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 = { let saddle = {
Saddle: { Saddle: { value: 5 },
canBuy: true,
canDrop: false,
text: t('foodSaddleText'),
value: 5,
notes: t('foodSaddleNotes'),
},
}; };
setFoodDefaults(saddle, {canBuy: CAN_BUY, canDrop: CAN_DROP});
export default saddle; export default saddle;

View File

@@ -54,3 +54,22 @@ export function setSpellDefaults (className, spells) {
defaults(spell, spellDefaults); 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'),
});
});
};