Merge branch 'develop' into sabrecat/teams-rebase

gulp/gulp-sprites.js

@@ -20,17 +20,25 @@ function cssVarMap (sprite) {
   if (requiresSpecialTreatment) {
     sprite.custom = {
       px: {
-        offsetX: `-${sprite.x + 25}px`,
-        offsetY: `-${sprite.y + 15}px`,
+        offsetX: '-25px',
+        offsetY: '-15px',
         width: '60px',
         height: '60px',
       },
     };
   }
-  if (sprite.name.indexOf('shirt') !== -1) sprite.custom.px.offsetY = `-${sprite.y + 35}px`; // even more for shirts
+
+  // even more for shirts
+  if (sprite.name.indexOf('shirt') !== -1) {
+    sprite.custom.px.offsetX = '-29px';
+    sprite.custom.px.offsetY = '-42px';
+  }
+
   if (sprite.name.indexOf('hair_base') !== -1) {
     const styleArray = sprite.name.split('_').slice(2, 3);
-    if (Number(styleArray[0]) > 14) sprite.custom.px.offsetY = `-${sprite.y}px`; // don't crop updos
+    if (Number(styleArray[0]) > 14) {
+      sprite.custom.px.offsetY = '0'; // don't crop updos
+    }
   }
 }
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.228.0",
+  "version": "4.228.3",
   "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.228.0",
+  "version": "4.228.3",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.17.9",

website/client/src/components/avatarModal/customize-options.vue

@@ -125,6 +125,16 @@ export default {
       box-shadow: 0 2px 2px 0 rgba(26, 24, 29, 0.16), 0 1px 4px 0 rgba(26, 24, 29, 0.12);
       background-color: $white;
 
+      .sprite.customize-option.shirt {
+        margin-left: -3px !important;
+        // otherwise its overriden by the .outer-option-background:not(.none) { rules
+      }
+
+      .sprite.customize-option.skin {
+        margin-left: -8px !important;
+        // otherwise its overriden by the .outer-option-background:not(.none) { rules
+      }
+
       .option {
         border: none;
         border-radius: 2px;
@@ -203,17 +213,9 @@ export default {
   .outer-option-background:not(.none) {
 
     .sprite.customize-option {
-      // margin: 0 auto;
-      //margin-left: -3px;
-      //margin-top: -7px;
       margin-top: 0;
       margin-left: 0;
 
-      &.size, &.shirt {
-        margin-top: -8px;
-        margin-left: -4px;
-      }
-
       &.color-bangs {
         margin-top: 3px;
       }

website/common/locales/en/limited.json

@@ -193,6 +193,7 @@
   "septemberYYYY": "September <%= year %>",
   "decemberYYYY": "December <%= year %>",
   "marchYYYY": "March <%= year %>",
+  "aprilYYYY": "April <%= year %>",
   "mayYYYY": "May <%= year %>",
   "juneYYYY": "June <%= year %>",
   "novemberYYYY": "November <%= year %>",

website/common/script/content/hatching-potions.js

@@ -529,7 +529,7 @@ const wacky = {
   Veggie: {
     text: t('hatchingPotionVeggie'),
     limited: true,
-    event: EVENTS.spring2021,
+    event: EVENTS.spring2022,
     _addlNotes: t('eventAvailabilityReturning', {
       availableDate: t('dateEndApril'),
       previousDate: t('aprilYYYY', { year: 2021 }),

website/raw_sprites/css/css.template.handlebars

@@ -6,6 +6,7 @@
 }
 {{#if custom}}
 .customize-option.{{name}} {
+  background-position: {{custom.px.offsetX}} {{custom.px.offsetY}};
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/{{{name}}}.png');
   width: {{custom.px.width}};
   height: {{custom.px.height}};