From b79f53a108ccab163f0b1187fef80fa3b86dc803 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Fri, 23 Dec 2022 15:35:50 -0600 Subject: [PATCH 1/8] 4.254.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 b541922bd8..a5a4bf1e2d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.253.0", + "version": "4.254.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 953ce21b8f..fd491ab7f4 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.253.0", + "version": "4.254.0", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.20.5", From 3adbc3354631887c854bb33ba0b7366575bef8ff Mon Sep 17 00:00:00 2001 From: SabreCat Date: Tue, 27 Dec 2022 11:59:15 -0600 Subject: [PATCH 2/8] fix(event): update Snowball dates --- website/common/script/content/spells.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/common/script/content/spells.js b/website/common/script/content/spells.js index 9d9748e08d..b6f7e4bef7 100644 --- a/website/common/script/content/spells.js +++ b/website/common/script/content/spells.js @@ -289,7 +289,7 @@ spells.special = { target: 'user', notes: t('spellSpecialSnowballAuraNotes'), canOwn () { - return moment().isBetween('2021-12-30T08:00-04:00', EVENTS.winter2022.end); + return moment().isBetween('2022-12-27T08:00-05:00', EVENTS.winter2023.end); }, cast (user, target, req) { if (!user.items.special.snowball) throw new NotAuthorized(t('spellNotOwned')(req.language)); From ec2322bdd98ff1749e50197cdb79a0e00778acdb Mon Sep 17 00:00:00 2001 From: SabreCat Date: Tue, 27 Dec 2022 11:59:21 -0600 Subject: [PATCH 3/8] 4.254.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 a5a4bf1e2d..e9c8577ee3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.254.0", + "version": "4.254.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index fd491ab7f4..fc8dc67464 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.254.0", + "version": "4.254.1", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.20.5", From f72224f9f1772214f32cfbe35c4c670f3dad6f5b Mon Sep 17 00:00:00 2001 From: SabreCat Date: Wed, 28 Dec 2022 11:42:56 -0600 Subject: [PATCH 4/8] fix(event): more date corrections --- website/common/script/content/appearance/sets.js | 2 +- website/common/script/content/spells.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/website/common/script/content/appearance/sets.js b/website/common/script/content/appearance/sets.js index 942b70f2ad..a5b61c3a26 100644 --- a/website/common/script/content/appearance/sets.js +++ b/website/common/script/content/appearance/sets.js @@ -18,7 +18,7 @@ export default prefill({ setPrice: 5, availableFrom: '2022-10-04T08:00-04:00', availableUntil: EVENTS.fall2022.end, text: t('hauntedColors'), }, winteryHairColors: { - setPrice: 5, availableFrom: '2021-12-23T08:00-05:00', availableUntil: EVENTS.winter2023.end, text: t('winteryColors'), + setPrice: 5, availableFrom: '2023-01-17T08:00-05:00', availableUntil: EVENTS.winter2023.end, text: t('winteryColors'), }, rainbowSkins: { setPrice: 5, text: t('rainbowSkins') }, animalSkins: { setPrice: 5, text: t('animalSkins') }, diff --git a/website/common/script/content/spells.js b/website/common/script/content/spells.js index b6f7e4bef7..2be4768dd1 100644 --- a/website/common/script/content/spells.js +++ b/website/common/script/content/spells.js @@ -435,7 +435,7 @@ spells.special = { target: 'user', notes: t('nyeCardNotes'), canOwn () { - return moment().isBetween('2021-12-30T08:00-04:00', '2022-01-02T20:00-04:00'); + return moment().isBetween('2022-12-28T08:00-05:00', '2023-01-02T20:00-05:00'); }, cast (user, target) { if (user === target) { From 43a196ffeadae7012e82ddac8c68946151cb33fe Mon Sep 17 00:00:00 2001 From: SabreCat Date: Wed, 28 Dec 2022 11:43:07 -0600 Subject: [PATCH 5/8] 4.254.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 e9c8577ee3..0e39c3a0b3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.254.1", + "version": "4.254.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index fc8dc67464..1c2c25f40b 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.254.1", + "version": "4.254.2", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.20.5", From 95231b1ede0e4e308b2ff3ec33a4f211716a59a1 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Thu, 29 Dec 2022 10:33:00 -0600 Subject: [PATCH 6/8] chore(git): update subproject --- habitica-images | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/habitica-images b/habitica-images index c1e8973a66..e2108645aa 160000 --- a/habitica-images +++ b/habitica-images @@ -1 +1 @@ -Subproject commit c1e8973a668cef4a52c1205ea916aceb8f7c5307 +Subproject commit e2108645aad014a416dcd4fcfe258655f79cab2b From b1dab729b637a71ed864cfd4c26b8f544275438f Mon Sep 17 00:00:00 2001 From: Natalie L <78037386+CuriousMagpie@users.noreply.github.com> Date: Thu, 29 Dec 2022 11:46:17 -0500 Subject: [PATCH 7/8] chore(content): january subscriber items (#14433) Co-authored-by: SabreCat --- .../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 ++ 4 files changed, 32 insertions(+) diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css index d90ff37a04..501cbea3e6 100644 --- a/website/client/src/assets/css/sprites/spritesmith-main.css +++ b/website/client/src/assets/css/sprites/spritesmith-main.css @@ -27535,6 +27535,31 @@ width: 114px; height: 90px; } +.back_mystery_202301 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/back_mystery_202301.png'); + width: 114px; + height: 90px; +} +.head_mystery_202301 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_mystery_202301.png'); + width: 114px; + height: 90px; +} +.shop_back_mystery_202301 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_back_mystery_202301.png'); + width: 68px; + height: 68px; +} +.shop_head_mystery_202301 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_mystery_202301.png'); + width: 68px; + height: 68px; +} +.shop_set_mystery_202301 { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_set_mystery_202301.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/common/locales/en/gear.json b/website/common/locales/en/gear.json index aa78ba0b1e..54e027996d 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -2009,6 +2009,8 @@ "headMystery202210Notes": "This scaly hood will surely terrify your To-Do list into submission! Confers no benefit. October 2022 Subscriber Item.", "headMystery202211Text": "Electromancer Hat", "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.", "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", @@ -2657,6 +2659,8 @@ "backMystery202205Notes": "The mighty flap of these vast wings can be heard echoing among the dunes. Confers no benefit. May 2022 Subscriber Item.", "backMystery202206Text": "Sea Sprite Wings", "backMystery202206Notes": "Whimsical wings made of water and waves! Confers no benefit. June 2022 Subscriber Item.", + "backMystery202301Text": "Five Tails of Valor", + "backMystery202301Notes": "These fluffy tails contain ethereal power and also a high level of charm! Confers no benefit. January 2023 Subscriber Item.", "backSpecialWonderconRedText": "Mighty Cape", "backSpecialWonderconRedNotes": "Swishes with strength and beauty. Confers no benefit. Special Edition Convention Item.", diff --git a/website/common/locales/en/subscriber.json b/website/common/locales/en/subscriber.json index ee1ef8615d..daba1d6947 100644 --- a/website/common/locales/en/subscriber.json +++ b/website/common/locales/en/subscriber.json @@ -145,6 +145,7 @@ "mysterySet202210": "Ominous Ophidian Set", "mysterySet202211": "Electromancer Set", "mysterySet202212": "Glacial Guardian Set", + "mysterySet202301": "Valiant Vulpine 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 8d1268646b..e851da7513 100644 --- a/website/common/script/content/gear/sets/mystery.js +++ b/website/common/script/content/gear/sets/mystery.js @@ -96,6 +96,7 @@ const back = { 202203: { }, 202205: { }, 202206: { }, + 202301: { }, }; const body = { @@ -198,6 +199,7 @@ const head = { 202208: { }, 202210: { }, 202211: { }, + 202301: { }, 301404: { }, 301405: { }, 301703: { }, From 5a07e5cbf3255b3013981252b3d26f51f7a5a435 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Thu, 29 Dec 2022 10:46:37 -0600 Subject: [PATCH 8/8] 4.255.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 0e39c3a0b3..956f081ed3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.254.2", + "version": "4.255.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 1c2c25f40b..e880bffd80 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.254.2", + "version": "4.255.0", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.20.5",