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

Merge branch 'release' into develop

Browse Source
This commit is contained in:
SabreCat
2022-05-17 09:33:45 -05:00
parent 5bc544c481 5a13231027
commit c0e22377d1
7 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/common/script/content/bundles.js
View File

@@ -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,

8
website/common/script/content/constants/events.js
View File

@@ -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',

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

@@ -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: {

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

@@ -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',
},
];
}