krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

use helpers.countPets on server, fix client side pet count

Browse Source
This commit is contained in:
Matteo Pagliazzi
2013-11-20 18:48:48 +01:00
parent 6fc848270f
commit 4bedefbc57
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/js/controllers/inventoryCtrl.js
View File

@@ -14,7 +14,7 @@ habitrpg.controller("InventoryCtrl", ['$rootScope', '$scope', 'User', 'API_URL',
var countStacks = function(items) { return _.reduce(items,function(m,v){return m+v;},0);} var countStacks = function(items) { return _.reduce(items,function(m,v){return m+v;},0);}
$scope.$watch('user.items.pets', function(pets){ $scope.$watch('user.items.pets', function(pets){
window.habitrpgShared.helpers.countPets($rootScope.countExists(pets), User.user.items.pets); $scope.petCount = window.habitrpgShared.helpers.countPets($rootScope.countExists(pets), User.user.items.pets);
}, true); }, true);
$scope.$watch('user.items.mounts', function(mounts){ $scope.mountCount = $rootScope.countExists(mounts); }, true); $scope.$watch('user.items.mounts', function(mounts){ $scope.mountCount = $rootScope.countExists(mounts); }, true);
$scope.$watch('user.items.eggs', function(eggs){ $scope.eggCount = countStacks(eggs); }, true); $scope.$watch('user.items.eggs', function(eggs){ $scope.eggCount = countStacks(eggs); }, true);

2
src/models/user.js
View File

@@ -267,7 +267,7 @@ UserSchema.pre('save', function(next) {
'Anonymous'; 'Anonymous';
} }
var petCount = _.reduce(this.items.pets,function(m,v){return m+(v ? 1 : 0);},0); var petCount = helpers.countPets(_.reduce(this.items.pets,function(m,v){return m+(v?1:0)},0), this.items.pets);
this.achievements.beastMaster = petCount >= 90; this.achievements.beastMaster = petCount >= 90;
//our own version incrementer //our own version incrementer