Merge branch 'release' into develop

This commit is contained in:
SabreCat
2022-02-17 14:53:11 -06:00
4 changed files with 9 additions and 25 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "habitica",
"version": "4.222.0",
"version": "4.222.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "4.222.0",
"version": "4.222.1",
"main": "./website/server/index.js",
"dependencies": {
"@babel/core": "^7.17.2",
+1 -1
View File
@@ -190,7 +190,7 @@ const bundles = {
'gryphon',
],
canBuy () {
return moment().isBefore('2021-02-28T08:00-05:00');
return moment().isBefore('2022-02-28T20:00-05:00');
},
type: 'quests',
value: 7,
@@ -44,46 +44,30 @@ const featuredItems = {
];
},
quests () {
if (moment().isBefore('2022-01-11T08:00-05:00')) {
return [
{
type: 'quests',
path: 'quests.evilsanta',
},
{
type: 'quests',
path: 'quests.evilsanta2',
},
{
type: 'quests',
path: 'quests.penguin',
},
];
}
if (moment().isBefore('2022-01-31T20:00-05:00')) {
if (moment().isBefore('2022-02-28T20:00-05:00')) {
return [
{
type: 'bundles',
path: 'bundles.winterQuests',
path: 'bundles.mythicalMarvels',
},
{
type: 'quests',
path: 'quests.silver',
path: 'quests.onyx',
},
{
type: 'quests',
path: 'quests.sheep',
path: 'quests.dolphin',
},
];
}
return [
{
type: 'quests',
path: 'quests.ferret',
path: 'quests.snake',
},
{
type: 'quests',
path: 'quests.bronze',
path: 'quests.turquoise',
},
{
type: 'quests',