diff --git a/common/locales/en/limited.json b/common/locales/en/limited.json index ac2318be30..711355ae22 100644 --- a/common/locales/en/limited.json +++ b/common/locales/en/limited.json @@ -59,5 +59,6 @@ "monsterOfScienceSet": "Monster of Science (Warrior)", "witchyWizardSet": "Witchy Wizard (Mage)", "mummyMedicSet": "Mummy Medic (Healer)", - "vampireSmiterSet": "Vampire Smiter (Rogue)" + "vampireSmiterSet": "Vampire Smiter (Rogue)", + "fallEventAvailability": "Available until October 31" } diff --git a/common/locales/en/pets.json b/common/locales/en/pets.json index b6421abdc9..fab7bc6ff1 100644 --- a/common/locales/en/pets.json +++ b/common/locales/en/pets.json @@ -24,14 +24,14 @@ "eggSingular": "egg", "noEggs": "You don't have any eggs.", "hatchingPotions": "Hatching Potions", - "magicHatchingPotions": "Magic Hatching Potions", + "magicHatchingPotions": "Magic Hatching Potions", "hatchingPotion": "hatching potion", "noHatchingPotions": "You don't have any hatching potions.", "inventoryText": "Click an egg to see usable potions highlighted in green and then click one of the highlighted potions to hatch your pet. If no potions are highlighted, click that egg again to deselect it, and instead click a potion first to have the usable eggs highlighted. You can also sell unwanted drops to Alexander the Merchant.", "foodText": "food", "food": "Food and Saddles", "noFood": "You don't have any food or saddles.", - "dropsExplanation": "Get these items faster with gems if you don't want to wait for them to drop when completing a task. Learn more about the drop system.", + "dropsExplanation": "Get these items faster with Gems if you don't want to wait for them to drop when completing a task. Learn more about the drop system.", "beastMasterProgress": "Beast Master Progress", "stableBeastMasterProgress": "Beast Master Progress: <%= number %> Pets Found", "beastAchievement": "You have earned the \"Beast Master\" Achievement for collecting all the pets!", diff --git a/common/script/content/index.coffee b/common/script/content/index.coffee index 79b0309a17..6d53393b08 100644 --- a/common/script/content/index.coffee +++ b/common/script/content/index.coffee @@ -1168,7 +1168,7 @@ api.hatchingPotions = CottonCandyPink: value: 4, text: t('hatchingPotionCottonCandyPink') CottonCandyBlue: value: 4, text: t('hatchingPotionCottonCandyBlue') Golden: value: 5, text: t('hatchingPotionGolden') - Spooky: value: 3, text: t('hatchingPotionSpooky'), addlNotes: t('premiumPotionAddlNotes'), premium: true, limited: true + Spooky: value: 2, text: t('hatchingPotionSpooky'), addlNotes: t('premiumPotionAddlNotes'), premium: true, limited: true _.each api.hatchingPotions, (pot,key) -> _.defaults pot, {key, value: 2, notes: t('hatchingPotionNotes', {potText: pot.text}), premium: false, limited: false, canBuy: (()->true)} diff --git a/website/views/options/inventory/drops.jade b/website/views/options/inventory/drops.jade index bef1acff77..b0d385c346 100644 --- a/website/views/options/inventory/drops.jade +++ b/website/views/options/inventory/drops.jade @@ -125,7 +125,8 @@ span.Pet_Currency_Gem1x.inline-gems li.customize-menu - menu.pets-menu(label=env.t('magicHatchingPotions')) + menu.pets-menu!=env.t('magicHatchingPotions') + " - " + env.t('fallEventAvailability') + p.muted=env.t('premiumPotionAddlNotes') div(ng-repeat='pot in Content.hatchingPotions', ng-if='pot.premium && pot.canBuy(user)') button.customize-option(class='Pet_HatchingPotion_{{::pot.key}}', popover='{{::pot.notes()}} {{::pot.addlNotes()}}', popover-append-to-body='true',