diff --git a/website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css b/website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css
index 79fde8b8d5..6d744b91d4 100644
--- a/website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css
+++ b/website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css
@@ -1,21 +1,33 @@
+.promo_aquatic_amigos_bundle {
+ background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
+ background-position: 0px -883px;
+ width: 423px;
+ height: 147px;
+}
.promo_armoire_backgrounds_202007 {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
- background-position: -340px -524px;
+ background-position: 0px -735px;
width: 423px;
height: 147px;
}
.promo_mystery_202007 {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
- background-position: -424px -735px;
+ background-position: -848px -735px;
width: 282px;
height: 147px;
}
.promo_sand_sculpture_potions {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
- background-position: 0px -735px;
+ background-position: -424px -735px;
width: 423px;
height: 147px;
}
+.promo_seafoam {
+ background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
+ background-position: -340px -524px;
+ width: 425px;
+ height: 148px;
+}
.promo_splashy_skins {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -409px -337px;
diff --git a/website/client/src/assets/images/sprites/spritesmith-largeSprites-0.png b/website/client/src/assets/images/sprites/spritesmith-largeSprites-0.png
index fbeed7b231..6d3c5bdb10 100644
Binary files a/website/client/src/assets/images/sprites/spritesmith-largeSprites-0.png and b/website/client/src/assets/images/sprites/spritesmith-largeSprites-0.png differ
diff --git a/website/common/locales/en/questsContent.json b/website/common/locales/en/questsContent.json
index a5779dc4a9..dbb80ff79b 100644
--- a/website/common/locales/en/questsContent.json
+++ b/website/common/locales/en/questsContent.json
@@ -702,7 +702,7 @@
"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.",
+ "aquaticAmigosNotes": "Contains 'The Magical Axolotl', 'The Kraken of Inkomplete', and 'The Call of Octothulu'. Available until August 31.",
"questSeaSerpentText": "Danger in the Depths: Sea Serpent Strike!",
"questSeaSerpentNotes": "Your streaks have you feeling lucky—it’s the perfect time for a trip to the seahorse racetrack. You board the submarine at Diligent Docks and settle in for the trip to Dilatory, but you’ve barely submerged when an impact rocks the sub, sending its occupants tumbling. “What’s going on?” @AriesFaries shouts.
You glance through a nearby porthole and are shocked by the wall of shimmering scales passing by it. “Sea serpent!” Captain @Witticaster calls through the intercom. “Brace yourselves, it’s coming ‘round again!” As you grip the arms of your seat, your unfinished tasks flash before your eyes. ‘Maybe if we work together and complete them,’ you think, ‘we can drive this monster away!’",
diff --git a/website/common/script/content/bundles.js b/website/common/script/content/bundles.js
index 3c64bfd6ba..e0bd13aab1 100644
--- a/website/common/script/content/bundles.js
+++ b/website/common/script/content/bundles.js
@@ -126,7 +126,7 @@ const bundles = {
'octopus',
],
canBuy () {
- return moment().isBetween('2018-06-12', '2018-07-02');
+ return moment().isBetween('2020-07-14', '2020-08-02');
},
type: 'quests',
value: 7,
diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js
index e432a02785..e3b34bb175 100644
--- a/website/common/script/content/shop-featuredItems.js
+++ b/website/common/script/content/shop-featuredItems.js
@@ -25,8 +25,8 @@ const featuredItems = {
quests () {
return [
{
- type: 'quests',
- path: 'quests.rock',
+ type: 'bundles',
+ path: 'bundles.aquaticAmigos',
},
{
type: 'quests',
diff --git a/website/common/script/libs/shops-seasonal.config.js b/website/common/script/libs/shops-seasonal.config.js
index 506f26ad1e..5ccc6edff9 100644
--- a/website/common/script/libs/shops-seasonal.config.js
+++ b/website/common/script/libs/shops-seasonal.config.js
@@ -19,6 +19,7 @@ export default {
},
availableSpells: [
+ 'seafoam',
],
availableQuests: [
diff --git a/website/raw_sprites/spritesmith_large/promo_aquatic_amigos_bundle.png b/website/raw_sprites/spritesmith_large/promo_aquatic_amigos_bundle.png
new file mode 100644
index 0000000000..b6d05815eb
Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_aquatic_amigos_bundle.png differ
diff --git a/website/raw_sprites/spritesmith_large/promo_seafoam.png b/website/raw_sprites/spritesmith_large/promo_seafoam.png
new file mode 100644
index 0000000000..eac89bcd2f
Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_seafoam.png differ
diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js
index 67c3f6c3ad..86bdc409bf 100644
--- a/website/server/controllers/api-v3/news.js
+++ b/website/server/controllers/api-v3/news.js
@@ -4,7 +4,7 @@ const api = {};
// @TODO export this const, cannot export it from here because only routes are exported from
// controllers
-const LAST_ANNOUNCEMENT_TITLE = 'NEW BACKGROUNDS AND ARMOIRE ITEMS!';
+const LAST_ANNOUNCEMENT_TITLE = 'PET QUEST BUNDLE AND SEAFOAM!';
const worldDmg = { // @TODO
bailey: false,
};
@@ -31,25 +31,38 @@ api.getNews = {
${res.t('newStuff')}
- 6/29/2020 - ${LAST_ANNOUNCEMENT_TITLE}
+ 7/14/2020 - ${LAST_ANNOUNCEMENT_TITLE}
-
+
+ Discounted Pet Quest Bundle: Aquatic Amigos!
- We’ve added three new backgrounds to the Background Shop! Now your avatar can explore
- Underwater Ruins, go Swimming Among Jellyfish, and relax in a Beach Cabana. Check them
- out under User Icon > Backgrounds on web and Menu > Inventory > Customize Avatar on
- mobile!
-
-
- Plus, there’s new Gold-purchasable equipment in the Enchanted Armoire, including a new
- set of Pirate Accessories. Better work hard on your real-life tasks to earn all the
- pieces! Enjoy :)
+ If you're looking to add some splashy pets to your Habitica stable, you're in luck! From
+ now until July 31, 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!
- by gawrone, Vikte, -Tyr-, Vyllan, a_diamond, katieslug, shanaqui, and SabreCat
+ by PainterProphet, Streak, James Danger, hazel, RiverMori, UncommonCriminal, Urse,
+ RBrinks, TokenKnight, wolvenhalo, Lemoness, and SabreCat
+
+ Seafoam!
+
+ Throw some Seafoam at your friends and they will turn into a cheerful sea star until
+ their next cron! You can buy the Seafoam in the Seasonal
+ Shop for 15 Gold. Plus, if you get splashed by Seafoam, you'll receive the Aquatic
+ Friends badge!
+
+
+ Don't want to be a sea star? Just buy some Sand from your Rewards column to reverse it.
+
+
+ Seafoam will be available in the Seasonal Shop until July 31st!
+
+ by Lemoness
`,
});