From 36d82a1d395a06a43ec2142e820572d2a65a06b3 Mon Sep 17 00:00:00 2001 From: CuriousMagpie Date: Mon, 13 Jun 2022 16:37:02 -0400 Subject: [PATCH 1/3] June 2022 Pet Quest Bundle --- website/common/locales/en/questsContent.json | 2 +- website/common/script/content/bundles.js | 2 +- .../common/script/content/constants/events.js | 4 ++++ .../common/script/content/shop-featuredItems.js | 16 ++++++++-------- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/website/common/locales/en/questsContent.json b/website/common/locales/en/questsContent.json index d0fce2dd93..3d1c84b6e2 100644 --- a/website/common/locales/en/questsContent.json +++ b/website/common/locales/en/questsContent.json @@ -702,7 +702,7 @@ "cuddleBuddiesNotes": "Contains 'The Killer Bunny', 'The Nefarious Ferret', and 'The Guinea Pig Gang'. Available until March 31.", "aquaticAmigosText": "Aquatic Amigos Quest Bundle", - "aquaticAmigosNotes": "Contains 'The Magical Axolotl', 'The Kraken of Inkomplete', and 'The Call of Octothulu'. Available until August 31.", + "aquaticAmigosNotes": "Contains 'The Magical Axolotl', 'The Kraken of Inkomplete', and 'The Call of Octothulu'. Available until June 30.", "questSeaSerpentText": "Danger in the Depths: Sea Serpent Strike!", "questSeaSerpentNotes": "Your streaks have you feeling lucky—it’s the perfect time for a trip to the seahorse racetrack. You board the submarine at Diligent Docks and settle in for the trip to Dilatory, but you’ve barely submerged when an impact rocks the sub, sending its occupants tumbling. “What’s going on?” @AriesFaries shouts.

You glance through a nearby porthole and are shocked by the wall of shimmering scales passing by it. “Sea serpent!” Captain @Witticaster calls through the intercom. “Brace yourselves, it’s coming ‘round again!” As you grip the arms of your seat, your unfinished tasks flash before your eyes. ‘Maybe if we work together and complete them,’ you think, ‘we can drive this monster away!’", diff --git a/website/common/script/content/bundles.js b/website/common/script/content/bundles.js index 5179cb1cd5..784c2a3903 100644 --- a/website/common/script/content/bundles.js +++ b/website/common/script/content/bundles.js @@ -129,7 +129,7 @@ const bundles = { 'octopus', ], canBuy () { - return moment().isBetween('2020-07-14', '2020-08-02'); + return moment().isBefore(EVENTS.bundle202206.end); }, type: 'quests', value: 7, diff --git a/website/common/script/content/constants/events.js b/website/common/script/content/constants/events.js index 9ed33d8edb..ed7145637c 100644 --- a/website/common/script/content/constants/events.js +++ b/website/common/script/content/constants/events.js @@ -15,6 +15,10 @@ export const EVENTS = { season: 'normal', npcImageSuffix: '', }, + bundle202206: { + start:'2022-06-14T08:00-04:00', + end:'2022-06-30T20:00-04:00', + }, potions202205: { start: '2022-05-17T08:00-04:00', end: '2022-05-31T20:00-04:00', diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js index 8d6bb0ec14..7950bbc467 100644 --- a/website/common/script/content/shop-featuredItems.js +++ b/website/common/script/content/shop-featuredItems.js @@ -1,5 +1,5 @@ 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', @@ -45,34 +45,34 @@ const featuredItems = { ]; }, quests () { - if (moment().isBefore('2022-05-31T20:00-04:00')) { + if (moment().isBefore(EVENTS.bundle202206.end)) { return [ { type: 'bundles', - path: 'bundles.delightfulDinos', + path: 'bundles.aquaticAmigos', }, { type: 'quests', - path: 'quests.alligator', + path: 'quests.seaserpent', }, { type: 'quests', - path: 'quests.turtle', + path: 'quests.dolphin', }, ]; } return [ { type: 'quests', - path: 'quests.ferret', + path: 'quests.badger', }, { type: 'quests', - path: 'quests.silver', + path: 'quests.onyx', }, { type: 'quests', - path: 'quests.basilist', + path: 'quests.rooster', }, ]; }, From 285fcbd71f99293b2f3961d577fb3181b3aed59c Mon Sep 17 00:00:00 2001 From: SabreCat Date: Tue, 14 Jun 2022 14:34:25 -0500 Subject: [PATCH 2/3] fix(content): add event field for countdown --- website/common/script/content/bundles.js | 1 + 1 file changed, 1 insertion(+) diff --git a/website/common/script/content/bundles.js b/website/common/script/content/bundles.js index 784c2a3903..bda8e75941 100644 --- a/website/common/script/content/bundles.js +++ b/website/common/script/content/bundles.js @@ -128,6 +128,7 @@ const bundles = { 'kraken', 'octopus', ], + event: EVENTS.bundle202206, canBuy () { return moment().isBefore(EVENTS.bundle202206.end); }, From 0ceb0fd8449cf610cdedfa9366f4c672bcbd7300 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Tue, 14 Jun 2022 14:34:31 -0500 Subject: [PATCH 3/3] 4.233.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 cd457d2644..116ca0034f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.233.0", + "version": "4.233.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 1bfaafc10e..d4f773d09e 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.233.0", + "version": "4.233.1", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.17.10",