krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 15:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4703 from scribblypanda/issue2825

Browse Source 
added pet colour to feed/evolve notif
This commit is contained in:
Blade Barringer
2015-02-22 12:12:23 -05:00
parent 6d38086b66 d46633b089
commit f355672b3b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/locales/en/messages.json
View File

@@ -6,9 +6,9 @@
"messageFoodNotFound": ":food not found in user.items.food", "messageFoodNotFound": ":food not found in user.items.food",
"messageCannotFeedPet": "Can't feed this pet.", "messageCannotFeedPet": "Can't feed this pet.",
"messageAlreadyMount": "You already have that mount. Try feeding another pet.", "messageAlreadyMount": "You already have that mount. Try feeding another pet.",
"messageEvolve": "You have tamed <%= egg %>, let's go for a ride!", "messageEvolve": "You have tamed <%= potion%> <%= egg %>, let's go for a ride!",
"messageLikesFood": "<%= egg %> really likes the <%= foodText %>!", "messageLikesFood": "<%= potion %> <%= egg %> really likes the <%= foodText %>!",
"messageDontEnjoyFood": "<%= egg %> eats the <%= foodText %> but doesn't seem to enjoy it.", "messageDontEnjoyFood": "<%= potion %> <%= egg %> eats the <%= foodText %> but doesn't seem to enjoy it.",
"messageBought": "Bought <%= itemText %>", "messageBought": "Bought <%= itemText %>",
"messageEquipped": " <%= itemText %> equipped.", "messageEquipped": " <%= itemText %> equipped.",
"messageUnEquipped": "<%= itemText %> un-equipped.", "messageUnEquipped": "<%= itemText %> un-equipped.",

6
common/script/index.coffee
View File

@@ -683,17 +683,17 @@ api.wrap = (user, main=true) ->
# changed to -1 to mark "owned" pets # changed to -1 to mark "owned" pets
user.items.mounts[pet] = true user.items.mounts[pet] = true
user.items.currentPet = "" if pet is user.items.currentPet 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' if food.key is 'Saddle'
evolve() evolve()
else else
if food.target is potion if food.target is potion
userPets[pet] += 5 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 else
userPets[pet] += 2 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] if userPets[pet] >= 50 and !user.items.mounts[pet]
evolve() evolve()
user.items.food[food.key]-- user.items.food[food.key]--