Merge pull request #62 from HabitRPG/sabe/tweak

Improve food drop notification phrasing
This commit is contained in:
Tyler Renelle
2013-12-27 07:58:09 -08:00
2 changed files with 11 additions and 11 deletions
+10 -10
View File
@@ -462,16 +462,16 @@ _.each api.hatchingPotions, (pot,key) ->
_.defaults pot, {key, value: 2, notes: "Pour this on an egg, and it will hatch as a #{pot.text} pet."}
api.food =
Meat: text: 'Meat', target: 'Base'
Milk: text: 'Milk', target: 'White'
Potatoe: text: 'Potato', target: 'Desert'
Strawberry: text: 'Strawberry', target: 'Red'
Chocolate: text: 'Chocolate', target: 'Shade'
Fish: text: 'Fish', target: 'Skeleton'
RottenMeat: text: 'Rotten Meat', target: 'Zombie'
CottonCandyPink: text: 'Pink Cotton Candy', target: 'CottonCandyPink'
CottonCandyBlue: text: 'Blue Cotton Candy', target: 'CottonCandyBlue'
Honey: text: 'Honey', target: 'Golden'
Meat: text: 'Meat', target: 'Base', article: ''
Milk: text: 'Milk', target: 'White', article: ''
Potatoe: text: 'Potato', target: 'Desert', article: 'a '
Strawberry: text: 'Strawberry', target: 'Red', article: 'a '
Chocolate: text: 'Chocolate', target: 'Shade', article: ''
Fish: text: 'Fish', target: 'Skeleton', article: 'a '
RottenMeat: text: 'Rotten Meat', target: 'Zombie', article: ''
CottonCandyPink: text: 'Pink Cotton Candy', target: 'CottonCandyPink', article: ''
CottonCandyBlue: text: 'Blue Cotton Candy', target: 'CottonCandyBlue', article: ''
Honey: text: 'Honey', target: 'Golden', article: ''
# FIXME what to do with these extra items? Should we add "targets" (plural) for food instead of singular, so we don't have awkward extras?
#Cheese: text: 'Cheese', target: 'Golden'
#Watermelon: text: 'Watermelon', target: 'Golden'
+1 -1
View File
@@ -894,7 +894,7 @@ api.wrap = (user) ->
user.items.food[drop.key] ?= 0
user.items.food[drop.key]+= 1
drop.type = 'Food'
drop.dialog = "You've found a #{drop.text} Food! #{drop.notes}"
drop.dialog = "You've found #{drop.article}#{drop.text}! #{drop.notes}"
# Eggs: 30% chance
else if rarity > .3