diff --git a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css
index 4c4b074ccb..6fba8f31d9 100644
--- a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css
+++ b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css
@@ -4,33 +4,39 @@
width: 423px;
height: 147px;
}
+.promo_farm_friends_bundle {
+ background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+ background-position: 0px -148px;
+ width: 420px;
+ height: 147px;
+}
.promo_mystery_201907 {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
- background-position: -424px 0px;
+ background-position: 0px -296px;
width: 282px;
height: 144px;
}
.promo_naming_day_2018 {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
- background-position: 0px -148px;
+ background-position: -424px 0px;
width: 285px;
height: 162px;
}
.promo_take_this {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
- background-position: -596px -145px;
+ background-position: -424px -163px;
width: 96px;
height: 69px;
}
.scene_reading {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
- background-position: -424px -145px;
+ background-position: -283px -296px;
width: 171px;
height: 144px;
}
.scene_rewards {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
- background-position: 0px -311px;
+ background-position: 0px -441px;
width: 207px;
height: 180px;
}
diff --git a/website/client/assets/images/sprites/spritesmith-largeSprites-0.png b/website/client/assets/images/sprites/spritesmith-largeSprites-0.png
index 95a6fd3278..2204a1ff72 100644
Binary files a/website/client/assets/images/sprites/spritesmith-largeSprites-0.png and b/website/client/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 3196434748..03aaa9dbb5 100644
--- a/website/common/locales/en/questsContent.json
+++ b/website/common/locales/en/questsContent.json
@@ -594,7 +594,7 @@
"questHippoUnlockText": "Unlocks purchasable Hippo eggs in the Market",
"farmFriendsText": "Farm Friends Quest Bundle",
- "farmFriendsNotes": "Contains 'The Mootant Cow', 'Ride the Night-Mare', and 'The Thunder Ram'. Available until September 30.",
+ "farmFriendsNotes": "Contains 'The Mootant Cow', 'Ride the Night-Mare', and 'The Thunder Ram'. Available until August 31.",
"witchyFamiliarsText": "Witchy Familiars Quest Bundle",
"witchyFamiliarsNotes": "Contains 'The Rat King', 'The Icy Arachnid', and 'Swamp of the Clutter Frog'. Available until October 31.",
diff --git a/website/common/script/content/index.js b/website/common/script/content/index.js
index cdeaf154e5..cc3a9dbf41 100644
--- a/website/common/script/content/index.js
+++ b/website/common/script/content/index.js
@@ -106,7 +106,7 @@ api.bundles = {
'sheep',
],
canBuy () {
- return moment().isBetween('2017-09-12', '2017-10-07');
+ return moment().isBetween('2019-08-08', '2019-09-02');
},
type: 'quests',
value: 7,
diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js
index 4fbff4ec1d..dc9d759f86 100644
--- a/website/common/script/content/shop-featuredItems.js
+++ b/website/common/script/content/shop-featuredItems.js
@@ -26,8 +26,8 @@ const featuredItems = {
path: 'quests.bronze',
},
{
- type: 'quests',
- path: 'quests.yarn',
+ type: 'bundles',
+ path: 'bundles.farmFriends',
},
{
type: 'quests',
diff --git a/website/raw_sprites/spritesmith_large/promo_farm_friends_bundle.png b/website/raw_sprites/spritesmith_large/promo_farm_friends_bundle.png
new file mode 100644
index 0000000000..e71541c063
Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_farm_friends_bundle.png differ
diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js
index 93259a2e74..76dc224f21 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 = 'BACK-TO-SCHOOL CHALLENGE, NEW BACKGROUNDS, AND NEW ARMOIRE ITEMS';
+const LAST_ANNOUNCEMENT_TITLE = 'DISCOUNTED PET QUEST BUNDLE: FARM FRIENDS';
const worldDmg = { // @TODO
bailey: false,
};
@@ -34,15 +34,11 @@ api.getNews = {
-
- Official Challenge: Back-to-School Preparation
- The school year is looming large for many scholarly Habiticans, so we've prepared a special Back-to-School Challenge to help with the transition between summer and semester. Check it out now for a chance to win: five lucky winners will get a badge for their profile and their choice of a gift subscription or Gems!
- by Beffymaroo
-
- August Backgrounds and Armoire Items!
- We’ve added three new backgrounds to the Background Shop! Now your avatar can dally among Giant Dandelions, explore mysterious Ancient Ruins, and relax in a woodsy Tree House. Check them out under User Icon > Backgrounds!
- Plus, there’s new Gold-purchasable equipment in the Enchanted Armoire, including the Detective Set. Better work hard on your real-life tasks to earn all the pieces! Enjoy :)
- by Vikte, Tigergurke, Maans, QuartzFox, GeraldThePixel, and Izel
+
+ If you are looking to add critters from the barnyard to your Habitica stable, you're in luck! From now until August 30, you can purchase the Farm Friends Pet Quest Bundle and receive the Sheep, Cow, and Horse 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 Lemoness and SabreCat
+ Art by UncommonCriminal, Soloana, fuzzytrees, Feralem Tau, Eevachu, Beffymaroo, JessicaChase, starsystemic, nonight, Misceo and Tocath
+ Writing by schizelle, VikingRunner, Salambander, Leephon, and Lemoness
`,
});