From bcfe0741e1a520f2d92e694c09cac08069268d80 Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Tue, 18 Feb 2020 20:06:06 +0100 Subject: [PATCH] Comestible modern json (#38135) --- data/json/items/comestibles/frozen.json | 5 ++--- data/json/items/comestibles/junkfood.json | 9 +++------ data/json/items/comestibles/meat_dishes.json | 3 +-- data/json/items/comestibles/other.json | 3 +-- data/json/items/comestibles/raw_veggy.json | 6 ++---- data/json/items/comestibles/seed.json | 20 +++++++------------ data/json/items/comestibles/spice.json | 3 +-- data/json/items/comestibles/veggy_dishes.json | 6 ++---- 8 files changed, 19 insertions(+), 36 deletions(-) diff --git a/data/json/items/comestibles/frozen.json b/data/json/items/comestibles/frozen.json index 1840bdf8921e8..f3ad0070153d9 100644 --- a/data/json/items/comestibles/frozen.json +++ b/data/json/items/comestibles/frozen.json @@ -143,10 +143,9 @@ "type": "COMESTIBLE", "copy-from": "icecream", "id": "icecream_sorbet", - "name": "sorbet", - "name_plural": "sorbet scoops", + "name": { "str": "sorbet", "str_pl": "sorbet scoops" }, "description": "A simple frozen dessert food made from water and fruit juice.", - "spoils_in": 336, + "spoils_in": "14 days", "calories": 116, "quench": 8, "fun": 10, diff --git a/data/json/items/comestibles/junkfood.json b/data/json/items/comestibles/junkfood.json index a22a7b9fb8b53..0332e05577378 100644 --- a/data/json/items/comestibles/junkfood.json +++ b/data/json/items/comestibles/junkfood.json @@ -39,8 +39,7 @@ { "type": "COMESTIBLE", "id": "toasterpastryfrozen", - "name": "toaster pastry (uncooked)", - "name_plural": "toaster pastries (uncooked)", + "name": { "str": "toaster pastry (uncooked)", "str_pl": "toaster pastries (uncooked)" }, "weight": "52 g", "color": "red", "spoils_in": "2 days 12 hours", @@ -61,8 +60,7 @@ { "type": "COMESTIBLE", "id": "toasterpastry", - "name": "toaster pastry", - "name_plural": "toaster pastries", + "name": { "str": "toaster pastry", "str_pl": "toaster pastries" }, "copy-from": "toasterpastryfrozen", "quench": 4, "description": "A delicious fruit-filled pastry that you've cooked. It even comes with frosting!", @@ -664,8 +662,7 @@ { "type": "COMESTIBLE", "id": "nachos", - "name": "tortilla chips", - "name_plural": "tortilla chips", + "name": { "str": "tortilla chips", "str_pl": "tortilla chips" }, "weight": "80 g", "color": "yellow", "spoils_in": "30 days", diff --git a/data/json/items/comestibles/meat_dishes.json b/data/json/items/comestibles/meat_dishes.json index 3a6772ac4f13a..bf4c0b61cf331 100644 --- a/data/json/items/comestibles/meat_dishes.json +++ b/data/json/items/comestibles/meat_dishes.json @@ -60,8 +60,7 @@ { "type": "COMESTIBLE", "id": "sweet_sausage", - "name": "sweet sausage", - "name_plural": "sweet sausages", + "name": { "str": "sweet sausage", "str_pl": "sweet sausages" }, "conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "sinister %s", "str_pl": "sinister %s" } } ], "weight": "148 g", "color": "brown", diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json index b6b71c713a0f1..c4f6bfb2d8f25 100644 --- a/data/json/items/comestibles/other.json +++ b/data/json/items/comestibles/other.json @@ -317,8 +317,7 @@ { "type": "COMESTIBLE", "id": "tofu", - "name": "tofu", - "name_plural": "tofu", + "name": { "str": "tofu", "str_pl": "tofu" }, "weight": "85 g", "color": "white", "spoils_in": "4 days", diff --git a/data/json/items/comestibles/raw_veggy.json b/data/json/items/comestibles/raw_veggy.json index f084c0719450a..55a509d2d2e42 100644 --- a/data/json/items/comestibles/raw_veggy.json +++ b/data/json/items/comestibles/raw_veggy.json @@ -589,8 +589,7 @@ { "type": "COMESTIBLE", "id": "tea_raw", - "name": "tea leaf", - "name_plural": "tea leaves", + "name": { "str": "tea leaf", "str_pl": "tea leaves" }, "weight": "14 g", "color": "green", "use_action": "CAFF", @@ -611,8 +610,7 @@ { "type": "COMESTIBLE", "id": "tomato", - "name": "tomato", - "name_plural": "tomatoes", + "name": { "str": "tomato", "str_pl": "tomatoes" }, "weight": "231 g", "color": "red", "spoils_in": "3 days 18 hours", diff --git a/data/json/items/comestibles/seed.json b/data/json/items/comestibles/seed.json index 18101da6f6fa2..be525c2ebdfd1 100644 --- a/data/json/items/comestibles/seed.json +++ b/data/json/items/comestibles/seed.json @@ -105,8 +105,7 @@ "id": "seed_strawberries", "copy-from": "seed_fruit", "type": "COMESTIBLE", - "name": "strawberry seeds", - "name_plural": "strawberry seeds", + "name": { "str": "strawberry seeds", "str_pl": "strawberry seeds" }, "description": "Some strawberry seeds.", "seed_data": { "plant_name": "strawberry", "fruit": "strawberries", "byproducts": [ "withered" ], "grow": "91 days" } }, @@ -130,8 +129,7 @@ "type": "COMESTIBLE", "id": "seed_tobacco", "copy-from": "seed", - "name": "tobacco seeds", - "name_plural": "tobacco seeds", + "name": { "str": "tobacco seeds", "str_pl": "tobacco seeds" }, "description": "Some tobacco seeds.", "seed_data": { "plant_name": "tobacco", "fruit": "tobacco_raw", "grow": "91 days" } }, @@ -152,10 +150,9 @@ "id": "seed_sugar_beet", "copy-from": "seed", "price": 120, - "name": "sugar beet seeds", - "name_plural": "sugar beet seeds", + "name": { "str": "sugar beet seeds", "str_pl": "sugar beet seeds" }, "description": "Some sugar beet seeds.", - "volume": 0, + "volume": "1 ml", "weight": "5 g", "stack_size": 40, "seed_data": { "plant_name": "sugar beet", "fruit": "sugar_beet", "grow": "90 days" } @@ -184,8 +181,7 @@ "id": "seed_tomato", "copy-from": "seed", "price": 50, - "name": "tomato seeds", - "name_plural": "tomato seeds", + "name": { "str": "tomato seeds", "str_pl": "tomato seeds" }, "description": "Some tomato seeds.", "seed_data": { "plant_name": "tomato", "fruit": "tomato", "byproducts": [ "withered" ], "grow": "65 days" } }, @@ -467,8 +463,7 @@ "id": "seed_thyme", "copy-from": "seed", "price": 120, - "name": "thyme seeds", - "name_plural": "thyme seeds", + "name": { "str": "thyme seeds", "str_pl": "thyme seeds" }, "color": "green", "description": "Some thyme seeds.", "charges": 2, @@ -502,8 +497,7 @@ "type": "COMESTIBLE", "id": "seed_sunflower", "copy-from": "seed", - "name": "sunflower seeds", - "name_plural": "sunflower seeds", + "name": { "str": "sunflower seeds", "str_pl": "sunflower seeds" }, "weight": "2 g", "color": "green", "use_action": "SEED", diff --git a/data/json/items/comestibles/spice.json b/data/json/items/comestibles/spice.json index e20665b1837fd..bc1e3a52fb730 100644 --- a/data/json/items/comestibles/spice.json +++ b/data/json/items/comestibles/spice.json @@ -58,8 +58,7 @@ { "type": "COMESTIBLE", "id": "sugar", - "name": "sugar", - "name_plural": "sugar", + "name": { "str": "sugar", "str_pl": "sugar" }, "weight": "5 g", "color": "white", "container": "box_small", diff --git a/data/json/items/comestibles/veggy_dishes.json b/data/json/items/comestibles/veggy_dishes.json index b9eaea6ebcd5d..bbd7be31ce693 100644 --- a/data/json/items/comestibles/veggy_dishes.json +++ b/data/json/items/comestibles/veggy_dishes.json @@ -248,8 +248,7 @@ { "type": "COMESTIBLE", "id": "tofu_rice", - "name": "tofu fried rice", - "name_plural": "tofu fried rice", + "name": { "str": "tofu fried rice", "str_pl": "tofu fried rice" }, "weight": "135 g", "color": "yellow", "spoils_in": "15 days", @@ -268,8 +267,7 @@ { "type": "COMESTIBLE", "id": "tofu_stirfry", - "name": "tofu stirfry", - "name_plural": "tofu stirfry", + "name": { "str": "tofu stirfry", "str_pl": "tofu stirfry" }, "weight": "135 g", "color": "yellow", "spoils_in": "4 days",