Merge branch 'release' into develop

website/common/script/content/appearance/backgrounds.js

@@ -661,6 +661,20 @@ let backgrounds = {
       notes: t('backgroundTulipGardenNotes'),
     },
   },
+  backgrounds052018: {
+    champions_colosseum: {
+      text: t('backgroundChampionsColosseumText'),
+      notes: t('backgroundChampionsColosseumNotes'),
+    },
+    fantastical_shoe_store: {
+      text: t('backgroundFantasticalShoeStoreText'),
+      notes: t('backgroundFantasticalShoeStoreNotes'),
+    },
+    terraced_rice_field: {
+      text: t('backgroundTerracedRiceFieldText'),
+      notes: t('backgroundTerracedRiceFieldNotes'),
+    },
+  },
   incentiveBackgrounds: {
     violet: {
       text: t('backgroundVioletText'),

website/common/script/content/gear/sets/armoire.js

@@ -340,6 +340,15 @@ let armor = {
     set: 'fluttery',
     canOwn: ownsItem('armor_armoire_flutteryFrock'),
   },
+  cobblersCoveralls: {
+    text: t('armorArmoireCobblersCoverallsText'),
+    notes: t('armorArmoireCobblersCoverallsNotes', { attrs: 7 }),
+    value: 100,
+    per: 7,
+    str: 7,
+    set: 'cobbler',
+    canOwn: ownsItem('armor_armoire_cobblersCoveralls'),
+  },
 };
 
 let body = {
@@ -937,6 +946,15 @@ let shield = {
     // set: 'fluttery',
     canOwn: ownsItem('shield_armoire_flutteryFan'),
   },
+  fancyShoe: {
+    text: t('shieldArmoireFancyShoeText'),
+    notes: t('shieldArmoireFancyShoeNotes', { attrs: 7 }),
+    value: 100,
+    int: 7,
+    per: 7,
+    set: 'cobbler',
+    canOwn: ownsItem('shield_armoire_fancyShoe'),
+  },
 };
 
 let headAccessory = {
@@ -1229,6 +1247,15 @@ let weapon = {
     set: 'fluttery',
     canOwn: ownsItem('weapon_armoire_flutteryArmy'),
   },
+  cobblersHammer: {
+    text: t('weaponArmoireCobblersHammerText'),
+    notes: t('weaponArmoireCobblersHammerNotes', { attrs: 7 }),
+    value: 100,
+    con: 7,
+    str: 7,
+    set: 'cobbler',
+    canOwn: ownsItem('weapon_armoire_cobblersHammer'),
+  },
 };
 
 let armoireSet = {

website/common/script/content/shop-featuredItems.js

@@ -8,12 +8,12 @@ const featuredItems = {
       path: 'armoire',
     },
     {
-      type: 'premiumHatchingPotion',
-      path: 'premiumHatchingPotions.Shimmer',
+      type: 'hatchingPotions',
+      path: 'hatchingPotions.Red',
     },
     {
-      type: 'premiumHatchingPotion',
-      path: 'premiumHatchingPotions.Rainbow',
+      type: 'hatchingPotions',
+      path: 'hatchingPotions.Golden',
     },
     {
       type: 'card',
@@ -29,16 +29,12 @@ const featuredItems = {
       type: 'quests',
       path: 'quests.taskwoodsTerror1',
     },
-    {
-      type: 'quests',
-      path: 'quests.egg',
-    },
     {
       type: 'quests',
       path: 'quests.bunny',
     },
   ],
-  seasonal: 'springHealer',
+  seasonal: '',
   timeTravelers: [
     // TODO
   ],

website/common/script/libs/shops-seasonal.config.js

@@ -1,29 +1,22 @@
-import { SEASONAL_SETS } from '../content/constants';
+// import { SEASONAL_SETS } from '../content/constants';
 
 module.exports = {
-  opened: true,
+  opened: false,
 
-  currentSeason: 'Spring',
+  currentSeason: 'Closed',
 
   dateRange: { start: '2018-03-20', end: '2018-04-30' },
 
   availableSets: [
-    ...SEASONAL_SETS.spring,
   ],
 
   pinnedSets: {
-    wizard: 'spring2018TulipMageSet',
-    warrior: 'spring2018SunriseWarriorSet',
-    rogue: 'spring2018DucklingRogueSet',
-    healer: 'spring2018GarnetHealerSet',
   },
 
   availableSpells: [
-    'shinySeed',
   ],
 
   availableQuests: [
-    'egg',
   ],
 
   featuredSet: 'comfortingKittySet',