Merge branch 'sabrecat/potion-quests' into release

website/common/locales/en/content.json

@@ -283,6 +283,7 @@
   "hatchingPotionCelestial": "Celestial",
   "hatchingPotionVeggie": "Garden",
   "hatchingPotionSunshine": "Sunshine",
+  "hatchingPotionBronze": "Bronze",
 
   "hatchingPotionNotes": "Pour this on an egg, and it will hatch as a <%= potText(locale) %> pet.",
   "premiumPotionAddlNotes": "Not usable on quest pet eggs.",

website/common/locales/en/questsContent.json

@@ -740,5 +740,12 @@
   "questVelociraptorUnlockText": "Unlocks purchasable Velociraptor eggs in the Market",
 
   "mythicalMarvelsText": "Mythical Marvels Quest Bundle",
-  "mythicalMarvelsNotes": "Contains 'Convincing the Unicorn Queen,' 'The Fiery Gryphon,' and 'Danger in the Depths: Sea Serpent Strike!' Available until February 28."
+  "mythicalMarvelsNotes": "Contains 'Convincing the Unicorn Queen,' 'The Fiery Gryphon,' and 'Danger in the Depths: Sea Serpent Strike!' Available until February 28.",
+
+  "questBronzeText": "Brazen Beetle Battle",
+  "questBronzeNotes": "On a refreshing break between tasks, you and some friends take a stroll through the forest trails of the Taskwoods. You come upon a large hollow log and a sparkle from inside catches your attention.<br><br>Why, it's a cache of Magic Hatching Potions! The shimmering bronze liquid swirls gently in the bottles, and @Hachiseiko reaches to pick one up to examine it.<br><br>“Halt!” hisses a voice from behind you. It's a gigantic beetle with a carapace of gleaming bronze, raising her clawed feet in a fight stance. “Those are my potions, and if you wish to earn them you must prove yourself in a gentlefolks' duel!”",
+  "questBronzeCompletion": "“Well met, warrior!” says the beetle as she settles to the ground. Is she smiling? It's hard to tell from those mandibles. “You've truly earned these potions!”<br<br>“Oh wow, what an exciting reward!” says @UncommonCriminal, turning a shimmering bottle in their hand. “Let's go hatch our new pets!”",
+  "questBronzeBoss": "Brazen Beetle",
+  "questBronzeDropBronzePotion": "Bronze Hatching Potion",
+  "questBronzeUnlockText": "Unlocks purchasable Bronze hatching potions in the Market"
 }

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

@@ -5,6 +5,13 @@ import t from './translation';
 
 const CURRENT_SEASON = 'May';
 
+function hasQuestAchievementFunction (key) {
+  return (user) => {
+    return user.achievements.quests &&
+      user.achievements.quests[key] > 0;
+  };
+}
+
 let drops = {
   Base: {
     value: 2,
@@ -174,6 +181,13 @@ let premium = {
     limited: true,
     _season: 'May',
   },
+  Bronze: {
+    value: 2,
+    text: t('hatchingPotionBronze'),
+    limited: true,
+    _season: 'March',
+    canBuy: hasQuestAchievementFunction('bronze'),
+  },
 };
 
 const wacky = {

website/common/script/content/quests.js

@@ -3353,7 +3353,38 @@ let quests = {
       unlock: t('questVelociraptorUnlockText'),
     },
   },
-
+  bronze: {
+    text: t('questBronzeText'),
+    notes: t('questBronzeNotes'),
+    completion: t('questBronzeCompletion'),
+    value: 4,
+    category: 'pet',
+    boss: {
+      name: t('questBronzeBoss'),
+      hp: 800,
+      str: 2,
+    },
+    drop: {
+      items: [
+        {
+          type: 'hatchingPotions',
+          key: 'Bronze',
+          text: t('questBronzeDropBronzePotion'),
+        }, {
+          type: 'hatchingPotions',
+          key: 'Bronze',
+          text: t('questBronzeDropBronzePotion'),
+        }, {
+          type: 'hatchingPotions',
+          key: 'Bronze',
+          text: t('questBronzeDropBronzePotion'),
+        },
+      ],
+      gp: 63,
+      exp: 575,
+      unlock: t('questBronzeUnlockText'),
+    },
+  },
 };
 
 each(quests, (v, key) => {

website/common/script/libs/shops.js

@@ -73,7 +73,7 @@ shops.getMarketCategories = function getMarket (user, language) {
     notes: i18n.t('premiumPotionNoDropExplanation', language),
   };
   premiumHatchingPotionsCategory.items = sortBy(values(content.hatchingPotions)
-    .filter(hp => hp.limited && hp.canBuy())
+    .filter(hp => hp.limited && hp.canBuy(user))
     .map(premiumHatchingPotion => {
       return getItemInfo(user, 'premiumHatchingPotion', premiumHatchingPotion, officialPinnedItems, language);
     }), 'key');