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: change growth-points requirement to 50 (@lemoness)

Browse Source
This commit is contained in:
Tyler Renelle
2013-11-10 19:20:34 -08:00
parent 05c3e71a92
commit 543635dd37
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,7 +122,7 @@ habitrpg.controller("InventoryCtrl", ['$rootScope', '$scope', 'User', 'API_URL',
// Saddling a pet // Saddling a pet
if ($scope.selectedFood.name == 'Saddle') { if ($scope.selectedFood.name == 'Saddle') {
if (userPets[pet] < 150) return Notification.text(egg+" is not strong enough yet to 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 (user.items.mounts[pet]) return Notification.text("You already have that mount");
if (!confirm('Saddle ' + pet + '?')) return; if (!confirm('Saddle ' + pet + '?')) return;
userPets[pet] = 0; userPets[pet] = 0;
@@ -131,11 +131,11 @@ habitrpg.controller("InventoryCtrl", ['$rootScope', '$scope', 'User', 'API_URL',
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!");
} else { } else {
if (userPets[pet] >= 150) if (userPets[pet] >= 50)
return Notification.text(egg+" has become very strong and wild, try using a saddle and something might happen."); 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] += 50; // FIXME change this to 5 before we're live userPets[pet] += 5;
Notification.text(egg+' really likes the '+$scope.selectedFood.name+'!'); Notification.text(egg+' really likes the '+$scope.selectedFood.name+'!');
} else { } else {
userPets[pet] += 2; userPets[pet] += 2;

4
views/options/inventory/stable.jade
View File

@@ -55,8 +55,8 @@ script(type='text/ng-template', id='partials/options.inventory.stable.pets.html'
menu menu
div(ng-repeat='potion in Items.hatchingPotions', tooltip='{{potion.name}} {{egg.name}}', ng-init='pet = egg.name+"-"+potion.name') div(ng-repeat='potion in Items.hatchingPotions', tooltip='{{potion.name}} {{egg.name}}', ng-init='pet = egg.name+"-"+potion.name')
button(class="pet-button Pet-{{pet}}", ng-if='user.items.pets[pet]>0', ng-class='{active: user.items.currentPet == pet}', ng-click='choosePet(egg.name, potion.name)') button(class="pet-button Pet-{{pet}}", ng-if='user.items.pets[pet]>0', ng-class='{active: user.items.currentPet == pet}', ng-click='choosePet(egg.name, potion.name)')
.progress(ng-class='{"progress-success": user.items.pets[pet]<150}') .progress(ng-class='{"progress-success": user.items.pets[pet]<50}')
.bar(style="width: {{user.items.pets[pet]/1.5}}%;") .bar(style="width: {{user.items.pets[pet]/.5}}%;")
button(class="pet-button pet-not-owned", ng-if='!user.items.pets[pet]') button(class="pet-button pet-not-owned", ng-if='!user.items.pets[pet]')
img(src='/bower_components/habitrpg-shared/img/PixelPaw.png') img(src='/bower_components/habitrpg-shared/img/PixelPaw.png')