Merge branch 'develop' into fix-antidotes-from-revert

website/common/script/libs/isFreeRebirth.js

@@ -10,5 +10,5 @@ export default function isFreeRebirth (user) {
     daysFromLastFreeRebirth = 999;
   }
 
-  return user.stats.lvl >= MAX_LEVEL && daysFromLastFreeRebirth > 45;
+  return user.stats.lvl >= MAX_LEVEL && daysFromLastFreeRebirth >= 45;
 }

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

@@ -1,25 +1,19 @@
-import { SEASONAL_SETS } from '../content/constants';
+// import { SEASONAL_SETS } from '../content/constants';
 
 export default {
-  opened: true,
+  opened: false,
 
-  currentSeason: 'Fall',
+  currentSeason: 'Closed',
 
   dateRange: { start: '2019-09-24', end: '2019-10-31' },
 
   availableSets: [
-    ...SEASONAL_SETS.fall,
   ],
 
   pinnedSets: {
-    wizard: 'fall2019CyclopsSet',
-    warrior: 'fall2019RavenSet',
-    rogue: 'fall2019OperaticSpecterSet',
-    healer: 'fall2019LichSet',
   },
 
   availableSpells: [
-    'spookySparkles',
   ],
 
   availableQuests: [

website/common/script/libs/shops.js

@@ -30,7 +30,7 @@ shops.getMarketShop = function getMarketShop (user, language) {
     categories: shops.getMarketCategories(user, language),
     featured: {
       text: i18n.t('featuredItems'),
-      items: featuredItems.market.map(i => getItemInfo(user, i.type, get(content, i.path))),
+      items: featuredItems.market().map(i => getItemInfo(user, i.type, get(content, i.path))),
     },
   };
 };