From ff612555ea1c72111a08f656aacbaa1a711d521d Mon Sep 17 00:00:00 2001 From: Yafinee Date: Wed, 21 May 2014 19:54:20 +0000 Subject: [PATCH] #3054 - When feeding/saddling, ineligible pets should not get the green bubble --- views/options/inventory/stable.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/options/inventory/stable.jade b/views/options/inventory/stable.jade index 52d5b16f15..cdfada4f16 100644 --- a/views/options/inventory/stable.jade +++ b/views/options/inventory/stable.jade @@ -34,7 +34,7 @@ mixin petList(source) li.customize-menu(ng-repeat='egg in #{source}') menu div(ng-repeat='potion in Content.hatchingPotions', popover-trigger='mouseenter', popover=env.t('petName', {potion: '{{potion.text()}}', egg: '{{egg.text()}}'}), popover-placement='bottom', ng-init='pet = egg.key+"-"+potion.key') - button(class="pet-button Pet-{{pet}}", ng-if='user.items.pets[pet]>0', ng-class='{active: user.items.currentPet == pet, selectableInventory: selectedFood}', ng-click='choosePet(egg.key, potion.key)') + button(class="pet-button Pet-{{pet}}", ng-if='user.items.pets[pet]>0', ng-class='{active: user.items.currentPet == pet, selectableInventory: selectedFood && !user.items.mounts[pet]}', ng-click='choosePet(egg.key, potion.key)') .progress(ng-show='!user.items.mounts[pet] && egg.key!="Egg"') .progress-bar.progress-bar-success(style="width:{{user.items.pets[pet]/.5}}%") button(class="pet-button pet-not-owned", ng-if='!user.items.pets[pet]')