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

classes: reposition inventory, fix saddle confirm dialog, gems & food tweaks

Browse Source
This commit is contained in:
Tyler Renelle
2013-12-15 12:35:20 -07:00
parent 9f32d3e7b8
commit 12cc6f51eb
3 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,6 +76,7 @@ habitrpg.controller("InventoryCtrl", ['$rootScope', '$scope', 'User', 'API_URL',
}
$scope.hatch = function(egg, potion){
if (!confirm('Hatch a ' + potion.name + ' ' + egg.name + '?')) return;
user.ops.hatch({query:{egg:egg.name, hatchingPotion:potion.name}});
$scope.selectedEgg = null;
$scope.selectedPotion = null;
@@ -100,8 +101,11 @@ habitrpg.controller("InventoryCtrl", ['$rootScope', '$scope', 'User', 'API_URL',
// Feeding Pet
if ($scope.selectedFood) {
var food = $scope.selectedFood
if (food.name == 'Saddle' && !confirm('Saddle ' + pet + '?')) return;
if (!confirm('Feed ' + pet + ' a ' + food.name + '?')) return;
if (food.name == 'Saddle') {
if (!confirm('Saddle ' + pet + '?')) return;
} else if (!confirm('Feed ' + pet + ' a ' + food.name + '?')) {
return;
}
User.user.ops.feed({query:{pet: pet, food: food.name}});
$scope.selectedFood = null;