Merge pull request #217 from Alys/messageEvolve

insert messageEvolve into correct locations, replacing incorrect messageAlreadyMount
This commit is contained in:
Tyler Renelle
2014-05-17 19:21:24 -06:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -12831,7 +12831,7 @@ api.wrap = function(user, main) {
if (pet === user.items.currentPet) {
user.items.currentPet = "";
}
return message = i18n.t('messageAlreadyMount', {
return message = i18n.t('messageEvolve', {
egg: egg
}, req.language);
};
+1 -1
View File
@@ -581,7 +581,7 @@ 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('messageAlreadyMount', {egg: egg}, req.language)
message = i18n.t('messageEvolve', {egg: egg}, req.language)
if food.key is 'Saddle'
evolve()