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

Fix content name error (#7995)

Browse Source 
* fix: correct translation strings for pet/mount names

* chore: expose potion and egg key, not object in pet content api

* fix: Update feed route to use potion and egg objects

* refactor: Update feed route to use petInfo

* Use pet/mount text method for name

* correct feed route
This commit is contained in:
Blade Barringer
2016-09-10 22:05:25 -05:00
committed by GitHub
parent 295463b210
commit 3d53781bd3
9 changed files with 82 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
website/client/js/controllers/inventoryCtrl.js
View File

@@ -180,11 +180,8 @@ habitrpg.controller("InventoryCtrl",
}
$scope.choosePet = function(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;
var pet = Content.petInfo[egg + '-' + potion];
var petDisplayName = pet.text();
// Feeding Pet
if ($scope.selectedFood) {
@@ -195,14 +192,14 @@ habitrpg.controller("InventoryCtrl",
} else if (!$window.confirm(window.env.t('feedPet', {name: petDisplayName, article: food.article, text: food.text()}))) {
return;
}
User.feed({params:{pet: pet, food: food.key}});
User.feed({params:{pet: pet.key, food: food.key}});
$scope.selectedFood = null;
_updateDropAnimalCount(user.items);
if ($rootScope.countExists(user.items.mounts) > startingMounts && !user.preferences.suppressModals.raisePet) {
$scope.raisedPet = {
displayName: petDisplayName,
spriteName: pet,
spriteName: pet.key,
egg: egg,
potion: potion
}
@@ -221,7 +218,7 @@ habitrpg.controller("InventoryCtrl",
// Selecting Pet
} else {
User.equip({params:{type: 'pet', key: pet}});
User.equip({params:{type: 'pet', key: pet.key}});
}
}