Merge branch 'release' into develop

This commit is contained in:
Sabe Jones
2019-02-12 07:35:56 -06:00
78 changed files with 11789 additions and 11549 deletions
@@ -3,7 +3,7 @@ import defaults from 'lodash/defaults';
import each from 'lodash/each';
import t from './translation';
const CURRENT_SEASON = '_NONE_';
const CURRENT_SEASON = 'February';
let drops = {
Base: {
@@ -156,6 +156,12 @@ let premium = {
limited: true,
_season: 'January',
},
RoseQuartz: {
value: 2,
text: t('hatchingPotionRoseQuartz'),
limited: true,
_season: 'February',
},
};
each(drops, (pot, key) => {
@@ -8,16 +8,16 @@ const featuredItems = {
path: 'armoire',
},
{
type: 'hatchingPotions',
path: 'hatchingPotions.CottonCandyPink',
type: 'premiumHatchingPotion',
path: 'premiumHatchingPotions.Cupid',
},
{
type: 'eggs',
path: 'eggs.TigerCub',
type: 'premiumHatchingPotion',
path: 'premiumHatchingPotions.RoseQuartz',
},
{
type: 'card',
path: 'cardTypes.birthday',
path: 'cardTypes.valentine',
},
],
quests: [