diff --git a/common/locales/en/messages.json b/common/locales/en/messages.json index e14f302fe0..f6d2d03d07 100644 --- a/common/locales/en/messages.json +++ b/common/locales/en/messages.json @@ -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 <%= 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.", + "messageEvolve": "You have tamed <%= potion%> <%= egg %>, let's go for a ride!", + "messageLikesFood": "<%= potion %> <%= egg %> really likes the <%= foodText %>!", + "messageDontEnjoyFood": "<%= potion %> <%= egg %> eats the <%= foodText %> but doesn't seem to enjoy it.", "messageBought": "Bought <%= itemText %>", "messageEquipped": " <%= itemText %> equipped.", "messageUnEquipped": "<%= itemText %> un-equipped.", diff --git a/common/script/index.coffee b/common/script/index.coffee index 2ff79cde7c..205c97e635 100644 --- a/common/script/index.coffee +++ b/common/script/index.coffee @@ -683,17 +683,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', {egg: egg}, req.language) + message = i18n.t('messageEvolve', {egg: egg, potion: potion}, req.language) if food.key is 'Saddle' evolve() else if food.target is potion userPets[pet] += 5 - message = i18n.t('messageLikesFood', {egg: egg, foodText: food.text(req.language)}, req.language) + message = i18n.t('messageLikesFood', {egg: egg, potion: potion, foodText: food.text(req.language)}, req.language) else userPets[pet] += 2 - message = i18n.t('messageDontEnjoyFood', {egg: egg, foodText: food.text(req.language)}, req.language) + message = i18n.t('messageDontEnjoyFood', {egg: egg, potion: potion, foodText: food.text(req.language)}, req.language) if userPets[pet] >= 50 and !user.items.mounts[pet] evolve() user.items.food[food.key]--