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

fix(pets): disallow hatching quest pets with Wacky potions

Browse Source
This commit is contained in:
Sabe Jones
2019-04-09 16:25:49 -05:00
parent 060e68ef95
commit 6b933914ef
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/common/ops/hatch.js
View File

@@ -93,6 +93,22 @@ describe('shared.ops.hatch', () => {
done(); done();
} }
}); });
it('does not allow hatching quest pet egg using wacky potion', (done) => {
user.items.eggs = {Bunny: 1};
user.items.hatchingPotions = {Veggie: 1};
user.items.pets = {};
try {
hatch(user, {params: {egg: 'Bunny', hatchingPotion: 'Veggie'}});
} catch (err) {
expect(err).to.be.an.instanceof(BadRequest);
expect(err.message).to.equal(i18n.t('messageInvalidEggPotionCombo'));
expect(user.items.pets).to.be.empty;
expect(user.items.eggs).to.eql({Bunny: 1});
expect(user.items.hatchingPotions).to.eql({Veggie: 1});
done();
}
});
}); });
context('successful hatching', () => { context('successful hatching', () => {

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

@@ -20,7 +20,7 @@ module.exports = function hatch (user, req = {}) {
throw new NotFound(i18n.t('messageMissingEggPotion', req.language)); throw new NotFound(i18n.t('messageMissingEggPotion', req.language));
} }
if (content.hatchingPotions[hatchingPotion].premium && !content.dropEggs[egg]) { if ((content.hatchingPotions[hatchingPotion].premium || content.hatchingPotions[hatchingPotion].wacky) && !content.dropEggs[egg]) {
throw new BadRequest(i18n.t('messageInvalidEggPotionCombo', req.language)); throw new BadRequest(i18n.t('messageInvalidEggPotionCombo', req.language));
} }