Merge branch 'release' into develop

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.124.1",
+  "version": "4.125.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.124.1",
+  "version": "4.125.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.7.4",

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

@@ -1,4 +1,4 @@
-.promo_armoire_backgrounds_201911 {
+.promo_armoire_backgrounds_201912 {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
   background-position: 0px -752px;
   width: 423px;
@@ -6,7 +6,7 @@
 }
 .promo_costume_achievement {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -1175px -444px;
+  background-position: -1175px -296px;
   width: 144px;
   height: 156px;
 }
@@ -24,19 +24,13 @@
 }
 .promo_harvest_feast {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -928px -444px;
+  background-position: -928px -296px;
   width: 246px;
   height: 168px;
 }
-.promo_mystery_201911 {
-  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -928px -148px;
-  width: 282px;
-  height: 147px;
-}
 .promo_mystery_201912 {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -928px -296px;
+  background-position: -928px -148px;
   width: 282px;
   height: 147px;
 }

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

@@ -994,163 +994,163 @@
   width: 141px;
   height: 147px;
 }
-.background_ice_cave {
+.background_holiday_market {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -426px -592px;
   width: 141px;
   height: 147px;
 }
-.background_iceberg {
+.background_holiday_wreath {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -284px -592px;
   width: 141px;
   height: 147px;
 }
-.background_idyllic_cabin {
+.background_ice_cave {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -142px -592px;
   width: 141px;
   height: 147px;
 }
-.background_in_a_classroom {
+.background_iceberg {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: 0px -592px;
   width: 141px;
   height: 147px;
 }
-.background_in_an_ancient_tomb {
+.background_idyllic_cabin {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -710px -444px;
   width: 141px;
   height: 147px;
 }
-.background_island_waterfalls {
+.background_in_a_classroom {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -710px -296px;
   width: 141px;
   height: 147px;
 }
-.background_kelp_forest {
+.background_in_an_ancient_tomb {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -710px -148px;
   width: 141px;
   height: 147px;
 }
-.background_lake_with_floating_lanterns {
+.background_island_waterfalls {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -710px 0px;
   width: 141px;
   height: 147px;
 }
-.background_lighthouse_shore {
+.background_kelp_forest {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -568px -444px;
   width: 141px;
   height: 147px;
 }
-.background_lilypad {
+.background_lake_with_floating_lanterns {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -426px -444px;
   width: 141px;
   height: 147px;
 }
-.background_magic_beanstalk {
+.background_lighthouse_shore {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -284px -444px;
   width: 141px;
   height: 147px;
 }
-.background_magical_candles {
+.background_lilypad {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -142px -444px;
   width: 141px;
   height: 147px;
 }
-.background_magical_museum {
+.background_magic_beanstalk {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: 0px -444px;
   width: 141px;
   height: 147px;
 }
-.background_marble_temple {
+.background_magical_candles {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -568px -296px;
   width: 141px;
   height: 147px;
 }
-.background_market {
+.background_magical_museum {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -568px -148px;
   width: 141px;
   height: 147px;
 }
-.background_meandering_cave {
+.background_marble_temple {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -568px 0px;
   width: 141px;
   height: 147px;
 }
-.background_medieval_kitchen {
+.background_market {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -426px -296px;
   width: 141px;
   height: 147px;
 }
-.background_midnight_castle {
+.background_meandering_cave {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -284px -296px;
   width: 141px;
   height: 147px;
 }
-.background_midnight_clouds {
+.background_medieval_kitchen {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -142px -296px;
   width: 141px;
   height: 147px;
 }
-.background_midnight_lake {
+.background_midnight_castle {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: 0px -296px;
   width: 141px;
   height: 147px;
 }
-.background_mist_shrouded_mountain {
+.background_midnight_clouds {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -426px -148px;
   width: 141px;
   height: 147px;
 }
-.background_mistiflying_circus {
+.background_midnight_lake {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -426px 0px;
   width: 141px;
   height: 147px;
 }
-.background_monster_makers_workshop {
+.background_mist_shrouded_mountain {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -284px -148px;
   width: 141px;
   height: 147px;
 }
-.background_mountain_lake {
+.background_mistiflying_circus {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -142px -148px;
   width: 141px;
   height: 147px;
 }
-.background_mountain_pyramid {
+.background_monster_makers_workshop {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: 0px -148px;
   width: 141px;
   height: 147px;
 }
-.background_night_dunes {
+.background_mountain_lake {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -284px 0px;
   width: 141px;
   height: 147px;
 }
-.background_ocean_sunrise {
+.background_mountain_pyramid {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -142px 0px;
   width: 141px;

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

@@ -1,414 +1,492 @@
+.weapon_warrior_3 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1893px -1361px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_warrior_4 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1893px -1270px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_warrior_5 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1802px -1452px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_warrior_6 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1893px -1452px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_wizard_0 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1802px -1543px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_wizard_1 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1893px -1543px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_wizard_2 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1893px -997px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_wizard_3 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1802px -1088px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_wizard_4 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1893px -1088px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_wizard_5 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1802px -1179px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_wizard_6 {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1802px -1270px;
+  width: 90px;
+  height: 90px;
+}
 .Pet_Currency_Gem {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1529px -1529px;
+  background-position: -1921px -444px;
   width: 68px;
   height: 68px;
 }
 .Pet_Currency_Gem1x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1697px -1492px;
+  background-position: -1957px -676px;
   width: 15px;
   height: 13px;
 }
 .Pet_Currency_Gem2x {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1407px -1287px;
+  background-position: -1960px -766px;
   width: 30px;
   height: 26px;
 }
 .PixelPaw-Gold {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -473px -220px;
+  background-position: -1688px -1436px;
   width: 51px;
   height: 51px;
 }
 .PixelPaw {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -473px -272px;
+  background-position: -1740px -1436px;
   width: 51px;
   height: 51px;
 }
 .PixelPaw002 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -473px -324px;
+  background-position: -220px -203px;
   width: 51px;
   height: 51px;
 }
+.avatar_floral_healer {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1887px -576px;
+  width: 99px;
+  height: 99px;
+}
+.avatar_floral_rogue {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1802px -697px;
+  width: 99px;
+  height: 99px;
+}
 .avatar_floral_warrior {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1470px -1315px;
+  background-position: -1802px -897px;
   width: 99px;
   height: 99px;
 }
 .avatar_floral_wizard {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -190px -1529px;
+  background-position: -1802px -797px;
   width: 99px;
   height: 99px;
 }
 .empty_bottles {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -371px -1671px;
+  background-position: -1921px -513px;
   width: 64px;
   height: 54px;
 }
 .ghost {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -290px -1529px;
+  background-position: -1802px -997px;
   width: 90px;
   height: 90px;
 }
 .inventory_present {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1100px -1013px;
+  background-position: -1696px -608px;
   width: 68px;
   height: 68px;
 }
 .inventory_present_01 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -220px -324px;
+  background-position: -1902px -797px;
   width: 68px;
   height: 68px;
 }
 .inventory_present_02 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -302px -1671px;
+  background-position: -1902px -897px;
   width: 68px;
   height: 68px;
 }
 .inventory_present_03 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -770px -1529px;
+  background-position: -1627px -470px;
   width: 68px;
   height: 68px;
 }
 .inventory_present_04 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -908px -1529px;
+  background-position: -1627px -539px;
   width: 68px;
   height: 68px;
 }
 .inventory_present_05 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -660px -435px;
+  background-position: -1696px -539px;
   width: 68px;
   height: 68px;
 }
 .inventory_present_06 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -660px -504px;
+  background-position: -1627px -884px;
   width: 68px;
   height: 68px;
 }
 .inventory_present_07 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -660px -573px;
+  background-position: -1696px -884px;
   width: 68px;
   height: 68px;
 }
 .inventory_present_08 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -880px -655px;
+  background-position: -1627px -953px;
   width: 68px;
   height: 68px;
 }
 .inventory_present_09 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -880px -724px;
+  background-position: -1696px -1367px;
   width: 68px;
   height: 68px;
 }
 .inventory_present_10 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -880px -793px;
+  background-position: -1902px -697px;
   width: 68px;
   height: 68px;
 }
 .inventory_present_11 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1100px -875px;
+  background-position: -1696px -470px;
   width: 68px;
   height: 68px;
 }
 .inventory_present_12 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1100px -944px;
+  background-position: -1627px -608px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_birthday {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1320px -1095px;
+  background-position: -1627px -746px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_congrats {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1320px -1164px;
+  background-position: -1696px -746px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_fortify {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1320px -1233px;
+  background-position: -1627px -815px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_getwell {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -563px -1529px;
+  background-position: -1696px -953px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_goodluck {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -632px -1529px;
+  background-position: -1627px -1367px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_greeting {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -701px -1529px;
+  background-position: -1696px -1298px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_nye {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1046px -1529px;
+  background-position: -1627px -1298px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_opaquePotion {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1115px -1529px;
+  background-position: -1696px -1229px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_seafoam {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1184px -1529px;
+  background-position: -1627px -1229px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_shinySeed {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1322px -1529px;
+  background-position: -1696px -1160px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_snowball {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1391px -1529px;
+  background-position: -1627px -1160px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_spookySparkles {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1460px -1529px;
+  background-position: -1696px -1091px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_thankyou {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1736px -1529px;
+  background-position: -1627px -1091px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_trinket {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1667px -1529px;
+  background-position: -1696px -1022px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_valentine {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1598px -1529px;
+  background-position: -1627px -1022px;
   width: 68px;
   height: 68px;
 }
 .knockout {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1627px -1444px;
+  background-position: -1627px -422px;
   width: 120px;
   height: 47px;
 }
 .pet_key {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1253px -1529px;
+  background-position: -1696px -815px;
   width: 68px;
   height: 68px;
 }
 .rebirth_orb {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -977px -1529px;
+  background-position: -1696px -677px;
   width: 68px;
   height: 68px;
 }
 .seafoam_star {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -472px -1529px;
+  background-position: -1893px -1179px;
   width: 90px;
   height: 90px;
 }
 .shop_armoire {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -839px -1529px;
+  background-position: -1627px -677px;
   width: 68px;
   height: 68px;
 }
 .snowman {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -381px -1529px;
+  background-position: -1802px -1361px;
   width: 90px;
   height: 90px;
 }
 .zzz {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1789px -1444px;
+  background-position: -220px -255px;
   width: 40px;
   height: 40px;
 }
 .zzz_light {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1748px -1444px;
+  background-position: -1748px -422px;
   width: 40px;
   height: 40px;
 }
 .notif_inventory_present_01 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1083px -838px;
+  background-position: -1953px -229px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_02 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1187px -1061px;
+  background-position: -1953px -200px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_03 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1216px -1061px;
+  background-position: -1953px -171px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_04 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1245px -1061px;
+  background-position: -1953px -142px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_05 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1274px -1061px;
+  background-position: -1931px -766px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_06 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1303px -1061px;
+  background-position: -1902px -766px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_07 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1332px -1061px;
+  background-position: -1953px -409px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_08 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1361px -1061px;
+  background-position: -1953px -380px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_09 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -967px -838px;
+  background-position: -1953px -351px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_10 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -996px -838px;
+  background-position: -1953px -322px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_11 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1025px -838px;
+  background-position: -1953px -258px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_12 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1054px -838px;
+  background-position: -1953px -293px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_special_birthday {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1526px -1287px;
+  background-position: -1971px -797px;
   width: 20px;
   height: 24px;
 }
 .notif_inventory_special_congrats {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1547px -1287px;
+  background-position: -1927px -866px;
   width: 20px;
   height: 22px;
 }
 .notif_inventory_special_getwell {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1568px -1287px;
+  background-position: -1948px -866px;
   width: 20px;
   height: 22px;
 }
 .notif_inventory_special_goodluck {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1463px -1287px;
+  background-position: -1971px -697px;
   width: 20px;
   height: 26px;
 }
 .notif_inventory_special_greeting {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1589px -1287px;
+  background-position: -1969px -866px;
   width: 20px;
   height: 22px;
 }
 .notif_inventory_special_nye {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1438px -1287px;
+  background-position: -1902px -866px;
   width: 24px;
   height: 26px;
 }
 .notif_inventory_special_thankyou {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1505px -1287px;
+  background-position: -1971px -724px;
   width: 20px;
   height: 24px;
 }
 .notif_inventory_special_valentine {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1484px -1287px;
+  background-position: -1971px -822px;
   width: 20px;
   height: 24px;
 }
 .npc_bailey {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -302px -1740px;
+  background-position: -1627px -1436px;
   width: 60px;
   height: 72px;
 }
 .npc_justin {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -220px -203px;
+  background-position: -1802px -576px;
   width: 84px;
   height: 120px;
 }
 .npc_matt {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1155px -1315px;
+  background-position: -208px -1529px;
   width: 195px;
   height: 138px;
 }
@@ -420,103 +498,103 @@
 }
 .banner_flair_dysheartener {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1627px -1492px;
+  background-position: -1887px -676px;
   width: 69px;
   height: 18px;
 }
 .phobia_dysheartener {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1627px -1061px;
+  background-position: -307px -220px;
   width: 201px;
   height: 195px;
 }
 .quest_alligator {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1627px -645px;
+  background-position: -967px -660px;
   width: 201px;
   height: 213px;
 }
 .quest_amber {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -747px -220px;
+  background-position: -1187px -660px;
   width: 219px;
   height: 219px;
 }
 .quest_armadillo {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -660px -655px;
+  background-position: -527px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_atom1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -696px -1315px;
+  background-position: -1335px -1315px;
   width: 250px;
   height: 150px;
 }
 .quest_atom2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -947px -1315px;
+  background-position: 0px -1529px;
   width: 207px;
   height: 138px;
 }
 .quest_atom3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1187px -880px;
+  background-position: -433px -1315px;
   width: 216px;
   height: 180px;
 }
 .quest_axolotl {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -875px;
+  background-position: -660px -655px;
   width: 219px;
   height: 219px;
 }
 .quest_badger {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -880px -875px;
+  background-position: 0px -875px;
   width: 219px;
   height: 219px;
 }
 .quest_basilist {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -1529px;
+  background-position: -1802px 0px;
   width: 189px;
   height: 141px;
 }
 .quest_beetle {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1627px -859px;
+  background-position: -747px -440px;
   width: 204px;
   height: 201px;
 }
 .quest_bronze {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1187px -440px;
+  background-position: -880px -875px;
   width: 219px;
   height: 219px;
 }
 .quest_bunny {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1627px -1257px;
+  background-position: -222px -1315px;
   width: 210px;
   height: 186px;
 }
 .quest_butterfly {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -1095px;
+  background-position: -1187px -440px;
   width: 219px;
   height: 219px;
 }
 .quest_cheetah {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -660px -1095px;
+  background-position: 0px -1095px;
   width: 219px;
   height: 219px;
 }
 .quest_cow {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -527px -220px;
+  background-position: -1627px 0px;
   width: 174px;
   height: 213px;
 }
@@ -528,13 +606,13 @@
 }
 .quest_dilatoryDistress1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1627px -434px;
+  background-position: -1187px -880px;
   width: 210px;
   height: 210px;
 }
 .quest_dilatoryDistress2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -151px -1671px;
+  background-position: -1802px -293px;
   width: 150px;
   height: 150px;
 }
@@ -546,31 +624,31 @@
 }
 .quest_dilatory_derby {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1100px -1095px;
+  background-position: -880px -1095px;
   width: 219px;
   height: 219px;
 }
 .quest_dolphin {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1407px -880px;
+  background-position: -1407px -660px;
   width: 219px;
   height: 219px;
 }
 .quest_dustbunnies {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1407px -660px;
+  background-position: -660px -1095px;
   width: 219px;
   height: 219px;
 }
 .quest_egg {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -307px -220px;
+  background-position: -1627px -214px;
   width: 165px;
   height: 207px;
 }
 .quest_evilsanta {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1351px -1315px;
+  background-position: -1802px -444px;
   width: 118px;
   height: 131px;
 }
@@ -582,13 +660,13 @@
 }
 .quest_falcon {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -307px 0px;
+  background-position: -1100px -1095px;
   width: 219px;
   height: 219px;
 }
 .quest_ferret {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -880px -1095px;
+  background-position: -440px -875px;
   width: 219px;
   height: 219px;
 }
@@ -612,7 +690,7 @@
 }
 .quest_goldenknight2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -445px -1315px;
+  background-position: -1084px -1315px;
   width: 250px;
   height: 150px;
 }
@@ -624,7 +702,7 @@
 }
 .quest_gryphon {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -967px -660px;
+  background-position: -867px -1315px;
   width: 216px;
   height: 177px;
 }
@@ -642,7 +720,7 @@
 }
 .quest_hedgehog {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1407px -1100px;
+  background-position: -527px -220px;
   width: 219px;
   height: 186px;
 }
@@ -654,7 +732,7 @@
 }
 .quest_horse {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -440px -875px;
+  background-position: -307px 0px;
   width: 219px;
   height: 219px;
 }
@@ -666,7 +744,7 @@
 }
 .quest_kraken {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -747px -440px;
+  background-position: -650px -1315px;
   width: 216px;
   height: 177px;
 }
@@ -690,7 +768,7 @@
 }
 .quest_mayhemMistiflying1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -1671px;
+  background-position: -1802px -142px;
   width: 150px;
   height: 150px;
 }
@@ -714,55 +792,43 @@
 }
 .quest_moon1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1627px 0px;
+  background-position: -1407px -880px;
   width: 216px;
   height: 216px;
 }
 .quest_moon2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -747px 0px;
+  background-position: -747px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_moon3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -440px -435px;
+  background-position: -747px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -220px -435px;
+  background-position: -440px -435px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -435px;
+  background-position: -220px -435px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -527px 0px;
+  background-position: 0px -435px;
   width: 219px;
   height: 219px;
 }
 .quest_nudibranch {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1627px -217px;
+  background-position: -1407px -1097px;
   width: 216px;
   height: 216px;
 }
-.quest_octopus {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -222px -1315px;
-  width: 222px;
-  height: 177px;
-}
-.quest_owl {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1187px -660px;
-  width: 219px;
-  height: 219px;
-}

website/common/locales/en/backgrounds.json

@@ -545,5 +545,13 @@
   "backgroundFlyingInAThunderstormText": "Tumultuous Thunderstorm",
   "backgroundFlyingInAThunderstormNotes": "Chase a Tumultuous Thunderstorm as closely as you dare.",
   "backgroundPotionShopText": "Potion Shop",
-  "backgroundPotionShopNotes": "Find an elixir for any ailment at a Potion Shop."
+  "backgroundPotionShopNotes": "Find an elixir for any ailment at a Potion Shop.",
+
+  "backgrounds122019": "SET 67: Released December 2019",
+  "backgroundHolidayMarketText": "Holiday Market",
+  "backgroundHolidayMarketNotes": "Find the perfect gifts and decorations at a Holiday Market.",
+  "backgroundHolidayWreathText": "Holiday Wreath",
+  "backgroundHolidayWreathNotes": "Festoon your avatar with a fragrant Holiday Wreath.",
+  "backgroundWinterNocturneText": "Winter Nocturne",
+  "backgroundWinterNocturneNotes": "Bask in the starlight of a Winter Nocturne."
 }

website/common/locales/en/gear.json

@@ -992,6 +992,8 @@
   "armorArmoireShadowMastersRobeNotes": "The fabric of this flowy robe is woven from the darkest shadows in the deepest caves of Habitica. Increases Constitution by <%= con %>. Enchanted Armoire: Shadow Master Set (Item 1 of 4).",
   "armorArmoireAlchemistsRobeText": "Alchemist's Robe",
   "armorArmoireAlchemistsRobeNotes": "Any number of dangerous elixirs are involved in creating arcane metals and gems, and these heavy robes will protect you from harm and unintended side effects! Increases Constitution by <%= con %> and Perception by <%= per %>. Enchanted Armoire: Alchemist Set (Item 1 of 4).",
+  "armorArmoireDuffleCoatText": "Duffle Coat",
+  "armorArmoireDuffleCoatNotes": "Travel frosty realms in style with this cozy wool coat. Increases Constitution and Perception by <%= attrs %> each. Enchanted Armoire: Duffle Coat Set (Item 1 of 2).",
 
   "headgear": "helm",
   "headgearCapitalized": "Headgear",
@@ -1538,6 +1540,8 @@
   "headArmoireShadowMastersHoodNotes": "This hood grants you the power to see through even the deepest darkness. It may occasionally require eyedrops, though. Increases Perception and Constitution by <%= attrs %> each. Enchanted Armoire: Shadow Master Set (Item 2 of 4).",
   "headArmoireAlchemistsHatText": "Alchemist's Hat",
   "headArmoireAlchemistsHatNotes": "While hats are not strictly necessary for alchemical practice, looking cool certainly doesn't hurt anything! Increases Perception by <%= per %>. Enchanted Armoire: Alchemist Set (Item 2 of 4).",
+  "headArmoireEarflapHatText": "Earflap Hat",
+  "headArmoireEarflapHatNotes": "If you're looking to keep your head toasty warm, this hat has you covered! Increases Intelligence and Strength by <%= attrs %> each. Enchanted Armoire: Duffle Coat Set (Item 2 of 2).",
 
   "offhand": "off-hand item",
   "offhandCapitalized": "Off-Hand Item",

website/common/script/content/appearance/backgrounds.js

@@ -927,6 +927,20 @@ const backgrounds = {
       notes: t('backgroundPotionShopNotes'),
     },
   },
+  backgrounds122019: {
+    holiday_market: {
+      text: t('backgroundHolidayMarketText'),
+      notes: t('backgroundHolidayMarketNotes'),
+    },
+    holiday_wreath: {
+      text: t('backgroundHolidayWreathText'),
+      notes: t('backgroundHolidayWreathNotes'),
+    },
+    winter_nocturne: {
+      text: t('backgroundWinterNocturneText'),
+      notes: t('backgroundWinterNocturneNotes'),
+    },
+  },
   incentiveBackgrounds: {
     violet: {
       text: t('backgroundVioletText'),

website/common/script/content/gear/sets/armoire.js

@@ -507,6 +507,15 @@ const armor = {
     set: 'alchemist',
     canOwn: ownsItem('armor_armoire_alchemistsRobe'),
   },
+  duffleCoat: {
+    text: t('armorArmoireDuffleCoatText'),
+    notes: t('armorArmoireDuffleCoatNotes', { attrs: 7 }),
+    value: 100,
+    con: 7,
+    per: 7,
+    set: 'duffle',
+    canOwn: ownsItem('armor_armoire_duffleCoat'),
+  },
 };
 
 const body = {
@@ -1037,6 +1046,15 @@ const head = {
     set: 'alchemist',
     canOwn: ownsItem('head_armoire_alchemistsHat'),
   },
+  earflapHat: {
+    text: t('headArmoireEarflapHatText'),
+    notes: t('headArmoireEarflapHatNotes', { attrs: 7 }),
+    value: 100,
+    int: 7,
+    str: 7,
+    set: 'duffle',
+    canOwn: ownsItem('head_armoire_earflapHat'),
+  },
 };
 
 const shield = {

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 SUBSCRIBER SET AND OFFICIAL HABITICA CHALLENGES!';
+const LAST_ANNOUNCEMENT_TITLE = 'NEW BACKGROUNDS AND ARMOIRE ITEMS!';
 const worldDmg = { // @TODO
   bailey: false,
 };
@@ -31,62 +31,23 @@ api.getNews = {
           <div class="mr-3 ${baileyClass}"></div>
           <div class="media-body">
             <h1 class="align-self-center">${res.t('newStuff')}</h1>
-            <h2>12/2/2019 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
+            <h2>12/3/2019 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
           </div>
         </div>
         <hr/>
-        <div class="promo_mystery_201912 center-block"></div>
-        <h3>December Subscriber Items Revealed!</h3>
+        <div class="promo_armoire_backgrounds_201912 center-block"></div>
         <p>
-          The December Subscriber Item Set has been revealed: the Polar Pixie Item Set! <a
-          href='/user/settings/subscription'>Subscribe to Habitica</a> by December 31 to receive this
-          exciting set! If you're already an active subscriber, reload the site and then head to
-          Inventory > Items to claim your gear.
+          We’ve added three new backgrounds to the Background Shop! Now your avatar can shop a
+          cheerful Holiday Market, enjoy the scent of a Holiday Wreath and bask in the starlight
+          of a Winter Nocturne. Check them out under User Icon > Backgrounds!
         </p>
         <p>
-          Subscribers also receive the ability to buy Gems for Gold -- the longer you subscribe,
-          the more Gems you can buy per month! There are other perks as well, such as longer access
-          to uncompressed data and a cute Jackalope pet. Best of all, subscriptions let us keep
-          Habitica running. Thank you very much for your support -- it means a lot to us.
-        </p>
-        <div class="small mb-3">by Beffymaroo</div>
-        <div class="promo_take_this center-block"></div>
-        <h3>December 2019 Resolution Success Challenge and Take This Challenge</h3>
-        <p>
-          The Habitica team has launched a special official Challenge series hosted in the <a
-          href='/groups/guild/6e6a8bd3-9f5f-4351-9188-9f11fcd80a99' target='_blank'>Official New
-          Year's Resolution Guild</a>. These Challenges are designed to help you build and
-          maintain goals that are destined for success and then stick with them as the year
-          progresses. For this month's Challenge, "<a
-          href='/challenges/b83f3995-f7c9-4424-8728-be7dee8b52bc'>Journey's End and New
-          Beginnings</a>", we're focusing on sharing our successes and reviewing the year!
-          It has a 15 Gem prize, which will be awarded to five lucky winners on January 1st.
-        </p>
-        <p>
-          Congratulations to the winners of November's Challenge, @LuxInWonderland, @noblegeas,
-          @thebadhobbit, @Slardibarfast, and @yasaminnb!
-        </p>
-        <p>
-          The next Take This Challenge has also launched, "<a
-          href='/challenges/d969932e-887d-45eb-9f7d-312f2173c059'>Test Thy Courage!</a>", with a
-          focus on positive social interactions. Be sure to check it out to earn additional pieces
-          of the Take This armor set!
-        </p>
-        <p>
-          <a href='http://www.takethis.org/' target='_blank'>Take This</a> is a nonprofit that
-          seeks to inform the gamer community about mental health issues, to provide education
-          about mental disorders and mental illness prevention, and to reduce the stigma of mental
-          illness.
-        <p>
-          Congratulations to the winners of the last Take This Challenge, "Cast of Characters!":
-          grand prize winner Geomiceman, and runners-up Christen, no_robot, 🔥 KidSlazy 🔥,
-          marek13, and Nova Rose! Plus, all participants in that Challenge have received a piece of
-          the <a href='http://habitica.wikia.com/wiki/Event_Item_Sequences#Take_This_Armor_Set'
-          target='_blank'>Take This item set</a> if they hadn't completed it already. It is located
-           in your Rewards column. Enjoy!
+          Plus, there’s new Gold-purchasable equipment in the Enchanted Armoire, including the
+          Duffle Coat and Ear-Flap Hat. Better work hard on your real-life tasks to earn all
+          the pieces! Enjoy :)
         </p>
         <div class="small mb-3">
-          by Doctor B, the Take This team, Lemoness, Beffymaroo, and SabreCat
+          by Katy133, gawrone, Vikte, Maans, GeraldThePixel, QuartzFox, KatieSlug, and SabreCat
         </div>
       </div>
       `,