diff --git a/website/common/locales/en/questsContent.json b/website/common/locales/en/questsContent.json index 92485ac2e8..28c2966963 100644 --- a/website/common/locales/en/questsContent.json +++ b/website/common/locales/en/questsContent.json @@ -697,5 +697,8 @@ "questSquirrelUnlockText": "Unlocks purchasable Squirrel eggs in the Market", "cuddleBuddiesText": "Cuddle Buddies Quest Bundle", - "cuddleBuddiesNotes": "Contains 'The Killer Bunny', 'The Nefarious Ferret', and 'The Guinea Pig Gang'. Available until May 31." + "cuddleBuddiesNotes": "Contains 'The Killer Bunny', 'The Nefarious Ferret', and 'The Guinea Pig Gang'. Available until May 31.", + + "aquaticAmigosText": "Aquatic Amigos Quest Bundle", + "aquaticAmigosNotes": "Contains 'The Magical Axolotl', 'The Kraken of Inkomplete', and 'The Call of Octothulu'. Available until June 30." } diff --git a/website/common/script/content/index.js b/website/common/script/content/index.js index 505b4996d4..1974ebfc0a 100644 --- a/website/common/script/content/index.js +++ b/website/common/script/content/index.js @@ -167,6 +167,21 @@ api.bundles = { type: 'quests', value: 7, }, + aquaticAmigos: { + key: 'aquaticAmigos', + text: t('aquaticAmigosText'), + notes: t('aquaticAmigosNotes'), + bundleKeys: [ + 'axolotl', + 'kraken', + 'octopus', + ], + canBuy () { + return moment().isBetween('2018-06-12', '2018-07-02'); + }, + type: 'quests', + value: 7, + }, }; /* diff --git a/website/raw_sprites/spritesmith/quests/scrolls/quest_bundle_aquaticAmigos.png b/website/raw_sprites/spritesmith/quests/scrolls/quest_bundle_aquaticAmigos.png new file mode 100644 index 0000000000..e8166c80c3 Binary files /dev/null and b/website/raw_sprites/spritesmith/quests/scrolls/quest_bundle_aquaticAmigos.png differ diff --git a/website/raw_sprites/spritesmith_large/promo_bundle_aquaticAmigos.png b/website/raw_sprites/spritesmith_large/promo_bundle_aquaticAmigos.png new file mode 100644 index 0000000000..f0b3cd47a6 Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_bundle_aquaticAmigos.png differ diff --git a/website/raw_sprites/spritesmith_large/promo_bundle_cuddleBuddies.png b/website/raw_sprites/spritesmith_large/promo_bundle_cuddleBuddies.png deleted file mode 100644 index 022d29a12c..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_bundle_cuddleBuddies.png and /dev/null differ diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index 9859998a20..bb8784404b 100644 --- a/website/server/controllers/api-v3/news.js +++ b/website/server/controllers/api-v3/news.js @@ -3,7 +3,7 @@ import { authWithHeaders } from '../../middlewares/auth'; let api = {}; // @TODO export this const, cannot export it from here because only routes are exported from controllers -const LAST_ANNOUNCEMENT_TITLE = 'JUNE BACKGROUNDS AND ARMOIRE ITEMS, AND WIKI SPOTLIGHT ON PERFECT DAYS'; +const LAST_ANNOUNCEMENT_TITLE = 'NEW DISCOUNTED PET QUEST BUNDLE: AQUATIC AMIGOS!'; const worldDmg = { // @TODO bailey: false, }; @@ -32,25 +32,10 @@ api.getNews = {

${res.t('newStuff')}

-

6/5/2018 - ${LAST_ANNOUNCEMENT_TITLE}

+

6/12/2018 - ${LAST_ANNOUNCEMENT_TITLE}


-
-
-

June Backgrounds and Armoire Items!

-

We’ve added three new backgrounds to the Background Shop! Now your avatar can sing rounds in a Rowboat, fish at the Docks, or wave a Pirate Flag. Check them out under User Icon > Backgrounds!

-

Plus, there’s new gold-purchasable equipment in the Enchanted Armoire, including the Glass Blower Set and the Blue Party Dress. Better work hard on your real-life tasks to earn all the pieces! Enjoy :)

-
by ChimeraLiani, Gerald The Pixel, AnnDeLune, CarolinaAsh, eyenne, Alonquian TGW, and Migu the Wanderer
-
-
-
-

Blog Post: Perfect Day

-

This month's featured Wiki article is about the Perfect Day achievement! We hope that it will help you as you work on finishing all your Dailies. Be sure to check it out, and let us know what you think by reaching out on Twitter, Tumblr, and Facebook.

-
by shanaqui and the Wiki Wizards
-
-
-
-
-
+

If you're looking to add some pets to your Habitica stable, you're in luck! From now until June 30, you can purchase the Aquatic Amigos Pet Quest Bundle and receive the Axolotl, Cuttlefish, and Octopus quests, all for only 7 Gems! That's a discount of 5 Gems from the price of purchasing them separately. Check it out in the Quest Shop today!

+
`, });