diff --git a/website/common/locales/en/content.json b/website/common/locales/en/content.json index ee8ebe9897..748b341c0a 100644 --- a/website/common/locales/en/content.json +++ b/website/common/locales/en/content.json @@ -307,6 +307,7 @@ "hatchingPotionSunset": "Sunset", "hatchingPotionMoonglow": "Moonglow", "hatchingPotionSolarSystem": "Solar System", + "hatchingPotionOnyx": "Onyx", "hatchingPotionNotes": "Pour this on an egg, and it will hatch as a <%= potText(locale) %> pet.", "premiumPotionAddlNotes": "Not usable on quest pet eggs. Available for purchase until <%= date(locale) %>.", diff --git a/website/common/locales/en/questsContent.json b/website/common/locales/en/questsContent.json index b10156822f..9f2d03a401 100644 --- a/website/common/locales/en/questsContent.json +++ b/website/common/locales/en/questsContent.json @@ -858,5 +858,14 @@ "questSolarSystemCompletion": "Through careful practice, you and the crew manage to keep the Diversionoids from sweeping you overboard, just by noticing and acknowledging them without letting them take over. As you pass safely by the pulsing star, @gawrone notices a cluster of floating bottles and pulls them aboard. Each appears to contain a tiny solar system!

“Well, looks like our hard work has brought us some fine rewards!” says @beffymaroo. “Let’s see what celestial wonders might appear if we hatch pet eggs with these new potions.”", "questSolarSystemBoss": "Diversionoids", "questSolarSystemDropSolarSystemPotion": "Solar System Hatching Potion", - "questSolarSystemUnlockText": "Unlocks Solar System Hatching Potions for purchase in the Market" + "questSolarSystemUnlockText": "Unlocks Solar System Hatching Potions for purchase in the Market", + + "questOnyxText": "The Onyx Odyssey", + "questOnyxNotes": "@Vikte, @aspiring_advocate, and @starsystemic know you’ve been feeling unmotivated lately and decide that a fun day out might boost your mood. However, “fun” apparently means going deep-sea diving to search the Dark Crevasse for treasure! You don your diving gear, board the boat, and row towards the ancient city of Dilatory. As you travel, you ask them what kind of treasure you’re looking for.

“Pluto runes!” says @Vikte.

“No, Leo runes!” says @aspiring_advocate.

“No, onyx stones!” says @starsystemic.

As they argue among themselves, you look into the ocean and see the cave entrance directly below you! Excited, you jump up, and dive into the sea, leaving the trio to watch as you swim towards the Dark Crevasse to search for the treasure yourself.", + "questOnyxCompletion": "As you enter the Dark Crevasse, the mantis shrimps that live there dart away, seemingly scared of you. However, they quickly return carrying small coloured orbs, and you realise that these are the treasures that the others wanted! You pocket a healthy collection of each type, say goodbye to the shrimps, and head back to the boat where the others help you aboard.

“Where have you been?” @Vikte exclaims. In response you show them the treasure you’ve collected.

“These ingredients make Onyx Magic Hatching Potions!”, @aspiring_advocate says excitedly as you begin to head back to shore.

“So… we can hatch Onyx pets!” @starsystemic smiles. “Didn’t we say this would be fun?”

You smile back, excited for your new pets, and ready to finish your tasks!", + "questOnyxCollectPlutoRunes": "Pluto Runes", + "questOnyxCollectLeoRunes": "Leo Runes", + "questOnyxCollectOnyxStones": "Onyx Stones", + "questOnyxDropOnyxPotion": "Onyx Hatching Potion", + "questOnyxUnlockText": "Unlocks Mossy Onyx Hatching Potions for purchase in the Market" } diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js index 6b87ebbe38..d73a8de3d1 100644 --- a/website/common/script/content/hatching-potions.js +++ b/website/common/script/content/hatching-potions.js @@ -508,6 +508,13 @@ const premium = { canBuy: hasQuestAchievementFunction('solarSystem'), _addlNotes: t('premiumPotionUnlimitedNotes'), }, + Onyx: { + value: 2, + text: t('hatchingPotionOnyx'), + limited: true, + canBuy: hasQuestAchievementFunction('onyx'), + _addlNotes: t('premiumPotionUnlimitedNotes'), + }, }; const wacky = { diff --git a/website/common/script/content/quests.js b/website/common/script/content/quests.js index 54f90b9f8c..5c7a5e2d91 100644 --- a/website/common/script/content/quests.js +++ b/website/common/script/content/quests.js @@ -3839,6 +3839,47 @@ const quests = { unlock: t('questSolarSystemUnlockText'), }, }, + onyx: { + text: t('questOnyxText'), + notes: t('questOnyxNotes'), + completion: t('questOnyxCompletion'), + value: 4, + category: 'hatchingPotion', + collect: { + onyxStone: { + text: t('questOnyxCollectOnyxStones'), + count: 25, + }, + plutoRune: { + text: t('questOnyxCollectPlutoRunes'), + count: 10, + }, + leoRune: { + text: t('questOnyxCollectLeoRunes'), + count: 10, + }, + }, + drop: { + items: [ + { + type: 'hatchingPotions', + key: 'Onyx', + text: t('questOnyxDropOnyxPotion'), + }, { + type: 'hatchingPotions', + key: 'Onyx', + text: t('questOnyxDropOnyxPotion'), + }, { + type: 'hatchingPotions', + key: 'Onyx', + text: t('questOnyxDropOnyxPotion'), + }, + ], + gp: 50, + exp: 100, + unlock: t('questOnyxUnlockText'), + }, + }, }; each(quests, (v, key) => { diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js index 62af186e3c..b905af32af 100644 --- a/website/common/script/content/shop-featuredItems.js +++ b/website/common/script/content/shop-featuredItems.js @@ -1,29 +1,9 @@ -import moment from 'moment'; +// import moment from 'moment'; // Magic Hatching Potions are configured like this: // type: 'premiumHatchingPotion', // note no "s" at the end // path: 'premiumHatchingPotions.Rainbow', const featuredItems = { market () { - if (moment().isBefore('2021-10-31T20:00-04:00')) { - return [ - { - type: 'armoire', - path: 'armoire', - }, - { - type: 'premiumHatchingPotion', - path: 'premiumHatchingPotions.Glow', - }, - { - type: 'premiumHatchingPotion', - path: 'premiumHatchingPotions.Spooky', - }, - { - type: 'premiumHatchingPotion', - path: 'premiumHatchingPotions.Vampire', - }, - ]; - } return [ { type: 'armoire', @@ -51,7 +31,7 @@ const featuredItems = { }, { type: 'quests', - path: 'quests.horse', + path: 'quests.onyx', }, { type: 'quests', diff --git a/website/raw_sprites/spritesmith/quests/bosses/quest_onyx.png b/website/raw_sprites/spritesmith/quests/bosses/quest_onyx.png new file mode 100644 index 0000000000..30ebff716c Binary files /dev/null and b/website/raw_sprites/spritesmith/quests/bosses/quest_onyx.png differ diff --git a/website/raw_sprites/spritesmith/quests/items/quest_onyx_leoRune.png b/website/raw_sprites/spritesmith/quests/items/quest_onyx_leoRune.png new file mode 100644 index 0000000000..e3cdebbeeb Binary files /dev/null and b/website/raw_sprites/spritesmith/quests/items/quest_onyx_leoRune.png differ diff --git a/website/raw_sprites/spritesmith/quests/items/quest_onyx_onyxStone.png b/website/raw_sprites/spritesmith/quests/items/quest_onyx_onyxStone.png new file mode 100644 index 0000000000..18579f3a85 Binary files /dev/null and b/website/raw_sprites/spritesmith/quests/items/quest_onyx_onyxStone.png differ diff --git a/website/raw_sprites/spritesmith/quests/items/quest_onyx_plutoRune.png b/website/raw_sprites/spritesmith/quests/items/quest_onyx_plutoRune.png new file mode 100644 index 0000000000..2d786b5488 Binary files /dev/null and b/website/raw_sprites/spritesmith/quests/items/quest_onyx_plutoRune.png differ diff --git a/website/raw_sprites/spritesmith/quests/scrolls/inventory_quest_scroll_onyx.png b/website/raw_sprites/spritesmith/quests/scrolls/inventory_quest_scroll_onyx.png new file mode 100644 index 0000000000..cdb1b11a90 Binary files /dev/null and b/website/raw_sprites/spritesmith/quests/scrolls/inventory_quest_scroll_onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_BearCub-Onyx.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_BearCub-Onyx.png new file mode 100644 index 0000000000..dc36350fde Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_BearCub-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Cactus-Onyx.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Cactus-Onyx.png new file mode 100644 index 0000000000..98488c5661 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Cactus-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Dragon-Onyx.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Dragon-Onyx.png new file mode 100644 index 0000000000..ae93e756bf Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Dragon-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_FlyingPig-Onyx.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_FlyingPig-Onyx.png new file mode 100644 index 0000000000..2113a72f8b Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_FlyingPig-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Fox-Onyx.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Fox-Onyx.png new file mode 100644 index 0000000000..c4d54edca6 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Fox-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_LionCub-Onyx.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_LionCub-Onyx.png new file mode 100644 index 0000000000..365b659460 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_LionCub-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_PandaCub-Onyx.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_PandaCub-Onyx.png new file mode 100644 index 0000000000..459e237e79 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_PandaCub-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_TigerCub-Onyx.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_TigerCub-Onyx.png new file mode 100644 index 0000000000..be7af51f04 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_TigerCub-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Wolf-Onyx.png b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Wolf-Onyx.png new file mode 100644 index 0000000000..4b158af0e6 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/body/Mount_Body_Wolf-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_BearCub-Onyx.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_BearCub-Onyx.png new file mode 100644 index 0000000000..d39f1c0cb4 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_BearCub-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Cactus-Onyx.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Cactus-Onyx.png new file mode 100644 index 0000000000..a4b80998d6 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Cactus-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Dragon-Onyx.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Dragon-Onyx.png new file mode 100644 index 0000000000..e915ab70fc Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Dragon-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_FlyingPig-Onyx.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_FlyingPig-Onyx.png new file mode 100644 index 0000000000..d75dcd2b4a Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_FlyingPig-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Fox-Onyx.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Fox-Onyx.png new file mode 100644 index 0000000000..576ffdd884 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Fox-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_LionCub-Onyx.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_LionCub-Onyx.png new file mode 100644 index 0000000000..561fde32f1 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_LionCub-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_PandaCub-Onyx.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_PandaCub-Onyx.png new file mode 100644 index 0000000000..7ae9840c57 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_PandaCub-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_TigerCub-Onyx.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_TigerCub-Onyx.png new file mode 100644 index 0000000000..b49c4b5d9f Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_TigerCub-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Wolf-Onyx.png b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Wolf-Onyx.png new file mode 100644 index 0000000000..0adf6c8e84 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/head/Mount_Head_Wolf-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_BearCub-Onyx.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_BearCub-Onyx.png new file mode 100644 index 0000000000..95ddeea44e Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_BearCub-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Cactus-Onyx.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Cactus-Onyx.png new file mode 100644 index 0000000000..b4e479b14c Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Cactus-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Dragon-Onyx.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Dragon-Onyx.png new file mode 100644 index 0000000000..c849eb9ba6 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Dragon-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_FlyingPig-Onyx.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_FlyingPig-Onyx.png new file mode 100644 index 0000000000..d56c36b36b Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_FlyingPig-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Fox-Onyx.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Fox-Onyx.png new file mode 100644 index 0000000000..4fed6fc816 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Fox-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_LionCub-Onyx.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_LionCub-Onyx.png new file mode 100644 index 0000000000..e4fbce9150 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_LionCub-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_PandaCub-Onyx.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_PandaCub-Onyx.png new file mode 100644 index 0000000000..66649c153a Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_PandaCub-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_TigerCub-Onyx.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_TigerCub-Onyx.png new file mode 100644 index 0000000000..dd822b2b04 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_TigerCub-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Wolf-Onyx.png b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Wolf-Onyx.png new file mode 100644 index 0000000000..abe57cd894 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Wolf-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-BearCub-Onyx.png b/website/raw_sprites/spritesmith/stable/pets/Pet-BearCub-Onyx.png new file mode 100644 index 0000000000..a0bef404e5 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-BearCub-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-Cactus-Onyx.png b/website/raw_sprites/spritesmith/stable/pets/Pet-Cactus-Onyx.png new file mode 100644 index 0000000000..69b5251f3f Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-Cactus-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-Dragon-Onyx.png b/website/raw_sprites/spritesmith/stable/pets/Pet-Dragon-Onyx.png new file mode 100644 index 0000000000..f44a8a953a Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-Dragon-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-FlyingPig-Onyx.png b/website/raw_sprites/spritesmith/stable/pets/Pet-FlyingPig-Onyx.png new file mode 100644 index 0000000000..4e66fb3051 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-FlyingPig-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-Fox-Onyx.png b/website/raw_sprites/spritesmith/stable/pets/Pet-Fox-Onyx.png new file mode 100644 index 0000000000..338bc55630 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-Fox-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-LionCub-Onyx.png b/website/raw_sprites/spritesmith/stable/pets/Pet-LionCub-Onyx.png new file mode 100644 index 0000000000..48a98ea497 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-LionCub-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-PandaCub-Onyx.png b/website/raw_sprites/spritesmith/stable/pets/Pet-PandaCub-Onyx.png new file mode 100644 index 0000000000..13f3ebe1d1 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-PandaCub-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-TigerCub-Onyx.png b/website/raw_sprites/spritesmith/stable/pets/Pet-TigerCub-Onyx.png new file mode 100644 index 0000000000..f819bae6b7 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-TigerCub-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-Wolf-Onyx.png b/website/raw_sprites/spritesmith/stable/pets/Pet-Wolf-Onyx.png new file mode 100644 index 0000000000..cdbf767773 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/pets/Pet-Wolf-Onyx.png differ diff --git a/website/raw_sprites/spritesmith/stable/potions/Pet_HatchingPotion_Onyx.png b/website/raw_sprites/spritesmith/stable/potions/Pet_HatchingPotion_Onyx.png new file mode 100644 index 0000000000..93bbb10799 Binary files /dev/null and b/website/raw_sprites/spritesmith/stable/potions/Pet_HatchingPotion_Onyx.png differ