From c3278a3baf555c57685165273c001e48e0bcb793 Mon Sep 17 00:00:00 2001
From: Natalie L <78037386+CuriousMagpie@users.noreply.github.com>
Date: Mon, 4 Apr 2022 15:53:34 -0400
Subject: [PATCH] 2022-04 Backgrounds & Enchanted Armoire Items (#13915)

* 2022-04 Backgrounds & Enchanted Armoire Items

* remove spritesmith-main.css

* adding spritesmith-main.css back in

* css fix
---
 habitica-images                                         | 2 +-
 website/common/locales/en/backgrounds.json              | 8 ++++++++
 website/common/locales/en/gear.json                     | 8 ++++++--
 website/common/script/content/appearance/backgrounds.js | 5 +++++
 website/common/script/content/gear/sets/armoire.js      | 8 ++++++++
 5 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/habitica-images b/habitica-images
index b038e469b6..1d105ddf59 160000
--- a/habitica-images
+++ b/habitica-images
@@ -1 +1 @@
-Subproject commit b038e469b6ac4ca028852fe2a8c3b9e4b543611a
+Subproject commit 1d105ddf5925f8c1ff388d6a7363570b89de6ebc
diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json
index 93c7c349c8..f759980ab5 100644
--- a/website/common/locales/en/backgrounds.json
+++ b/website/common/locales/en/backgrounds.json
@@ -770,6 +770,14 @@
   "backgroundFloweringPrairieText": "Flowering Prairie",
   "backgroundFloweringPrairieNotes": "Frolic through a Flowering Prairie.",
 
+  "backgrounds042022": "SET 95: Released April 2022",
+  "backgroundBlossomingTreesText": "Blossoming Trees",
+  "backgroundBlossomingTreesNotes": "Dally beneath Blossoming Trees.",
+  "backgroundFlowerShopText": "Flower Shop",
+  "backgroundFlowerShopNotes": "Enjoy the sweet scent of a Flower Shop.",
+  "backgroundSpringtimeLakeText": "Springtime Lake",
+  "backgroundSpringtimeLakeNotes": "Take in the sights along the shores of a Springtime Lake.",
+
   "timeTravelBackgrounds": "Steampunk Backgrounds",
   "backgroundAirshipText": "Airship",
   "backgroundAirshipNotes": "Become a sky sailor on board your very own Airship.",
diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json
index df93aa8553..6b0c99681c 100644
--- a/website/common/locales/en/gear.json
+++ b/website/common/locales/en/gear.json
@@ -1326,7 +1326,9 @@
   "armorArmoireSoftVioletSuitText": "Soft Violet Suit",
   "armorArmoireSoftVioletSuitNotes": "Purple is a luxurious color. Relax in style after you’ve accomplished all your daily tasks. Increases Constitution and Strength by <%= attrs %> each. Enchanted Armoire: Violet Loungewear Set (Item 2 of 3).",
   "armorArmoireGardenersOverallsText": "Gardener's Overalls",
-   "armorArmoireGardenersOverallsNotes": "Don’t be afraid to work down in the dirt when you’re wearing these durable overalls. Increases Constitution by <%= con %>. Enchanted Armoire: Gardener Set (Item 1 of 4).",
+  "armorArmoireGardenersOverallsNotes": "Don’t be afraid to work down in the dirt when you’re wearing these durable overalls. Increases Constitution by <%= con %>. Enchanted Armoire: Gardener Set (Item 1 of 4).",
+  "armorArmoireStrawRaincoatText": "Straw Raincoat",
+  "armorArmoireStrawRaincoatNotes":"This woven straw cape will keep you dry and your armor from rusting while on your quest. Just don’t venture too near a candle! Increases Constitution by <%= con %>. Enchanted Armoire: Straw Raincoat Set (Item 1 of 2).",
 
   "headgear": "helm",
   "headgearCapitalized": "Headgear",
@@ -2044,7 +2046,9 @@
   "headArmoireShootingStarCrownText": "Star Crown",
   "headArmoireShootingStarCrownNotes": "With this brightly shining headpiece, you will literally be the star of your own adventure! Increases Perception by <%= per %>. Enchanted Armoire: Stardust Set (Item 1 of 3).",
   "headArmoireGardenersSunHatText": "Gardener's Sun Hat",
- "headArmoireGardenersSunHatNotes": "The bright light of the day star won’t shine in your eyes when you wear this wide-brimmed hat. Increases Perception by <%= per %>. Enchanted Armoire: Gardener Set (Item 2 of 4).",
+  "headArmoireGardenersSunHatNotes": "The bright light of the day star won’t shine in your eyes when you wear this wide-brimmed hat. Increases Perception by <%= per %>. Enchanted Armoire: Gardener Set (Item 2 of 4).",
+  "headArmoireStrawRainHatText": "Straw Rain Hat",
+  "headArmoireStrawRainHatNotes": "You’ll be able to spot every obstacle in your path when you wear this water-resistant, conical hat. Increases Perception by <%= per %>. Enchanted Armoire: Straw Raincoat Set (Item 2 of 2).",
 
   "offhand": "off-hand item",
   "offHandCapitalized": "Off-Hand Item",
diff --git a/website/common/script/content/appearance/backgrounds.js b/website/common/script/content/appearance/backgrounds.js
index 85e7228013..a7bb2d582e 100644
--- a/website/common/script/content/appearance/backgrounds.js
+++ b/website/common/script/content/appearance/backgrounds.js
@@ -490,6 +490,11 @@ const backgrounds = {
     brick_wall_with_ivy: { },
     flowering_prairie: { },
   },
+  backgrounds042022: {
+    blossoming_trees: { },
+    flower_shop: { },
+    springtime_lake: { },
+  },
   timeTravelBackgrounds: {
     airship: {
       price: 1,
diff --git a/website/common/script/content/gear/sets/armoire.js b/website/common/script/content/gear/sets/armoire.js
index 544d4f2c90..8a94df1d62 100644
--- a/website/common/script/content/gear/sets/armoire.js
+++ b/website/common/script/content/gear/sets/armoire.js
@@ -392,6 +392,10 @@ const armor = {
     con: 7,
     set: 'gardenerSet',
   },
+  strawRaincoat: {
+    con: 9,
+    set: 'strawRaincoat',
+  },
 };
 
 const body = {
@@ -795,6 +799,10 @@ const head = {
     per: 7,
     set: 'gardenerSet',
   },
+  strawRainHat: {
+    per: 9,
+    set: 'strawRaincoat',
+  },
 };
 
 const shield = {