Merge branch 'release' into develop

package-lock.json

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

website/client/src/components/inventory/stable/index.vue

@@ -9,7 +9,7 @@
         <div slot="header">
           <div
             id="npmMattStable"
-            :class="seasonalNPC('matt')"
+            :class="npcClass('matt')"
           ></div>
           <b-popover
             triggers="hover"

website/client/src/components/inventory/stable/welcomeModal.vue

@@ -8,7 +8,7 @@
     @hide="hideFlag()"
   >
     <div class="content">
-      <div :class="seasonalNPC('matt')"></div><h1
+      <div :class="npcClass('matt')"></div><h1
         v-once
         class="page-header"
       >

website/client/src/components/news/newsContent.vue

@@ -3,7 +3,7 @@
     <div class="bailey-header d-flex align-items-center mb-3">
       <div
         class="mr-3"
-        :class="seasonalNPC('bailey')"
+        :class="npcClass('bailey')"
       ></div>
       <h1 v-once>
         {{ $t('newStuff') }}

website/client/src/mixins/seasonalNPC.js

@@ -5,6 +5,8 @@ export default {
     ...mapState({
       currentEvent: 'worldState.data.currentEvent',
     }),
+  },
+  methods: {
     npcClass (name) {
       if (!this.currentEvent || !this.currentEvent.season) return `npc_${name}`;
       return `npc_${name} npc_${name}_${this.currentEvent.season}`;