From 0a6b22fdd9d6fe717e0ba6f9525e64e6edc68a2e Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Fri, 25 Sep 2020 14:45:56 -0500 Subject: [PATCH 1/2] fix(potions): erroneous Ghost overbuy warnings --- website/client/src/components/shops/buyModal.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue index 65a0393199..532b170a19 100644 --- a/website/client/src/components/shops/buyModal.vue +++ b/website/client/src/components/shops/buyModal.vue @@ -554,12 +554,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); From dd4c9c2536efab901a8b75e7b0bf3cd73f766ea7 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Fri, 25 Sep 2020 14:46:14 -0500 Subject: [PATCH 2/2] 4.160.1 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 828ff55bf5..317bcfac09 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.160.0", + "version": "4.160.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 191bd9859a..49836eff25 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "habitica", "description": "A habit tracker app which treats your goals like a Role Playing Game.", - "version": "4.160.0", + "version": "4.160.1", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.11.6",