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

fix(pets): correct achievement logic

Browse Source
This commit is contained in:
Sabe Jones
2019-10-23 08:21:51 -05:00
parent 2b8e25833d
commit 51726d8d8e
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/api/v3/integration/user/POST-user_feed_pet_food.test.js
View File

@@ -72,6 +72,7 @@ describe('POST /user/feed/:pet/:food', () => {
const body = server.getWebhookData(uuid); const body = server.getWebhookData(uuid);
expect(user.achievements.allYourBase).to.not.equal(true);
expect(body.type).to.eql('mountRaised'); expect(body.type).to.eql('mountRaised');
expect(body.pet).to.eql('Wolf-Base'); expect(body.pet).to.eql('Wolf-Base');
expect(body.message).to.eql(res.message); expect(body.message).to.eql(res.message);

2
test/api/v3/integration/user/POST-user_hatch_egg_hatchingPotion.test.js
View File

@@ -25,7 +25,7 @@ describe('POST /user/hatch/:egg/:hatchingPotion', () => {
expect(user.items.pets['Wolf-Base']).to.equal(5); expect(user.items.pets['Wolf-Base']).to.equal(5);
expect(user.items.eggs.Wolf).to.equal(0); expect(user.items.eggs.Wolf).to.equal(0);
expect(user.items.hatchingPotions.Base).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({ expect(res).to.eql({
message: t('messageHatched'), message: t('messageHatched'),

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

@@ -53,7 +53,7 @@ export default function hatch (user, req = {}) {
if (!user.achievements[achievement.petAchievement]) { if (!user.achievements[achievement.petAchievement]) {
const petIndex = findIndex( const petIndex = findIndex(
keys(content.dropEggs), 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) { if (petIndex === -1) {
user.achievements[achievement.petAchievement] = true; user.achievements[achievement.petAchievement] = true;