sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-09 21:58:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix: reassign object for user.items.eggs to trigger change in vue view

Browse source
This commit is contained in:
Xaz16 2019-12-15 20:22:47 +03:00
parent 3e476c4f52
commit aea02d735e
4 changed files with 128 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

135
website/common/script/content/loginIncentives.js
View file

@ -289,23 +289,50 @@ export default function getLoginIncentives (api) {
rewardName: 'oneOfAllPetEggs',
assignReward: function assignReward (user) {
if (!user.items.eggs.BearCub) user.items.eggs.BearCub = 0;
user.items.eggs.BearCub += 1;
user.items.eggs = {
...user.items.eggs,
BearCub: user.items.eggs.BearCub + 1,
};
if (!user.items.eggs.Cactus) user.items.eggs.Cactus = 0;
user.items.eggs.Cactus += 1;
user.items.eggs = {
...user.items.eggs,
Cactus: user.items.eggs.Cactus + 1,
};
if (!user.items.eggs.Dragon) user.items.eggs.Dragon = 0;
user.items.eggs.Dragon += 1;
user.items.eggs = {
...user.items.eggs,
Dragon: user.items.eggs.Dragon + 1,
};
if (!user.items.eggs.FlyingPig) user.items.eggs.FlyingPig = 0;
user.items.eggs.FlyingPig += 1;
user.items.eggs = {
...user.items.eggs,
FlyingPig: user.items.eggs.FlyingPig + 1,
};
if (!user.items.eggs.Fox) user.items.eggs.Fox = 0;
user.items.eggs.Fox += 1;
user.items.eggs = {
...user.items.eggs,
Fox: user.items.eggs.Fox + 1,
};
if (!user.items.eggs.LionCub) user.items.eggs.LionCub = 0;
user.items.eggs.LionCub += 1;
user.items.eggs = {
...user.items.eggs,
LionCub: user.items.eggs.LionCub + 1,
};
if (!user.items.eggs.PandaCub) user.items.eggs.PandaCub = 0;
user.items.eggs.PandaCub += 1;
user.items.eggs = {
...user.items.eggs,
PandaCub: user.items.eggs.PandaCub + 1,
};
if (!user.items.eggs.TigerCub) user.items.eggs.TigerCub = 0;
user.items.eggs.TigerCub += 1;
user.items.eggs = {
...user.items.eggs,
TigerCub: user.items.eggs.TigerCub + 1,
};
if (!user.items.eggs.Wolf) user.items.eggs.Wolf = 0;
user.items.eggs.Wolf += 1;
user.items.eggs = {
...user.items.eggs,
Wolf: user.items.eggs.Wolf + 1,
};
if (user.markModified) user.markModified('items.eggs');
},
},
@ -587,23 +614,50 @@ export default function getLoginIncentives (api) {
rewardName: 'twoOfAllPetEggs',
assignReward: function assignReward (user) {
if (!user.items.eggs.BearCub) user.items.eggs.BearCub = 0;
user.items.eggs.BearCub += 2;
user.items.eggs = {
...user.items.eggs,
BearCub: user.items.eggs.BearCub + 2,
};
if (!user.items.eggs.Cactus) user.items.eggs.Cactus = 0;
user.items.eggs.Cactus += 2;
user.items.eggs = {
...user.items.eggs,
Cactus: user.items.eggs.Cactus + 2,
};
if (!user.items.eggs.Dragon) user.items.eggs.Dragon = 0;
user.items.eggs.Dragon += 2;
user.items.eggs = {
...user.items.eggs,
Dragon: user.items.eggs.Dragon + 2,
};
if (!user.items.eggs.FlyingPig) user.items.eggs.FlyingPig = 0;
user.items.eggs.FlyingPig += 2;
user.items.eggs = {
...user.items.eggs,
FlyingPig: user.items.eggs.FlyingPig + 2,
};
if (!user.items.eggs.Fox) user.items.eggs.Fox = 0;
user.items.eggs.Fox += 2;
user.items.eggs = {
...user.items.eggs,
Fox: user.items.eggs.Fox + 2,
};
if (!user.items.eggs.LionCub) user.items.eggs.LionCub = 0;
user.items.eggs.LionCub += 2;
user.items.eggs = {
...user.items.eggs,
LionCub: user.items.eggs.LionCub + 2,
};
if (!user.items.eggs.PandaCub) user.items.eggs.PandaCub = 0;
user.items.eggs.PandaCub += 2;
user.items.eggs = {
...user.items.eggs,
PandaCub: user.items.eggs.PandaCub + 2,
};
if (!user.items.eggs.TigerCub) user.items.eggs.TigerCub = 0;
user.items.eggs.TigerCub += 2;
user.items.eggs = {
...user.items.eggs,
TigerCub: user.items.eggs.TigerCub + 2,
};
if (!user.items.eggs.Wolf) user.items.eggs.Wolf = 0;
user.items.eggs.Wolf += 2;
user.items.eggs = {
...user.items.eggs,
Wolf: user.items.eggs.Wolf + 2,
};
if (user.markModified) user.markModified('items.eggs');
},
},
@ -652,23 +706,50 @@ export default function getLoginIncentives (api) {
rewardName: 'threeOfAllPetEggs',
assignReward: function assignReward (user) {
if (!user.items.eggs.BearCub) user.items.eggs.BearCub = 0;
user.items.eggs.BearCub += 3;
user.items.eggs = {
...user.items.eggs,
BearCub: user.items.eggs.BearCub + 3,
};
if (!user.items.eggs.Cactus) user.items.eggs.Cactus = 0;
user.items.eggs.Cactus += 3;
user.items.eggs = {
...user.items.eggs,
Cactus: user.items.eggs.Cactus + 3,
};
if (!user.items.eggs.Dragon) user.items.eggs.Dragon = 0;
user.items.eggs.Dragon += 3;
user.items.eggs = {
...user.items.eggs,
Dragon: user.items.eggs.Dragon + 3,
};
if (!user.items.eggs.FlyingPig) user.items.eggs.FlyingPig = 0;
user.items.eggs.FlyingPig += 3;
user.items.eggs = {
...user.items.eggs,
FlyingPig: user.items.eggs.FlyingPig + 3,
};
if (!user.items.eggs.Fox) user.items.eggs.Fox = 0;
user.items.eggs.Fox += 3;
user.items.eggs = {
...user.items.eggs,
Fox: user.items.eggs.Fox + 3,
};
if (!user.items.eggs.LionCub) user.items.eggs.LionCub = 0;
user.items.eggs.LionCub += 3;
user.items.eggs = {
...user.items.eggs,
LionCub: user.items.eggs.LionCub + 3,
};
if (!user.items.eggs.PandaCub) user.items.eggs.PandaCub = 0;
user.items.eggs.PandaCub += 3;
user.items.eggs = {
...user.items.eggs,
PandaCub: user.items.eggs.PandaCub + 3,
};
if (!user.items.eggs.TigerCub) user.items.eggs.TigerCub = 0;
user.items.eggs.TigerCub += 3;
user.items.eggs = {
...user.items.eggs,
TigerCub: user.items.eggs.TigerCub + 3,
};
if (!user.items.eggs.Wolf) user.items.eggs.Wolf = 0;
user.items.eggs.Wolf += 3;
user.items.eggs = {
...user.items.eggs,
Wolf: user.items.eggs.Wolf + 3,
};
if (user.markModified) user.markModified('items.eggs');
},
},

10
website/common/script/fns/randomDrop.js
View file

@ -91,8 +91,14 @@ export default function randomDrop (user, options, req = {}, analytics) {
} else if (rarity > 0.3) { // eggs 30% chance
drop = cloneDropItem(randomVal(content.dropEggs));
user.items.eggs[drop.key] = user.items.eggs[drop.key] || 0;
user.items.eggs[drop.key] += 1;
user.items.eggs = {
...user.items.eggs,
[drop.key]: user.items.eggs[drop.key] || 0,
};
user.items.eggs = {
...user.items.eggs,
[drop.key]: drop.key += 1,
};
if (user.markModified) user.markModified('items.eggs');
drop.type = 'Egg';

10
website/common/script/fns/updateStats.js
View file

@ -71,9 +71,15 @@ export default function updateStats (user, stats, req = {}, analytics) {
if (user.addNotification) user.addNotification('DROPS_ENABLED');
if (user.items.eggs.Wolf > 0) {
user.items.eggs.Wolf += 1;
user.items.eggs = {
...user.items.eggs,
Wolf: user.items.eggs.Wolf + 1,
};
} else {
user.items.eggs.Wolf = 1;
user.items.eggs = {
...user.items.eggs,
Wolf: 1,
};
}
if (user.markModified) user.markModified('items.eggs');

5
website/common/script/ops/hatch.js
View file

@ -44,7 +44,10 @@ export default function hatch (user, req = {}) {
...user.items.pets,
[pet]: 5,
};
user.items.eggs[egg] -= 1;
user.items.eggs = {
...user.items.eggs,
[egg]: user.items.eggs - 1,
};
user.items.hatchingPotions[hatchingPotion] -= 1;
if (user.markModified) {
user.markModified('items.pets');