From 51726d8d8e62a41939844d75da8d2edcc833dbc0 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Wed, 23 Oct 2019 08:21:51 -0500 Subject: [PATCH] fix(pets): correct achievement logic --- test/api/v3/integration/user/POST-user_feed_pet_food.test.js | 1 + .../integration/user/POST-user_hatch_egg_hatchingPotion.test.js | 2 +- website/common/script/ops/hatch.js | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/api/v3/integration/user/POST-user_feed_pet_food.test.js b/test/api/v3/integration/user/POST-user_feed_pet_food.test.js index 9818b4ab9e..c56be573c3 100644 --- a/test/api/v3/integration/user/POST-user_feed_pet_food.test.js +++ b/test/api/v3/integration/user/POST-user_feed_pet_food.test.js @@ -72,6 +72,7 @@ describe('POST /user/feed/:pet/:food', () => { const body = server.getWebhookData(uuid); + expect(user.achievements.allYourBase).to.not.equal(true); expect(body.type).to.eql('mountRaised'); expect(body.pet).to.eql('Wolf-Base'); expect(body.message).to.eql(res.message); diff --git a/test/api/v3/integration/user/POST-user_hatch_egg_hatchingPotion.test.js b/test/api/v3/integration/user/POST-user_hatch_egg_hatchingPotion.test.js index 51d79676b3..35fb766f38 100644 --- a/test/api/v3/integration/user/POST-user_hatch_egg_hatchingPotion.test.js +++ b/test/api/v3/integration/user/POST-user_hatch_egg_hatchingPotion.test.js @@ -25,7 +25,7 @@ describe('POST /user/hatch/:egg/:hatchingPotion', () => { expect(user.items.pets['Wolf-Base']).to.equal(5); expect(user.items.eggs.Wolf).to.equal(0); expect(user.items.hatchingPotions.Base).to.equal(0); - expect(user.achievements.aridAuthority).to.not.equal(true); + expect(user.achievements.backToBasics).to.not.equal(true); expect(res).to.eql({ message: t('messageHatched'), diff --git a/website/common/script/ops/hatch.js b/website/common/script/ops/hatch.js index cad4f703f1..7a60e92ac1 100644 --- a/website/common/script/ops/hatch.js +++ b/website/common/script/ops/hatch.js @@ -53,7 +53,7 @@ export default function hatch (user, req = {}) { if (!user.achievements[achievement.petAchievement]) { const petIndex = findIndex( keys(content.dropEggs), - animal => Number.isNaN(user.items.pets[`${animal}-${achievement.color}`]) || user.items.pets[`${animal}-${achievement.color}`] <= 0, + animal => !user.items.pets[`${animal}-${achievement.color}`] || user.items.pets[`${animal}-${achievement.color}`] <= 0, ); if (petIndex === -1) { user.achievements[achievement.petAchievement] = true;