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

eggs: bug fixes on selling potions

Browse Source
This commit is contained in:
Tyler Renelle
2013-10-19 20:22:12 -07:00
parent c882525150
commit e4f2a4386d
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,18 +30,18 @@ habitrpg.controller("InventoryCtrl", ['$scope', 'User',
$scope.sellInventory = function() {
if ($scope.selectedEgg) {
User.user.stats.gp += $scope.selectedEgg.value;
$scope.userEggs.splice($scope.selectedEgg.index, 1);
User.log([
{ op: 'set', data: {'items.eggs': $scope.userEggs} }
]);
User.setMultiple({
'items.eggs': $scope.userEggs,
'stats.gp': User.user.stats.gp + $scope.selectedEgg.value
});
$scope.selectedEgg = null;
} else if ($scope.selectedPotion) {
User.user.stats.gp += $scope.selectedPotion.value;
$scope.userHatchingPotions.splice($scope.selectedPotion.index, 1);
User.log([
{ op: 'set', data: {'items.hatchingPotions': $scope.selectedPotion} }
]);
User.setMultiple({
'items.hatchingPotions': $scope.userHatchingPotions,
'stats.gp': User.user.stats.gp + $scope.selectedPotion.value
});
$scope.selectedPotion = null;
}
}
@@ -58,7 +58,7 @@ habitrpg.controller("InventoryCtrl", ['$scope', 'User',
}
$scope.hatch = function(egg, potion){
if ($scope.ownsPet(egg.name, potion.name)){
if ($scope.ownsPet(egg, potion.name)){
return alert("You already have that pet, hatch a different combo.")
}
var pet = egg.name + '-' + potion.name;