sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-13 07:18:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #217 from Alys/messageEvolve

Browse source 
insert messageEvolve into correct locations, replacing incorrect messageAlreadyMount
This commit is contained in:
Tyler Renelle 2014-05-17 19:21:24 -06:00
commit b0f4c9e9e3
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dist/habitrpg-shared.js vendored
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);
};

2
script/index.coffee
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()