Merge branch 'release' into develop
This commit is contained in:
Generated
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "habitica",
|
||||
"version": "4.82.1",
|
||||
"version": "4.82.2",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "habitica",
|
||||
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
|
||||
"version": "4.82.1",
|
||||
"version": "4.82.2",
|
||||
"main": "./website/server/index.js",
|
||||
"dependencies": {
|
||||
"@slack/client": "^3.8.1",
|
||||
|
||||
@@ -13,7 +13,7 @@ import forEach from 'lodash/forEach';
|
||||
import moment from 'moment';
|
||||
|
||||
describe('shared.ops.purchase', () => {
|
||||
const SEASONAL_FOOD = 'Cake_Base';
|
||||
const SEASONAL_FOOD = 'Meat';
|
||||
let user;
|
||||
let goldPoints = 40;
|
||||
let analytics = {track () {}};
|
||||
|
||||
@@ -356,12 +356,12 @@ api.specialMounts = stable.specialMounts;
|
||||
api.mountInfo = stable.mountInfo;
|
||||
|
||||
// For seasonal events, change these booleans:
|
||||
let canBuyNormalFood = false;
|
||||
let canDropNormalFood = false;
|
||||
let canBuyNormalFood = true;
|
||||
let canDropNormalFood = true;
|
||||
let canBuyCandyFood = false;
|
||||
let canDropCandyFood = false;
|
||||
let canBuyCakeFood = true;
|
||||
let canDropCakeFood = true;
|
||||
let canBuyCakeFood = false;
|
||||
let canDropCakeFood = false;
|
||||
|
||||
api.food = {
|
||||
Meat: {
|
||||
|
||||
Reference in New Issue
Block a user