2022 Summer Gala Content (#14067)

* 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
@@ -30,16 +30,16 @@ export default {
pinnedSets: SHOP_OPEN
? {
healer: 'spring2022PeridotHealerSet',
rogue: 'spring2022MagpieRogueSet',
warrior: 'spring2022RainstormWarriorSet',
wizard: 'spring2022ForsythiaMageSet',
healer: 'summer2022AngelfishHealerSet',
rogue: 'summer2022CrabRogueSet',
warrior: 'summer2022WaterspoutWarriorSet',
wizard: 'summer2022MantaRayMageSet',
}
: {},
availableSpells: SHOP_OPEN && moment().isBetween('2022-04-14T08:00-05:00', CURRENT_EVENT.end)
availableSpells: SHOP_OPEN && moment().isBetween('2022-07-12T08:00-05:00', CURRENT_EVENT.end)
? [
'shinySeed',
'seafoam',
]
: [],
@@ -49,5 +49,5 @@ export default {
]
: [],
featuredSet: 'spring2021TwinFlowerRogueSet',
featuredSet: 'summer2021NautilusMageSet',
};