diff --git a/package-lock.json b/package-lock.json index 218c5af2d2..e5a8dd39c0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.225.3", + "version": "4.225.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 9abcb27be4..47c40fb5b1 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.225.3", + "version": "4.225.4", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.17.8", diff --git a/website/common/script/content/constants/events.js b/website/common/script/content/constants/events.js index 08caac74ad..4484ae8f9a 100644 --- a/website/common/script/content/constants/events.js +++ b/website/common/script/content/constants/events.js @@ -18,7 +18,7 @@ export const EVENTS = { spring2022: { start: '2022-03-22T08:00-05:00', end: '2022-04-30T20:00-05:00', - npcImageSuffix: 'spring', + npcImageSuffix: '_spring', season: 'spring', gear: true, }, diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js index defe1ad3eb..9f490e0c50 100644 --- a/website/common/script/content/hatching-potions.js +++ b/website/common/script/content/hatching-potions.js @@ -70,13 +70,13 @@ const premium = { value: 2, text: t('hatchingPotionShimmer'), limited: true, - event: EVENTS.spring2020, + event: EVENTS.spring2022, _addlNotes: t('eventAvailabilityReturning', { availableDate: t('dateEndMarch'), - previousDate: t('marchYYYY', { year: 2018 }), + previousDate: t('marchYYYY', { year: 2020 }), }), canBuy () { - return moment().isBefore('2020-05-02'); + return moment().isBefore(EVENTS.spring2022.end); }, }, Fairy: { @@ -284,13 +284,13 @@ const premium = { value: 2, text: t('hatchingPotionCelestial'), limited: true, - event: EVENTS.spring2020, + event: EVENTS.spring2022, _addlNotes: t('eventAvailabilityReturning', { availableDate: t('dateEndMarch'), - previousDate: t('marchYYYY', { year: 2019 }), + previousDate: t('marchYYYY', { year: 2020 }), }), canBuy () { - return moment().isBefore('2020-05-02'); + return moment().isBefore(EVENTS.spring2022.end); }, }, Sunshine: { @@ -469,12 +469,13 @@ const premium = { value: 2, text: t('hatchingPotionPolkaDot'), limited: true, - event: EVENTS.spring2021, - _addlNotes: t('premiumPotionAddlNotes', { - date: t('dateEndMarch'), + event: EVENTS.spring2022, + _addlNotes: t('eventAvailabilityReturning', { + availableDate: t('dateEndMarch'), + previousDate: t('marchYYYY', { year: 2021 }), }), canBuy () { - return moment().isBefore(EVENTS.spring2021.end); + return moment().isBefore(EVENTS.spring2022.end); }, }, MossyStone: { diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js index 179264d3db..7cecd12cf3 100644 --- a/website/common/script/content/shop-featuredItems.js +++ b/website/common/script/content/shop-featuredItems.js @@ -1,10 +1,11 @@ import moment from 'moment'; +import { EVENTS } from './constants'; // Magic Hatching Potions are configured like this: // type: 'premiumHatchingPotion', // note no "s" at the end // path: 'premiumHatchingPotions.Rainbow', const featuredItems = { market () { - if (moment().isBefore('2022-02-28T20:00-05:00')) { + if (moment().isBefore(EVENTS.spring2022.end)) { return [ { type: 'armoire', @@ -12,15 +13,15 @@ const featuredItems = { }, { type: 'premiumHatchingPotion', - path: 'premiumHatchingPotions.Cupid', + path: 'premiumHatchingPotions.Shimmer', }, { type: 'premiumHatchingPotion', - path: 'premiumHatchingPotions.RoseQuartz', + path: 'premiumHatchingPotions.Celestial', }, { - type: 'hatchingPotions', - path: 'hatchingPotions.CottonCandyPink', + type: 'premiumHatchingPotion', + path: 'premiumHatchingPotions.PolkaDot', }, ]; }