Merge branch 'release' into develop

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.177.0",
+  "version": "4.178.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.177.0",
+  "version": "4.178.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.12.10",

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

@@ -1234,19 +1234,19 @@
   width: 141px;
   height: 147px;
 }
-.background_ice_cave {
+.background_hot_spring {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -1562px -1332px;
   width: 141px;
   height: 147px;
 }
-.background_iceberg {
+.background_ice_cave {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: 0px -1480px;
   width: 141px;
   height: 147px;
 }
-.background_idyllic_cabin {
+.background_iceberg {
   background-image: url('~@/assets/images/sprites/spritesmith-main-0.png');
   background-position: -142px -1480px;
   width: 141px;

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

@@ -4,36 +4,60 @@
   width: 221px;
   height: 39px;
 }
-.quest_evilsanta {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1762px -815px;
-  width: 118px;
-  height: 131px;
-}
-.quest_evilsanta2 {
+.quest_dilatoryDistress3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
   background-position: -220px 0px;
   width: 219px;
   height: 219px;
 }
-.quest_falcon {
+.quest_dolphin {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
   background-position: -440px 0px;
   width: 219px;
   height: 219px;
 }
-.quest_ferret {
+.quest_dustbunnies {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
   background-position: 0px -232px;
   width: 219px;
   height: 219px;
 }
-.quest_fluorite {
+.quest_egg {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -1762px -362px;
+  width: 165px;
+  height: 207px;
+}
+.quest_evilsanta {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -1762px -1023px;
+  width: 118px;
+  height: 131px;
+}
+.quest_evilsanta2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
   background-position: -220px -232px;
   width: 219px;
   height: 219px;
 }
+.quest_falcon {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -440px -232px;
+  width: 219px;
+  height: 219px;
+}
+.quest_ferret {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -660px 0px;
+  width: 219px;
+  height: 219px;
+}
+.quest_fluorite {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
+  background-position: -660px -220px;
+  width: 219px;
+  height: 219px;
+}
 .quest_frog {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
   background-position: -1540px 0px;
@@ -42,13 +66,13 @@
 }
 .quest_ghost_stag {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -440px -232px;
+  background-position: 0px -452px;
   width: 219px;
   height: 219px;
 }
 .quest_goldenknight1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -660px 0px;
+  background-position: -220px -452px;
   width: 219px;
   height: 219px;
 }
@@ -72,13 +96,13 @@
 }
 .quest_guineapig {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -660px -220px;
+  background-position: -440px -452px;
   width: 219px;
   height: 219px;
 }
 .quest_harpy {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: 0px -452px;
+  background-position: -660px -452px;
   width: 219px;
   height: 219px;
 }
@@ -90,19 +114,19 @@
 }
 .quest_hippo {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -220px -452px;
+  background-position: -880px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_horse {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -440px -452px;
+  background-position: -880px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_kangaroo {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -660px -452px;
+  background-position: -880px -440px;
   width: 219px;
   height: 219px;
 }
@@ -114,43 +138,43 @@
 }
 .quest_lostMasterclasser1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -880px 0px;
+  background-position: 0px -672px;
   width: 219px;
   height: 219px;
 }
 .quest_lostMasterclasser2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -880px -220px;
+  background-position: -220px -672px;
   width: 219px;
   height: 219px;
 }
 .quest_lostMasterclasser3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -880px -440px;
+  background-position: -440px -672px;
   width: 219px;
   height: 219px;
 }
 .quest_mayhemMistiflying1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1762px -362px;
+  background-position: -1762px -570px;
   width: 150px;
   height: 150px;
 }
 .quest_mayhemMistiflying2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: 0px -672px;
+  background-position: -660px -672px;
   width: 219px;
   height: 219px;
 }
 .quest_mayhemMistiflying3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -220px -672px;
+  background-position: -880px -672px;
   width: 219px;
   height: 219px;
 }
 .quest_monkey {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -440px -672px;
+  background-position: -1100px 0px;
   width: 219px;
   height: 219px;
 }
@@ -162,31 +186,31 @@
 }
 .quest_moon2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -660px -672px;
+  background-position: -1100px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_moon3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -880px -672px;
+  background-position: -1100px -440px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1100px 0px;
+  background-position: -1100px -660px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1100px -220px;
+  background-position: 0px -892px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1100px -440px;
+  background-position: -220px -892px;
   width: 219px;
   height: 219px;
 }
@@ -204,7 +228,7 @@
 }
 .quest_owl {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1100px -660px;
+  background-position: -440px -892px;
   width: 219px;
   height: 219px;
 }
@@ -222,19 +246,19 @@
 }
 .quest_pterodactyl {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: 0px -892px;
+  background-position: -660px -892px;
   width: 219px;
   height: 219px;
 }
 .quest_rat {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -220px -892px;
+  background-position: -880px -892px;
   width: 219px;
   height: 219px;
 }
 .quest_robot {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -440px -892px;
+  background-position: -1100px -892px;
   width: 219px;
   height: 219px;
 }
@@ -252,43 +276,43 @@
 }
 .quest_ruby {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -660px -892px;
+  background-position: -1320px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_sabretooth {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -880px -892px;
+  background-position: -1320px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_seaserpent {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1100px -892px;
+  background-position: -1320px -440px;
   width: 219px;
   height: 219px;
 }
 .quest_sheep {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1320px 0px;
+  background-position: -1320px -660px;
   width: 219px;
   height: 219px;
 }
 .quest_silver {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1320px -220px;
+  background-position: -1320px -880px;
   width: 219px;
   height: 219px;
 }
 .quest_slime {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1320px -440px;
+  background-position: 0px -1112px;
   width: 219px;
   height: 219px;
 }
 .quest_sloth {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1320px -660px;
+  background-position: -220px -1112px;
   width: 219px;
   height: 219px;
 }
@@ -312,31 +336,31 @@
 }
 .quest_squirrel {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1320px -880px;
+  background-position: -440px -1112px;
   width: 219px;
   height: 219px;
 }
 .quest_stoikalmCalamity1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1762px -513px;
+  background-position: -1762px -721px;
   width: 150px;
   height: 150px;
 }
 .quest_stoikalmCalamity2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: 0px -1112px;
+  background-position: -660px -1112px;
   width: 219px;
   height: 219px;
 }
 .quest_stoikalmCalamity3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -220px -1112px;
+  background-position: -880px -1112px;
   width: 219px;
   height: 219px;
 }
 .quest_taskwoodsTerror1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1762px -664px;
+  background-position: -1762px -872px;
   width: 150px;
   height: 150px;
 }
@@ -348,7 +372,7 @@
 }
 .quest_taskwoodsTerror3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -440px -1112px;
+  background-position: -1100px -1112px;
   width: 219px;
   height: 219px;
 }
@@ -370,21 +394,3 @@
   width: 216px;
   height: 177px;
 }
-.quest_triceratops {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -660px -1112px;
-  width: 219px;
-  height: 219px;
-}
-.quest_turquoise {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -880px -1112px;
-  width: 219px;
-  height: 219px;
-}
-.quest_turtle {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-14.png');
-  background-position: -1100px -1112px;
-  width: 219px;
-  height: 219px;
-}

website/client/src/components/appFooter.vue

@@ -168,7 +168,7 @@
       </div>
       <div class="row">
         <div class="col-12 col-md-5 text-center text-md-left">
-          © 2020 Habitica. All rights reserved.
+          © 2021 Habitica. All rights reserved.
           <div v-if="!IS_PRODUCTION && isUserLoaded"
                class="debug float-left">
             <button class="btn btn-primary"

website/client/src/components/creatorIntro.vue

@@ -121,7 +121,7 @@
             v-if="editing"
             class="menu-container col-2"
             :class="{active: activeTopPage === 'backgrounds'}"
-            @click="changeTopPage('backgrounds', '2020')"
+            @click="changeTopPage('backgrounds', '2021')"
           >
             <div class="menu-item">
               <div
@@ -1184,7 +1184,7 @@ export default {
         },
       ],
 
-      bgSubMenuItems: ['2020', '2019', '2018', '2017', '2016', '2015', '2014'].map(y => ({
+      bgSubMenuItems: ['2021', '2020', '2019', '2018', '2017', '2016', '2015', '2014'].map(y => ({
         id: y,
         label: y,
       })),
@@ -1211,6 +1211,7 @@ export default {
         2018: [],
         2019: [],
         2020: [],
+        2021: [],
       };
 
       // Hack to force update for now until we restructure the data

website/client/src/components/header/userDropdown.vue

@@ -40,7 +40,7 @@
       >{{ $t('editAvatar') }}</a>
       <a
         class="topbar-dropdown-item dropdown-item dropdown-separated"
-        @click="showAvatar('backgrounds', '2020')"
+        @click="showAvatar('backgrounds', '2021')"
       >{{ $t('backgrounds') }}</a>
       <a
         class="topbar-dropdown-item dropdown-item"

website/common/locales/en/backgrounds.json

@@ -651,6 +651,14 @@
   "backgroundInsideAnOrnamentText": "Inside an Ornament",
   "backgroundInsideAnOrnamentNotes": "Let your festive cheer shine out from Inside an Ornament.",
 
+  "backgrounds012021": "SET 80: Released January 2021",
+  "backgroundHotSpringText": "Hot Spring",
+  "backgroundHotSpringNotes": "Melt away your worries with a dip in a Hot Spring.",
+  "backgroundIcicleBridgeText": "Icicle Bridge",
+  "backgroundIcicleBridgeNotes": "Cross the Icicle Bridge with care.",
+  "backgroundWintryCastleText": "Wintry Castle",
+  "backgroundWintryCastleNotes": "Witness a Wintry Castle through the chilly mists.",
+
   "timeTravelBackgrounds": "Steampunk Backgrounds",
   "backgroundAirshipText": "Airship",
   "backgroundAirshipNotes": "Become a sky sailor on board your very own Airship.",

website/common/locales/en/gear.json

@@ -532,6 +532,8 @@
   "weaponArmoireClubOfClubsNotes": "This stylish club won't tip your hand too early about your intentions toward those sneaky old tasks. Increases Strength by <%= str %>. Enchanted Armoire: Jack of Clubs Set (Item 2 of 3).",
   "weaponArmoireEveningTeaText": "Cup of Tea",
   "weaponArmoireEveningTeaNotes": "This panacea will help you relax so those big tasks don't look so threatening. Increases Intelligence by <%= int %>. Enchanted Armoire: Dressing Gown Set (Item 3 of 3).",
+  "weaponArmoireBlueMoonSaiText": "Dark Lunar Sai",
+  "weaponArmoireBlueMoonSaiNotes": "This sai is a traditional weapon, imbued with the powers of the dark side of the moon. Increases Strength by <%= str %>. Enchanted Armoire: Blue Moon Rogue Set (item 1 of 4).",
 
   "armor": "armor",
   "armorCapitalized": "Armor",
@@ -1141,6 +1143,8 @@
   "armorArmoireDoubletOfClubsNotes": "Who knows what's in the cards, but you'll look stylish at any event in this doublet and cape! Increases Constitution by <%= con %>. Enchanted Armoire: Jack of Clubs Set (Item 3 of 3).",
   "armorArmoireDressingGownText": "Comfy Dressing Gown",
   "armorArmoireDressingGownNotes": "Relax in style with this beautiful traditional dressing gown. Increases Constitution by <%= con %>. Enchanted Armoire: Dressing Gown Set (Item 1 of 3).",
+  "armorArmoireBlueMoonShozokuText": "Blue Moon Armor",
+  "armorArmoireBlueMoonShozokuNotes": "A strange serenity surrounds the wearer of this armor. Increases Constitution by <%= con %>. Enchanted Armoire: Blue Moon Rogue Set (item 4 of 4).",
 
   "headgear": "helm",
   "headgearCapitalized": "Headgear",
@@ -1772,6 +1776,8 @@
   "headArmoireCapOfClubsNotes": "Let everyone know about your latest achievements with this literal feather in your cap! Increases Intelligence by <%= int %>. Enchanted Armoire: Jack of Clubs Set (Item 1 of 3).",
   "headArmoireNightcapText": "Nightcap",
   "headArmoireNightcapNotes": "Your new nightcap even has a nice bouncy pompom! Increases Perception by <%= per %>. Enchanted Armoire: Dressing Gown Set (Item 2 of 3).",
+  "headArmoireBlueMoonHelmText": "Blue Moon Helm",
+  "headArmoireBlueMoonHelmNotes": "This helm offers an astonishing amount of luck to its wearer, and exceptional events follow its use. Increases Intelligence by <%= int %>. Enchanted Armoire: Blue Moon Rogue Set (item 3 of 4).",
 
   "offhand": "off-hand item",
   "offhandCapitalized": "Off-Hand Item",
@@ -2084,6 +2090,8 @@
   "shieldArmoireMortarAndPestleNotes": "The most important equipment in the herbalist's arsenal! Grind up your ingredients for your herbal concoctions, and put your back into it! Increases Constitution by <%= con %>. Enchanted Armoire: Heroic Herbalist Set (Item 2 of 3).",
   "shieldArmoireDarkAutumnFlameText": "Dark Autumn Flame",
   "shieldArmoireDarkAutumnFlameNotes": "These mesmerizing flames dance with lively but foreboding energy even in autumn's chilliest nights. Increases Constitution by <%= con %>. Enchanted Armoire: Autumn Enchanter Set (Item 4 of 4).",
+  "shieldArmoireBlueMoonSaiText": "Light Lunar Sai",
+  "shieldArmoireBlueMoonSaiNotes": "This sai is a traditional weapon, imbued with the powers of the light side of the moon. Increases Perception by <%= per %>. Enchanted Armoire: Blue Moon Rogue Set (item 3 of 4).",
 
   "back": "Back Accessory",
   "backCapitalized": "Back Accessory",

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

@@ -415,6 +415,11 @@ const backgrounds = {
     holiday_hearth: { },
     inside_an_ornament: { },
   },
+  backgrounds012021: {
+    hot_spring: { },
+    icicle_bridge: { },
+    wintry_castle: { },
+  },
   timeTravelBackgrounds: {
     airship: {
       price: 1,

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

@@ -17,7 +17,7 @@ export default prefill({
     setPrice: 5, availableFrom: '2020-09-25', availableUntil: '2020-11-02', text: t('hauntedColors'),
   },
   winteryHairColors: {
-    setPrice: 5, availableFrom: '2020-01-10', availableUntil: '2020-02-02', text: t('winteryColors'),
+    setPrice: 5, availableFrom: '2021-01-05', availableUntil: '2021-02-02', text: t('winteryColors'),
   },
   rainbowSkins: { setPrice: 5, text: t('rainbowSkins') },
   animalSkins: { setPrice: 5, text: t('animalSkins') },
@@ -32,6 +32,6 @@ export default prefill({
     setPrice: 5, availableFrom: '2020-06-23', availableUntil: '2020-08-02', text: t('splashySkins'),
   },
   winterySkins: {
-    setPrice: 5, availableFrom: '2020-01-10', availableUntil: '2020-02-02', text: t('winterySkins'),
+    setPrice: 5, availableFrom: '2021-01-05', availableUntil: '2021-02-02', text: t('winterySkins'),
   },
 });

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

@@ -338,6 +338,10 @@ const armor = {
     con: 12,
     set: 'dressingGown',
   },
+  blueMoonShozoku: {
+    con: 8,
+    set: 'blueMoon',
+  },
 };
 
 const body = {
@@ -676,6 +680,10 @@ const head = {
     per: 12,
     set: 'dressingGown',
   },
+  blueMoonHelm: {
+    int: 8,
+    set: 'blueMoon',
+  },
 };
 
 const shield = {
@@ -865,6 +873,10 @@ const shield = {
     con: 12,
     set: 'autumnEnchanter',
   },
+  blueMoonSai: {
+    per: 8,
+    set: 'blueMoon',
+  },
 };
 
 const headAccessory = {
@@ -1155,6 +1167,10 @@ const weapon = {
     int: 12,
     set: 'dressingGown',
   },
+  blueMoonSai: {
+    str: 8,
+    set: 'blueMoon',
+  },
 };
 
 forEach({