From 80f517f1ad53acd3b8664c0b89717e79345d4f95 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Fri, 24 Feb 2023 16:31:50 -0600 Subject: [PATCH 1/4] feat(content): subscriber items March 2023 Also fixes Vue templating in one paragraph of the Community Guidelines. --- habitica-images | 2 +- .../assets/css/sprites/spritesmith-main.css | 25 +++++++++++++++++++ .../components/static/communityGuidelines.vue | 2 +- website/common/locales/en/gear.json | 4 +++ website/common/locales/en/subscriber.json | 1 + .../script/content/gear/sets/mystery.js | 2 ++ 6 files changed, 34 insertions(+), 2 deletions(-) diff --git a/habitica-images b/habitica-images index 5cc03160b5..0393ffa0b9 160000 --- a/habitica-images +++ b/habitica-images @@ -1 +1 @@ -Subproject commit 5cc03160b57bb3e0fbb7b75543fcd01c2c136883 +Subproject commit 0393ffa0b95ce9ed4fa04646db56bf1882e29bb1 diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css index 2ac6f4a821..b65af5b396 100644 --- a/website/client/src/assets/css/sprites/spritesmith-main.css +++ b/website/client/src/assets/css/sprites/spritesmith-main.css @@ -27750,6 +27750,31 @@ width: 68px; height: 68px; } +.eyewear_mystery_202303 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/eyewear_mystery_202303.png'); + width: 114px; + height: 90px; +} +.head_mystery_202303 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_mystery_202303.png'); + width: 114px; + height: 90px; +} +.shop_eyewear_mystery_202303 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_eyewear_mystery_202303.png'); + width: 68px; + height: 68px; +} +.shop_head_mystery_202303 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_mystery_202303.png'); + width: 68px; + height: 68px; +} +.shop_set_mystery_202303 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_set_mystery_202303.png'); + width: 68px; + height: 68px; +} .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/client/src/components/static/communityGuidelines.vue b/website/client/src/components/static/communityGuidelines.vue index 7d26f14d56..8f4b186ce1 100644 --- a/website/client/src/components/static/communityGuidelines.vue +++ b/website/client/src/components/static/communityGuidelines.vue @@ -149,7 +149,7 @@
  • {{ $t('commGuideList10A') }}
  • diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index c02f62d6c3..61fb13a119 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -2016,6 +2016,8 @@ "headMystery202211Notes": "Be careful with this powerful hat, its effect on admirers can be quite shocking! Confers no benefit. November 2022 Subscriber Item.", "headMystery202301Text": "Valiant Vulpine Ears", "headMystery202301Notes": "Your hearing will be so sharp you'll hear the dawn breaking and the dew sparkling. Confers no benefit. January 2023 Subscriber Item.", + "headMystery202303Text": "Main Character Hair", + "headMystery202303Notes": "What better way to let everyone know you’re the star of this tale than to have blue and improbably spiky hair? Confers no benefit. March 2023 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", @@ -2970,6 +2972,8 @@ "eyewearMystery202204BNotes": "What's your mood today? Express yourself with these fun screens. Confers no benefit. April 2022 Subscriber Item.", "eyewearMystery202208Text": "Sparkly Eyes", "eyewearMystery202208Notes": "Lull your enemies into a false sense of security with these terrifyingly cute peepers. Confers no benefit. August 2022 Subscriber Item.", + "eyewearMystery202303Text": "Dreamy Eyes", + "eyewearMystery202303Notes": "Let your nonchalant expression lure your enemies into a false sense of security. Confers no benefit. March 2023 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", diff --git a/website/common/locales/en/subscriber.json b/website/common/locales/en/subscriber.json index e8c737be83..ced96324eb 100644 --- a/website/common/locales/en/subscriber.json +++ b/website/common/locales/en/subscriber.json @@ -147,6 +147,7 @@ "mysterySet202212": "Glacial Guardian Set", "mysterySet202301": "Valiant Vulpine Set", "mysterySet202302": "Trickster Tabby Set", + "mysterySet202303": "Main Character 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 ed445c9e09..f9a5775e8e 100644 --- a/website/common/script/content/gear/sets/mystery.js +++ b/website/common/script/content/gear/sets/mystery.js @@ -124,6 +124,7 @@ const eyewear = { '202204A': { mystery: '202204' }, '202204B': { mystery: '202204' }, 202208: { }, + 202303: { }, 301404: { }, 301405: { }, 301703: { }, @@ -201,6 +202,7 @@ const head = { 202210: { }, 202211: { }, 202301: { }, + 202303: { }, 301404: { }, 301405: { }, 301703: { }, From cc419385f69fd95b455dd675aca6cb7bb4d5bd68 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Fri, 24 Feb 2023 16:32:41 -0600 Subject: [PATCH 2/4] 4.261.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 a7e1f4f37d..1c014aa33b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.260.1", + "version": "4.261.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index beabae8d5e..4d849f8682 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.260.1", + "version": "4.261.0", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.20.12", From 8cf5a380da55617dabd7f63f55a2cfb760c8e8b6 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Mon, 27 Feb 2023 16:17:09 -0600 Subject: [PATCH 3/4] fix(strings): more silly --- website/common/locales/en/gear.json | 2 +- website/common/locales/en/subscriber.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index 61fb13a119..c26a4c7f16 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -2016,7 +2016,7 @@ "headMystery202211Notes": "Be careful with this powerful hat, its effect on admirers can be quite shocking! Confers no benefit. November 2022 Subscriber Item.", "headMystery202301Text": "Valiant Vulpine Ears", "headMystery202301Notes": "Your hearing will be so sharp you'll hear the dawn breaking and the dew sparkling. Confers no benefit. January 2023 Subscriber Item.", - "headMystery202303Text": "Main Character Hair", + "headMystery202303Text": "Mane Character Hair", "headMystery202303Notes": "What better way to let everyone know you’re the star of this tale than to have blue and improbably spiky hair? Confers no benefit. March 2023 Subscriber Item.", "headMystery301404Text": "Fancy Top Hat", "headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.", diff --git a/website/common/locales/en/subscriber.json b/website/common/locales/en/subscriber.json index ced96324eb..62c7cea8bf 100644 --- a/website/common/locales/en/subscriber.json +++ b/website/common/locales/en/subscriber.json @@ -147,7 +147,7 @@ "mysterySet202212": "Glacial Guardian Set", "mysterySet202301": "Valiant Vulpine Set", "mysterySet202302": "Trickster Tabby Set", - "mysterySet202303": "Main Character Set", + "mysterySet202303": "Mane Character Set", "mysterySet301404": "Steampunk Standard Set", "mysterySet301405": "Steampunk Accessories Set", "mysterySet301703": "Peacock Steampunk Set", From f3277957614758d535d56888a42552a229dc32ea Mon Sep 17 00:00:00 2001 From: SabreCat Date: Mon, 27 Feb 2023 16:17:17 -0600 Subject: [PATCH 4/4] 4.261.1 --- 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 1c014aa33b..f88811c6e5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.261.0", + "version": "4.261.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 4d849f8682..0eac686db9 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.261.0", + "version": "4.261.1", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.20.12",