From 63387cef142adbd8d8ca686031e4f8bc973a6b95 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Wed, 5 May 2021 15:20:05 -0500 Subject: [PATCH 1/4] fix(text): correct set count on Cotton Candy shield --- website/common/locales/en/gear.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index d500f64748..f4cdda9521 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -2175,7 +2175,7 @@ "shieldArmoireChocolateFoodText": "Chocolate", "shieldArmoireChocolateFoodNotes": "Everybody likes a little chocolate, but some of your pets are keener than others... Increases Intelligence by <%= int %>. Enchanted Armoire: Pet Food Set (Item 8 of 10).", "shieldArmoireBlueCottonCandyFoodText": "Blue Cotton Candy", - "shieldArmoireBlueCottonCandyFoodNotes": "A sweet treat for the pets with a sweet tooth. But who will like it best? Increases Constitution by <%= con %>. Enchanted Armoire: Pet Food Set (Item 9 of 9).", + "shieldArmoireBlueCottonCandyFoodNotes": "A sweet treat for the pets with a sweet tooth. But who will like it best? Increases Constitution by <%= con %>. Enchanted Armoire: Pet Food Set (Item 9 of 10).", "back": "Back Accessory", "backCapitalized": "Back Accessory", From 8a118c562b599829871fccd38d17f000c6fe2afb Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Thu, 6 May 2021 15:16:07 -0500 Subject: [PATCH 2/4] 4.192.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 a0f01d5313..11a66f31d2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.191.0", + "version": "4.192.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 16877723e3..bab0238d06 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.191.0", + "version": "4.192.0", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.13.16", From 719b4ca3ea7dcc56f2066a6d116aca60f41f9662 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Tue, 11 May 2021 16:07:44 -0500 Subject: [PATCH 3/4] feat(content): magic options --- website/common/script/content/constants/events.js | 8 +++++++- website/common/script/content/hatching-potions.js | 13 +++++++++++-- website/common/script/libs/shops-seasonal.config.js | 6 +++--- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/website/common/script/content/constants/events.js b/website/common/script/content/constants/events.js index eac768f45c..cab137e428 100644 --- a/website/common/script/content/constants/events.js +++ b/website/common/script/content/constants/events.js @@ -10,11 +10,17 @@ const gemsPromo = { export const EVENTS = { noCurrentEvent2021: { - start: '2021-04-30T20:00-05:00', + start: '2021-05-31T20:00-05:00', end: '2021-08-23T08:00-05:00', season: 'normal', npcImageSuffix: '', }, + potions202105: { + start: '2021-05-11T08:00-05:00', + end: '2021-05-31T20:00-05:00', + season: 'normal', + npcImageSuffix: '', + }, spring2021: { start: '2021-03-23T08:00-05:00', end: '2021-04-30T20:00-05:00', diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js index 52957737c5..3adf96eb81 100644 --- a/website/common/script/content/hatching-potions.js +++ b/website/common/script/content/hatching-potions.js @@ -86,18 +86,27 @@ const premium = { value: 2, text: t('hatchingPotionFairy'), limited: true, + event: EVENTS.potions202105, _addlNotes: t('eventAvailabilityReturning', { availableDate: t('dateEndMay'), - previousDate: t('mayYYYY', { year: 2017 }), + previousDate: t('mayYYYY', { year: 2020 }), }), canBuy () { - return moment().isBefore('2020-06-02'); + return moment().isBefore(EVENTS.potions202105.end); }, }, Floral: { value: 2, text: t('hatchingPotionFloral'), limited: true, + event: EVENTS.potions202105, + _addlNotes: t('eventAvailabilityReturning', { + availableDate: t('dateEndMay'), + previousDate: t('mayYYYY', { year: 2016 }), + }), + canBuy () { + return moment().isBefore(EVENTS.potions202105.end); + }, }, Aquatic: { value: 2, diff --git a/website/common/script/libs/shops-seasonal.config.js b/website/common/script/libs/shops-seasonal.config.js index 72bd5db381..b6d92a78ec 100644 --- a/website/common/script/libs/shops-seasonal.config.js +++ b/website/common/script/libs/shops-seasonal.config.js @@ -7,7 +7,7 @@ import { } from '../content/constants'; const CURRENT_EVENT = find( - EVENTS, event => moment().isBetween(event.start, event.end) && Boolean(event.season), + EVENTS, event => moment().isBetween(event.start, event.end), ); const SHOP_OPEN = CURRENT_EVENT && ['winter', 'spring', 'summer', 'fall'].includes(CURRENT_EVENT.season); @@ -18,8 +18,8 @@ export default { currentSeason: SHOP_OPEN ? upperFirst(CURRENT_EVENT.season) : 'Closed', dateRange: { - start: SHOP_OPEN ? moment(CURRENT_EVENT.start) : moment().subtract(1, 'days').toDate(), - end: SHOP_OPEN ? moment(CURRENT_EVENT.end) : moment().subtract(1, 'seconds').toDate(), + start: CURRENT_EVENT ? moment(CURRENT_EVENT.start) : moment().subtract(1, 'days').toDate(), + end: CURRENT_EVENT ? moment(CURRENT_EVENT.end) : moment().subtract(1, 'seconds').toDate(), }, availableSets: SHOP_OPEN From 2e64591f70b3a3e3bf26e4e03bd49e3f50b4ec5a Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Tue, 11 May 2021 16:07:58 -0500 Subject: [PATCH 4/4] 4.192.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 11a66f31d2..3b5030f0a8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.192.0", + "version": "4.192.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index bab0238d06..bb4a6a29ee 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.192.0", + "version": "4.192.1", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.13.16",