From efc9a6e715842b7e3518c96a2803977d445fa8a5 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Sun, 8 Jun 2014 11:11:34 -0600 Subject: [PATCH] fix(pets): if !Content.hatchingPotions[x], use string passed for displayname. Fixes #3575 --- public/js/controllers/inventoryCtrl.js | 7 +++++-- views/options/inventory/stable.jade | 12 +++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/public/js/controllers/inventoryCtrl.js b/public/js/controllers/inventoryCtrl.js index 3368e38a52..b8be82e0a4 100644 --- a/public/js/controllers/inventoryCtrl.js +++ b/public/js/controllers/inventoryCtrl.js @@ -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) { diff --git a/views/options/inventory/stable.jade b/views/options/inventory/stable.jade index cdfada4f16..83ba8c9e3d 100644 --- a/views/options/inventory/stable.jade +++ b/views/options/inventory/stable.jade @@ -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