Merge branch 'release' into develop

habitica-images

@@ -1 +1 @@
-Subproject commit 04a3834384c7b290b06772fb7febf675a8c3e7b8
+Subproject commit b038e469b6ac4ca028852fe2a8c3b9e4b543611a

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.225.4",
+  "version": "4.226.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.225.4",
+  "version": "4.226.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.17.8",

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

@@ -25208,6 +25208,46 @@
   width: 68px;
   height: 68px;
 }
+.broad_armor_mystery_202204 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_mystery_202204.png');
+  width: 114px;
+  height: 90px;
+}
+.eyewear_mystery_202204A {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/eyewear_mystery_202204A.png');
+  width: 114px;
+  height: 90px;
+}
+.eyewear_mystery_202204B {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/eyewear_mystery_202204B.png');
+  width: 114px;
+  height: 90px;
+}
+.shop_armor_mystery_202204 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_mystery_202204.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_eyewear_mystery_202204A {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_eyewear_mystery_202204A.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_eyewear_mystery_202204B {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_eyewear_mystery_202204B.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_set_mystery_202204 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_set_mystery_202204.png');
+  width: 68px;
+  height: 68px;
+}
+.slim_armor_mystery_202204 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_mystery_202204.png');
+  width: 114px;
+  height: 90px;
+}
 .broad_armor_mystery_301404 {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_mystery_301404.png');
   width: 90px;
@@ -50008,6 +50048,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-BearCub-Virtual {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-BearCub-Virtual.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-BearCub-Watery {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-BearCub-Watery.png');
   width: 81px;
@@ -50433,6 +50478,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-Cactus-Virtual {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Cactus-Virtual.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-Cactus-Watery {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Cactus-Watery.png');
   width: 81px;
@@ -50963,6 +51013,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-Dragon-Virtual {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Dragon-Virtual.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-Dragon-Watery {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Dragon-Watery.png');
   width: 81px;
@@ -51388,6 +51443,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-FlyingPig-Virtual {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-FlyingPig-Virtual.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-FlyingPig-Watery {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-FlyingPig-Watery.png');
   width: 81px;
@@ -51668,6 +51728,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-Fox-Virtual {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Fox-Virtual.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-Fox-Watery {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Fox-Watery.png');
   width: 81px;
@@ -52333,6 +52398,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-LionCub-Virtual {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-LionCub-Virtual.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-LionCub-Watery {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-LionCub-Watery.png');
   width: 81px;
@@ -52828,6 +52898,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-PandaCub-Virtual {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-PandaCub-Virtual.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-PandaCub-Watery {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-PandaCub-Watery.png');
   width: 81px;
@@ -54068,6 +54143,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-TigerCub-Virtual {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-TigerCub-Virtual.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-TigerCub-Watery {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-TigerCub-Watery.png');
   width: 81px;
@@ -54663,6 +54743,11 @@
   width: 81px;
   height: 99px;
 }
+.Pet-Wolf-Virtual {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Wolf-Virtual.png');
+  width: 81px;
+  height: 99px;
+}
 .Pet-Wolf-Watery {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Wolf-Watery.png');
   width: 81px;

website/common/locales/en/gear.json

@@ -1152,6 +1152,8 @@
   "armorMystery202110Notes": "Velvety moss makes you seem soft on the outside, but you're protected by solid stone. Confers no benefit. October 2021 Subscriber Item.",
   "armorMystery202112Text": "Antarctic Undine Tail",
   "armorMystery202112Notes": "Glide through icy seas and never get cold with this glimmering tail. Confers no benefit. December 2021 Subscriber Item.",
+  "armorMystery202204Text":"Virtual Adventurer Capsule",
+  "armorMystery202204Notes":"Looks like doing your tasks now requires pushing these mysterious buttons! What could they do? Confers no benefit. April 2022 Subscriber Item.",
   "armorMystery301404Text": "Steampunk Suit",
   "armorMystery301404Notes": "Dapper and dashing, wot! Confers no benefit. February 3015 Subscriber Item.",
   "armorMystery301703Text": "Steampunk Peacock Gown",
@@ -2762,6 +2764,10 @@
   "eyewearMystery202201Notes": "Ring in the new year with an air of mystery in this stylish feathered mask. Confers no benefit. January 2022 Subscriber Item.",
   "eyewearMystery202202Text":"Turquoise Eyes with Blush",
   "eyewearMystery202202Notes":"Cheerful singing brings color to your cheeks. Confers no benefit. February 2022 Subscriber Item",
+  "eyewearMystery202204AText":"Virtual Face",
+  "eyewearMystery202204ANotes":"What's your mood today? Express yourself with these fun screens. Confers no benefit. April 2022 Subscriber Item.",
+  "eyewearMystery202204BText":"Virtual Face",
+  "eyewearMystery202204BNotes":"What's your mood today? Express yourself with these fun screens. Confers no benefit. April 2022 Subscriber Item.",
   "eyewearMystery301404Text": "Eyewear Goggles",
   "eyewearMystery301404Notes": "No eyewear could be fancier than a pair of goggles - except, perhaps, for a monocle. Confers no benefit. April 3015 Subscriber Item.",
   "eyewearMystery301405Text": "Monocle",

website/common/locales/en/subscriber.json

@@ -132,6 +132,7 @@
     "mysterySet202201": "Midnight Merrymaker Set",
     "mysterySet202202": "Turquoise Twintails Set",
     "mysterySet202203": "Dauntless Dragonfly Set",
+    "mysterySet202204": "Virtual Adventurer Set",
     "mysterySet301404": "Steampunk Standard Set",
     "mysterySet301405": "Steampunk Accessories Set",
     "mysterySet301703": "Peacock Steampunk Set",

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

@@ -56,6 +56,7 @@ const armor = {
   202106: { },
   202110: { },
   202112: { },
+  202204: { },
   301404: { },
   301703: { },
   301704: { },
@@ -113,6 +114,8 @@ const eyewear = {
   202108: { },
   202201: { },
   202202: { },
+  '202204A': { mystery: '202204' },
+  '202204B': { mystery: '202204' },
   301404: { },
   301405: { },
   301703: { },
@@ -234,12 +237,8 @@ const weapon = {
   201911: { },
   202002: { },
   202102: { },
-  202104: {
+  202104: { twoHanded: true },
-    twoHanded: true,
+  202111: { twoHanded: true },
-  },
-  202111: {
-    twoHanded: true,
-  },
   202201: { },
   301404: { },
 };