From 3209ceca650014b963c08ee059f5eebcd042bc24 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Sat, 21 Dec 2013 22:01:14 -0600 Subject: [PATCH 1/2] Improve food drop notification phrasing --- script/content.coffee | 6 +++--- script/index.coffee | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/script/content.coffee b/script/content.coffee index ac33e47dae..670853c94f 100644 --- a/script/content.coffee +++ b/script/content.coffee @@ -460,10 +460,10 @@ _.each api.hatchingPotions, (pot,k) -> api.food = Meat: text: 'Meat', target: 'Base' Milk: text: 'Milk', target: 'White' - Potatoe: text: 'Potato', target: 'Desert' - Strawberry: text: 'Strawberry', target: 'Red' + Potatoe: text: 'Potato', target: 'Desert', article: 'a ' + Strawberry: text: 'Strawberry', target: 'Red', article: 'a ' Chocolate: text: 'Chocolate', target: 'Shade' - Fish: text: 'Fish', target: 'Skeleton' + Fish: text: 'Fish', target: 'Skeleton', article: 'a ' RottenMeat: text: 'Rotten Meat', target: 'Zombie' CottonCandyPink: text: 'Pink Cotton Candy', target: 'CottonCandyPink' CottonCandyBlue: text: 'Blue Cotton Candy', target: 'CottonCandyBlue' diff --git a/script/index.coffee b/script/index.coffee index 2ea351ba5e..cdb9764416 100644 --- a/script/index.coffee +++ b/script/index.coffee @@ -893,7 +893,7 @@ api.wrap = (user) -> user.items.food[drop.name] ?= 0 user.items.food[drop.name]+= 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 From fce23fc04a9f32e9e811467a9f363f24ea2aa71b Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Sat, 21 Dec 2013 22:19:09 -0600 Subject: [PATCH 2/2] Fix "You found undefinedHoney" --- script/content.coffee | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/script/content.coffee b/script/content.coffee index 670853c94f..e9cca80942 100644 --- a/script/content.coffee +++ b/script/content.coffee @@ -458,16 +458,16 @@ _.each api.hatchingPotions, (pot,k) -> _.defaults pot, {name: k, 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' + 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' + Chocolate: text: 'Chocolate', target: 'Shade', article: '' Fish: text: 'Fish', target: 'Skeleton', article: 'a ' - 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' + 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'