Merge branch 'develop' into client-monorepo

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.116.4",
+  "version": "4.116.6",
   "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.116.4",
+  "version": "4.116.6",
   "main": "./website/server/index.js",
   "dependencies": {
     "@google-cloud/trace-agent": "^4.0.0",

website/client/src/components/avatar.vue

@@ -47,7 +47,7 @@
   @import '~@/assets/scss/colors.scss';
 
   .avatar {
-    width: 140px;
+    width: 141px;
     height: 147px;
     image-rendering: pixelated;
     position: relative;
@@ -136,7 +136,7 @@ export default {
         return this.overrideTopPadding;
       }
 
-      let val = '28px';
+      let val = '27px';
 
       if (!this.avatarOnly) {
         if (this.member.items.currentPet) val = '24px';

website/client/src/components/inventory/equipment/equipGearModal.vue

@@ -40,8 +40,8 @@
 
 <style lang="scss">
 
-  @import '~@/assets/scss/colors.scss';
-  @import '~@/assets/scss/modal.scss';
+  @import '~client/assets/scss/colors.scss';
+  @import '~client/assets/scss/modal.scss';
 
   #equipgear-modal {
     @include centeredModal();
@@ -105,7 +105,7 @@
       margin: 0 auto;
 
       .character-sprites span {
-        left: 25px;
+        left: 24px;
       }
     }
 
@@ -117,16 +117,16 @@
 </style>
 
 <script>
-import { mapState } from '@/libs/store';
+import { mapState } from 'client/libs/store';
 
-import svgClose from '@/assets/svg/close.svg';
-import svgWarrior from '@/assets/svg/warrior.svg';
-import svgWizard from '@/assets/svg/wizard.svg';
-import svgRogue from '@/assets/svg/rogue.svg';
-import svgHealer from '@/assets/svg/healer.svg';
+import svgClose from 'assets/svg/close.svg';
+import svgWarrior from 'assets/svg/warrior.svg';
+import svgWizard from 'assets/svg/wizard.svg';
+import svgRogue from 'assets/svg/rogue.svg';
+import svgHealer from 'assets/svg/healer.svg';
 
-import Avatar from '@/components/avatar';
-import attributesGrid from '@/components/inventory/equipment/attributesGrid.vue';
+import Avatar from 'client/components/avatar';
+import attributesGrid from 'client/components/inventory/equipment/attributesGrid.vue';
 
 export default {
   components: {

website/client/tests/unit/components/avatar.spec.js

@@ -78,9 +78,9 @@ context('avatar.vue', () => {
       };
     });
 
-    it('defaults to 28px', () => {
+    it('defaults to 27px', () => {
       vm.avatarOnly = true;
-      expect(vm.paddingTop).to.equal('28px');
+      expect(vm.paddingTop).to.equal('27px');
     });
 
     it('is 24px if user has a pet', () => {

website/common/locales/en/content.json

@@ -298,6 +298,7 @@
 
   "hatchingPotionNotes": "Pour this on an egg, and it will hatch as a <%= potText(locale) %> pet.",
   "premiumPotionAddlNotes": "Not usable on quest pet eggs. Available for purchase until <%= date(locale) %>.",
+  "premiumPotionUnlimitedNotes": "Not usable on quest pet eggs.",
 
   "foodMeat": "Meat",
   "foodMeatThe": "the Meat",

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

@@ -196,6 +196,7 @@ const premium = {
     text: t('hatchingPotionBronze'),
     limited: true,
     canBuy: hasQuestAchievementFunction('bronze'),
+    _addlNotes: t('premiumPotionUnlimitedNotes'),
   },
   Watery: {
     value: 2,
@@ -208,6 +209,7 @@ const premium = {
     text: t('hatchingPotionSilver'),
     limited: true,
     canBuy: hasQuestAchievementFunction('silver'),
+    _addlNotes: t('premiumPotionUnlimitedNotes'),
   },
   Shadow: {
     value: 2,