From 4140c48a69f6e000f76013da7f39975119485a76 Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Sat, 15 Feb 2020 09:38:36 +0100 Subject: [PATCH] Comestible name to object --- data/json/items/comestibles/drink.json | 6 ++--- data/json/items/comestibles/frozen.json | 3 +-- data/json/items/comestibles/fruit_dishes.json | 3 +-- data/json/items/comestibles/meat_dishes.json | 12 ++++------ data/json/items/comestibles/med.json | 6 ++--- data/json/items/comestibles/raw_veggy.json | 3 +-- data/json/items/comestibles/sandwich.json | 6 ++--- data/json/items/comestibles/seed.json | 24 +++++++------------ data/json/items/comestibles/veggy_dishes.json | 6 ++--- data/json/items/comestibles/wheat.json | 3 +-- 10 files changed, 24 insertions(+), 48 deletions(-) diff --git a/data/json/items/comestibles/drink.json b/data/json/items/comestibles/drink.json index ad1e3b498990d..d37e03f9a61c1 100644 --- a/data/json/items/comestibles/drink.json +++ b/data/json/items/comestibles/drink.json @@ -339,8 +339,7 @@ { "type": "COMESTIBLE", "id": "crispycran", - "name": "crispy cranberry", - "name_plural": "crispy cranberries", + "name": { "str": "crispy cranberry", "str_pl": "crispy cranberries" }, "weight": "250 g", "color": "pink", "container": "can_drink", @@ -361,8 +360,7 @@ { "type": "COMESTIBLE", "id": "dandelion_tea", - "name": "dandelion tea", - "name_plural": "dandelion tea", + "name": { "str": "dandelion tea", "str_pl": "dandelion tea" }, "weight": "252 g", "color": "yellow", "comestible_type": "DRINK", diff --git a/data/json/items/comestibles/frozen.json b/data/json/items/comestibles/frozen.json index f0cf7312aa21f..73f8dfd219e46 100644 --- a/data/json/items/comestibles/frozen.json +++ b/data/json/items/comestibles/frozen.json @@ -42,8 +42,7 @@ "type": "COMESTIBLE", "copy-from": "milkshake", "id": "milkshake_deluxe", - "name": "deluxe milkshake", - "name_plural": "deluxe milkshakes", + "name": { "str": "deluxe milkshake" }, "description": "This milkshake has been enhanced with added sweeteners, and even has a cherry on top. Tastes great, but is fairly awful for your health.", "calories": 265, "quench": 40, diff --git a/data/json/items/comestibles/fruit_dishes.json b/data/json/items/comestibles/fruit_dishes.json index 1a8838fc45e8e..ce9044360f8fa 100644 --- a/data/json/items/comestibles/fruit_dishes.json +++ b/data/json/items/comestibles/fruit_dishes.json @@ -160,8 +160,7 @@ { "type": "COMESTIBLE", "id": "dry_fruit", - "name": "dehydrated fruit", - "name_plural": "dehydrated fruit", + "name": { "str": "dehydrated fruit", "str_pl": "dehydrated fruit" }, "weight": "75 g", "color": "magenta", "spoils_in": "360 days", diff --git a/data/json/items/comestibles/meat_dishes.json b/data/json/items/comestibles/meat_dishes.json index 37d5cab07fede..3cb101026146d 100644 --- a/data/json/items/comestibles/meat_dishes.json +++ b/data/json/items/comestibles/meat_dishes.json @@ -169,8 +169,7 @@ { "type": "COMESTIBLE", "id": "cracklins", - "name": "cracklins", - "name_plural": "cracklins", + "name": { "str": "cracklins", "str_pl": "cracklins" }, "weight": "42 g", "color": "brown", "spoils_in": "7 days", @@ -265,8 +264,7 @@ { "type": "COMESTIBLE", "id": "dry_fish", - "name": "dehydrated fish", - "name_plural": "dehydrated fish", + "name": { "str": "dehydrated fish", "str_pl": "dehydrated fish" }, "copy-from": "fish_cooked", "primary_material": "cured_meat", "weight": "85 g", @@ -762,8 +760,7 @@ { "type": "COMESTIBLE", "id": "deluxe_beansnrice", - "name": "deluxe beans and rice", - "name_plural": "deluxe beans and rice", + "name": { "str": "deluxe beans and rice", "str_pl": "deluxe beans and rice" }, "conditional_names": [ { "type": "COMPONENT_ID", @@ -854,8 +851,7 @@ { "type": "COMESTIBLE", "id": "deluxe_eggs", - "name": "deluxe scrambled eggs", - "name_plural": "deluxe scrambled eggs", + "name": { "str": "deluxe scrambled eggs", "str_pl": "deluxe scrambled eggs" }, "conditional_names": [ { "type": "COMPONENT_ID", diff --git a/data/json/items/comestibles/med.json b/data/json/items/comestibles/med.json index 93fc1121eea26..ca485517902ee 100644 --- a/data/json/items/comestibles/med.json +++ b/data/json/items/comestibles/med.json @@ -433,8 +433,7 @@ "id": "cotton_ball", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "cotton balls", - "name_plural": "cotton balls", + "name": { "str": "cotton balls", "str_pl": "cotton balls" }, "description": "Fluffy balls of clean white cotton. Can serve as makeshift bandages in an emergency.", "category": "spare_parts", "weight": "22 g", @@ -452,8 +451,7 @@ "id": "crack", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "crack", - "name_plural": "crack", + "name": { "str": "crack", "str_pl": "crack" }, "description": "Deprotonated cocaine crystals, incredibly addictive and deleterious to brain chemistry.", "weight": "1 g", "volume": "250 ml", diff --git a/data/json/items/comestibles/raw_veggy.json b/data/json/items/comestibles/raw_veggy.json index 9313e87a70373..1c6fcf34347e5 100644 --- a/data/json/items/comestibles/raw_veggy.json +++ b/data/json/items/comestibles/raw_veggy.json @@ -198,8 +198,7 @@ { "type": "COMESTIBLE", "id": "corn", - "name": "corn", - "name_plural": "corn", + "name": { "str": "corn", "str_pl": "corn" }, "weight": "153 g", "color": "light_green", "spoils_in": "5 days", diff --git a/data/json/items/comestibles/sandwich.json b/data/json/items/comestibles/sandwich.json index 479895b359cc8..dc87867532478 100644 --- a/data/json/items/comestibles/sandwich.json +++ b/data/json/items/comestibles/sandwich.json @@ -24,8 +24,7 @@ { "type": "COMESTIBLE", "id": "sandwich_deluxe", - "name": "deluxe sandwich", - "name_plural": "deluxe sandwiches", + "name": { "str": "deluxe sandwich", "str_pl": "deluxe sandwiches" }, "conditional_names": [ { "type": "COMPONENT_ID", @@ -54,8 +53,7 @@ { "type": "COMESTIBLE", "id": "sandwich_cucumber", - "name": "cucumber sandwich", - "name_plural": "cucumber sandwiches", + "name": { "str": "cucumber sandwich", "str_pl": "cucumber sandwiches" }, "weight": "500 g", "color": "light_green", "spoils_in": "1 day 12 hours", diff --git a/data/json/items/comestibles/seed.json b/data/json/items/comestibles/seed.json index bd70598befb05..84ca714b436c5 100644 --- a/data/json/items/comestibles/seed.json +++ b/data/json/items/comestibles/seed.json @@ -67,8 +67,7 @@ "id": "seed_cranberries", "copy-from": "seed_fruit", "type": "COMESTIBLE", - "name": "cranberry seeds", - "name_plural": "cranberry seeds", + "name": { "str": "cranberry seeds", "str_pl": "cranberry seeds" }, "description": "Some cranberry seeds.", "seed_data": { "plant_name": "cranberry", "fruit": "cranberries", "byproducts": [ "withered" ], "grow": "91 days" } }, @@ -204,8 +203,7 @@ "id": "seed_cotton_boll", "copy-from": "seed", "price": 50, - "name": "cotton seeds", - "name_plural": "cotton seeds", + "name": { "str": "cotton seeds", "str_pl": "cotton seeds" }, "description": "Some cotton seeds. Can be processed to produce an edible oil.", "weight": "5 g", "charges": 8, @@ -264,8 +262,7 @@ "type": "COMESTIBLE", "id": "seed_dahlia", "copy-from": "seed", - "name": "dahlia seeds", - "name_plural": "dahlia seeds", + "name": { "str": "dahlia seeds", "str_pl": "dahlia seeds" }, "color": "green", "description": "Some dahlia seeds.", "seed_data": { "plant_name": "dahlia", "fruit": "dahlia_root", "byproducts": [ "withered" ], "grow": "91 days" } @@ -305,8 +302,7 @@ "type": "COMESTIBLE", "id": "seed_flower", "copy-from": "seed", - "name": "decorative plant seeds", - "name_plural": "decorative plant seeds", + "name": { "str": "decorative plant seeds", "str_pl": "decorative plant seeds" }, "color": "green", "description": "Some small decorative plant seeds, likely grass or flower. Don't expect them to be useful for anything other than dry plant material.", "seed_data": { "plant_name": "decorative plant", "fruit": "withered", "grow": "91 days" } @@ -355,8 +351,7 @@ "id": "seed_corn", "copy-from": "seed", "price": 50, - "name": "corn seeds", - "name_plural": "corn seeds", + "name": { "str": "corn seeds", "str_pl": "corn seeds" }, "description": "Some corn seeds.", "seed_data": { "plant_name": "corn", "fruit": "corn", "byproducts": [ "withered" ], "grow": "80 days" } }, @@ -375,8 +370,7 @@ "id": "seed_cucumber", "copy-from": "seed", "price": 50, - "name": "cucumber seeds", - "name_plural": "cucumber seeds", + "name": { "str": "cucumber seeds", "str_pl": "cucumber seeds" }, "description": "Some cucumber seeds.", "seed_data": { "plant_name": "cucumber", "fruit": "cucumber", "byproducts": [ "withered" ], "grow": "60 days" } }, @@ -603,8 +597,7 @@ "type": "COMESTIBLE", "id": "seed_raw_dandelion", "copy-from": "seed", - "name": "dandelion seeds", - "name_plural": "dandelion seeds", + "name": { "str": "dandelion seeds", "str_pl": "dandelion seeds" }, "color": "green", "description": "Some dandelion seeds.", "charges": 2, @@ -643,8 +636,7 @@ "type": "COMESTIBLE", "copy-from": "seed", "comestible_type": "MED", - "name": "datura seeds", - "name_plural": "datura seeds", + "name": { "str": "datura seeds", "str_pl": "datura seeds" }, "description": "Small, dark seeds from the spiny pods of a datura plant. Full of powerful psychoactive chemicals, these tiny seeds are a potent analgesic and deliriant, and can be deadly in cases of overdose.", "weight": "2 g", "price": 0, diff --git a/data/json/items/comestibles/veggy_dishes.json b/data/json/items/comestibles/veggy_dishes.json index 2d96d9912d8b7..3548714a936fc 100644 --- a/data/json/items/comestibles/veggy_dishes.json +++ b/data/json/items/comestibles/veggy_dishes.json @@ -109,8 +109,7 @@ { "type": "COMESTIBLE", "id": "can_corn", - "name": "corn", - "name_plural": "corn", + "name": { "str": "corn", "str_pl": "corn" }, "comestible_type": "FOOD", "weight": "178 g", "color": "yellow", @@ -294,8 +293,7 @@ { "type": "COMESTIBLE", "id": "deluxe_veggy_beansnrice", - "name": "deluxe vegetarian beans and rice", - "name_plural": "deluxe vegetarian beans and rice", + "name": { "str": "deluxe vegetarian beans and rice", "str_pl": "deluxe vegetarian beans and rice" }, "weight": "140 g", "color": "brown", "spoils_in": "15 days", diff --git a/data/json/items/comestibles/wheat.json b/data/json/items/comestibles/wheat.json index c0651c7ed73ec..b8727a8d7e39a 100644 --- a/data/json/items/comestibles/wheat.json +++ b/data/json/items/comestibles/wheat.json @@ -226,8 +226,7 @@ { "type": "COMESTIBLE", "id": "oatmeal_deluxe", - "name": "deluxe cooked oatmeal", - "name_plural": "deluxe cooked oatmeal", + "name": { "str": "deluxe cooked oatmeal", "str_pl": "deluxe cooked oatmeal" }, "weight": "164 g", "color": "light_gray", "spoils_in": "10 days",