Merge branch 'release' into develop

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.136.4",
+  "version": "4.137.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

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.4",
+  "version": "4.137.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.8.7",

test/common/ops/buy/purchase.js

@@ -13,7 +13,7 @@ import {
 } from '../../../helpers/common.helper';
 
 describe('shared.ops.purchase', () => {
-  const SEASONAL_FOOD = 'Pie_Base';
+  const SEASONAL_FOOD = 'Meat';
   let user;
   const goldPoints = 40;
   const analytics = { track () {} };

website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css

@@ -1,54 +1,60 @@
 .promo_achievement_CottonCandyPink {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -668px -444px;
+  background-position: -328px -316px;
   width: 204px;
   height: 102px;
 }
 .promo_armoire_backgrounds_202003 {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -277px;
+  background-position: 0px -445px;
   width: 423px;
   height: 147px;
 }
+.promo_cosplay {
+  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: 0px 0px;
+  width: 623px;
+  height: 167px;
+}
 .promo_hugabug_bundle {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -425px;
+  background-position: -424px -445px;
   width: 420px;
   height: 147px;
 }
 .promo_mystery_202003 {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -668px 0px;
+  background-position: -624px -211px;
   width: 282px;
   height: 147px;
 }
 .promo_pi_day {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -668px -296px;
+  background-position: 0px -593px;
   width: 273px;
   height: 147px;
 }
 .promo_take_this {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -424px -277px;
+  background-position: -624px -359px;
   width: 96px;
   height: 69px;
 }
 .scene_dailies {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px 0px;
+  background-position: 0px -168px;
   width: 327px;
   height: 276px;
 }
 .scene_gaining_achievement {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -328px 0px;
+  background-position: -624px 0px;
   width: 339px;
   height: 210px;
 }
 .scene_shanaqui {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -668px -148px;
+  background-position: -328px -168px;
   width: 282px;
   height: 147px;
 }

website/client/src/assets/css/sprites/spritesmith-main-0.css

@@ -1,222 +1,228 @@
 .achievement-alien {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1446px -1628px;
+  background-position: -1659px -1507px;
   width: 24px;
   height: 26px;
 }
 .achievement-alien2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -813px -1549px;
+  background-position: -862px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-allYourBase2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1092px -1480px;
+  background-position: -1153px -1480px;
   width: 64px;
   height: 56px;
 }
 .achievement-alpha2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1372px -1628px;
+  background-position: -1470px -1628px;
   width: 48px;
   height: 52px;
 }
 .achievement-aridAuthority2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1027px -1480px;
+  background-position: -1088px -1480px;
   width: 64px;
   height: 56px;
 }
 .achievement-armor2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1274px -1628px;
+  background-position: -1372px -1628px;
   width: 48px;
   height: 52px;
 }
 .achievement-backToBasics2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1549px -1480px;
+  background-position: -1610px -1480px;
   width: 48px;
   height: 56px;
 }
 .achievement-bewilder2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1176px -1628px;
+  background-position: -1274px -1628px;
   width: 48px;
   height: 52px;
 }
 .achievement-birthday2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1127px -1628px;
+  background-position: -1225px -1628px;
   width: 48px;
   height: 52px;
 }
 .achievement-boot2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1078px -1628px;
+  background-position: -1176px -1628px;
   width: 48px;
   height: 52px;
 }
 .achievement-bow2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1029px -1628px;
+  background-position: -1127px -1628px;
   width: 48px;
   height: 52px;
 }
-.achievement-burnout2x {
+.achievement-bugBonanza2x {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -980px -1628px;
-  width: 48px;
-  height: 52px;
-}
-.achievement-cactus2x {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -931px -1628px;
-  width: 48px;
-  height: 52px;
-}
-.achievement-cake2x {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -882px -1628px;
-  width: 48px;
-  height: 52px;
-}
-.achievement-cave2x {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -833px -1628px;
-  width: 48px;
-  height: 52px;
-}
-.achievement-challenge2x {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -784px -1628px;
-  width: 48px;
-  height: 52px;
-}
-.achievement-comment2x {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -735px -1628px;
-  width: 48px;
-  height: 52px;
-}
-.achievement-completedTask2x {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1500px -1480px;
-  width: 48px;
-  height: 56px;
-}
-.achievement-congrats2x {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -637px -1628px;
-  width: 48px;
-  height: 52px;
-}
-.achievement-costumeContest2x {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -588px -1628px;
-  width: 48px;
-  height: 52px;
-}
-.achievement-createdTask2x {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1451px -1480px;
-  width: 48px;
-  height: 56px;
-}
-.achievement-dilatory2x {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -490px -1628px;
-  width: 48px;
-  height: 52px;
-}
-.achievement-dustDevil2x {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1402px -1480px;
-  width: 48px;
-  height: 56px;
-}
-.achievement-dysheartener2x {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -392px -1628px;
-  width: 48px;
-  height: 52px;
-}
-.achievement-fedPet2x {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1353px -1480px;
-  width: 48px;
-  height: 56px;
-}
-.achievement-friends2x {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -294px -1628px;
-  width: 48px;
-  height: 52px;
-}
-.achievement-getwell2x {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -245px -1628px;
-  width: 48px;
-  height: 52px;
-}
-.achievement-goodluck2x {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -196px -1628px;
-  width: 48px;
-  height: 52px;
-}
-.achievement-greeting2x {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -147px -1628px;
-  width: 48px;
-  height: 52px;
-}
-.achievement-guild2x {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -98px -1628px;
-  width: 48px;
-  height: 52px;
-}
-.achievement-habitBirthday2x {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -49px -1628px;
-  width: 48px;
-  height: 52px;
-}
-.achievement-habiticaDay2x {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: 0px -1628px;
-  width: 48px;
-  height: 52px;
-}
-.achievement-hatchedPet2x {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1304px -1480px;
-  width: 48px;
-  height: 56px;
-}
-.achievement-heart2x {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1597px -1549px;
-  width: 48px;
-  height: 52px;
-}
-.achievement-justAddWater2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -775px -1480px;
   width: 60px;
   height: 64px;
 }
+.achievement-burnout2x {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
+  background-position: -1029px -1628px;
+  width: 48px;
+  height: 52px;
+}
+.achievement-cactus2x {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
+  background-position: -980px -1628px;
+  width: 48px;
+  height: 52px;
+}
+.achievement-cake2x {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
+  background-position: -931px -1628px;
+  width: 48px;
+  height: 52px;
+}
+.achievement-cave2x {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
+  background-position: -882px -1628px;
+  width: 48px;
+  height: 52px;
+}
+.achievement-challenge2x {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
+  background-position: -833px -1628px;
+  width: 48px;
+  height: 52px;
+}
+.achievement-comment2x {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
+  background-position: -784px -1628px;
+  width: 48px;
+  height: 52px;
+}
+.achievement-completedTask2x {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
+  background-position: -1512px -1480px;
+  width: 48px;
+  height: 56px;
+}
+.achievement-congrats2x {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
+  background-position: -686px -1628px;
+  width: 48px;
+  height: 52px;
+}
+.achievement-costumeContest2x {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
+  background-position: -637px -1628px;
+  width: 48px;
+  height: 52px;
+}
+.achievement-createdTask2x {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
+  background-position: -1463px -1480px;
+  width: 48px;
+  height: 56px;
+}
+.achievement-dilatory2x {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
+  background-position: -539px -1628px;
+  width: 48px;
+  height: 52px;
+}
+.achievement-dustDevil2x {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
+  background-position: -1414px -1480px;
+  width: 48px;
+  height: 56px;
+}
+.achievement-dysheartener2x {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
+  background-position: -441px -1628px;
+  width: 48px;
+  height: 52px;
+}
+.achievement-fedPet2x {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
+  background-position: -1365px -1480px;
+  width: 48px;
+  height: 56px;
+}
+.achievement-friends2x {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
+  background-position: -343px -1628px;
+  width: 48px;
+  height: 52px;
+}
+.achievement-getwell2x {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
+  background-position: -294px -1628px;
+  width: 48px;
+  height: 52px;
+}
+.achievement-goodluck2x {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
+  background-position: -245px -1628px;
+  width: 48px;
+  height: 52px;
+}
+.achievement-greeting2x {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
+  background-position: -196px -1628px;
+  width: 48px;
+  height: 52px;
+}
+.achievement-guild2x {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
+  background-position: -147px -1628px;
+  width: 48px;
+  height: 52px;
+}
+.achievement-habitBirthday2x {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
+  background-position: -98px -1628px;
+  width: 48px;
+  height: 52px;
+}
+.achievement-habiticaDay2x {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
+  background-position: -49px -1628px;
+  width: 48px;
+  height: 52px;
+}
+.achievement-hatchedPet2x {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
+  background-position: -1316px -1480px;
+  width: 48px;
+  height: 56px;
+}
+.achievement-heart2x {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
+  background-position: -1646px -1549px;
+  width: 48px;
+  height: 52px;
+}
+.achievement-justAddWater2x {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
+  background-position: -836px -1480px;
+  width: 60px;
+  height: 64px;
+}
 .achievement-karaoke-2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1499px -1549px;
+  background-position: -1548px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-karaoke {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1421px -1628px;
+  background-position: -1659px -1480px;
   width: 24px;
   height: 26px;
 }
@@ -228,79 +234,79 @@
 }
 .achievement-lostMasterclasser2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1352px -1549px;
+  background-position: -1401px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-mindOverMatter2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -836px -1480px;
+  background-position: -897px -1480px;
   width: 60px;
   height: 64px;
 }
 .achievement-monsterMagus2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1157px -1480px;
+  background-position: -1218px -1480px;
   width: 48px;
   height: 56px;
 }
 .achievement-ninja2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1205px -1549px;
+  background-position: -1254px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-npc2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1156px -1549px;
+  background-position: -1205px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-nye2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1107px -1549px;
+  background-position: -1156px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-partyOn2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1058px -1549px;
+  background-position: -1107px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-partyUp2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1009px -1549px;
+  background-position: -1058px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-pearlyPro2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -962px -1480px;
+  background-position: -958px -1480px;
   width: 64px;
   height: 56px;
 }
 .achievement-perfect2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -911px -1549px;
+  background-position: -960px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-primedForPainting2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1206px -1480px;
+  background-position: -1267px -1480px;
   width: 48px;
   height: 56px;
 }
 .achievement-purchasedEquipment2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1255px -1480px;
+  background-position: -1561px -1480px;
   width: 48px;
   height: 56px;
 }
 .achievement-rat2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -764px -1549px;
+  background-position: -813px -1549px;
   width: 48px;
   height: 52px;
 }
@@ -312,31 +318,31 @@
 }
 .achievement-royally-loyal2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -666px -1549px;
+  background-position: -715px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-seafoam2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -617px -1549px;
+  background-position: -666px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-shield2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -568px -1549px;
+  background-position: -617px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-shinySeed2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1647px -1480px;
+  background-position: -568px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-snowball2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1598px -1480px;
+  background-position: -1421px -1628px;
   width: 48px;
   height: 52px;
 }
@@ -348,31 +354,31 @@
 }
 .achievement-stoikalm2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1225px -1628px;
+  background-position: -1078px -1628px;
   width: 48px;
   height: 52px;
 }
 .achievement-sun2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -686px -1628px;
+  background-position: -735px -1628px;
   width: 48px;
   height: 52px;
 }
 .achievement-sword2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -539px -1628px;
+  background-position: -588px -1628px;
   width: 48px;
   height: 52px;
 }
 .achievement-thankyou2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -441px -1628px;
+  background-position: -490px -1628px;
   width: 48px;
   height: 52px;
 }
 .achievement-thermometer2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -343px -1628px;
+  background-position: -392px -1628px;
   width: 48px;
   height: 52px;
 }
@@ -384,379 +390,379 @@
 }
 .achievement-tree2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1548px -1549px;
+  background-position: -1597px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-triadbingo2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1450px -1549px;
+  background-position: -1499px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-ultimate-healer2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1303px -1549px;
+  background-position: -1352px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-ultimate-mage2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1254px -1549px;
+  background-position: -1303px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-ultimate-rogue2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -960px -1549px;
+  background-position: -1009px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-ultimate-warrior2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -862px -1549px;
+  background-position: -911px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-undeadUndertaker2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -897px -1480px;
+  background-position: -1023px -1480px;
   width: 64px;
   height: 56px;
 }
 .achievement-unearned2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -715px -1549px;
+  background-position: -764px -1549px;
   width: 48px;
   height: 52px;
 }
 .achievement-valentine2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1646px -1549px;
+  background-position: 0px -1628px;
   width: 48px;
   height: 52px;
 }
 .achievement-wolf2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1401px -1549px;
+  background-position: -1450px -1549px;
   width: 48px;
   height: 52px;
 }
 .background_alpine_slopes {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1278px -296px;
+  background-position: -1278px -444px;
   width: 141px;
   height: 147px;
 }
 .background_amid_ancient_ruins {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1278px -444px;
+  background-position: -1278px -592px;
   width: 141px;
   height: 147px;
 }
 .background_among_giant_anemones {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1278px -592px;
+  background-position: -1278px -740px;
   width: 141px;
   height: 147px;
 }
 .background_among_giant_flowers {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1278px -740px;
+  background-position: -1278px -888px;
   width: 141px;
   height: 147px;
 }
 .customize-option.background_among_giant_flowers {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1303px -755px;
+  background-position: -1303px -903px;
   width: 60px;
   height: 60px;
 }
 .background_apple_picking {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1278px -888px;
+  background-position: -1278px -1036px;
   width: 141px;
   height: 147px;
 }
 .background_aquarium {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1278px -1036px;
+  background-position: 0px -1184px;
   width: 141px;
   height: 147px;
 }
 .background_archaeological_dig {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: 0px -1184px;
+  background-position: -142px -1184px;
   width: 141px;
   height: 147px;
 }
 .background_archery_range {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -142px -1184px;
+  background-position: -284px -1184px;
   width: 141px;
   height: 147px;
 }
 .background_at_the_docks {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -284px -1184px;
+  background-position: -426px -1184px;
   width: 141px;
   height: 147px;
 }
 .background_aurora {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -426px -1184px;
+  background-position: -568px -1184px;
   width: 141px;
   height: 147px;
 }
 .background_autumn_flower_garden {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -568px -1184px;
+  background-position: -710px -1184px;
   width: 141px;
   height: 147px;
 }
 .customize-option.background_autumn_flower_garden {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -593px -1199px;
+  background-position: -735px -1199px;
   width: 60px;
   height: 60px;
 }
 .background_autumn_forest {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -710px -1184px;
+  background-position: -852px -1184px;
   width: 141px;
   height: 147px;
 }
 .background_avalanche {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -852px -1184px;
+  background-position: -994px -1184px;
   width: 141px;
   height: 147px;
 }
 .background_back_alley {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -994px -1184px;
+  background-position: -1136px -1184px;
   width: 141px;
   height: 147px;
 }
 .background_back_of_giant_beast {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1136px -1184px;
+  background-position: -1278px -1184px;
   width: 141px;
   height: 147px;
 }
 .background_bamboo_forest {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1278px -1184px;
+  background-position: -1420px 0px;
   width: 141px;
   height: 147px;
 }
 .background_bayou {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1420px 0px;
+  background-position: -1420px -148px;
   width: 141px;
   height: 147px;
 }
 .background_beach {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1420px -148px;
+  background-position: -1420px -296px;
   width: 141px;
   height: 147px;
 }
 .background_beehive {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1420px -296px;
+  background-position: -1420px -444px;
   width: 141px;
   height: 147px;
 }
 .background_bell_tower {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1420px -444px;
+  background-position: -1420px -592px;
   width: 141px;
   height: 147px;
 }
 .background_beside_well {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1420px -592px;
+  background-position: -1420px -740px;
   width: 141px;
   height: 147px;
 }
 .background_birch_forest {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1420px -740px;
+  background-position: -1420px -888px;
   width: 141px;
   height: 147px;
 }
 .background_birthday_party {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1420px -888px;
+  background-position: -1420px -1036px;
   width: 141px;
   height: 147px;
 }
 .background_blacksmithy {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1420px -1036px;
+  background-position: -1420px -1184px;
   width: 141px;
   height: 147px;
 }
 .background_blizzard {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1420px -1184px;
+  background-position: 0px 0px;
   width: 141px;
   height: 147px;
 }
 .background_blossoming_desert {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: 0px 0px;
+  background-position: -142px -1332px;
   width: 141px;
   height: 147px;
 }
 .background_blue {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -142px -1332px;
+  background-position: -284px -1332px;
   width: 141px;
   height: 147px;
 }
 .background_bridge {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -284px -1332px;
+  background-position: -426px -1332px;
   width: 141px;
   height: 147px;
 }
 .background_bug_covered_log {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -426px -1332px;
+  background-position: -568px -1332px;
   width: 141px;
   height: 147px;
 }
 .background_buried_treasure {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -568px -1332px;
+  background-position: -710px -1332px;
   width: 141px;
   height: 147px;
 }
 .background_butterfly_garden {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -710px -1332px;
+  background-position: -852px -1332px;
   width: 141px;
   height: 147px;
 }
 .background_champions_colosseum {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -852px -1332px;
+  background-position: -994px -1332px;
   width: 141px;
   height: 147px;
 }
 .background_cherry_trees {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -994px -1332px;
+  background-position: -1136px -1332px;
   width: 141px;
   height: 147px;
 }
 .background_chessboard_land {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1136px -1332px;
+  background-position: -1278px -1332px;
   width: 141px;
   height: 147px;
 }
 .background_clouds {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1278px -1332px;
+  background-position: -1420px -1332px;
   width: 141px;
   height: 147px;
 }
 .background_coral_reef {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1420px -1332px;
+  background-position: -1562px 0px;
   width: 141px;
   height: 147px;
 }
 .background_cornfields {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1562px 0px;
+  background-position: -1562px -148px;
   width: 141px;
   height: 147px;
 }
 .background_cozy_barn {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1562px -148px;
+  background-position: -1562px -296px;
   width: 141px;
   height: 147px;
 }
 .background_cozy_bedroom {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1562px -296px;
+  background-position: -1562px -444px;
   width: 141px;
   height: 147px;
 }
 .background_cozy_library {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1562px -444px;
+  background-position: -1562px -592px;
   width: 141px;
   height: 147px;
 }
 .background_creepy_castle {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1562px -592px;
+  background-position: -1562px -740px;
   width: 141px;
   height: 147px;
 }
 .background_crosscountry_ski_trail {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1562px -740px;
+  background-position: -1562px -888px;
   width: 141px;
   height: 147px;
 }
 .background_crystal_cave {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1562px -888px;
+  background-position: -1562px -1036px;
   width: 141px;
   height: 147px;
 }
 .background_dark_deep {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1562px -1036px;
+  background-position: -1562px -1184px;
   width: 141px;
   height: 147px;
 }
 .background_deep_mine {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1562px -1184px;
+  background-position: -1562px -1332px;
   width: 141px;
   height: 147px;
 }
 .background_deep_sea {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -1562px -1332px;
+  background-position: 0px -1480px;
   width: 141px;
   height: 147px;
 }
 .background_desert_dunes {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: 0px -1480px;
+  background-position: -142px -1480px;
   width: 141px;
   height: 147px;
 }
 .background_desert_with_snow {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -142px -1480px;
+  background-position: -284px -1480px;
   width: 141px;
   height: 147px;
 }
 .background_dilatory_castle {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -284px -1480px;
+  background-position: -426px -1480px;
   width: 141px;
   height: 147px;
 }
 .background_dilatory_city {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: -426px -1480px;
+  background-position: 0px -1332px;
   width: 141px;
   height: 147px;
 }
 .background_dilatory_ruins {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
-  background-position: 0px -1332px;
+  background-position: -1278px -296px;
   width: 141px;
   height: 147px;
 }

website/client/src/components/notifications.vue

@@ -310,6 +310,14 @@ const NOTIFICATIONS = {
       achievement: 'rosyOutlook', // defined manually until the server sends all the necessary data
     },
   },
+  ACHIEVEMENT_BUG_BONANZA: {
+    achievement: true,
+    label: $t => `${$t('achievement')}: ${$t('achievementBugBonanza')}`,
+    modalId: 'generic-achievement',
+    data: {
+      achievement: 'bugBonanza', // defined manually until the server sends all the necessary data
+    },
+  },
 };
 
 export default {
@@ -368,7 +376,7 @@ export default {
       'ACHIEVEMENT_MOUNT_MASTER', 'ACHIEVEMENT_TRIAD_BINGO', 'ACHIEVEMENT_DUST_DEVIL', 'ACHIEVEMENT_ARID_AUTHORITY',
       'ACHIEVEMENT_MONSTER_MAGUS', 'ACHIEVEMENT_UNDEAD_UNDERTAKER', 'ACHIEVEMENT_PRIMED_FOR_PAINTING',
       'ACHIEVEMENT_PEARLY_PRO', 'ACHIEVEMENT_TICKLED_PINK', 'ACHIEVEMENT_ROSY_OUTLOOK', 'ACHIEVEMENT',
-      'ONBOARDING_COMPLETE', 'FIRST_DROPS',
+      'ONBOARDING_COMPLETE', 'FIRST_DROPS', 'ACHIEVEMENT_BUG_BONANZA',
     ].forEach(type => {
       handledNotifications[type] = true;
     });
@@ -782,6 +790,7 @@ export default {
           case 'ACHIEVEMENT_PEARLY_PRO':
           case 'ACHIEVEMENT_TICKLED_PINK':
           case 'ACHIEVEMENT_ROSY_OUTLOOK':
+          case 'ACHIEVEMENT_BUG_BONANZA':
           case 'GENERIC_ACHIEVEMENT':
             this.showNotificationWithModal(notification);
             break;

website/common/locales/en/achievements.json

@@ -72,5 +72,8 @@
   "achievementTickledPinkModalText": "You collected all the Cotton Candy Pink Pets!",
   "achievementRosyOutlook": "Rosy Outlook",
   "achievementRosyOutlookText": "Has tamed all Cotton Candy Pink Mounts.",
-  "achievementRosyOutlookModalText": "You tamed all the Cotton Candy Pink Mounts!"
+  "achievementRosyOutlookModalText": "You tamed all the Cotton Candy Pink Mounts!",
+  "achievementBugBonanza": "Bug Bonanza",
+  "achievementBugBonanzaText": "Has completed Beetle, Butterfly, Snail, and Spider pet quests.",
+  "achievementBugBonanzaModalText": "You completed the Beetle, Butterfly, Snail, and Spider pet quests!"
 }

website/common/script/content/achievements.js

@@ -187,6 +187,11 @@ const basicAchievs = {
     titleKey: 'achievementRosyOutlook',
     textKey: 'achievementRosyOutlookText',
   },
+  bugBonanza: {
+    icon: 'achievement-bugBonanza',
+    titleKey: 'achievementBugBonanza',
+    textKey: 'achievementBugBonanzaText',
+  },
 };
 Object.assign(achievementsData, basicAchievs);
 

website/common/script/content/constants.js

@@ -268,6 +268,12 @@ export const QUEST_SERIES_ACHIEVEMENTS = {
     'seaserpent',
     'dolphin',
   ],
+  bugBonanza: [
+    'beetle',
+    'butterfly',
+    'snail',
+    'spider',
+  ],
 };
 
 export const ANIMAL_COLOR_ACHIEVEMENTS = [

website/common/script/content/index.js

@@ -195,7 +195,7 @@ api.mountInfo = stable.mountInfo;
 
 // For seasonal events, change this constant:
 
-const FOOD_SEASON = 'Pie';
+const FOOD_SEASON = 'Normal';
 
 api.food = {
   Meat: {

website/common/script/libs/achievements.js

@@ -199,6 +199,7 @@ function _getBasicAchievements (user, language) {
   _addSimple(result, user, { path: 'pearlyPro', language });
   _addSimple(result, user, { path: 'tickledPink', language });
   _addSimple(result, user, { path: 'rosyOutlook', language });
+  _addSimple(result, user, { path: 'bugBonanza', language });
 
   _addSimpleWithMasterCount(result, user, { path: 'beastMaster', language });
   _addSimpleWithMasterCount(result, user, { path: 'mountMaster', language });

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 = 'CELEBRATE PI DAY WITH HABITICA!';
+const LAST_ANNOUNCEMENT_TITLE = 'NEW PET QUEST BADGE AND BLOG POST!';
 const worldDmg = { // @TODO
   bailey: false,
 };
@@ -31,21 +31,37 @@ api.getNews = {
           <div class="mr-3 ${baileyClass}"></div>
           <div class="media-body">
             <h1 class="align-self-center">${res.t('newStuff')}</h1>
-            <h2>3/14/2020 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
+            <h2>3/17/2020 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
           </div>
         </div>
         <hr/>
-        <div class="promo_pi_day center-block"></div>
+        <div class="achievement-bugBonanza2x center-block"></div>
+        <h3>New Pet Quest Badge!</h3>
         <p>
-          Hello Habiticans! In celebration of Pi Day on March 14, we've gifted everyone delicious
+          We're releasing a new achievement so you can celebrate your successes in the world of
-          slices of pie for you all to feed to your pets.
+          Habitican Pet collecting! Earn the Bug Bonanza achievement by collecting all Habitica's
+          insect and insect-adjacent Pets and you'll earn a nifty badge for your profile.
         </p>
         <p>
-          If you weren't with us for last year's Pi Day, we've also given you a festive Pi Hat and
+          If you’ve already completed the required Quests for a newly released achievement you
-          Shield so you can celebrate in style. Enjoy them, and thanks for being a part of our
+          don’t have to do them all again! Just complete one of the relevant Quests and the
-          community!
+          Achievement will unlock. Check your profile and celebrate your new Achievement with
+          pride.
         </p>
-        <div class="small mb-3">by Beffymaroo and SabreCat</div>
+        <div class="small mb-3">by JokeRat and SabreCat</div>
+        <div class="promo_cosplay center-block"></div>
+        <h3>Blog Post: Cosplay</h3>
+        <p>
+          This month's <a href='https://habitica.wordpress.com/2020/03/11/cosplay/'
+          target='_blank'>featured Wiki article</a> is about doing Cosplay with your avatar! We
+          hope that it will help you as you explore more ways to have fun with the stash of
+          outfits, pets, and backgrounds you've earned by completing your tasks. Be sure to check
+          it out, and let us know what you think by reaching out on <a
+          href='https://twitter.com/habitica' target='_blank'>Twitter</a>, <a
+          href='http://blog.habitrpg.com' target='_blank'>Tumblr</a>, and <a
+          href='https://facebook.com/habitica' target='_blank'>Facebook</a>.
+        </p>
+        <div class="small mb-3">by shanaqui and the Wiki Wizards</div>
       </div>
       `,
     });

website/server/models/user/schema.js

@@ -132,6 +132,7 @@ export default new Schema({
     pearlyPro: Boolean,
     tickledPink: Boolean,
     rosyOutlook: Boolean,
+    bugBonanza: Boolean,
     // Onboarding Guide
     createdTask: Boolean,
     completedTask: Boolean,

website/server/models/userNotification.js

@@ -54,6 +54,7 @@ const NOTIFICATION_TYPES = [
   'ACHIEVEMENT_PEARLY_PRO',
   'ACHIEVEMENT_TICKLED_PINK',
   'ACHIEVEMENT_ROSY_OUTLOOK',
+  'ACHIEVEMENT_BUG_BONANZA',
   'ACHIEVEMENT', // generic achievement notification, details inside `notification.data`
 ];