krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-16 22:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

2022 Summer Gala Content (#14067)

Browse Source 
* merge upstream/release into origin/release

* Revert "merge upstream/release into origin/release"

This reverts commit 902ed08cc3.

* Summer Splash 2022 Content

* added magic hatching potions

* updated events for testing

* fix whitespace

* various corrections

* fix(gear): mage set, healer set, event start date

* update: habitica-images

* fix(events): include normal/empty season data outside of gala

* fix(string): missing attribute and event verbiage for warrior item

Co-authored-by: SabreCat <sabe@habitica.com>
This commit is contained in:
Natalie L
2022-06-21 10:29:53 -04:00
committed by GitHub
parent 170146f91e
commit f0c25dab05
10 changed files with 309 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
website/common/script/content/hatching-potions.js
View File

@@ -109,13 +109,13 @@ const premium = {
value: 2,
text: t('hatchingPotionAquatic'),
limited: true,
event: EVENTS.summer2020,
event: EVENTS.summer2022,
_addlNotes: t('eventAvailabilityReturning', {
availableDate: t('dateEndJuly'),
previousDate: t('juneYYYY', { year: 2017 }),
previousDate: t('augustYYYY', { year: 2020 }),
}),
canBuy () {
return moment().isBefore('2020-08-02');
return moment().isBetween(EVENTS.summer2022.start, EVENTS.summer2022.end);
},
},
Ember: {
@@ -317,13 +317,13 @@ const premium = {
value: 2,
text: t('hatchingPotionWatery'),
limited: true,
event: EVENTS.summer2020,
event: EVENTS.summer2022,
_addlNotes: t('eventAvailabilityReturning', {
availableDate: t('dateEndJuly'),
previousDate: t('juneYYYY', { year: 2019 }),
previousDate: t('julyYYYY', { year: 2020 }),
}),
canBuy () {
return moment().isBefore('2020-08-02');
return moment().isBetween(EVENTS.summer2022.start, EVENTS.summer2022.end);
},
},
Silver: {
@@ -490,12 +490,13 @@ const premium = {
value: 2,
text: t('hatchingPotionSunset'),
limited: true,
event: EVENTS.summer2021,
event: EVENTS.summer2022,
_addlNotes: t('premiumPotionAddlNotes', {
date: t('dateEndJuly'),
previousDate: t('julyYYYY', { year: 2021 }),
}),
canBuy () {
return moment().isBetween(EVENTS.summer2021.start, EVENTS.summer2021.end);
return moment().isBetween(EVENTS.summer2022.start, EVENTS.summer2022.end);
},
},
Moonglow: {