diff --git a/website/common/locales/en/content.json b/website/common/locales/en/content.json index 8704e77451..c0ff17b186 100644 --- a/website/common/locales/en/content.json +++ b/website/common/locales/en/content.json @@ -282,6 +282,7 @@ "hatchingPotionRoseQuartz": "Rose Quartz", "hatchingPotionCelestial": "Celestial", "hatchingPotionVeggie": "Garden", + "hatchingPotionBronze": "Bronze", "hatchingPotionNotes": "Pour this on an egg, and it will hatch as a <%= potText(locale) %> pet.", "premiumPotionAddlNotes": "Not usable on quest pet eggs.", diff --git a/website/common/locales/en/questsContent.json b/website/common/locales/en/questsContent.json index 581c6248ad..06581765be 100644 --- a/website/common/locales/en/questsContent.json +++ b/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.

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.

“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!”“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" } diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js index cc65eff886..c6be71c90a 100644 --- a/website/common/script/content/hatching-potions.js +++ b/website/common/script/content/hatching-potions.js @@ -5,6 +5,13 @@ import t from './translation'; const CURRENT_SEASON = '_NONE_'; +function hasQuestAchievementFunction (key) { + return (user) => { + return user.achievements.quests && + user.achievements.quests[key] > 0; + }; +} + let drops = { Base: { value: 2, @@ -168,6 +175,13 @@ let premium = { limited: true, _season: 'March', }, + Bronze: { + value: 2, + text: t('hatchingPotionBronze'), + limited: true, + _season: 'March', + canBuy: hasQuestAchievementFunction('bronze'), + }, }; const wacky = { diff --git a/website/common/script/content/quests.js b/website/common/script/content/quests.js index 8c903681fa..e9227cec7a 100644 --- a/website/common/script/content/quests.js +++ b/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) => { diff --git a/website/common/script/libs/shops.js b/website/common/script/libs/shops.js index b9c9c9df61..f7529bae05 100644 --- a/website/common/script/libs/shops.js +++ b/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'); diff --git a/website/raw_sprites/spritesmith/quests/bosses/quest_bronze.png b/website/raw_sprites/spritesmith/quests/bosses/quest_bronze.png new file mode 100644 index 0000000000..a6065e32c1 Binary files /dev/null and b/website/raw_sprites/spritesmith/quests/bosses/quest_bronze.png differ diff --git a/website/raw_sprites/spritesmith/quests/scrolls/inventory_quest_scroll_bronze.png b/website/raw_sprites/spritesmith/quests/scrolls/inventory_quest_scroll_bronze.png new file mode 100644 index 0000000000..9e1cc210da Binary files /dev/null and b/website/raw_sprites/spritesmith/quests/scrolls/inventory_quest_scroll_bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_BearCub-Bronze.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_BearCub-Bronze.png new file mode 100644 index 0000000000..eddf99e71c Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_BearCub-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Cactus-Bronze.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Cactus-Bronze.png new file mode 100644 index 0000000000..122d57f035 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Cactus-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Dragon-Bronze.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Dragon-Bronze.png new file mode 100644 index 0000000000..d62e7dc72d Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Dragon-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_FlyingPig-Bronze.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_FlyingPig-Bronze.png new file mode 100644 index 0000000000..c69056ef6d Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_FlyingPig-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Fox-Bronze.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Fox-Bronze.png new file mode 100644 index 0000000000..584fb6807a Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Fox-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_LionCub-Bronze.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_LionCub-Bronze.png new file mode 100644 index 0000000000..45aab9603d Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_LionCub-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_PandaCub-Bronze.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_PandaCub-Bronze.png new file mode 100644 index 0000000000..5a50179e10 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_PandaCub-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_TigerCub-Bronze.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_TigerCub-Bronze.png new file mode 100644 index 0000000000..06c9871651 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_TigerCub-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Wolf-Bronze.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Wolf-Bronze.png new file mode 100644 index 0000000000..be42cef5f7 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Wolf-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_BearCub-Bronze.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_BearCub-Bronze.png new file mode 100644 index 0000000000..4c1aca5417 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_BearCub-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Cactus-Bronze.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Cactus-Bronze.png new file mode 100644 index 0000000000..eb7e46ebce Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Cactus-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Dragon-Bronze.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Dragon-Bronze.png new file mode 100644 index 0000000000..7b246fcccc Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Dragon-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_FlyingPig-Bronze.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_FlyingPig-Bronze.png new file mode 100644 index 0000000000..9c2df92d2e Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_FlyingPig-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Fox-Bronze.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Fox-Bronze.png new file mode 100644 index 0000000000..1d381e443f Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Fox-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_LionCub-Bronze.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_LionCub-Bronze.png new file mode 100644 index 0000000000..28cb9e76fc Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_LionCub-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_PandaCub-Bronze.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_PandaCub-Bronze.png new file mode 100644 index 0000000000..e2c79e45fc Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_PandaCub-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_TigerCub-Bronze.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_TigerCub-Bronze.png new file mode 100644 index 0000000000..47327bc1c8 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_TigerCub-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Wolf-Bronze.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Wolf-Bronze.png new file mode 100644 index 0000000000..ac8db3e65c Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Wolf-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_BearCub-Bronze.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_BearCub-Bronze.png new file mode 100644 index 0000000000..a8ab633008 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_BearCub-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Cactus-Bronze.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Cactus-Bronze.png new file mode 100644 index 0000000000..15722e8093 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Cactus-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Dragon-Bronze.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Dragon-Bronze.png new file mode 100644 index 0000000000..396ba5f0a3 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Dragon-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_FlyingPig-Bronze.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_FlyingPig-Bronze.png new file mode 100644 index 0000000000..e2c747efab Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_FlyingPig-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Fox-Bronze.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Fox-Bronze.png new file mode 100644 index 0000000000..53a7d10357 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Fox-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_LionCub-Bronze.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_LionCub-Bronze.png new file mode 100644 index 0000000000..5fc7e73979 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_LionCub-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_PandaCub-Bronze.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_PandaCub-Bronze.png new file mode 100644 index 0000000000..4553eba55e Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_PandaCub-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_TigerCub-Bronze.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_TigerCub-Bronze.png new file mode 100644 index 0000000000..54fee38579 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_TigerCub-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Wolf-Bronze.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Wolf-Bronze.png new file mode 100644 index 0000000000..956e4a92fe Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Wolf-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-BearCub-Bronze.png b/website/raw_sprites/spritesmith/stable/pets/Pet-BearCub-Bronze.png new file mode 100644 index 0000000000..e1844a788e Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-BearCub-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-Cactus-Bronze.png b/website/raw_sprites/spritesmith/stable/pets/Pet-Cactus-Bronze.png new file mode 100644 index 0000000000..9ed68e36d5 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-Cactus-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-Dragon-Bronze.png b/website/raw_sprites/spritesmith/stable/pets/Pet-Dragon-Bronze.png new file mode 100644 index 0000000000..9457ddcef6 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-Dragon-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-FlyingPig-Bronze.png b/website/raw_sprites/spritesmith/stable/pets/Pet-FlyingPig-Bronze.png new file mode 100644 index 0000000000..ccc7acfd86 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-FlyingPig-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-Fox-Bronze.png b/website/raw_sprites/spritesmith/stable/pets/Pet-Fox-Bronze.png new file mode 100644 index 0000000000..d2b297b83f Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-Fox-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-LionCub-Bronze.png b/website/raw_sprites/spritesmith/stable/pets/Pet-LionCub-Bronze.png new file mode 100644 index 0000000000..d35b2a4b74 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-LionCub-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-PandaCub-Bronze.png b/website/raw_sprites/spritesmith/stable/pets/Pet-PandaCub-Bronze.png new file mode 100644 index 0000000000..b968fd71b7 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-PandaCub-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-TigerCub-Bronze.png b/website/raw_sprites/spritesmith/stable/pets/Pet-TigerCub-Bronze.png new file mode 100644 index 0000000000..c54f824e6b Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-TigerCub-Bronze.png differ diff --git a/website/raw_sprites/spritesmith/stable/potions/Pet_HatchingPotion_Bronze.png b/website/raw_sprites/spritesmith/stable/potions/Pet_HatchingPotion_Bronze.png new file mode 100644 index 0000000000..d7cd329013 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/potions/Pet_HatchingPotion_Bronze.png differ