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

mounts: new saddle logic. saddles don't drop, can only purchase for

Browse Source 
5G. Saddle instantly raises pet=>mount (full 50pts). Saddles no longer
required as "finisher" item. (@lemoness)
This commit is contained in:
Tyler Renelle
2013-11-10 20:23:14 -08:00
parent e6f524fce2
commit e990850b01
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,20 +119,20 @@ habitrpg.controller("InventoryCtrl", ['$rootScope', '$scope', 'User', 'API_URL',
if ($scope.selectedFood) { if ($scope.selectedFood) {
var setObj = {}; var setObj = {};
var userPets = user.items.pets; var userPets = user.items.pets;
if (user.items.mounts[pet] && (userPets[pet] >= 50 || $scope.selectedFood.name == 'Saddle'))
return Notification.text("You already have that mount");
// Saddling a pet var evolve = function(){
if ($scope.selectedFood.name == 'Saddle') {
if (userPets[pet] < 50) return Notification.text(egg+" is not strong enough yet to saddle.");
if (user.items.mounts[pet]) return Notification.text("You already have that mount");
if (!confirm('Saddle ' + pet + '?')) return;
userPets[pet] = 0; userPets[pet] = 0;
setObj['items.mounts.' + pet] = true; setObj['items.mounts.' + pet] = true;
if (pet == user.items.currentPet) if (pet == user.items.currentPet) setObj['items.currentPet'] = '';
setObj['items.currentPet'] = '';
Notification.text('You have tamed '+egg+", let's go for a ride!"); Notification.text('You have tamed '+egg+", let's go for a ride!");
}
// Saddling a pet
if ($scope.selectedFood.name == 'Saddle') {
if (!confirm('Saddle ' + pet + '?')) return;
evolve();
} else { } else {
if (userPets[pet] >= 50)
return Notification.text(egg+" has become very strong and wild, try using a saddle and something might happen.");
if (!confirm('Feed ' + pet + ' a ' + $scope.selectedFood.name + '?')) return; if (!confirm('Feed ' + pet + ' a ' + $scope.selectedFood.name + '?')) return;
if ($scope.selectedFood.target == potion) { if ($scope.selectedFood.target == potion) {
userPets[pet] += 5; userPets[pet] += 5;
@@ -141,6 +141,7 @@ habitrpg.controller("InventoryCtrl", ['$rootScope', '$scope', 'User', 'API_URL',
userPets[pet] += 2; userPets[pet] += 2;
Notification.text(egg+' eats the '+$scope.selectedFood.name+" but doesn't seem to enjoy it."); Notification.text(egg+' eats the '+$scope.selectedFood.name+" but doesn't seem to enjoy it.");
} }
if (userPets[pet] >= 50 && !user.items.mounts[pet]) evolve();
} }
setObj['items.pets.' + pet] = userPets[pet]; setObj['items.pets.' + pet] = userPets[pet];
setObj['items.food.' + $scope.selectedFood.name] = user.items.food[$scope.selectedFood.name] - 1; setObj['items.food.' + $scope.selectedFood.name] = user.items.food[$scope.selectedFood.name] - 1;