sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-01 15:31:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

working stable

Browse source
This commit is contained in:
Matteo Pagliazzi 2013-09-03 12:05:54 +02:00
parent 3fd290a3e1
commit e41efa98e4
2 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
assets/js/controllers/petsCtrl.js
View file

@ -1,10 +1,8 @@
habitrpg.controller("PetsCtrl", ['$scope', '$rootScope', 'User',
function($scope, $rootScope, User) {
habitrpg.controller("PetsCtrl", ['$scope', 'User',
function($scope, User) {
var user = $rootScope.user;
$scope.userPets = user.items.pets;
$scope.userCurrentPet = user.items.currentPet;
$scope.userPets = User.user.items.pets;
$scope.userCurrentPet = User.user.items.currentPet;
$scope.pets = window.habitrpgShared.items.items.pets;
$scope.hatchingPotions = window.habitrpgShared.items.items.hatchingPotions;
@ -19,21 +17,15 @@ habitrpg.controller("PetsCtrl", ['$scope', '$rootScope', 'User',
}
$scope.choosePet = function(name, potion){
console.log(user.items.currentPet);
if($scope.userCurrentPet && $scope.userCurrentPet.str === (name + '-' + potion)){
$scope.userCurrentPet = null;
User.log({op:'set', data:{'items.currentPet': $scope.userCurrentPet}});
}else{
var pet = _.find($scope.pets, {name: name});
console.log(pet, {name: $scope.pets});
pet.modifier = potion;
pet.str = name + '-' + potion;
$scope.userCurrentPet = pet;
User.log({op:'set', data:{'items.currentPet': $scope.userCurrentPet}});
}
// Changes doesn't propagate!!! here the console log for 'user.items.currentPet' the old value and
// for '$scope.userCurrentPet' the new one
console.log(user.items.currentPet, $scope.userCurrentPet);
User.set('items.currentPet', $scope.userCurrentPet);
}
}]);

2
views/options/index.jade
View file

@ -54,7 +54,7 @@
//app:game-pane:market
.tab-pane#stable-tab
include ./groups/tavern
include ./pets
.tab-pane#tavern-tab
include ./groups/tavern