sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-08 13:35:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(pets): if !Content.hatchingPotions[x], use string passed for

Browse source 
displayname. Fixes #3575
This commit is contained in:
Tyler Renelle 2014-06-08 11:11:34 -06:00
parent ce2f0b1ba7
commit efc9a6e715
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
public/js/controllers/inventoryCtrl.js
View file

@ -98,8 +98,11 @@ habitrpg.controller("InventoryCtrl", ['$rootScope', '$scope', '$window', 'User',
}
$scope.choosePet = function(egg, potion){
var petDisplayName = env.t('petName', {potion: Content.hatchingPotions[potion].text(), egg: Content.eggs[egg].text()}),
pet = egg + '-' + potion;
var petDisplayName = env.t('petName', {
potion: Content.hatchingPotions[potion] ? Content.hatchingPotions[potion].text() : potion,
egg: Content.eggs[egg] ? Content.eggs[egg].text() : egg
}),
pet = egg + '-' + potion;
// Feeding Pet
if ($scope.selectedFood) {

12
views/options/inventory/stable.jade
View file

@ -70,11 +70,13 @@ script(type='text/ng-template', id='partials/options.inventory.pets.html')
h4=env.t('rarePets')
menu
div
button(ng-if='user.items.pets["Wolf-Veteran"]', class="pet-button Pet-Wolf-Veteran", ng-class='{active: user.items.currentPet == "Wolf-Veteran"}', ng-click='choosePet("Wolf", "Veteran")', popover=env.t('veteranWolf'), popover-trigger='mouseenter', popover-placement='bottom')
button(ng-if='user.items.pets["Wolf-Cerberus"]', class="pet-button Pet-Wolf-Cerberus", ng-class='{active: user.items.currentPet == "Wolf-Cerberus"}', ng-click='choosePet("Wolf", "Cerberus")', popover=env.t('cerberusPup'), popover-trigger='mouseenter', popover-placement='bottom')
button(ng-if='user.items.pets["Turkey-Base"]', class="pet-button Pet-Turkey-Base", ng-class='{active: user.items.currentPet == "Turkey-Base"}', ng-click='choosePet("Turkey", "Base")', popover=env.t('turkey'), popover-trigger='mouseenter', popover-placement='bottom')
button(ng-if='user.items.pets["BearCub-Polar"]', class="pet-button Pet-BearCub-Polar", ng-class='{active: user.items.currentPet == "BearCub-Polar"}', ng-click='choosePet("BearCub", "Polar")', popover=env.t('polarBearPup'), popover-trigger='mouseenter', popover-placement='bottom')
button(ng-if='user.items.pets["Dragon-Hydra"]', class="pet-button Pet-Dragon-Hydra", ng-class='{active: user.items.currentPet == "Dragon-Hydra"}', ng-click='choosePet("Dragon", "Hydra")', popover=env.t('hydra'), popover-trigger='mouseenter', popover-placement='bottom')
mixin vetPet(egg,pot,t)
button(ng-if='user.items.pets["#{egg}-#{pot}"]', class="pet-button Pet-#{egg}-#{pot}", ng-class='{active: user.items.currentPet == "#{egg}-#{pot}"}', ng-click='choosePet("#{egg}", "#{pot}")', popover=env.t(t), popover-trigger='mouseenter', popover-placement='bottom')
+vetPet("Wolf","Veteran","veteranWolf")
+vetPet("Wolf","Cerberus","cerberusPup")
+vetPet("Turkey","Base","turkey")
+vetPet("BearCub","Polar","polarBearPup")
+vetPet("Dragon","Hydra","hydra")
a(target='_blank', href='http://habitrpg.wikia.com/wiki/Contributing_to_HabitRPG')
button(ng-if='!user.items.pets["Dragon-Hydra"]', class="pet-button pet-not-owned", popover-trigger='mouseenter', popover-placement='right', popover=env.t('rarePetPop1'), popover-title=env.t('rarePetPop2'))
.PixelPaw-Gold