Merge branch 'develop'

This commit is contained in:
Tyler Renelle 2013-08-04 22:32:41 -04:00
commit 4df34095aa

View file

@ -71,7 +71,7 @@ items = module.exports.items =
_.each ['weapon', 'armor', 'head', 'shield'], (key) ->
_.each items[key], (item) -> item.type = key
_.each items.pets, (pet) -> pet.notes = 'Find a hatching potion to pour on this egg, and one day it will hatch into a loyal pet.'
_.each items.pets, (pet) -> pet.notes = 'Find a hatching potion to pour on this egg, and it will hatch into a loyal pet.'
_.each items.hatchingPotions, (hatchingPotion) -> hatchingPotion.notes = "Pour this on an egg, and it will hatch as a #{hatchingPotion.text} pet."
module.exports.buyItem = (user, type, value, index) ->
@ -113,4 +113,4 @@ module.exports.updateStore = (user) ->
###
module.exports.getItem = (type, index=0) ->
i = if (~~index > items[type].length - 1) then items[type].length - 1 else ~~index
items[type][i]
items[type][i]