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

mounts: fix isUser class bringing user too far down. Fix initial drop bug. Remove items.currentPet if turned into mount

Browse Source
This commit is contained in:
Tyler Renelle
2013-11-10 12:28:47 -08:00
parent 284114c056
commit cd79649100
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -127,6 +127,8 @@ habitrpg.controller("InventoryCtrl", ['$rootScope', '$scope', 'User', 'API_URL',
if (!confirm('Saddle ' + pet + '?')) return;
userPets[pet] = 0;
setObj['items.mounts.' + pet] = true;
if (pet == user.items.currentPet)
setObj['items.currentPet'] = '';
Notification.text('You have tamed '+egg+", let's go for a ride!");
} else {
if (userPets[pet] >= 150)
@@ -149,7 +151,7 @@ habitrpg.controller("InventoryCtrl", ['$rootScope', '$scope', 'User', 'API_URL',
} else {
var userCurrentPet = User.user.items.currentPet;
if(userCurrentPet && userCurrentPet == pet){
User.user.items.currentPet = null;
User.user.items.currentPet = '';
}else{
User.user.items.currentPet = pet;
}
@@ -159,7 +161,7 @@ habitrpg.controller("InventoryCtrl", ['$rootScope', '$scope', 'User', 'API_URL',
$scope.chooseMount = function(egg, potion) {
var mount = egg + '-' + potion;
User.set('items.currentMount', (user.items.currentMount == mount) ? null : mount);
User.set('items.currentMount', (user.items.currentMount == mount) ? '' : mount);
}
}