From 755f51b674157274ce4cccab88933d6ff700767c Mon Sep 17 00:00:00 2001 From: Natalie L <78037386+CuriousMagpie@users.noreply.github.com> Date: Tue, 30 Aug 2022 15:06:06 -0400 Subject: [PATCH 1/3] chore(content): add September 2022 Mystery Items (#14199) * chore(submodule): add August 2022 Mystery Items * chore(content): add September 2022 Mystery Items * fix(typo): verb form Co-authored-by: Sabe Jones --- habitica-images | 2 +- .../assets/css/sprites/spritesmith-main.css | 25 +++++++++++++++++++ website/common/locales/en/gear.json | 4 +++ website/common/locales/en/subscriber.json | 1 + .../script/content/gear/sets/mystery.js | 2 ++ 5 files changed, 33 insertions(+), 1 deletion(-) diff --git a/habitica-images b/habitica-images index 6610fcd017..bb2e481550 160000 --- a/habitica-images +++ b/habitica-images @@ -1 +1 @@ -Subproject commit 6610fcd01761149ce5391cbe85a249fd80d7983c +Subproject commit bb2e481550a9e91f82f0ae5aac8cfad21c55e34b diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css index 9d19bc4451..4944d95ed6 100644 --- a/website/client/src/assets/css/sprites/spritesmith-main.css +++ b/website/client/src/assets/css/sprites/spritesmith-main.css @@ -27015,6 +27015,31 @@ width: 68px; height: 68px; } +.shield_mystery_202209 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_mystery_202209.png'); + width: 114px; + height: 90px; +} +.shop_set_mystery_202209 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_set_mystery_202209.png'); + width: 68px; + height: 68px; +} +.shop_shield_mystery_202209 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_mystery_202209.png'); + width: 68px; + height: 68px; +} +.shop_weapon_mystery_202209 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_mystery_202209.png'); + width: 68px; + height: 68px; +} +.weapon_mystery_202209 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_mystery_202209.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; diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index 6e0857865e..c2678b12cd 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -471,6 +471,8 @@ "weaponMystery202111Notes": "Shape the flow of time with this mysterious and powerful staff. Confers no benefit. November 2021 Subscriber Item.", "weaponMystery202201Text": "Midnight Confetti Cannon", "weaponMystery202201Notes": "Unleash a cloud of gold and silver glitter when the clock strikes midnight. Happy New Year! Now who's cleaning this up? Confers no benefit. January 2022 Subscriber Item.", + "weaponMystery202209Text": "Magic Manual", + "weaponMystery202209Notes": "This book will guide you through your journey into magic-making. Confers no benefit. September 2022 Subscriber Item.", "weaponMystery301404Text": "Steampunk Cane", "weaponMystery301404Notes": "Excellent for taking a turn about town. March 3015 Subscriber Item. Confers no benefit.", @@ -2357,6 +2359,8 @@ "shieldMystery201902Notes": "This glittery paper forms magic hearts that slowly drift and dance in the air. Confers no benefit. February 2019 Subscriber Item.", "shieldMystery202011Text": "Foliated Staff", "shieldMystery202011Notes": "Harness the power of the autumn wind with this staff. Use for arcane magic or to make awesome leaf piles, the choice is yours! Confers no benefit. November 2020 Subscriber Item.", + "shieldMystery202209Text": "Mound o' Magic Books", + "shieldMystery202209Notes": "Building your sorcery knowledge takes a lot of reading, but you're sure to enjoy your education. Confers no benefit. September 2022 Subscriber Item.", "shieldMystery301405Text": "Clock Shield", "shieldMystery301405Notes": "Time is on your side with this towering clock shield! Confers no benefit. June 3015 Subscriber Item.", "shieldMystery301704Text": "Fluttery Fan", diff --git a/website/common/locales/en/subscriber.json b/website/common/locales/en/subscriber.json index 808f9bd208..e7cc53175a 100644 --- a/website/common/locales/en/subscriber.json +++ b/website/common/locales/en/subscriber.json @@ -141,6 +141,7 @@ "mysterySet202206": "Sea Sprite Set", "mysterySet202207": "Jammin' Jelly Set", "mysterySet202208": "Perky Ponytail Set", + "mysterySet202209": "Magical Scholar 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 dc8d8f2be7..716bdfdcb0 100644 --- a/website/common/script/content/gear/sets/mystery.js +++ b/website/common/script/content/gear/sets/mystery.js @@ -231,6 +231,7 @@ const shield = { 201802: { }, 201902: { }, 202011: { }, + 202209: { }, 301405: { }, 301704: { }, }; @@ -248,6 +249,7 @@ const weapon = { 202104: { twoHanded: true }, 202111: { twoHanded: true }, 202201: { }, + 202209: { }, 301404: { }, }; From 4ce4e55e80c824d3c1bad8109e6559b9cca66ba3 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Tue, 30 Aug 2022 14:20:50 -0500 Subject: [PATCH 2/3] chore(git): update subproject commit --- habitica-images | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/habitica-images b/habitica-images index bb2e481550..8d63ff55e5 160000 --- a/habitica-images +++ b/habitica-images @@ -1 +1 @@ -Subproject commit bb2e481550a9e91f82f0ae5aac8cfad21c55e34b +Subproject commit 8d63ff55e5c63872f95a3c9106d0b5f90af9ab6f From a04479e689178f25e44e33f6c743f222271ffd72 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Tue, 30 Aug 2022 14:21:26 -0500 Subject: [PATCH 3/3] 4.242.0 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index f7de511b72..b6953313fa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.241.4", + "version": "4.242.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 0a86cdcd4c..450f41e328 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "habitica", "description": "A habit tracker app which treats your goals like a Role Playing Game.", - "version": "4.241.4", + "version": "4.242.0", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.18.10",