sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-18 09:52:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Consolidated calcTriadBingo function

Browse source
This commit is contained in:
Blade Barringer 2015-01-16 21:33:58 -06:00
parent e25472759a
commit f5e9568cef
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
public/js/controllers/inventoryCtrl.js
View file

@ -78,11 +78,16 @@ habitrpg.controller("InventoryCtrl",
}
$scope.calcTriadBingo = function() {
var hasPets = Shared.countPets(null, User.user.items.pets) >= 90 ;
var hasMounts = Shared.countMounts(null, User.user.items.mounts) >= 90;
if(!(hasPets && hasMounts)) return false;
for (var p in User.user.items.pets) {
if(User.user.items.pets[p] < 0) return false;
}
return true;
};
}
$scope.hatch = function(egg, potion){
var eggName = Content.eggs[egg.key].text();
@ -101,10 +106,7 @@ habitrpg.controller("InventoryCtrl",
// Checks if Triad Bingo has been reached for the first time
if(!User.user.achievements.triadBingo
&& Shared.countPets(null, User.user.items.pets) >= 90
&& Shared.countMounts(null, User.user.items.mounts) >= 90
&& $scope.calcTriadBingo()) {
User.user.achievements.triadBingo = true;
$rootScope.openModal('achievements/triadBingo');
}