From aa2458d56404a4d215a256c2581a79db5c992335 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Thu, 12 May 2022 13:55:59 -0500 Subject: [PATCH 1/3] 4.230.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 60f888006e..42ed898b7d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.230.0", + "version": "4.230.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 975d6cec9b..b9a6a52518 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.230.0", + "version": "4.230.1", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.17.10", From 4e78d72ceea4e60fc72a158c5501fc4893fad4c2 Mon Sep 17 00:00:00 2001 From: Natalie L <78037386+CuriousMagpie@users.noreply.github.com> Date: Tue, 17 May 2022 10:32:50 -0400 Subject: [PATCH 2/3] May 2022 Magic Hatching Potions and Quest Bundle (#13979) * May 2022 magic hatching potions and quest bundle * fix(string): typo * fix(content): add and use event Co-authored-by: SabreCat --- website/common/locales/en/questsContent.json | 2 +- website/common/script/content/bundles.js | 2 +- .../common/script/content/constants/events.js | 8 +++++++- .../common/script/content/hatching-potions.js | 11 +++++----- .../script/content/shop-featuredItems.js | 20 +++++++++---------- 5 files changed, 25 insertions(+), 18 deletions(-) diff --git a/website/common/locales/en/questsContent.json b/website/common/locales/en/questsContent.json index c969c30ef0..d0fce2dd93 100644 --- a/website/common/locales/en/questsContent.json +++ b/website/common/locales/en/questsContent.json @@ -780,7 +780,7 @@ "rockingReptilesNotes": "Contains 'The Insta-Gator,' 'The Serpent of Distraction,' and 'The Veloci-Rapper.' Available until September 30.", "delightfulDinosText": "Delightful Dinos Quest Bundle", - "delightfulDinosNotes": "Contains 'The Pterror-dactyl,' 'The Trampling Triceratops,' and 'The Dinosaur Unearthed.' Available until November 30.", + "delightfulDinosNotes": "Contains 'The Pterror-dactyl,' 'The Trampling Triceratops,' and 'The Dinosaur Unearthed.' Available until May 31.", "questAmberText": "The Amber Alliance", "questAmberNotes": "You’re sitting in the Tavern with @beffymaroo and @-Tyr- when @Vikte bursts through the door and excitedly tells you about the rumors of another type of Magic Hatching Potion hidden in the Taskwoods. Having completed your Dailies, the three of you immediately agree to help @Vikte on their search. After all, what’s the harm in a little adventure?

After walking through the Taskwoods for hours, you’re beginning to regret joining such a wild chase. You’re about to head home, when you hear a surprised yelp and turn to see a huge lizard with shiny amber scales coiled around a tree, clutching @Vikte in her claws. @beffymaroo reaches for her sword.

“Wait!” cries @-Tyr-. “It’s the Trerezin! She’s not dangerous, just dangerously clingy!”", diff --git a/website/common/script/content/bundles.js b/website/common/script/content/bundles.js index bfb7429b5a..5179cb1cd5 100644 --- a/website/common/script/content/bundles.js +++ b/website/common/script/content/bundles.js @@ -220,7 +220,7 @@ const bundles = { 'trex_undead', ], canBuy () { - return moment().isBetween('2019-11-14', '2019-12-02'); + return moment().isBetween('2022-05-16', '2022-05-31'); }, type: 'quests', value: 7, diff --git a/website/common/script/content/constants/events.js b/website/common/script/content/constants/events.js index 32fdcf3734..9ed33d8edb 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 = { noCurrentEvent: { - start: '2022-04-30T20:00-05:00', + start: '2022-05-31T20:00-04:00', end: '2022-06-30T20:00-05:00', season: 'normal', npcImageSuffix: '', }, + potions202205: { + start: '2022-05-17T08:00-04:00', + end: '2022-05-31T20:00-04:00', + season: 'normal', + npcImageSuffix: '', + }, spring2022: { start: '2022-03-22T08:00-05:00', end: '2022-04-30T20:00-05:00', diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js index f50ef98f7f..0f7f67d859 100644 --- a/website/common/script/content/hatching-potions.js +++ b/website/common/script/content/hatching-potions.js @@ -96,13 +96,13 @@ const premium = { value: 2, text: t('hatchingPotionFloral'), limited: true, - event: EVENTS.potions202105, + event: EVENTS.potions202205, _addlNotes: t('eventAvailabilityReturning', { availableDate: t('dateEndMay'), - previousDate: t('mayYYYY', { year: 2019 }), + previousDate: t('mayYYYY', { year: 2021 }), }), canBuy () { - return moment().isBefore(EVENTS.potions202105.end); + return moment().isBefore(EVENTS.potions202205.end); }, }, Aquatic: { @@ -297,12 +297,13 @@ const premium = { value: 2, text: t('hatchingPotionSunshine'), limited: true, + event: EVENTS.potions202205, _addlNotes: t('eventAvailabilityReturning', { availableDate: t('dateEndMay'), - previousDate: t('mayYYYY', { year: 2019 }), + previousDate: t('mayYYYY', { year: 2020 }), }), canBuy () { - return moment().isBefore('2020-06-02'); + return moment().isBefore(EVENTS.potions202205.end); }, }, Bronze: { diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js index 7cecd12cf3..8d6bb0ec14 100644 --- a/website/common/script/content/shop-featuredItems.js +++ b/website/common/script/content/shop-featuredItems.js @@ -1,11 +1,11 @@ import moment from 'moment'; -import { EVENTS } from './constants'; +// 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(EVENTS.spring2022.end)) { + if (moment().isBefore('2022-05-31T20:00-04:00')) { return [ { type: 'armoire', @@ -13,15 +13,15 @@ const featuredItems = { }, { type: 'premiumHatchingPotion', - path: 'premiumHatchingPotions.Shimmer', + path: 'premiumHatchingPotions.Sunshine', }, { type: 'premiumHatchingPotion', - path: 'premiumHatchingPotions.Celestial', + path: 'premiumHatchingPotions.Floral', }, { - type: 'premiumHatchingPotion', - path: 'premiumHatchingPotions.PolkaDot', + type: 'hatchingPotions', + path: 'hatchingPotions.Golden', }, ]; } @@ -45,19 +45,19 @@ const featuredItems = { ]; }, quests () { - if (moment().isBefore('2022-03-31T20:00-04:00')) { + if (moment().isBefore('2022-05-31T20:00-04:00')) { return [ { type: 'bundles', - path: 'bundles.cuddleBuddies', + path: 'bundles.delightfulDinos', }, { type: 'quests', - path: 'quests.egg', + path: 'quests.alligator', }, { type: 'quests', - path: 'quests.ghost_stag', + path: 'quests.turtle', }, ]; } From 5a13231027466ca9150b7f8dce6cf53aebfe0ab2 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Tue, 17 May 2022 09:33:34 -0500 Subject: [PATCH 3/3] 4.230.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 42ed898b7d..eb6663f175 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.230.1", + "version": "4.230.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index b9a6a52518..5945998e47 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.230.1", + "version": "4.230.2", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.17.10",