Merge remote-tracking branch 'upstream/develop' into fix-antidotes-from-revert

2019-12-07 22:32:25 +03:00
parent da8346ea50 97a1d0f474
commit aa1fcb4956
340 changed files with 33840 additions and 28916 deletions
@@ -927,6 +927,20 @@ const backgrounds = {
      notes: t('backgroundPotionShopNotes'),
    },
  },
+  backgrounds122019: {
+    holiday_market: {
+      text: t('backgroundHolidayMarketText'),
+      notes: t('backgroundHolidayMarketNotes'),
+    },
+    holiday_wreath: {
+      text: t('backgroundHolidayWreathText'),
+      notes: t('backgroundHolidayWreathNotes'),
+    },
+    winter_nocturne: {
+      text: t('backgroundWinterNocturneText'),
+      notes: t('backgroundWinterNocturneNotes'),
+    },
+  },
  incentiveBackgrounds: {
    violet: {
      text: t('backgroundVioletText'),
@@ -507,6 +507,15 @@ const armor = {
    set: 'alchemist',
    canOwn: ownsItem('armor_armoire_alchemistsRobe'),
  },
+  duffleCoat: {
+    text: t('armorArmoireDuffleCoatText'),
+    notes: t('armorArmoireDuffleCoatNotes', { attrs: 7 }),
+    value: 100,
+    con: 7,
+    per: 7,
+    set: 'duffle',
+    canOwn: ownsItem('armor_armoire_duffleCoat'),
+  },
 };

 const body = {
@@ -1037,6 +1046,15 @@ const head = {
    set: 'alchemist',
    canOwn: ownsItem('head_armoire_alchemistsHat'),
  },
+  earflapHat: {
+    text: t('headArmoireEarflapHatText'),
+    notes: t('headArmoireEarflapHatNotes', { attrs: 7 }),
+    value: 100,
+    int: 7,
+    str: 7,
+    set: 'duffle',
+    canOwn: ownsItem('head_armoire_earflapHat'),
+  },
 };

 const shield = {
@@ -394,6 +394,12 @@ const back = {
    mystery: '201905',
    value: 0,
  },
+  201912: {
+    text: t('backMystery201912Text'),
+    notes: t('backMystery201912Notes'),
+    mystery: '201912',
+    value: 0,
+  },
 };

 const body = {
@@ -757,6 +763,18 @@ const head = {
    mystery: '201910',
    value: 0,
  },
+  201911: {
+    text: t('headMystery201911Text'),
+    notes: t('headMystery201911Notes'),
+    mystery: '201911',
+    value: 0,
+  },
+  201912: {
+    text: t('headMystery201912Text'),
+    notes: t('headMystery201912Notes'),
+    mystery: '201912',
+    value: 0,
+  },
  301404: {
    text: t('headMystery301404Text'),
    notes: t('headMystery301404Notes'),
@@ -946,6 +964,12 @@ const weapon = {
    mystery: '201811',
    value: 0,
  },
+  201911: {
+    text: t('weaponMystery201911Text'),
+    notes: t('weaponMystery201911Notes'),
+    mystery: '201911',
+    value: 0,
+  },
  301404: {
    text: t('weaponMystery301404Text'),
    notes: t('weaponMystery301404Notes'),
@@ -230,6 +230,13 @@ const premium = {
    limited: true,
    _season: '_PENDING_',
  },
+  Amber: {
+    value: 2,
+    text: t('hatchingPotionAmber'),
+    limited: true,
+    canBuy: hasQuestAchievementFunction('amber'),
+    _addlNotes: t('premiumPotionUnlimitedNotes'),
+  },
 };

 const wacky = {
@@ -1,283 +1,8 @@
 import each from 'lodash/each';
+import moment from 'moment';
 import t from './translation';

 const mysterySets = {
-  201402: {
-    start: '2014-02-22',
-    end: '2014-02-28',
-  },
-  201403: {
-    start: '2014-03-24',
-    end: '2014-04-02',
-  },
-  201404: {
-    start: '2014-04-24',
-    end: '2014-05-02',
-  },
-  201405: {
-    start: '2014-05-21',
-    end: '2014-06-02',
-  },
-  201406: {
-    start: '2014-06-23',
-    end: '2014-07-02',
-  },
-  201407: {
-    start: '2014-07-23',
-    end: '2014-08-02',
-  },
-  201408: {
-    start: '2014-08-23',
-    end: '2014-09-02',
-  },
-  201409: {
-    start: '2014-09-24',
-    end: '2014-10-02',
-  },
-  201410: {
-    start: '2014-10-24',
-    end: '2014-11-02',
-  },
-  201411: {
-    start: '2014-11-24',
-    end: '2014-12-02',
-  },
-  201412: {
-    start: '2014-12-25',
-    end: '2015-01-02',
-  },
-  201501: {
-    start: '2015-01-26',
-    end: '2015-02-02',
-  },
-  201502: {
-    start: '2015-02-24',
-    end: '2015-03-02',
-  },
-  201503: {
-    start: '2015-03-25',
-    end: '2015-04-02',
-  },
-  201504: {
-    start: '2015-04-24',
-    end: '2015-05-02',
-  },
-  201505: {
-    start: '2015-05-25',
-    end: '2015-06-02',
-  },
-  201506: {
-    start: '2015-06-25',
-    end: '2015-07-02',
-  },
-  201507: {
-    start: '2015-07-24',
-    end: '2015-08-02',
-  },
-  201508: {
-    start: '2015-08-23',
-    end: '2015-09-02',
-  },
-  201509: {
-    start: '2015-09-24',
-    end: '2015-10-02',
-  },
-  201510: {
-    start: '2015-10-26',
-    end: '2015-11-02',
-  },
-  201511: {
-    start: '2015-11-25',
-    end: '2015-12-02',
-  },
-  201512: {
-    start: '2015-12-23',
-    end: '2016-01-02',
-  },
-  201601: {
-    start: '2016-01-26',
-    end: '2016-02-02',
-  },
-  201602: {
-    start: '2016-02-24',
-    end: '2016-03-02',
-  },
-  201603: {
-    start: '2016-03-24',
-    end: '2016-04-02',
-  },
-  201604: {
-    start: '2016-04-25',
-    end: '2016-05-02',
-  },
-  201605: {
-    start: '2016-05-25',
-    end: '2016-06-02',
-  },
-  201606: {
-    start: '2016-06-23',
-    end: '2016-07-02',
-  },
-  201607: {
-    start: '2016-07-26',
-    end: '2016-08-02',
-  },
-  201608: {
-    start: '2016-08-23',
-    end: '2016-09-02',
-  },
-  201609: {
-    start: '2016-09-22',
-    end: '2016-10-02',
-  },
-  201610: {
-    start: '2016-10-25',
-    end: '2016-11-02',
-  },
-  201611: {
-    start: '2016-11-22',
-    end: '2016-12-02',
-  },
-  201612: {
-    start: '2016-12-21',
-    end: '2017-01-02',
-  },
-  201701: {
-    start: '2017-01-24',
-    end: '2017-02-02',
-  },
-  201702: {
-    start: '2017-02-21',
-    end: '2017-03-02',
-  },
-  201703: {
-    start: '2017-03-23',
-    end: '2017-04-02',
-  },
-  201704: {
-    start: '2017-04-25',
-    end: '2017-05-02',
-  },
-  201705: {
-    start: '2017-05-23',
-    end: '2017-06-02',
-  },
-  201706: {
-    start: '2017-06-22',
-    end: '2017-07-02',
-  },
-  201707: {
-    start: '2017-07-25',
-    end: '2017-08-02',
-  },
-  201708: {
-    start: '2017-08-17',
-    end: '2017-09-02',
-  },
-  201709: {
-    start: '2017-09-19',
-    end: '2017-10-07',
-  },
-  201710: {
-    start: '2017-10-24',
-    end: '2017-11-02',
-  },
-  201711: {
-    start: '2017-11-17',
-    end: '2017-12-02',
-  },
-  201712: {
-    start: '2017-12-21',
-    end: '2018-01-02',
-  },
-  201801: {
-    start: '2018-01-23',
-    end: '2018-02-02',
-  },
-  201802: {
-    start: '2018-02-22',
-    end: '2018-03-02',
-  },
-  201803: {
-    start: '2018-03-22',
-    end: '2018-04-02',
-  },
-  201804: {
-    start: '2018-04-24',
-    end: '2018-05-02',
-  },
-  201805: {
-    start: '2018-05-24',
-    end: '2018-06-02',
-  },
-  201806: {
-    start: '2018-06-21',
-    end: '2018-07-02',
-  },
-  201807: {
-    start: '2018-07-24',
-    end: '2018-08-02',
-  },
-  201808: {
-    start: '2018-08-23',
-    end: '2018-09-02',
-  },
-  201809: {
-    start: '2018-09-25',
-    end: '2018-10-02',
-  },
-  201810: {
-    start: '2018-10-25',
-    end: '2018-11-02',
-  },
-  201811: {
-    start: '2018-11-28',
-    end: '2018-12-4',
-  },
-  201812: {
-    start: '2018-12-19',
-    end: '2019-01-02',
-  },
-  201901: {
-    start: '2019-01-28',
-    end: '2019-02-02',
-  },
-  201902: {
-    start: '2019-02-25',
-    end: '2019-03-02',
-  },
-  201903: {
-    start: '2019-03-26',
-    end: '2019-04-02',
-  },
-  201904: {
-    start: '2019-04-25',
-    end: '2019-05-02',
-  },
-  201905: {
-    start: '2019-05-28',
-    end: '2019-06-02',
-  },
-  201906: {
-    start: '2019-06-25',
-    end: '2019-07-03',
-  },
-  201907: {
-    start: '2019-07-25',
-    end: '2019-08-02',
-  },
-  201908: {
-    start: '2019-08-27',
-    end: '2019-09-02',
-  },
-  201909: {
-    start: '2019-09-25',
-    end: '2019-10-02',
-  },
-  201910: {
-    start: '2019-10-24',
-    end: '2019-11-02',
-  },
  301404: {
    start: '3014-03-24',
    end: '3014-04-02',
@@ -300,6 +25,19 @@ const mysterySets = {
    end: '2014-04-01',
  },
 };
+const FIRST_MYSTERY_SET = moment('2014-02-01');
+
+for (
+  let mysteryMonth = FIRST_MYSTERY_SET;
+  moment(mysteryMonth).startOf('month').isSameOrBefore(moment().add(1, 'months'));
+  mysteryMonth = moment(mysteryMonth).add(1, 'months')
+) {
+  const setKey = moment(mysteryMonth).format('YYYYMM');
+  mysterySets[setKey] = {
+    start: moment(mysteryMonth).startOf('month').format('YYYY-MM-DD'),
+    end: moment(mysteryMonth).endOf('month').format('YYYY-MM-DD'),
+  };
+}

 each(mysterySets, (value, key) => {
  value.key = key;
@@ -3502,6 +3502,38 @@ const quests = {
      unlock: t('questRobotUnlockText'),
    },
  },
+  amber: {
+    text: t('questAmberText'),
+    notes: t('questAmberNotes'),
+    completion: t('questAmberCompletion'),
+    value: 4,
+    category: 'hatchingPotion',
+    boss: {
+      name: t('questAmberBoss'),
+      hp: 300,
+      str: 1.25,
+    },
+    drop: {
+      items: [
+        {
+          type: 'hatchingPotions',
+          key: 'Amber',
+          text: t('questAmberDropAmberPotion'),
+        }, {
+          type: 'hatchingPotions',
+          key: 'Amber',
+          text: t('questAmberDropAmberPotion'),
+        }, {
+          type: 'hatchingPotions',
+          key: 'Amber',
+          text: t('questAmberDropAmberPotion'),
+        },
+      ],
+      gp: 50,
+      exp: 100,
+      unlock: t('questAmberUnlockText'),
+    },
+  },
 };

 each(quests, (v, key) => {
@@ -46,8 +46,8 @@ const featuredItems = {
  },
  quests: [
    {
-      type: 'bundles',
-      path: 'bundles.delightfulDinos',
+      type: 'quests',
+      path: 'quests.badger',
    },
    {
      type: 'quests',
@@ -55,7 +55,7 @@ const featuredItems = {
    },
    {
      type: 'quests',
-      path: 'quests.silver',
+      path: 'quests.amber',
    },
  ],
  seasonal: 'fall2018Rogue',
@@ -13,6 +13,7 @@ each(mystery, (v, k) => {
  v.items = filter(gear.flat, {
    mystery: k,
  });
+  if (v.items.length === 0) delete mystery[k];
 });

 const timeTravelerStore = user => {