sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-07-13 17:52:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'release' into develop

Browse source
This commit is contained in:
SabreCat 2021-11-09 14:06:40 -06:00
commit 52f6affc3a
4 changed files with 18 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package-lock.json generated
View file

@ -1,6 +1,6 @@
{ {
"name": "habitica", "name": "habitica",
"version": "4.211.1", "version": "4.211.2",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

2
package.json
View file

@ -1,7 +1,7 @@
{ {
"name": "habitica", "name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.", "description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "4.211.1", "version": "4.211.2",
"main": "./website/server/index.js", "main": "./website/server/index.js",
"dependencies": { "dependencies": {
"@babel/core": "^7.16.0", "@babel/core": "^7.16.0",

22
website/common/script/content/constants/events.js
View file

@ -10,26 +10,16 @@ const gemsPromo = {
export const EVENTS = { export const EVENTS = {
noCurrentEvent: { noCurrentEvent: {
start: '2021-10-31T20:00-04:00', start: '2021-11-30T20:00-04:00',
end: '2021-12-31T20:00-04:00', end: '2021-12-31T20:00-04:00',
season: 'normal', season: 'normal',
npcImageSuffix: '', npcImageSuffix: '',
}, },
spooky_extra_gems: { // eslint-disable-line camelcase potions202111: {
start: '2021-10-29T08:00-04:00', start: '2021-11-09T08:00-05:00',
end: '2021-10-31T20:00-04:00', end: '2021-11-30T20:00-05:00',
npcImageSuffix: '_fall', season: 'normal',
season: 'fall', npcImageSuffix: '',
gemsPromo,
promo: 'spooky_extra_gems',
},
fall_extra_gems: { // eslint-disable-line camelcase
start: '2021-10-05T08:00-04:00',
end: '2021-10-12T20:00-04:00',
npcImageSuffix: '_fall',
season: 'fall',
gemsPromo,
promo: 'fall_extra_gems',
}, },
fall2021: { fall2021: {
start: '2021-09-21T08:00-04:00', start: '2021-09-21T08:00-04:00',

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

@ -125,12 +125,13 @@ const premium = {
value: 2, value: 2,
text: t('hatchingPotionEmber'), text: t('hatchingPotionEmber'),
limited: true, limited: true,
event: EVENTS.potions202111,
_addlNotes: t('eventAvailabilityReturning', { _addlNotes: t('eventAvailabilityReturning', {
availableDate: t('dateEndNovember'), availableDate: t('dateEndNovember'),
previousDate: t('augustYYYY', { year: 2017 }), previousDate: t('novemberYYYY', { year: 2019 }),
}), }),
canBuy () { canBuy () {
return moment().isBetween('2019-11-12', '2019-12-02'); return moment().isBefore(EVENTS.potions202111.end);
}, },
}, },
Thunderstorm: { Thunderstorm: {
@ -429,12 +430,14 @@ const premium = {
value: 2, value: 2,
text: t('hatchingPotionAutumnLeaf'), text: t('hatchingPotionAutumnLeaf'),
limited: true, limited: true,
canBuy () { event: EVENTS.potions202111,
return moment().isBefore('2020-12-02'); _addlNotes: t('eventAvailabilityReturning', {
}, availableDate: t('dateEndNovember'),
_addlNotes: t('premiumPotionAddlNotes', { previousDate: t('novemberYYYY', { year: 2020 }),
date: t('dateEndNovember'),
}), }),
canBuy () {
return moment().isBefore(EVENTS.potions202111.end);
},
}, },
BlackPearl: { BlackPearl: {
value: 2, value: 2,