Merge branch 'develop' into refactor-content

This commit is contained in:
Blade Barringer
2015-10-01 21:08:00 -05:00
86 changed files with 5065 additions and 4461 deletions

View File

@@ -1,6 +1,10 @@
import {setHatchingPotionDefaults} from './helpers';
import {
merge,
translator as t,
setHatchingPotionDefaults
} from './helpers';
let hatchingPotions = {
let dropPotions = {
Base: {
value: 2,
},
@@ -30,9 +34,25 @@ let hatchingPotions = {
},
Golden: {
value: 5,
}
},
};
setHatchingPotionDefaults(hatchingPotions);
let premiumPotions = {
Spooky: {
value: 2,
addlNotes: t('premiumPotionAddlNotes'),
premium: true,
limited: true,
},
};
export default hatchingPotions;
setHatchingPotionDefaults(dropPotions);
setHatchingPotionDefaults(premiumPotions);
let allPotions = merge([dropPotions, premiumPotions]);
export default {
all: allPotions,
drop: dropPotions,
premium: premiumPotions,
};