From 0204d8710f41810e1dafda3d323174c7f1986e46 Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Mon, 17 Feb 2020 13:35:24 +0100 Subject: [PATCH] Comestible name to object --- data/json/items/comestibles/brewing.json | 6 ++---- data/json/items/comestibles/carnivore.json | 3 +-- data/json/items/comestibles/drink.json | 6 ++---- data/json/items/comestibles/drink_other.json | 9 +++------ data/json/items/comestibles/frozen.json | 3 +-- data/json/items/comestibles/junkfood.json | 12 ++++-------- data/json/items/comestibles/meat_dishes.json | 6 ++---- data/json/items/comestibles/med.json | 3 +-- data/json/items/comestibles/mutagen.json | 3 +-- data/json/items/comestibles/other.json | 3 +-- data/json/items/comestibles/sandwich.json | 3 +-- data/json/items/comestibles/seed.json | 3 +-- data/json/items/comestibles/wheat.json | 3 +-- 13 files changed, 21 insertions(+), 42 deletions(-) diff --git a/data/json/items/comestibles/brewing.json b/data/json/items/comestibles/brewing.json index 98fd5f2df77d0..82878b2fcb659 100644 --- a/data/json/items/comestibles/brewing.json +++ b/data/json/items/comestibles/brewing.json @@ -303,8 +303,7 @@ { "type": "COMESTIBLE", "id": "brew_moonshine", - "name": "moonshine mash", - "name_plural": "moonshine mashes", + "name": { "str": "moonshine mash", "str_pl": "moonshine mashes" }, "description": "Unfermented moonshine. Just some water, sugar and corn, like good ol' aunt's recipe.", "weight": "50 g", "color": "brown", @@ -324,8 +323,7 @@ { "type": "COMESTIBLE", "id": "wash_moonshine", - "name": "moonshine wash", - "name_plural": "moonshine washes", + "name": { "str": "moonshine wash", "str_pl": "moonshine washes" }, "description": "Fermented, but not distilled moonshine. Contains all the contaminants you don't want in your moonshine.", "weight": "50 g", "color": "brown", diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json index 61c8d5b80cad7..11003693ef9fa 100644 --- a/data/json/items/comestibles/carnivore.json +++ b/data/json/items/comestibles/carnivore.json @@ -327,8 +327,7 @@ "id": "jerky", "copy-from": "flesh", "type": "COMESTIBLE", - "name": "meat jerky", - "name_plural": "meat jerky", + "name": { "str": "meat jerky", "str_pl": "meat jerky" }, "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "jerk jerky", "str_pl": "jerk jerky" } }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "monster jerky", "str_pl": "monster jerky" } } diff --git a/data/json/items/comestibles/drink.json b/data/json/items/comestibles/drink.json index 98c9fed5604b0..a516e85c2e951 100644 --- a/data/json/items/comestibles/drink.json +++ b/data/json/items/comestibles/drink.json @@ -599,8 +599,7 @@ { "type": "COMESTIBLE", "id": "milk", - "name": "milk", - "name_plural": "milk", + "name": { "str": "milk", "str_pl": "milk" }, "weight": "258 g", "color": "white", "spoils_in": "1 d", @@ -946,8 +945,7 @@ "id": "water_mineral", "copy-from": "water", "type": "COMESTIBLE", - "name": "mineral water", - "name_plural": "mineral water", + "name": { "str": "mineral water", "str_pl": "mineral water" }, "description": "Fancy mineral water, so fancy it makes you feel fancy just holding it.", "container": "bottle_plastic", "proportional": { "quench": 1.2 }, diff --git a/data/json/items/comestibles/drink_other.json b/data/json/items/comestibles/drink_other.json index 21dfda35046e5..6d9f50d2281b2 100644 --- a/data/json/items/comestibles/drink_other.json +++ b/data/json/items/comestibles/drink_other.json @@ -26,8 +26,7 @@ "type": "COMESTIBLE", "symbol": "~", "color": "light_cyan", - "name": "maple sap", - "name_plural": "maple sap", + "name": { "str": "maple sap", "str_pl": "maple sap" }, "copy-from": "syrup", "description": "A water and sugar solution that has been extracted from a maple tree.", "price": 50, @@ -51,8 +50,7 @@ "type": "COMESTIBLE", "symbol": "~", "color": "white", - "name": "mayonnaise", - "name_plural": "mayonnaise", + "name": { "str": "mayonnaise", "str_pl": "mayonnaise" }, "description": "A gloppy mix of egg, oil, and salt that is traditionally used to moisten sandwiches.", "price": 187, "material": [ "junk", "egg" ], @@ -211,8 +209,7 @@ { "type": "COMESTIBLE", "id": "molasses", - "name": "molasses", - "name_plural": "molasses", + "name": { "str": "molasses", "str_pl": "molasses" }, "weight": "89 g", "color": "brown", "container": "jar_glass", diff --git a/data/json/items/comestibles/frozen.json b/data/json/items/comestibles/frozen.json index d252569d8403c..c4cba5d4dad64 100644 --- a/data/json/items/comestibles/frozen.json +++ b/data/json/items/comestibles/frozen.json @@ -2,8 +2,7 @@ { "type": "COMESTIBLE", "id": "milkshake", - "name": "milkshake", - "name_plural": "milkshakes", + "name": { "str": "milkshake" }, "//": "they bring the boys to the yard", "description": "An all-natural cold beverage made with milk and sweeteners. Tastes great when frozen.", "weight": "160 g", diff --git a/data/json/items/comestibles/junkfood.json b/data/json/items/comestibles/junkfood.json index 9139e8af53242..6eced15dad4ff 100644 --- a/data/json/items/comestibles/junkfood.json +++ b/data/json/items/comestibles/junkfood.json @@ -215,8 +215,7 @@ { "type": "COMESTIBLE", "id": "marshmallow", - "name": "marshmallows", - "name_plural": "marshmallows", + "name": { "str": "marshmallows", "str_pl": "marshmallows" }, "weight": "53 g", "color": "white", "spoils_in": "90 days", @@ -338,8 +337,7 @@ { "type": "COMESTIBLE", "id": "maple_candy", - "name": "maple syrup candy", - "name_plural": "maple syrup candies", + "name": { "str": "maple syrup candy", "str_pl": "maple syrup candies" }, "weight": "18 g", "color": "brown", "spoils_in": "360 days", @@ -719,8 +717,7 @@ { "type": "COMESTIBLE", "id": "nachosm", - "name": "meat nachos", - "name_plural": "meat nachos", + "name": { "str": "meat nachos", "str_pl": "meat nachos" }, "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "niño nachos", "str_pl": "niño nachos" } }, { @@ -749,8 +746,7 @@ { "type": "COMESTIBLE", "id": "nachosmc", - "name": "meat nachos with cheese", - "name_plural": "meat nachos with cheese", + "name": { "str": "meat nachos with cheese", "str_pl": "meat nachos with cheese" }, "conditional_names": [ { "type": "FLAG", diff --git a/data/json/items/comestibles/meat_dishes.json b/data/json/items/comestibles/meat_dishes.json index 0551cd35eaf7c..37c694d82125b 100644 --- a/data/json/items/comestibles/meat_dishes.json +++ b/data/json/items/comestibles/meat_dishes.json @@ -736,8 +736,7 @@ { "type": "COMESTIBLE", "id": "deluxe_rice", - "name": "meat fried rice", - "name_plural": "meat fried rice", + "name": { "str": "meat fried rice", "str_pl": "meat fried rice" }, "conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "mutant fried rice", "str_pl": "mutant fried rice" } } ], @@ -1166,8 +1165,7 @@ { "type": "COMESTIBLE", "id": "sushi_meatroll", - "name": "meat temaki", - "name_plural": "meat temaki", + "name": { "str": "meat temaki", "str_pl": "meat temaki" }, "conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "troubling %s", "str_pl": "troubling %s" } } ], "weight": "273 g", "color": "green", diff --git a/data/json/items/comestibles/med.json b/data/json/items/comestibles/med.json index 2f3a52e212857..53d4cfb68e91d 100644 --- a/data/json/items/comestibles/med.json +++ b/data/json/items/comestibles/med.json @@ -1262,8 +1262,7 @@ "id": "weed", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "marijuana", - "name_plural": "marijuana", + "name": { "str": "marijuana", "str_pl": "marijuana" }, "description": "The dried flower buds and leaves harvested from a psychoactive variety of hemp plant. Used to reduce nausea, stimulate appetite and elevate mood. It can be habit-forming, and adverse reactions are possible.", "weight": "1 g", "volume": "250 ml", diff --git a/data/json/items/comestibles/mutagen.json b/data/json/items/comestibles/mutagen.json index 078c1bb8a6ac2..25a2bb0f75826 100644 --- a/data/json/items/comestibles/mutagen.json +++ b/data/json/items/comestibles/mutagen.json @@ -475,8 +475,7 @@ "type": "COMESTIBLE", "id": "fetus", "category": "other", - "name": "misshapen fetus", - "name_plural": "misshapen fetuses", + "name": { "str": "misshapen fetus", "str_pl": "misshapen fetuses" }, "weight": "760 g", "color": "pink", "spoils_in": "2 days", diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json index 552aec3d5d3b9..4af9973ae08cb 100644 --- a/data/json/items/comestibles/other.json +++ b/data/json/items/comestibles/other.json @@ -86,8 +86,7 @@ { "type": "COMESTIBLE", "id": "marloss_berry", - "name": "marloss berry", - "name_plural": "marloss berries", + "name": { "str": "marloss berry", "str_pl": "marloss berries" }, "weight": "177 g", "color": "pink", "addiction_type": "marloss_r", diff --git a/data/json/items/comestibles/sandwich.json b/data/json/items/comestibles/sandwich.json index 92ac602939d13..59d57ba1e8602 100644 --- a/data/json/items/comestibles/sandwich.json +++ b/data/json/items/comestibles/sandwich.json @@ -187,8 +187,7 @@ { "type": "COMESTIBLE", "id": "sandwich_t", - "name": "meat sandwich", - "name_plural": "meat sandwiches", + "name": { "str": "meat sandwich", "str_pl": "meat sandwiches" }, "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "slob sandwich", "str_pl": "slob sandwiches" } }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "mutant %s", "str_pl": "mutant %s" } } diff --git a/data/json/items/comestibles/seed.json b/data/json/items/comestibles/seed.json index e2188a45de421..266302bfa0564 100644 --- a/data/json/items/comestibles/seed.json +++ b/data/json/items/comestibles/seed.json @@ -619,8 +619,7 @@ "type": "COMESTIBLE", "id": "seed_mushroom_morel", "copy-from": "seed_mushroom_base", - "name": "morel mushroom spores", - "name_plural": "morel mushroom spores", + "name": { "str": "morel mushroom spores", "str_pl": "morel mushroom spores" }, "description": "Some morel mushroom spores.", "seed_data": { "plant_name": "morel mushroom", "fruit": "mushroom_morel", "grow": "91 days" } }, diff --git a/data/json/items/comestibles/wheat.json b/data/json/items/comestibles/wheat.json index c9bf26fa7b6cf..be630168299f8 100644 --- a/data/json/items/comestibles/wheat.json +++ b/data/json/items/comestibles/wheat.json @@ -123,8 +123,7 @@ { "type": "COMESTIBLE", "id": "macaroni_cooked", - "name": "mac & cheese", - "name_plural": "mac & cheese", + "name": { "str": "mac & cheese", "str_pl": "mac & cheese" }, "weight": "209 g", "color": "yellow", "spoils_in": "10 hours",