diff --git a/package-lock.json b/package-lock.json
index 533496dc04..057a970fcb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "habitica",
- "version": "4.136.1",
+ "version": "4.136.2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index b6778db6a4..c3d4808dd6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
- "version": "4.136.1",
+ "version": "4.136.2",
"main": "./website/server/index.js",
"dependencies": {
"@babel/core": "^7.8.7",
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 10b1a1d118..398c92a46d 100644
--- a/website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css
+++ b/website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css
@@ -1,6 +1,6 @@
.promo_achievement_CottonCandyPink {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
- background-position: -424px -277px;
+ background-position: -668px -296px;
width: 204px;
height: 102px;
}
@@ -10,15 +10,21 @@
width: 423px;
height: 147px;
}
-.promo_mystery_202003 {
+.promo_hugabug_bundle {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: 0px -425px;
+ width: 420px;
+ height: 147px;
+}
+.promo_mystery_202003 {
+ background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
+ background-position: -668px 0px;
width: 282px;
height: 147px;
}
.promo_take_this {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
- background-position: -566px -425px;
+ background-position: -668px -399px;
width: 96px;
height: 69px;
}
@@ -36,7 +42,7 @@
}
.scene_shanaqui {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
- background-position: -283px -425px;
+ background-position: -668px -148px;
width: 282px;
height: 147px;
}
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 9a0fb73b9c..21480feb75 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/script/content/bundles.js b/website/common/script/content/bundles.js
index ce217d4793..f72d00f538 100644
--- a/website/common/script/content/bundles.js
+++ b/website/common/script/content/bundles.js
@@ -96,7 +96,7 @@ const bundles = {
'butterfly',
],
canBuy () {
- return moment().isBetween('2018-02-06', '2018-04-02');
+ return moment().isBetween('2020-03-09', '2020-04-02');
},
type: 'quests',
value: 7,
diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js
index 4e3efc285e..bceb079798 100644
--- a/website/common/script/content/shop-featuredItems.js
+++ b/website/common/script/content/shop-featuredItems.js
@@ -5,26 +5,6 @@ import moment from 'moment';
// path: 'premiumHatchingPotions.Rainbow',
const featuredItems = {
market () {
- if (moment().isBefore('2020-03-02')) {
- return [
- {
- type: 'card',
- path: 'cardTypes.valentine',
- },
- {
- type: 'premiumHatchingPotion',
- path: 'premiumHatchingPotions.Cupid',
- },
- {
- type: 'premiumHatchingPotion',
- path: 'premiumHatchingPotions.RoseQuartz',
- },
- {
- type: 'eggs',
- path: 'eggs.Fox',
- },
- ];
- }
return [
{
type: 'armoire',
@@ -45,18 +25,34 @@ const featuredItems = {
];
},
quests () {
+ if (moment().isBefore('2020-04-02')) {
+ return [
+ {
+ type: 'bundles',
+ path: 'bundles.hugabug',
+ },
+ {
+ type: 'quests',
+ path: 'quests.velociraptor',
+ },
+ {
+ type: 'quests',
+ path: 'quests.taskwoodsTerror1',
+ },
+ ];
+ }
return [
{
type: 'quests',
- path: 'quests.treeling',
+ path: 'quests.badger',
},
{
type: 'quests',
- path: 'quests.stoikalmCalamity1',
+ path: 'quests.ferret',
},
{
type: 'quests',
- path: 'quests.ruby',
+ path: 'quests.sloth',
},
];
},
diff --git a/website/raw_sprites/spritesmith_large/promo_hugabug_bundle.png b/website/raw_sprites/spritesmith_large/promo_hugabug_bundle.png
new file mode 100644
index 0000000000..761eb8a238
Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_hugabug_bundle.png differ
diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js
index 7f1974f8c6..2bd5c7774b 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 = 'MARCH BACKGROUNDS AND ARMOIRE ITEMS! HOPEFUL HIPPOGRIFFS IN THE TIME TRAVELERS SHOP!';
+const LAST_ANNOUNCEMENT_TITLE = 'DISCOUNTED QUEST BUNDLE: HUG A BUG!';
const worldDmg = { // @TODO
bailey: false,
};
@@ -31,33 +31,29 @@ api.getNews = {
${res.t('newStuff')}
- 3/3/2020 - ${LAST_ANNOUNCEMENT_TITLE}
+ 3/10/2020 - ${LAST_ANNOUNCEMENT_TITLE}
-
- March Backgrounds and Armoire Items!
+
- We’ve added three new backgrounds to the Background Shop! Now your avatar can dally among
- Giant Flowers, admire a fancy Succulent Garden, and party with pollinators in the
- Butterfly Garden. Check them out under User Icon > Backgrounds!
+ If you're looking to add some insect friends to your Habitica stable, you're in luck!
+ From now until March 31, you can purchase the Hug a Bug Pet Quest Bundle and receive the
+ Snail, Beetle, and Butterfly 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!
- Plus, there’s new Gold-purchasable equipment in the Enchanted Armoire, including the
- Baseball Set. Better work hard on your real-life tasks to earn all the pieces! Enjoy :)
+ If you’d prefer not to see bugs in Habitica due to a phobia, check out the Phobia
+ Protection Extension and enable the option for hiding "Beetles"!
-
- by Vikte, Mantichore, FolleMente, Aspiring Advocate, QuartzFox, katieslug, and SabreCat
+
By Lemoness, SabreCat, and Beffymaroo
+
+ Art by Pfeffernusse, Megan, Pocketmole, overomega, Misceo, UncommonCriminal, Zorella,
+ Anna Glassman, Leephon, Lilith of Alfheim, Ac, starsystemic, and Karithina
-
-
Hopeful Hippogriffs in the Time Travelers' Shop!
-
- The Time Travelers have traveled back in time to obtain some
- rare Hopeful Hippogriff pets and mounts! You can buy them with Mystic Hourglasses, which
- are awarded to long-term subscribers. Thanks
- for helping us to keep Habitica running!
-
-
by Lemoness and SabreCat
+
Writing by arachnidstardis, emiausti, and AnnDeLune