From cd0278c6b326d7e470f02509a9956ebbf2a0ee21 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Fri, 24 Jun 2022 15:44:48 -0500 Subject: [PATCH 1/6] fix(strings): cherry-pick update by @CuriousMagpie --- website/common/locales/en/gear.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index 25d2436131..5814ea4d69 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -1073,7 +1073,7 @@ "armorSpecialSummer2022WarriorText": "Waterspout Armor", "armorSpecialSummer2022WarriorNotes": "Get ready for a watery battle as you surround yourself with this twirling, whirling column of air and mist. Increases Constitution by <%= con %>. Limited Edition 2022 Summer Gear.", "armorSpecialSummer2022MageText": "Manta Ray Armor", - "armorSpecialSummer2022MageNotes": "Keep your head protected as you dive into your tasks or into the deepest waters. Increases Intelligence by <%= int %>. Limited Edition 2022 Summer Gear.", + "armorSpecialSummer2022MageNotes": "When wearing this armor, you will glide easily through your work like the manta ray glides through water. Increases Intelligence by <%= int %>. Limited Edition 2022 Summer Gear.", "armorSpecialSummer2022HealerText": "Angelfish Tail", "armorSpecialSummer2022HealerNotes": "Use your colorful fins to scoot about the reef and help those in need of rest and healing. Increases Constitution by <%= con %>. Limited Edition 2022 Summer Gear.", @@ -1750,7 +1750,7 @@ "headSpecialSummer2022RogueText": "Crab Helm", "headSpecialSummer2022RogueNotes": "No time to be crabby, we're out here shellebrating the summer's hottest crustacean puns. Increases Perception by <%= per %>. Limited Edition 2022 Summer Gear.", "headSpecialSummer2022WarriorText": "Waterspout Helm", - "headSpecialSummer2022WarriorNotes": "Channel the power of water as you center yourself in this this intense vortex. Increases Strength by <%= str %>. Limited Edition 2022 Summer Gear.", + "headSpecialSummer2022WarriorNotes": "Channel the power of water as you center yourself in this intense vortex. Increases Strength by <%= str %>. Limited Edition 2022 Summer Gear.", "headSpecialSummer2022MageText": "Manta Ray Helm", "headSpecialSummer2022MageNotes": "Keep your head protected as you dive into your tasks or into the deepest waters. Increases Perception by <%= per %>. Limited Edition 2022 Summer Gear.", "headSpecialSummer2022HealerText": "Angelfish Ear Fins", From e9222e4f7c8d502591b52dd0d39777a6a7a5e92c Mon Sep 17 00:00:00 2001 From: SabreCat Date: Mon, 27 Jun 2022 16:11:23 -0500 Subject: [PATCH 2/6] fix(strings): revise text because left-handedness confuses people --- website/common/locales/en/gear.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index 5814ea4d69..6698f54167 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -428,7 +428,7 @@ "weaponSpecialSummer2022RogueText": "Crab Claw", "weaponSpecialSummer2022RogueNotes": "If you're in a pinch, don't hesitate to show these fearsome claws! Increases Strength by <%= str %>. Limited Edition 2022 Summer Gear.", - "weaponSpecialSummer2022WarriorText": "Cyclone Shield", + "weaponSpecialSummer2022WarriorText": "Whirling Cyclone", "weaponSpecialSummer2022WarriorNotes": "It spins! It redirects! And it brings the storm! Increases Strength by <%= str %>. Limited Edition 2022 Summer Gear.", "weaponSpecialSummer2022MageText": "Manta Ray Staff", "weaponSpecialSummer2022MageNotes": "Magically clear the waters ahead of you with one swirl of this staff. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2022 Summer Gear.", @@ -2323,7 +2323,7 @@ "shieldSpecialSpring2022HealerText": "Peridot Shield", "shieldSpecialSpring2022HealerNotes": "Formed by molten rock of the upper mantle, this shield can withstand any hit that comes its way. Increases Constitution by <%= con %>. Limited Edition 2022 Spring Gear.", - "shieldSpecialSummer2022WarriorText": "Shark Blade", + "shieldSpecialSummer2022WarriorText": "Feisty Shark", "shieldSpecialSummer2022WarriorNotes": "It snaps! It bites! And it never, ever stops! Increases Constitution by <%= con %>. Limited Edition 2022 Summer Gear.", "shieldSpecialSummer2022HealerText": "Remedial Ripples", "shieldSpecialSummer2022HealerNotes": "Send out restorative magic in gentle ripples through the reef. Increases Constitution by <%= con %>. Limited Edition 2022 Summer Gear.", From d5926ef7f1380eb716e9b7ed93cee08468741094 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Mon, 27 Jun 2022 16:35:13 -0500 Subject: [PATCH 3/6] fix(auth): null string validation error on unique email conflict --- website/server/libs/auth/social.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/server/libs/auth/social.js b/website/server/libs/auth/social.js index 982f25310f..ec018f4893 100644 --- a/website/server/libs/auth/social.js +++ b/website/server/libs/auth/social.js @@ -35,7 +35,7 @@ export async function socialEmailToLocal (user) { ).exec(); if (!conflictingUser) return socialEmail; } - return null; + return undefined; } export async function loginSocial (req, res) { // eslint-disable-line import/prefer-default-export From 88af9c13a84f09a1397ad7aa58e572bb668db2db Mon Sep 17 00:00:00 2001 From: SabreCat Date: Mon, 27 Jun 2022 16:35:20 -0500 Subject: [PATCH 4/6] 4.234.2 --- 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 0621c3e88f..d5108b395b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.234.1", + "version": "4.234.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 55a8bc31ee..632ab8a3e6 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.234.1", + "version": "4.234.2", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.18.5", 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 5/6] 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: { }, From 695a5cc24de0637d5d730dc34ec431490aa9ffcf Mon Sep 17 00:00:00 2001 From: SabreCat Date: Wed, 29 Jun 2022 14:04:28 -0500 Subject: [PATCH 6/6] 4.235.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 d5108b395b..77f762a089 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.234.2", + "version": "4.235.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 632ab8a3e6..bc7aa5cab8 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.234.2", + "version": "4.235.0", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.18.5",