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

Move all pet counting to shared count scripts

Browse Source
This commit is contained in:
Blade Barringer
2015-07-22 17:32:12 -05:00
parent 063e53b0ea
commit f40cfd2b66
5 changed files with 16 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,7 +104,7 @@ habitrpg.controller("InventoryCtrl",
// Checks if Triad Bingo has been reached for the first time
if(!user.achievements.triadBingo
&& $scope.mountCount >= 90
&& Shared.countTriad(User.user.items.pets) >= 90) {
&& Shared.count.dropPetsCurrentlyOwned(User.user.items.pets) >= 90) {
User.user.achievements.triadBingo = true;
$rootScope.openModal('achievements/triadBingo');
}
@@ -214,8 +214,8 @@ habitrpg.controller("InventoryCtrl",
};
function _updateDropAnimalCount(items) {
$scope.petCount = Shared.countBeastMasterProgress(items.pets);
$scope.mountCount = Shared.countMountMasterProgress(items.mounts);
$scope.petCount = Shared.count.beastMasterProgress(items.pets);
$scope.mountCount = Shared.count.mountMasterProgress(items.mounts);
$scope.beastMasterProgress = Stats.beastMasterProgress(items.pets);
$scope.mountMasterProgress = Stats.mountMasterProgress(items.mounts);
}