From c6472bc615c2f95ddd6f8383688fb025adff93a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Jureti=C4=87?= Date: Wed, 18 Sep 2013 11:07:23 -0300 Subject: [PATCH] fix hardcoded total pets count --- public/js/controllers/petsCtrl.js | 1 + views/options/pets.jade | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/public/js/controllers/petsCtrl.js b/public/js/controllers/petsCtrl.js index 1643d52d51..7d4e6ba5ed 100644 --- a/public/js/controllers/petsCtrl.js +++ b/public/js/controllers/petsCtrl.js @@ -5,6 +5,7 @@ habitrpg.controller("PetsCtrl", ['$scope', 'User', $scope.userCurrentPet = User.user.items.currentPet; $scope.pets = window.habitrpgShared.items.items.pets; $scope.hatchingPotions = window.habitrpgShared.items.items.hatchingPotions; + $scope.totalPets = $scope.pets.length * $scope.hatchingPotions.length; $scope.hasPet = function(name, potion){ if (!$scope.userPets) return false; diff --git a/views/options/pets.jade b/views/options/pets.jade index 8afc98672c..98befaa24e 100644 --- a/views/options/pets.jade +++ b/views/options/pets.jade @@ -11,7 +11,7 @@ | ! Until that day, a(target='_blank', href='https://f.cloud.github.com/assets/2374703/164631/3ed5fa6c-78cd-11e2-8743-f65ac477b55e.png') have a look-see | at all the pets you can collect. - h4 {{userPets.length}} / 90 Pets Found + h4 {{userPets.length}} / {{totalPets}} Pets Found table.pets(ng-repeat='pet in pets') tbody