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

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

Browse Source
This commit is contained in:
Xaz16
2019-12-15 22:09:07 +03:00
parent 8b780eaf0d
commit 0f755ab80d
3 changed files with 125 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
website/common/script/content/loginIncentives.js
View File

@@ -45,7 +45,10 @@ export default function getLoginIncentives (api) {
reward: [api.hatchingPotions.RoyalPurple],
assignReward: function assignReward (user) {
if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0;
user.items.hatchingPotions.RoyalPurple += 1;
user.items.hatchingPotions = {
...user.items.hatchingPotions,
RoyalPurple: user.items.hatchingPotions.RoyalPurple + 1,
};
if (user.markModified) user.markModified('items.hatchingPotions');
},
},
@@ -76,7 +79,10 @@ export default function getLoginIncentives (api) {
reward: [api.hatchingPotions.RoyalPurple],
assignReward: function assignReward (user) {
if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0;
user.items.hatchingPotions.RoyalPurple += 1;
user.items.hatchingPotions = {
...user.items.hatchingPotions,
RoyalPurple: user.items.hatchingPotions.RoyalPurple + 1,
};
if (user.markModified) user.markModified('items.hatchingPotions');
},
},
@@ -118,7 +124,10 @@ export default function getLoginIncentives (api) {
reward: [api.hatchingPotions.RoyalPurple],
assignReward: function assignReward (user) {
if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0;
user.items.hatchingPotions.RoyalPurple += 1;
user.items.hatchingPotions = {
...user.items.hatchingPotions,
RoyalPurple: user.items.hatchingPotions.RoyalPurple + 1,
};
if (user.markModified) user.markModified('items.hatchingPotions');
},
},
@@ -142,7 +151,10 @@ export default function getLoginIncentives (api) {
reward: [api.hatchingPotions.RoyalPurple],
assignReward: function assignReward (user) {
if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0;
user.items.hatchingPotions.RoyalPurple += 1;
user.items.hatchingPotions = {
...user.items.hatchingPotions,
RoyalPurple: user.items.hatchingPotions.RoyalPurple + 1,
};
if (user.markModified) user.markModified('items.hatchingPotions');
},
},
@@ -160,7 +172,10 @@ export default function getLoginIncentives (api) {
reward: [api.hatchingPotions.RoyalPurple],
assignReward: function assignReward (user) {
if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0;
user.items.hatchingPotions.RoyalPurple += 1;
user.items.hatchingPotions = {
...user.items.hatchingPotions,
RoyalPurple: user.items.hatchingPotions.RoyalPurple + 1,
};
if (user.markModified) user.markModified('items.hatchingPotions');
},
},
@@ -178,7 +193,10 @@ export default function getLoginIncentives (api) {
reward: [api.hatchingPotions.RoyalPurple],
assignReward: function assignReward (user) {
if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0;
user.items.hatchingPotions.RoyalPurple += 1;
user.items.hatchingPotions = {
...user.items.hatchingPotions,
RoyalPurple: user.items.hatchingPotions.RoyalPurple + 1,
};
if (user.markModified) user.markModified('items.hatchingPotions');
},
},
@@ -198,7 +216,10 @@ export default function getLoginIncentives (api) {
reward: [api.hatchingPotions.RoyalPurple],
assignReward: function assignReward (user) {
if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0;
user.items.hatchingPotions.RoyalPurple += 1;
user.items.hatchingPotions = {
...user.items.hatchingPotions,
RoyalPurple: user.items.hatchingPotions.RoyalPurple + 1,
};
if (user.markModified) user.markModified('items.hatchingPotions');
},
},
@@ -218,7 +239,10 @@ export default function getLoginIncentives (api) {
reward: [api.hatchingPotions.RoyalPurple],
assignReward: function assignReward (user) {
if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0;
user.items.hatchingPotions.RoyalPurple += 1;
user.items.hatchingPotions = {
...user.items.hatchingPotions,
RoyalPurple: user.items.hatchingPotions.RoyalPurple + 1,
};
if (user.markModified) user.markModified('items.hatchingPotions');
},
},
@@ -238,7 +262,10 @@ export default function getLoginIncentives (api) {
reward: [api.hatchingPotions.RoyalPurple],
assignReward: function assignReward (user) {
if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0;
user.items.hatchingPotions.RoyalPurple += 1;
user.items.hatchingPotions = {
...user.items.hatchingPotions,
RoyalPurple: user.items.hatchingPotions.RoyalPurple + 1,
};
if (user.markModified) user.markModified('items.hatchingPotions');
},
},
@@ -258,7 +285,10 @@ export default function getLoginIncentives (api) {
reward: [api.hatchingPotions.RoyalPurple],
assignReward: function assignReward (user) {
if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0;
user.items.hatchingPotions.RoyalPurple += 1;
user.items.hatchingPotions = {
...user.items.hatchingPotions,
RoyalPurple: user.items.hatchingPotions.RoyalPurple + 1,
};
if (user.markModified) user.markModified('items.hatchingPotions');
},
},
@@ -276,7 +306,10 @@ export default function getLoginIncentives (api) {
reward: [api.hatchingPotions.RoyalPurple],
assignReward: function assignReward (user) {
if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0;
user.items.hatchingPotions.RoyalPurple += 1;
user.items.hatchingPotions = {
...user.items.hatchingPotions,
RoyalPurple: user.items.hatchingPotions.RoyalPurple + 1,
};
if (user.markModified) user.markModified('items.hatchingPotions');
},
},
@@ -341,7 +374,10 @@ export default function getLoginIncentives (api) {
reward: [api.hatchingPotions.RoyalPurple],
assignReward: function assignReward (user) {
if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0;
user.items.hatchingPotions.RoyalPurple += 1;
user.items.hatchingPotions = {
...user.items.hatchingPotions,
RoyalPurple: user.items.hatchingPotions.RoyalPurple + 1,
};
if (user.markModified) user.markModified('items.hatchingPotions');
},
},
@@ -357,29 +393,59 @@ export default function getLoginIncentives (api) {
rewardName: 'oneOfAllHatchingPotions',
assignReward: function assignReward (user) {
if (!user.items.hatchingPotions.Base) user.items.hatchingPotions.Base = 0;
user.items.hatchingPotions.Base += 1;
user.items.hatchingPotions = {
...user.items.hatchingPotions,
Base: user.items.hatchingPotions.Base + 1,
};
if (!user.items.hatchingPotions.CottonCandyBlue) {
user.items.hatchingPotions.CottonCandyBlue = 0;
}
user.items.hatchingPotions.CottonCandyBlue += 1;
user.items.hatchingPotions = {
...user.items.hatchingPotions,
CottonCandyBlue: user.items.hatchingPotions.CottonCandyBlue + 1,
};
if (!user.items.hatchingPotions.CottonCandyPink) {
user.items.hatchingPotions.CottonCandyPink = 0;
}
user.items.hatchingPotions.CottonCandyPink += 1;
user.items.hatchingPotions = {
...user.items.hatchingPotions,
CottonCandyPink: user.items.hatchingPotions.CottonCandyPink + 1,
};
if (!user.items.hatchingPotions.Desert) user.items.hatchingPotions.Desert = 0;
user.items.hatchingPotions.Desert += 1;
user.items.hatchingPotions = {
...user.items.hatchingPotions,
Desert: user.items.hatchingPotions.Desert + 1,
};
if (!user.items.hatchingPotions.Golden) user.items.hatchingPotions.Golden = 0;
user.items.hatchingPotions.Golden += 1;
user.items.hatchingPotions = {
...user.items.hatchingPotions,
Golden: user.items.hatchingPotions.Golden + 1,
};
if (!user.items.hatchingPotions.Red) user.items.hatchingPotions.Red = 0;
user.items.hatchingPotions.Red += 1;
user.items.hatchingPotions = {
...user.items.hatchingPotions,
Red: user.items.hatchingPotions.Red + 1,
};
if (!user.items.hatchingPotions.Shade) user.items.hatchingPotions.Shade = 0;
user.items.hatchingPotions.Shade += 1;
user.items.hatchingPotions = {
...user.items.hatchingPotions,
Shade: user.items.hatchingPotions.Shade + 1,
};
if (!user.items.hatchingPotions.Skeleton) user.items.hatchingPotions.Skeleton = 0;
user.items.hatchingPotions.Skeleton += 1;
user.items.hatchingPotions = {
...user.items.hatchingPotions,
Skeleton: user.items.hatchingPotions.Skeleton + 1,
};
if (!user.items.hatchingPotions.White) user.items.hatchingPotions.White = 0;
user.items.hatchingPotions.White += 1;
user.items.hatchingPotions = {
...user.items.hatchingPotions,
White: user.items.hatchingPotions.White + 1,
};
if (!user.items.hatchingPotions.Zombie) user.items.hatchingPotions.Zombie = 0;
user.items.hatchingPotions.Zombie += 1;
user.items.hatchingPotions = {
...user.items.hatchingPotions,
Zombie: user.items.hatchingPotions.Zombie + 1,
};
if (user.markModified) user.markModified('items.hatchingPotions');
},
},
@@ -388,7 +454,10 @@ export default function getLoginIncentives (api) {
reward: [api.hatchingPotions.RoyalPurple],
assignReward: function assignReward (user) {
if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0;
user.items.hatchingPotions.RoyalPurple += 1;
user.items.hatchingPotions = {
...user.items.hatchingPotions,
RoyalPurple: user.items.hatchingPotions.RoyalPurple + 1,
};
if (user.markModified) user.markModified('items.hatchingPotions');
},
},
@@ -429,7 +498,10 @@ export default function getLoginIncentives (api) {
reward: [api.hatchingPotions.RoyalPurple],
assignReward: function assignReward (user) {
if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0;
user.items.hatchingPotions.RoyalPurple += 1;
user.items.hatchingPotions = {
...user.items.hatchingPotions,
RoyalPurple: user.items.hatchingPotions.RoyalPurple + 1,
};
if (user.markModified) user.markModified('items.hatchingPotions');
},
},
@@ -453,7 +525,10 @@ export default function getLoginIncentives (api) {
reward: [api.hatchingPotions.RoyalPurple],
assignReward: function assignReward (user) {
if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0;
user.items.hatchingPotions.RoyalPurple += 1;
user.items.hatchingPotions = {
...user.items.hatchingPotions,
RoyalPurple: user.items.hatchingPotions.RoyalPurple + 1,
};
if (user.markModified) user.markModified('items.hatchingPotions');
},
},
@@ -480,7 +555,10 @@ export default function getLoginIncentives (api) {
reward: [api.hatchingPotions.RoyalPurple],
assignReward: function assignReward (user) {
if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0;
user.items.hatchingPotions.RoyalPurple += 1;
user.items.hatchingPotions = {
...user.items.hatchingPotions,
RoyalPurple: user.items.hatchingPotions.RoyalPurple + 1,
};
if (user.markModified) user.markModified('items.hatchingPotions');
},
},
@@ -507,7 +585,10 @@ export default function getLoginIncentives (api) {
reward: [api.hatchingPotions.RoyalPurple],
assignReward: function assignReward (user) {
if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0;
user.items.hatchingPotions.RoyalPurple += 1;
user.items.hatchingPotions = {
...user.items.hatchingPotions,
RoyalPurple: user.items.hatchingPotions.RoyalPurple + 1,
};
if (user.markModified) user.markModified('items.hatchingPotions');
},
},
@@ -531,7 +612,10 @@ export default function getLoginIncentives (api) {
reward: [api.hatchingPotions.RoyalPurple],
assignReward: function assignReward (user) {
if (!user.items.hatchingPotions.RoyalPurple) user.items.hatchingPotions.RoyalPurple = 0;
user.items.hatchingPotions.RoyalPurple += 1;
user.items.hatchingPotions = {
...user.items.hatchingPotions,
RoyalPurple: user.items.hatchingPotions.RoyalPurple + 1,
};
if (user.markModified) user.markModified('items.hatchingPotions');
},
},

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

@@ -120,8 +120,14 @@ export default function randomDrop (user, options, req = {}, analytics) {
randomVal(pickBy(content.hatchingPotions, (v, k) => acceptableDrops.indexOf(k) >= 0)),
);
user.items.hatchingPotions[drop.key] = user.items.hatchingPotions[drop.key] || 0;
user.items.hatchingPotions[drop.key] += 1;
user.items.hatchingPotions = {
...user.items.hatchingPotions,
[drop.key]: user.items.hatchingPotions[drop.key] || 0,
};
user.items.hatchingPotions = {
...user.items.hatchingPotions,
[drop.key]: drop.key + 1,
};
if (user.markModified) user.markModified('items.hatchingPotions');
drop.type = 'HatchingPotion';

6
website/common/script/ops/hatch.js
View File

@@ -48,7 +48,11 @@ export default function hatch (user, req = {}) {
...user.items.eggs,
[egg]: Number.isInteger(user.items.eggs) ? user.items.eggs - 1 : 0,
};
user.items.hatchingPotions[hatchingPotion] -= 1;
user.items.hatchingPotions = {
...user.items.hatchingPotions,
[hatchingPotion]:
Number.isInteger(user.items.hatchingPotion) ? user.items.hatchingPotion - 1 : 0,
};
if (user.markModified) {
user.markModified('items.pets');
user.markModified('items.eggs');