Merge branch 'release' into develop

website/common/script/content/gear/sets/special/index.js

@@ -49,6 +49,13 @@ let armor = {
     value: 130,
     canOwn: ownsItem('armor_special_mammothRiderArmor'),
   },
+  roguishRainbowMessengerRobes: {
+    text: t('armorSpecialRoguishRainbowMessengerRobesText'),
+    notes: t('armorSpecialRoguishRainbowMessengerRobesNotes', { str: 15 }),
+    str: 15,
+    value: 130,
+    canOwn: ownsItem('armor_special_roguishRainbowMessengerRobes'),
+  },
   pageArmor: {
     text: t('armorSpecialPageArmorText'),
     notes: t('armorSpecialPageArmorNotes', { con: 16 }),
@@ -735,6 +742,13 @@ let head = {
     value: 130,
     canOwn: ownsItem('head_special_mammothRiderHelm'),
   },
+  roguishRainbowMessengerHood: {
+    text: t('headSpecialRoguishRainbowMessengerHoodText'),
+    notes: t('headSpecialRoguishRainbowMessengerHoodNotes', { con: 15 }),
+    con: 15,
+    value: 130,
+    canOwn: ownsItem('head_special_roguishRainbowMessengerHood'),
+  },
   pageHelm: {
     text: t('headSpecialPageHelmText'),
     notes: t('headSpecialPageHelmNotes', { per: 16 }),
@@ -1516,6 +1530,13 @@ let shield = {
     value: 130,
     canOwn: ownsItem('shield_special_mammothRiderHorn'),
   },
+  roguishRainbowMessage: {
+    text: t('shieldSpecialRoguishRainbowMessageText'),
+    notes: t('shieldSpecialRoguishRainbowMessageNotes', { int: 15 }),
+    int: 15,
+    value: 130,
+    canOwn: ownsItem('shield_special_roguishRainbowMessage'),
+  },
   diamondStave: {
     text: t('shieldSpecialDiamondStaveText'),
     notes: t('shieldSpecialDiamondStaveNotes', { int: 16 }),
@@ -1936,6 +1957,13 @@ let weapon = {
     value: 130,
     canOwn: ownsItem('weapon_special_mammothRiderSpear'),
   },
+  roguishRainbowMessage: {
+    text: t('weaponSpecialRoguishRainbowMessageText'),
+    notes: t('weaponSpecialRoguishRainbowMessageNotes', { per: 15 }),
+    per: 15,
+    value: 130,
+    canOwn: ownsItem('weapon_special_roguishRainbowMessage'),
+  },
   pageBanner: {
     text: t('weaponSpecialPageBannerText'),
     notes: t('weaponSpecialPageBannerNotes', { str: 16 }),

website/common/script/content/hatching-potions.js

@@ -3,7 +3,7 @@ import defaults from 'lodash/defaults';
 import each from 'lodash/each';
 import t from './translation';
 
-const CURRENT_SEASON = 'April';
+const CURRENT_SEASON = 'May';
 
 let drops = {
   Base: {
@@ -66,6 +66,12 @@ let premium = {
     limited: true,
     _season: 'April',
   },
+  Fairy: {
+    value: 2,
+    text: t('hatchingPotionFairy'),
+    limited: true,
+    _season: 'May',
+  },
   Floral: {
     value: 2,
     text: t('hatchingPotionFloral'),

website/common/script/content/index.js

@@ -3023,6 +3023,119 @@ api.quests = {
       unlock: t('questButterflyUnlockText'),
     },
   },
+  mayhemMistiflying1: {
+    text: t('questMayhemMistiflying1Text'),
+    notes: t('questMayhemMistiflying1Notes'),
+    completion: t('questMayhemMistiflying1Completion'),
+    value: 4,
+    goldValue: 200,
+    category: 'gold',
+    boss: {
+      name: t('questMayhemMistiflying1Boss'),
+      hp: 500,
+      rage: {
+        title: t('questMayhemMistiflying1RageTitle'),
+        description: t('questMayhemMistiflying1RageDescription'),
+        value: 50,
+        healing: 0.3,
+        effect: t('questMayhemMistiflying1RageEffect'),
+      },
+    },
+    drop: {
+      items: [
+        {
+          type: 'hatchingPotions',
+          key: 'Skeleton',
+          text: t('questMayhemMistiflying1DropSkeletonPotion'),
+        }, {
+          type: 'hatchingPotions',
+          key: 'White',
+          text: t('questMayhemMistiflying1DropWhitePotion'),
+        }, {
+          type: 'gear',
+          key: 'armor_special_roguishRainbowMessengerRobes',
+          text: t('questMayhemMistiflying1DropArmor'),
+        },
+      ],
+      gp: 0,
+      exp: 500,
+    },
+  },
+  mayhemMistiflying2: {
+    text: t('questMayhemMistiflying2Text'),
+    notes: t('questMayhemMistiflying2Notes'),
+    completion: t('questMayhemMistiflying2Completion'),
+    previous: 'mayhemMistiflying1',
+    value: 4,
+    goldValue: 300,
+    category: 'gold',
+    collect: {
+      mistifly1: {
+        text: t('questMayhemMistiflying2CollectRedMistiflies'),
+        count: 25,
+      },
+      mistifly2: {
+        text: t('questMayhemMistiflying2CollectBlueMistiflies'),
+        count: 15,
+      },
+      mistifly3: {
+        text: t('questMayhemMistiflying2CollectGreenMistiflies'),
+        count: 10,
+      },
+    },
+    drop: {
+      items: [
+        {
+          type: 'gear',
+          key: 'head_special_roguishRainbowMessengerHood',
+          text: t('questMayhemMistiflying2DropHeadgear'),
+        },
+      ],
+      gp: 0,
+      exp: 75,
+    },
+  },
+  mayhemMistiflying3: {
+    text: t('questMayhemMistiflying3Text'),
+    notes: t('questMayhemMistiflying3Notes'),
+    completion: t('questMayhemMistiflying3Completion'),
+    previous: 'mayhemMistiflying2',
+    value: 4,
+    goldValue: 400,
+    category: 'gold',
+    boss: {
+      name: t('questMayhemMistiflying3Boss'),
+      hp: 1000,
+      str: 2,
+    },
+    drop: {
+      items: [
+        {
+          type: 'food',
+          key: 'CottonCandyPink',
+          text: t('questMayhemMistiflying3DropPinkCottonCandy'),
+        }, {
+          type: 'food',
+          key: 'CottonCandyPink',
+          text: t('questMayhemMistiflying3DropPinkCottonCandy'),
+        }, {
+          type: 'food',
+          key: 'CottonCandyPink',
+          text: t('questMayhemMistiflying3DropPinkCottonCandy'),
+        }, {
+          type: 'gear',
+          key: 'weapon_special_roguishRainbowMessage',
+          text: t('questMayhemMistiflying3DropWeapon'),
+        }, {
+          type: 'gear',
+          key: 'shield_special_roguishRainbowMessage',
+          text: t('questMayhemMistiflying3DropShield'),
+        },
+      ],
+      gp: 0,
+      exp: 650,
+    },
+  },
 };
 
 each(api.quests, (v, key) => {