This commit is contained in:
Blade Barringer
2015-02-24 16:58:48 -06:00
parent 6eeff5a0af
commit 016e359690
3 changed files with 9 additions and 9 deletions
+3 -3
View File
@@ -5864,7 +5864,7 @@ api.wrap = function(user, main) {
user.items.currentPet = "";
}
return message = i18n.t('messageEvolve', {
pet: petDisplayName
egg: petDisplayName
}, req.language);
};
if (food.key === 'Saddle') {
@@ -5873,13 +5873,13 @@ api.wrap = function(user, main) {
if (food.target === potion) {
userPets[pet] += 5;
message = i18n.t('messageLikesFood', {
pet: petDisplayName,
egg: petDisplayName,
foodText: food.text(req.language)
}, req.language);
} else {
userPets[pet] += 2;
message = i18n.t('messageDontEnjoyFood', {
pet: petDisplayName,
egg: petDisplayName,
foodText: food.text(req.language)
}, req.language);
}
+3 -3
View File
@@ -6,9 +6,9 @@
"messageFoodNotFound": ":food not found in user.items.food",
"messageCannotFeedPet": "Can't feed this pet.",
"messageAlreadyMount": "You already have that mount. Try feeding another pet.",
"messageEvolve": "You have tamed <%= pet %>, let's go for a ride!",
"messageLikesFood": "<%= pet %> really likes the <%= foodText %>!",
"messageDontEnjoyFood": "<%= pet %> eats the <%= foodText %> but doesn't seem to enjoy it.",
"messageEvolve": "You have tamed <%= egg %>, let's go for a ride!",
"messageLikesFood": "<%= egg %> really likes the <%= foodText %>!",
"messageDontEnjoyFood": "<%= egg %> eats the <%= foodText %> but doesn't seem to enjoy it.",
"messageBought": "Bought <%= itemText %>",
"messageEquipped": " <%= itemText %> equipped.",
"messageUnEquipped": "<%= itemText %> un-equipped.",
+3 -3
View File
@@ -691,17 +691,17 @@ api.wrap = (user, main=true) ->
# changed to -1 to mark "owned" pets
user.items.mounts[pet] = true
user.items.currentPet = "" if pet is user.items.currentPet
message = i18n.t('messageEvolve', {pet: petDisplayName}, req.language)
message = i18n.t('messageEvolve', {egg: petDisplayName}, req.language)
if food.key is 'Saddle'
evolve()
else
if food.target is potion
userPets[pet] += 5
message = i18n.t('messageLikesFood', {pet: petDisplayName, foodText: food.text(req.language)}, req.language)
message = i18n.t('messageLikesFood', {egg: petDisplayName, foodText: food.text(req.language)}, req.language)
else
userPets[pet] += 2
message = i18n.t('messageDontEnjoyFood', {pet: petDisplayName, foodText: food.text(req.language)}, req.language)
message = i18n.t('messageDontEnjoyFood', {egg: petDisplayName, foodText: food.text(req.language)}, req.language)
if userPets[pet] >= 50 and !user.items.mounts[pet]
evolve()
user.items.food[food.key]--