From 7ede3acd01b41d3b317b504fc502c088122e138b Mon Sep 17 00:00:00 2001 From: SabreCat Date: Wed, 29 Mar 2023 15:35:26 -0500 Subject: [PATCH 1/7] feat(event): add AF2023 event const --- website/common/script/content/constants/events.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/website/common/script/content/constants/events.js b/website/common/script/content/constants/events.js index a79432ca0b..ffab2e9e46 100644 --- a/website/common/script/content/constants/events.js +++ b/website/common/script/content/constants/events.js @@ -15,6 +15,11 @@ export const EVENTS = { season: 'normal', npcImageSuffix: '', }, + aprilFools2023: { + start: '2023-04-01T08:00-05:00', + end: '2023-04-02T08:00-05:00', + aprilFools: 'teaShop', + }, spring2023: { start: '2023-03-21T08:00-04:00', end: '2023-04-30T23:59-04:00', From 229ed4642542b1bc467a9c126407eb4be240945d Mon Sep 17 00:00:00 2001 From: SabreCat Date: Sat, 1 Apr 2023 07:08:38 -0500 Subject: [PATCH 2/7] fix(tz): dst --- website/common/script/content/constants/events.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/common/script/content/constants/events.js b/website/common/script/content/constants/events.js index ffab2e9e46..84896195bc 100644 --- a/website/common/script/content/constants/events.js +++ b/website/common/script/content/constants/events.js @@ -16,8 +16,8 @@ export const EVENTS = { npcImageSuffix: '', }, aprilFools2023: { - start: '2023-04-01T08:00-05:00', - end: '2023-04-02T08:00-05:00', + start: '2023-04-01T08:00-04:00', + end: '2023-04-02T08:00-04:00', aprilFools: 'teaShop', }, spring2023: { From c0362c614e34b5799c7a1ccb8f919652814b5fcb Mon Sep 17 00:00:00 2001 From: CuriousMagpie Date: Tue, 4 Apr 2023 17:14:25 -0400 Subject: [PATCH 3/7] feat(content): add April fool day potions --- website/common/locales/en/content.json | 1 + .../common/script/content/hatching-potions.js | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/website/common/locales/en/content.json b/website/common/locales/en/content.json index 21af836eba..d7be693d2f 100644 --- a/website/common/locales/en/content.json +++ b/website/common/locales/en/content.json @@ -311,6 +311,7 @@ "hatchingPotionVirtualPet": "Virtual Pet", "hatchingPotionPorcelain": "Porcelain", "hatchingPotionPinkMarble": "Pink Marble", + "hatchingPotionTeaShop": "Tea Shop", "hatchingPotionNotes": "Pour this on an egg, and it will hatch as a <%= potText(locale) %> pet.", "premiumPotionAddlNotes": "Not usable on quest pet eggs. Available for purchase until <%= date(locale) %>.", diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js index f30535d985..deaa02de9c 100644 --- a/website/common/script/content/hatching-potions.js +++ b/website/common/script/content/hatching-potions.js @@ -564,13 +564,13 @@ const wacky = { Veggie: { text: t('hatchingPotionVeggie'), limited: true, - event: EVENTS.spring2022, + event: EVENTS.spring2023, _addlNotes: t('eventAvailabilityReturning', { availableDate: t('dateEndApril'), - previousDate: t('aprilYYYY', { year: 2021 }), + previousDate: t('aprilYYYY', { year: 2022 }), }), canBuy () { - return moment().isBetween('2022-04-07T08:00-05:00', EVENTS.spring2022.end); + return moment().isBetween('2023-04-06T08:00-05:00', EVENTS.spring2023.end); }, }, Dessert: { @@ -585,6 +585,17 @@ const wacky = { _addlNotes: t('premiumPotionUnlimitedNotes'), canBuy: hasQuestAchievementFunction('virtualpet'), }, + TeaShop: { + text: t('hatchingPotionTeaShop'), + limited: true, + event: EVENTS.spring2023, + _addlNotes: t('eventAvailabilityReturning', { + availableDate: t('dateEndApril'), + }), + canBuy () { + return moment().isBetween('2023-04-06T08:00-05:00', EVENTS.spring2023.end); + }, + }, }; each(drops, (pot, key) => { From 8c96ac241a9f3cccb654b543c05c46f3fd534808 Mon Sep 17 00:00:00 2001 From: CuriousMagpie Date: Tue, 4 Apr 2023 17:42:45 -0400 Subject: [PATCH 4/7] updated stylesheet --- .../client/src/assets/css/sprites/spritesmith-main.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css index c408b90a23..1979b239bb 100644 --- a/website/client/src/assets/css/sprites/spritesmith-main.css +++ b/website/client/src/assets/css/sprites/spritesmith-main.css @@ -58403,11 +58403,6 @@ width: 81px; height: 99px; } -.Pet-HatchingPotion-TeaShop { - background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-HatchingPotion-TeaShop.png'); - width: 68px; - height: 68px; -} .Pet_HatchingPotion_Amber { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_Amber.png'); width: 68px; @@ -58653,6 +58648,11 @@ width: 68px; height: 68px; } +.Pet_HatchingPotion_TeaShop { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_TeaShop.png'); + width: 68px; + height: 68px; +} .Pet_HatchingPotion_Thunderstorm { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_Thunderstorm.png'); width: 68px; From 01fea6b968d64aa6ed5414e506bf0d4ea890af83 Mon Sep 17 00:00:00 2001 From: CuriousMagpie Date: Wed, 5 Apr 2023 12:13:40 -0400 Subject: [PATCH 5/7] feat(fix): add correct string for potion end date --- website/common/script/content/hatching-potions.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js index deaa02de9c..9c953ffbea 100644 --- a/website/common/script/content/hatching-potions.js +++ b/website/common/script/content/hatching-potions.js @@ -589,8 +589,8 @@ const wacky = { text: t('hatchingPotionTeaShop'), limited: true, event: EVENTS.spring2023, - _addlNotes: t('eventAvailabilityReturning', { - availableDate: t('dateEndApril'), + _addlNotes: t('premiumPotionAddlNotes', { + date: t('dateEndApril'), }), canBuy () { return moment().isBetween('2023-04-06T08:00-05:00', EVENTS.spring2023.end); From afee09e7cb1cfd47d37dc098881fd360705f6168 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Wed, 5 Apr 2023 14:02:38 -0500 Subject: [PATCH 6/7] fix(tz): adjust release timing for DST --- website/common/script/content/hatching-potions.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js index 9c953ffbea..60d1cf21eb 100644 --- a/website/common/script/content/hatching-potions.js +++ b/website/common/script/content/hatching-potions.js @@ -570,7 +570,7 @@ const wacky = { previousDate: t('aprilYYYY', { year: 2022 }), }), canBuy () { - return moment().isBetween('2023-04-06T08:00-05:00', EVENTS.spring2023.end); + return moment().isBetween('2023-04-06T08:00-04:00', EVENTS.spring2023.end); }, }, Dessert: { @@ -593,7 +593,7 @@ const wacky = { date: t('dateEndApril'), }), canBuy () { - return moment().isBetween('2023-04-06T08:00-05:00', EVENTS.spring2023.end); + return moment().isBetween('2023-04-06T08:00-04:00', EVENTS.spring2023.end); }, }, }; From ea7e5d2a8d51daa50cb9f4ccb4b75331204cc6fb Mon Sep 17 00:00:00 2001 From: SabreCat Date: Wed, 5 Apr 2023 14:04:34 -0500 Subject: [PATCH 7/7] 4.266.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 2903d537ed..e54ab7cf5d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.265.0", + "version": "4.266.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 6c9b0eddcb..ac5af92903 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.265.0", + "version": "4.266.0", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.20.12",