From dcced2debb8e6ec04a090773a8d6c539d1d19e75 Mon Sep 17 00:00:00 2001
From: Natalie L <78037386+CuriousMagpie@users.noreply.github.com>
Date: Wed, 29 Jun 2022 15:02:46 -0400
Subject: [PATCH] chore(content): July 2022 Mystery Items (#14095)

* merge upstream/release into release

* chore(content): Added July 2022 Mystery Items
---
 habitica-images                               |  2 +-
 .../assets/css/sprites/spritesmith-main.css   | 30 +++++++++++++++++++
 website/common/locales/en/gear.json           |  4 +++
 website/common/locales/en/subscriber.json     |  1 +
 .../script/content/gear/sets/mystery.js       |  2 ++
 5 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/habitica-images b/habitica-images
index 847f56dd8f..896d1aedad 160000
--- a/habitica-images
+++ b/habitica-images
@@ -1 +1 @@
-Subproject commit 847f56dd8f54f3594135f6c3cb8905edc8f15a3b
+Subproject commit 896d1aedaddcfb650f0fb67c01ab36c8a9b3ef97
diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css
index 332d1ec560..85380001cc 100644
--- a/website/client/src/assets/css/sprites/spritesmith-main.css
+++ b/website/client/src/assets/css/sprites/spritesmith-main.css
@@ -26830,6 +26830,36 @@
   width: 68px;
   height: 68px;
 }
+.broad_armor_mystery_202207 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_mystery_202207.png');
+  width: 117px;
+  height: 120px;
+}
+.head_mystery_202207 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_mystery_202207.png');
+  width: 117px;
+  height: 120px;
+}
+.shop_armor_mystery_202207 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_mystery_202207.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_head_mystery_202207 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_mystery_202207.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_set_mystery_202207 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_set_mystery_202207.png');
+  width: 68px;
+  height: 68px;
+}
+.slim_armor_mystery_202207 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_mystery_202207.png');
+  width: 117px;
+  height: 120px;
+}
 .broad_armor_mystery_301404 {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_mystery_301404.png');
   width: 90px;
diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json
index 6698f54167..d394ab0fe9 100644
--- a/website/common/locales/en/gear.json
+++ b/website/common/locales/en/gear.json
@@ -1185,6 +1185,8 @@
   "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.",
+  "armorMystery202207Text": "Jammin' Jelly Armor",
+  "armorMystery202207Notes": "This armor will have you looking glamorous and gelatinous. Confers no benefit. July 2022 Subscriber Item.",
   "armorMystery301404Text": "Steampunk Suit",
   "armorMystery301404Notes": "Dapper and dashing, wot! Confers no benefit. February 3015 Subscriber Item.",
   "armorMystery301703Text": "Steampunk Peacock Gown",
@@ -1918,6 +1920,8 @@
   "headMystery202202Notes": "You gotta have blue hair! Confers no benefit. February 2022 Subscriber Item.",
   "headMystery202206Text": "Sea Sprite Circlet",
   "headMystery202206Notes": "The blue pearl in this circlet grants you waterbending powers. Use them wisely! Confers no benefit. June 2022 Subscriber Item.",
+  "headMystery202207Text": "Jammin' Jelly Helm",
+  "headMystery202207Notes": "Need a hand with your tasks? Will several dozen bioluminescent tentacles do? Confers no benefit. July 2022 Subscriber Item.",
   "headMystery301404Text": "Fancy Top Hat",
   "headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.",
   "headMystery301405Text": "Basic Top Hat",
diff --git a/website/common/locales/en/subscriber.json b/website/common/locales/en/subscriber.json
index 1b0c4b005c..0519601aaa 100644
--- a/website/common/locales/en/subscriber.json
+++ b/website/common/locales/en/subscriber.json
@@ -135,6 +135,7 @@
     "mysterySet202204": "Virtual Adventurer Set",
     "mysterySet202205": "Dusk-Winged Dragon Set",
     "mysterySet202206": "Sea Sprite Set",
+    "mysterySet202207": "Jammin' Jelly Set",
     "mysterySet301404": "Steampunk Standard Set",
     "mysterySet301405": "Steampunk Accessories Set",
     "mysterySet301703": "Peacock Steampunk Set",
diff --git a/website/common/script/content/gear/sets/mystery.js b/website/common/script/content/gear/sets/mystery.js
index 164ca580ca..cc3f511b6f 100644
--- a/website/common/script/content/gear/sets/mystery.js
+++ b/website/common/script/content/gear/sets/mystery.js
@@ -57,6 +57,7 @@ const armor = {
   202110: { },
   202112: { },
   202204: { },
+  202207: { },
   301404: { },
   301703: { },
   301704: { },
@@ -190,6 +191,7 @@ const head = {
   202112: { },
   202202: { },
   202206: { },
+  202207: { },
   301404: { },
   301405: { },
   301703: { },