From e9b60caef0fbcff5dad308a90d6b4130fc53352c Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Tue, 18 Feb 2020 20:48:07 +0100 Subject: [PATCH] Comestible name to object, flags to array --- data/json/items/chemicals_and_resources.json | 3 +-- data/json/items/comestibles/brewing.json | 6 ++---- data/json/items/comestibles/drink_other.json | 5 ++--- data/json/items/comestibles/junkfood.json | 6 ++---- data/json/items/comestibles/other.json | 5 ++--- data/json/items/comestibles/raw_veggy.json | 6 ++---- data/json/items/comestibles/sandwich.json | 3 +-- data/json/items/comestibles/seed.json | 15 +++++---------- data/json/items/comestibles/spice.json | 3 +-- data/json/items/comestibles/veggy_dishes.json | 3 +-- data/json/items/comestibles/wheat.json | 3 +-- 11 files changed, 20 insertions(+), 38 deletions(-) diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json index b36f7d02de081..9abc7f44c988f 100644 --- a/data/json/items/chemicals_and_resources.json +++ b/data/json/items/chemicals_and_resources.json @@ -387,8 +387,7 @@ { "type": "COMESTIBLE", "id": "water_acid_weak", - "name": "weak acid water", - "name_plural": "weak acid water", + "name": { "str": "weak acid water", "str_pl": "weak acid water" }, "weight": "255 g", "color": "light_green", "flags": [ "ACID" ], diff --git a/data/json/items/comestibles/brewing.json b/data/json/items/comestibles/brewing.json index afd3fc47d3a52..0e54c9140ef77 100644 --- a/data/json/items/comestibles/brewing.json +++ b/data/json/items/comestibles/brewing.json @@ -42,8 +42,7 @@ { "type": "COMESTIBLE", "id": "wash_whiskey", - "name": "whiskey wash", - "name_plural": "whiskey washes", + "name": { "str": "whiskey wash", "str_pl": "whiskey washes" }, "description": "Fermented, but not distilled whiskey. No longer tastes sweet.", "weight": "33 g", "color": "brown", @@ -131,8 +130,7 @@ { "type": "COMESTIBLE", "id": "wash_vodka", - "name": "vodka wash", - "name_plural": "vodka washes", + "name": { "str": "vodka wash", "str_pl": "vodka washes" }, "description": "Fermented, but not distilled vodka. No longer tastes sweet.", "weight": "33 g", "color": "light_cyan", diff --git a/data/json/items/comestibles/drink_other.json b/data/json/items/comestibles/drink_other.json index 6d9f50d2281b2..2b623707e42a0 100644 --- a/data/json/items/comestibles/drink_other.json +++ b/data/json/items/comestibles/drink_other.json @@ -177,8 +177,7 @@ { "type": "COMESTIBLE", "id": "cooking_oil", - "name": "vegetable cooking oil", - "name_plural": "vegetable cooking oil", + "name": { "str": "vegetable cooking oil", "str_pl": "vegetable cooking oil" }, "weight": "15 g", "color": "yellow", "container": "jug_plastic", @@ -193,7 +192,7 @@ "charges": 16, "phase": "liquid", "fun": -25, - "flags": "NUTRIENT_OVERRIDE", + "flags": [ "NUTRIENT_OVERRIDE" ], "vitamins": [ ], "freezing_point": 14 }, diff --git a/data/json/items/comestibles/junkfood.json b/data/json/items/comestibles/junkfood.json index 0332e05577378..2ae55f610192b 100644 --- a/data/json/items/comestibles/junkfood.json +++ b/data/json/items/comestibles/junkfood.json @@ -890,8 +890,7 @@ { "type": "COMESTIBLE", "id": "corndogs_frozen", - "name": "uncooked corn dogs", - "name_plural": "uncooked corn dogs", + "name": { "str": "uncooked corn dogs", "str_pl": "uncooked corn dogs" }, "weight": "78 g", "color": "yellow", "spoils_in": "11 days 16 hours", @@ -1019,8 +1018,7 @@ { "type": "COMESTIBLE", "id": "hotdogs_frozen", - "name": "uncooked hot dog", - "name_plural": "uncooked hot dogs", + "name": { "str": "uncooked hot dog" }, "weight": "43 g", "color": "red", "spoils_in": "11 days 16 hours", diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json index c4f6bfb2d8f25..e9f4be8951338 100644 --- a/data/json/items/comestibles/other.json +++ b/data/json/items/comestibles/other.json @@ -643,8 +643,7 @@ { "type": "COMESTIBLE", "id": "underbrush", - "name": "underbrush", - "name_plural": "underbrushes", + "name": { "str": "underbrush", "str_pl": "underbrushes" }, "weight": "100 g", "color": "green", "comestible_type": "FOOD", @@ -654,7 +653,7 @@ "description": "Some underbrush, edible by ruminants only. Seeing this item is a bug.", "price": 0, "material": "veggy", - "flags": "TRADER_AVOID", + "flags": [ "TRADER_AVOID" ], "volume": "250 ml" }, { diff --git a/data/json/items/comestibles/raw_veggy.json b/data/json/items/comestibles/raw_veggy.json index 55a509d2d2e42..2ec0a96329725 100644 --- a/data/json/items/comestibles/raw_veggy.json +++ b/data/json/items/comestibles/raw_veggy.json @@ -334,8 +334,7 @@ { "type": "COMESTIBLE", "id": "carrot_wild", - "name": "wild root", - "name_plural": "wild roots", + "name": { "str": "wild root" }, "copy-from": "carrot", "color": "white", "description": "A weed with a cluster of tiny white flowers. These are often wild carrots, but beware of poisonous lookalikes.", @@ -664,8 +663,7 @@ { "type": "COMESTIBLE", "id": "veggy_wild", - "name": "wild vegetables", - "name_plural": "wild vegetables", + "name": { "str": "wild vegetables", "str_pl": "wild vegetables" }, "copy-from": "veggy", "description": "An assortment of edible-looking wild plants. Most are quite bitter-tasting. Some are inedible until cooked.", "//": "In real life many root vegetables are mildly toxic until cooked", diff --git a/data/json/items/comestibles/sandwich.json b/data/json/items/comestibles/sandwich.json index 59d57ba1e8602..c255c6edeeba9 100644 --- a/data/json/items/comestibles/sandwich.json +++ b/data/json/items/comestibles/sandwich.json @@ -165,8 +165,7 @@ { "type": "COMESTIBLE", "id": "sandwich_veggy", - "name": "vegetable sandwich", - "name_plural": "vegetable sandwiches", + "name": { "str": "vegetable sandwich", "str_pl": "vegetable sandwiches" }, "weight": "289 g", "color": "light_gray", "spoils_in": "2 days", diff --git a/data/json/items/comestibles/seed.json b/data/json/items/comestibles/seed.json index be525c2ebdfd1..bc09b8507b5be 100644 --- a/data/json/items/comestibles/seed.json +++ b/data/json/items/comestibles/seed.json @@ -211,8 +211,7 @@ "id": "seed_zucchini", "copy-from": "seed", "price": 50, - "name": "zucchini seeds", - "name_plural": "zucchini seeds", + "name": { "str": "zucchini seeds", "str_pl": "zucchini seeds" }, "description": "Some zucchini seeds.", "seed_data": { "plant_name": "zucchini", "fruit": "zucchini", "byproducts": [ "withered" ], "grow": "47 days" } }, @@ -277,8 +276,7 @@ "id": "seed_wildcarrot", "copy-from": "seed", "price": 50, - "name": "wild root seeds", - "name_plural": "wild root seeds", + "name": { "str": "wild root seeds", "str_pl": "wild root seeds" }, "description": "Some seeds from a white flower.", "seed_data": { "plant_name": "wild root", "fruit": "carrot_wild", "byproducts": [ "withered" ], "grow": "65 days" } }, @@ -551,8 +549,7 @@ "type": "COMESTIBLE", "id": "seed_wild_herbs", "copy-from": "seed", - "name": "wild herb seeds", - "name_plural": "wild herb seeds", + "name": { "str": "wild herb seeds", "str_pl": "wild herb seeds" }, "color": "green", "description": "Some seeds harvested from wild herbs.", "charges": 2, @@ -562,8 +559,7 @@ "type": "COMESTIBLE", "id": "seed_veggy_wild", "copy-from": "seed", - "name": "wild vegetable stems", - "name_plural": "wild vegetable stems", + "name": { "str": "wild vegetable stems", "str_pl": "wild vegetable stems" }, "color": "green", "description": "Some wild vegetable stems.", "charges": 2, @@ -645,8 +641,7 @@ "id": "seed_wheat", "copy-from": "seed", "type": "COMESTIBLE", - "name": "wheat seeds", - "name_plural": "wheat seeds", + "name": { "str": "wheat seeds", "str_pl": "wheat seeds" }, "description": "Some wheat seeds.", "weight": "5 g", "price": 50, diff --git a/data/json/items/comestibles/spice.json b/data/json/items/comestibles/spice.json index bc1e3a52fb730..fdcd36792ee30 100644 --- a/data/json/items/comestibles/spice.json +++ b/data/json/items/comestibles/spice.json @@ -89,8 +89,7 @@ { "type": "COMESTIBLE", "id": "wild_herbs", - "name": "wild herbs", - "name_plural": "wild herbs", + "name": { "str": "wild herbs", "str_pl": "wild herbs" }, "weight": "7 g", "color": "green", "comestible_type": "FOOD", diff --git a/data/json/items/comestibles/veggy_dishes.json b/data/json/items/comestibles/veggy_dishes.json index bbd7be31ce693..838f7ca99ca4c 100644 --- a/data/json/items/comestibles/veggy_dishes.json +++ b/data/json/items/comestibles/veggy_dishes.json @@ -148,8 +148,7 @@ { "type": "COMESTIBLE", "id": "deluxe_veggy_beans", - "name": "vegetarian baked beans", - "name_plural": "vegetarian baked beans", + "name": { "str": "vegetarian baked beans", "str_pl": "vegetarian baked beans" }, "weight": "270 g", "color": "brown", "spoils_in": "15 days", diff --git a/data/json/items/comestibles/wheat.json b/data/json/items/comestibles/wheat.json index 8f3cce0c0006b..bdb8e7767a8d8 100644 --- a/data/json/items/comestibles/wheat.json +++ b/data/json/items/comestibles/wheat.json @@ -24,8 +24,7 @@ { "type": "COMESTIBLE", "id": "wheat", - "name": "wheat", - "name_plural": "wheat", + "name": { "str": "wheat", "str_pl": "wheat" }, "weight": "203 g", "color": "brown", "comestible_type": "FOOD",