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

refactor(modals): More readable invalid hatch check

Browse Source
This commit is contained in:
Sabe Jones
2015-12-07 16:00:52 -05:00
parent 0f578b79ff
commit dd4ca5c476
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
website/public/js/controllers/inventoryCtrl.js
View File

@@ -115,12 +115,12 @@ habitrpg.controller("InventoryCtrl",
var potName = Content.hatchingPotions[potion.key].text(); var potName = Content.hatchingPotions[potion.key].text();
if (!$window.confirm(window.env.t('hatchAPot', {potion: potName, egg: eggName}))) return; if (!$window.confirm(window.env.t('hatchAPot', {potion: potName, egg: eggName}))) return;
var invalidPet = (user.items.pets[egg.key + '-' + potion.key] > 0) || var userHasPet = user.items.pets[egg.key + '-' + potion.key] > 0;
(Content.hatchingPotions[potion.key].premium && !Content.dropEggs[egg.key]) var isPremiumPet = Content.hatchingPotions[potion.key].premium && !Content.dropEggs[egg.key];
user.ops.hatch({params:{egg:egg.key, hatchingPotion:potion.key}}); user.ops.hatch({params:{egg:egg.key, hatchingPotion:potion.key}});
if (!user.preferences.suppressModals.hatchPet && !invalidPet) { if (!user.preferences.suppressModals.hatchPet && !userHasPet && !isPremiumPet) {
$scope.hatchedPet = { $scope.hatchedPet = {
egg: eggName, egg: eggName,
potion: potName, potion: potName,