-
-
{{ $t('collect') + ':' }}
-
-
- {{ collect.count }} {{ getCollectText(collect) }}
-
-
-
-
-
{{ $t('bossHP') + ':' }}
- {{ quest.boss.hp }}
-
-
-
{{ $t('difficulty') + ':' }}
-
-
-
-
+
{{ $t('collect') + ':' }}
+
+
+ {{ collect.count }} {{ getCollectText(collect) }}
+
+
-
+
+
{{ $t('bossHP') + ':' }}
+ {{ quest.boss.hp }}
+
+
+
{{ $t('difficulty') + ':' }}
+
+
+
+
+
{{ limitedString }}
@@ -131,6 +132,10 @@ export default {
quest: {
type: Object,
},
+ abbreviated: {
+ type: Boolean,
+ default: false,
+ },
},
data () {
return {
diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json
index f4cdda9521..9beb13a2e7 100644
--- a/website/common/locales/en/gear.json
+++ b/website/common/locales/en/gear.json
@@ -2156,25 +2156,25 @@
"shieldArmoireSoftPinkPillowNotes": "The sensible warrior packs a pillow for any expedition. Soften life's blows... even while you nap. Increases Strength and Constitution by <%= attrs %> each. Enchanted Armoire: Pink Loungewear Set (item 3 of 3).",
"shieldArmoireClownsBalloonsText": "Clown's Balloons",
"shieldArmoireClownsBalloonsNotes": "Be careful: replacing these balloons would be a bit expensive... because of the inflation! Increases Perception by <%= per %>. Enchanted Armoire: Clown Set (Item 4 of 5).",
- "shieldArmoireStrawberryFoodText": "Strawberry",
+ "shieldArmoireStrawberryFoodText": "Decorative Strawberry",
"shieldArmoireStrawberryFoodNotes": "A delicious fresh strawberry to feed to your pets! Do you know which pets like strawberries best? Increases Strength by <%= str %>. Enchanted Armoire: Pet Food Set (Item 1 of 10).",
- "shieldArmoireRottenMeatFoodText": "Rotten Meat",
+ "shieldArmoireRottenMeatFoodText": "Decorative Rotten Meat",
"shieldArmoireRottenMeatFoodNotes": "Hold your nose! This rotten meat might be disgusting to you, but it's perfect for some of your pets! Increases Constitution by <%= con %>. Enchanted Armoire: Pet Food Set (Item 2 of 10).",
- "shieldArmoirePotatoFoodText": "Potato",
+ "shieldArmoirePotatoFoodText": "Decorative Potato",
"shieldArmoirePotatoFoodNotes": "Potatoes are a staple of many diets, but some pets would like to live on potatoes alone... Increases Perception by <%= per %>. Enchanted Armoire: Pet Food Set (Item 3 of 10).",
- "shieldArmoirePinkCottonCandyFoodText": "Pink Cotton Candy",
+ "shieldArmoirePinkCottonCandyFoodText": "Decorative Pink Cotton Candy",
"shieldArmoirePinkCottonCandyFoodNotes": "A sweet treat for the pets with a sweet tooth. But who will like it best? Increases Intelligence by <%= int %>. Enchanted Armoire: Pet Food Set (Item 4 of 10).",
- "shieldArmoireMilkFoodText": "Milk",
+ "shieldArmoireMilkFoodText": "Decorative Milk",
"shieldArmoireMilkFoodNotes": "There are many sayings about the health benefits of milk, but the pets who favor it just love its creamy taste. Increases Constitution and Strength by <%= attrs %> each. Enchanted Armoire: Pet Food Set (Item 10 of 10)",
- "shieldArmoireMeatFoodText": "Meat",
+ "shieldArmoireMeatFoodText": "Decorative Meat",
"shieldArmoireMeatFoodNotes": "Sometimes a bit of protein is what you need to grow up big and strong. Some of your pets are more eager for it than others! Increases Strength by <%= str %>. Enchanted Armoire: Pet Food Set (Item 5 of 10).",
- "shieldArmoireHoneyFoodText": "Honey",
+ "shieldArmoireHoneyFoodText": "Decorative Honey",
"shieldArmoireHoneyFoodNotes": "Watch out for sticky paws once you've fed your pets this honey! Some pets crave this natural sweetness; can you guess who? Increases Intelligence and Perception by <%= attrs %> each. Enchanted Armoire: Pet Food Set (Item 6 of 10).",
- "shieldArmoireFishFoodText": "Fish",
+ "shieldArmoireFishFoodText": "Decorative Fish",
"shieldArmoireFishFoodNotes": "This fish will help your pets have good bones! But you'll have to guess which of your pets like it the most. Increases Perception by <%= per %>. Enchanted Armoire: Pet Food Set (Item 7 of 10).",
- "shieldArmoireChocolateFoodText": "Chocolate",
+ "shieldArmoireChocolateFoodText": "Decorative Chocolate",
"shieldArmoireChocolateFoodNotes": "Everybody likes a little chocolate, but some of your pets are keener than others... Increases Intelligence by <%= int %>. Enchanted Armoire: Pet Food Set (Item 8 of 10).",
- "shieldArmoireBlueCottonCandyFoodText": "Blue Cotton Candy",
+ "shieldArmoireBlueCottonCandyFoodText": "Decorative Blue Cotton Candy",
"shieldArmoireBlueCottonCandyFoodNotes": "A sweet treat for the pets with a sweet tooth. But who will like it best? Increases Constitution by <%= con %>. Enchanted Armoire: Pet Food Set (Item 9 of 10).",
"back": "Back Accessory",
diff --git a/website/common/script/content/bundles.js b/website/common/script/content/bundles.js
index 97985190a8..74452b1207 100644
--- a/website/common/script/content/bundles.js
+++ b/website/common/script/content/bundles.js
@@ -21,8 +21,9 @@ const bundles = {
'harpy',
'owl',
],
+ event: EVENTS.potions202105,
canBuy () {
- return moment().isBetween('2019-05-09', '2019-06-02');
+ return moment().isBefore(EVENTS.potions202105.end);
},
type: 'quests',
class: 'quest_bundle_featheredFriends',
diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js
index 3adf96eb81..cfa8e39141 100644
--- a/website/common/script/content/hatching-potions.js
+++ b/website/common/script/content/hatching-potions.js
@@ -102,7 +102,7 @@ const premium = {
event: EVENTS.potions202105,
_addlNotes: t('eventAvailabilityReturning', {
availableDate: t('dateEndMay'),
- previousDate: t('mayYYYY', { year: 2016 }),
+ previousDate: t('mayYYYY', { year: 2019 }),
}),
canBuy () {
return moment().isBefore(EVENTS.potions202105.end);
diff --git a/website/common/script/libs/getItemInfo.js b/website/common/script/libs/getItemInfo.js
index c9d26ac32c..e7ffb300b6 100644
--- a/website/common/script/libs/getItemInfo.js
+++ b/website/common/script/libs/getItemInfo.js
@@ -122,6 +122,7 @@ export default function getItemInfo (user, type, item, officialPinnedItems, lang
purchaseType: 'bundles',
path: `bundles.${item.key}`,
pinType: 'bundles',
+ event: item.event,
};
break;
case 'quests': // eslint-disable-line no-case-declarations