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

Merge branch '2023-winner-funderlamb' into release

Browse Source 
by @CuriousMagpie
This commit is contained in:
SabreCat
2023-12-17 19:36:15 -06:00
parent 19253cd9b5
commit 8a45f753ca
15 changed files with 442 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
website/common/script/content/shop-featuredItems.js
View File

@@ -5,7 +5,7 @@ import { EVENTS } from './constants';
// path: 'premiumHatchingPotions.Rainbow',
const featuredItems = {
market () {
if (moment().isBetween(EVENTS.potions202311.start, EVENTS.potions202311.end)) {
if (moment().isBetween(EVENTS.winter2024.start, EVENTS.winter2024.end)) {
return [
{
type: 'armoire',
@@ -13,15 +13,15 @@ const featuredItems = {
},
{
type: 'premiumHatchingPotion',
path: 'premiumHatchingPotions.AutumnLeaf',
path: 'premiumHatchingPotions.StainedGlass',
},
{
type: 'premiumHatchingPotion',
path: 'premiumHatchingPotions.Ember',
path: 'premiumHatchingPotions.Peppermint',
},
{
type: 'premiumHatchingPotion',
path: 'premiumHatchingPotions.Frost',
path: 'premiumHatchingPotions.IcySnow',
},
];
}
@@ -32,32 +32,32 @@ const featuredItems = {
},
{
type: 'food',
path: 'food.RottenMeat',
path: 'food.Honey',
},
{
type: 'hatchingPotions',
path: 'hatchingPotions.Zombie',
path: 'hatchingPotions.Golden',
},
{
type: 'eggs',
path: 'eggs.Cactus',
path: 'eggs.BearCub',
},
];
},
quests () {
if (moment().isBetween(EVENTS.bundle202311.start, EVENTS.bundle202311.end)) {
if (moment().isBetween(EVENTS.winter2024.start, EVENTS.winter2024.end)) {
return [
{
type: 'bundles',
path: 'bundles.oddballs',
path: 'bundles.winterQuests',
},
{
type: 'quests',
path: 'quests.gryphon',
path: 'quests.ghost_stag',
},
{
type: 'quests',
path: 'quests.armadillo',
path: 'quests.penguin',
},
];
}
@@ -77,7 +77,7 @@ const featuredItems = {
},
];
},
seasonal: 'fall2017TrickOrTreatSet',
seasonal: 'winter2021WinterMoonMageSet',
timeTravelers: [
// TODO
],