Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release' into develop

Browse Source
This commit is contained in:
Sabe Jones
2020-09-25 14:47:10 -05:00
parent d940066ea2 dd4c9c2536
commit 6bbdd74927
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/client/src/components/shops/buyModal.vue
+6 -2
View File
@@ -565,12 +565,16 @@ export default {
}
const ownedPets = reduce(this.user.items.pets, (sum, petValue, petKey) => {
if (petKey.includes(this.item.key) && petValue > 0) return sum + 1;
if (petKey.includes(this.item.key) && petValue > 0
&& !petKey.includes('JackOLantern') // Jack-O-Lantern has "Ghost" version
) return sum + 1;
return sum;
}, 0);
const ownedMounts = reduce(this.user.items.mounts, (sum, mountValue, mountKey) => {
if (mountKey.includes(this.item.key) && mountValue === true) return sum + 1;
if (mountKey.includes(this.item.key) && mountValue === true
&& !mountKey.includes('JackOLantern')
) return sum + 1;
return sum;
}, 0);