diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json index ebd7866a65c13..5aa7293aaf0de 100644 --- a/data/json/items/chemicals_and_resources.json +++ b/data/json/items/chemicals_and_resources.json @@ -203,8 +203,7 @@ { "type": "COMESTIBLE", "id": "bleach", - "name": "bleach", - "name_plural": "bleach", + "name": { "str": "bleach", "str_pl": "bleach" }, "weight": "138 g", "color": "white", "use_action": "BLECH", @@ -295,8 +294,7 @@ "type": "COMESTIBLE", "id": "fungicide", "category": "chems", - "name": "fungicide", - "name_plural": "fungicide", + "name": { "str": "fungicide", "str_pl": "fungicide" }, "weight": "1 g", "//": "Typically sold in larger quantities, but that's handed in the charge count.", "color": "pink", @@ -344,8 +342,7 @@ { "type": "COMESTIBLE", "id": "salt_water", - "name": "salt water", - "name_plural": "salt water", + "name": { "str": "salt water", "str_pl": "salt water" }, "weight": "260 g", "color": "light_cyan", "container": "bottle_plastic", @@ -364,8 +361,7 @@ { "type": "COMESTIBLE", "id": "soapy_water", - "name": "soapy water", - "name_plural": "soapy water", + "name": { "str": "soapy water", "str_pl": "soapy water" }, "weight": "260 g", "color": "light_cyan", "container": "bottle_plastic", @@ -1108,8 +1104,7 @@ { "type": "COMESTIBLE", "id": "water_sewage", - "name": "sewage water", - "name_plural": "sewage water", + "name": { "str": "sewage water", "str_pl": "sewage water" }, "weight": "280 g", "color": "green", "container": "bottle_plastic", @@ -1160,8 +1155,7 @@ { "type": "COMESTIBLE", "id": "lye", - "name": "lye", - "name_plural": "lye", + "name": { "str": "lye", "str_pl": "lye" }, "weight": "125 g", "color": "white", "container": "bottle_plastic", @@ -1214,8 +1208,7 @@ "id": "ether", "category": "chems", "price": 10, - "name": "ether", - "name_plural": "ether", + "name": { "str": "ether", "str_pl": "ether" }, "symbol": "!", "quench": -96, "healthy": -20, @@ -1231,8 +1224,7 @@ "id": "chem_DMSO", "category": "chems", "price": 10, - "name": "dimethyl sulfoxide", - "name_plural": "dimethyl sulfoxide", + "name": { "str": "dimethyl sulfoxide", "str_pl": "dimethyl sulfoxide" }, "symbol": "~", "quench": -96, "healthy": -20, @@ -1248,8 +1240,7 @@ "id": "chem_chloroform", "category": "chems", "price": 20, - "name": "chloroform", - "name_plural": "chloroform", + "name": { "str": "chloroform", "str_pl": "chloroform" }, "symbol": "~", "color": "light_cyan", "container": "bottle_glass", @@ -1265,8 +1256,7 @@ "id": "chem_phenol", "category": "chems", "price": 10, - "name": "phenol", - "name_plural": "phenol", + "name": { "str": "phenol", "str_pl": "phenol" }, "symbol": "~", "quench": -96, "healthy": -20, @@ -1282,8 +1272,7 @@ "id": "chem_glycerol", "category": "chems", "price": 10, - "name": "glycerol", - "name_plural": "glycerol", + "name": { "str": "glycerol", "str_pl": "glycerol" }, "symbol": "~", "quench": -15, "healthy": -1, diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json index 725001177ac03..4d6ac1aedc64b 100644 --- a/data/json/items/comestibles/carnivore.json +++ b/data/json/items/comestibles/carnivore.json @@ -375,7 +375,7 @@ "quench": -5, "fun": 4, "vitamins": [ [ "vitA", 7 ], [ "vitC", 7 ], [ "calcium", 25 ], [ "iron", 21 ], [ "vitB", 617 ] ], - "proportional": { "price": 2, "volume": 0.28, "weight": 0.28 }, + "proportional": { "price": 2.0, "volume": 0.28, "weight": 0.28 }, "delete": { "flags": [ "RAW" ] } }, { @@ -543,8 +543,7 @@ { "type": "COMESTIBLE", "id": "blood", - "name": "blood", - "name_plural": "blood", + "name": { "str": "blood", "str_pl": "blood" }, "weight": "265 g", "color": "red", "container": "bag_iv", @@ -577,8 +576,7 @@ { "type": "COMESTIBLE", "id": "fat", - "name": "chunk of fat", - "name_plural": "chunks of fat", + "name": { "str": "chunk of fat", "str_pl": "chunks of fat" }, "weight": "220 g", "color": "pink", "spoils_in": "7 days", diff --git a/data/json/items/comestibles/dairy.json b/data/json/items/comestibles/dairy.json index e2277898d3332..6b629236ecd3f 100644 --- a/data/json/items/comestibles/dairy.json +++ b/data/json/items/comestibles/dairy.json @@ -90,8 +90,7 @@ { "type": "COMESTIBLE", "id": "butter", - "name": "butter", - "name_plural": "butter", + "name": { "str": "butter", "str_pl": "butter" }, "weight": "14180 mg", "color": "yellow", "spoils_in": "14 days", @@ -111,8 +110,7 @@ { "type": "COMESTIBLE", "id": "raw_butter", - "name": "raw butter", - "name_plural": "raw butter", + "name": { "str": "raw butter", "str_pl": "raw butter" }, "weight": "14 g", "color": "white", "spoils_in": "10 days", diff --git a/data/json/items/comestibles/drink.json b/data/json/items/comestibles/drink.json index 5b5618af62bc6..bcf153a30e433 100644 --- a/data/json/items/comestibles/drink.json +++ b/data/json/items/comestibles/drink.json @@ -868,8 +868,7 @@ { "type": "COMESTIBLE", "id": "sweet_water", - "name": "sweet water", - "name_plural": "sweet water", + "name": { "str": "sweet water", "str_pl": "sweet water" }, "weight": "260 g", "color": "light_cyan", "container": "bottle_plastic", diff --git a/data/json/items/comestibles/drink_other.json b/data/json/items/comestibles/drink_other.json index 713fc04b6914d..76d0f12510b01 100644 --- a/data/json/items/comestibles/drink_other.json +++ b/data/json/items/comestibles/drink_other.json @@ -92,8 +92,7 @@ "type": "COMESTIBLE", "symbol": "~", "color": "yellow", - "name": "mustard", - "name_plural": "mustard", + "name": { "str": "mustard", "str_pl": "mustard" }, "description": "A condiment made from the seeds of a mustard plant (/Brassica/ or /Sinapis/), vinegar, salt, and spices.", "price": 50, "material": "junk", @@ -163,8 +162,7 @@ { "type": "COMESTIBLE", "id": "vinegar", - "name": "vinegar", - "name_plural": "vinegar", + "name": { "str": "vinegar", "str_pl": "vinegar" }, "weight": "15 g", "color": "white", "container": "jug_plastic", @@ -241,8 +239,7 @@ "type": "COMESTIBLE", "symbol": "~", "color": "white", - "name": "horseradish", - "name_plural": "horseradish", + "name": { "str": "horseradish", "str_pl": "horseradish" }, "description": "A spicy grated root vegetable packed in vinegared brine.", "price": 75, "material": "veggy", diff --git a/data/json/items/comestibles/fruit_dishes.json b/data/json/items/comestibles/fruit_dishes.json index ba46843e2c540..c0cd12489e1ee 100644 --- a/data/json/items/comestibles/fruit_dishes.json +++ b/data/json/items/comestibles/fruit_dishes.json @@ -60,8 +60,7 @@ { "type": "COMESTIBLE", "id": "can_peach", - "name": "peaches in syrup", - "name_plural": "peaches in syrup", + "name": { "str": "peaches in syrup", "str_pl": "peaches in syrup" }, "weight": "277 g", "color": "yellow", "spoils_in": "1 day 6 hours", @@ -185,8 +184,7 @@ { "type": "COMESTIBLE", "id": "rehydrated_fruit", - "name": "rehydrated fruit", - "name_plural": "rehydrated fruit", + "name": { "str": "rehydrated fruit", "str_pl": "rehydrated fruit" }, "weight": "150 g", "color": "pink", "spoils_in": "18 hours", diff --git a/data/json/items/comestibles/junkfood.json b/data/json/items/comestibles/junkfood.json index 8fb06ab7f402f..5866bf67269bd 100644 --- a/data/json/items/comestibles/junkfood.json +++ b/data/json/items/comestibles/junkfood.json @@ -406,8 +406,7 @@ { "type": "COMESTIBLE", "id": "syrup", - "name": "maple syrup", - "name_plural": "maple syrup", + "name": { "str": "maple syrup", "str_pl": "maple syrup" }, "weight": "21 g", "color": "brown", "container": "bottle_glass", @@ -428,8 +427,7 @@ { "type": "COMESTIBLE", "id": "beet_syrup", - "name": "sugar beet syrup", - "name_plural": "sugar beet syrup", + "name": { "str": "sugar beet syrup", "str_pl": "sugar beet syrup" }, "weight": "15 g", "color": "brown", "container": "bottle_glass", @@ -603,8 +601,7 @@ { "type": "COMESTIBLE", "id": "sugar_fried", - "name": "caramel", - "name_plural": "caramel", + "name": { "str": "caramel", "str_pl": "caramel" }, "weight": "67 g", "color": "white", "container": "box_small", diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json index abe02de163e9c..a52f893d25a3f 100644 --- a/data/json/items/comestibles/other.json +++ b/data/json/items/comestibles/other.json @@ -50,8 +50,7 @@ { "type": "COMESTIBLE", "id": "wax", - "name": "wax", - "name_plural": "waxes", + "name": { "str_pl": "waxes", "str": "wax" }, "weight": "97 g", "color": "white", "comestible_type": "FOOD", @@ -348,8 +347,7 @@ { "type": "COMESTIBLE", "id": "dry_tofu", - "name": "dehydrated tofu", - "name_plural": "dehydrated tofu", + "name": { "str": "dehydrated tofu", "str_pl": "dehydrated tofu" }, "weight": "65 g", "color": "white", "spoils_in": "360 days", @@ -479,8 +477,7 @@ "type": "COMESTIBLE", "symbol": "~", "color": "yellow", - "name": "candied honey", - "name_plural": "candied honey", + "name": { "str": "candied honey", "str_pl": "candied honey" }, "description": "Honey, that stuff the bees make. This variant is \"candied honey\", a variant of very thick consistence. This honey won't spoil and is good for your digestion.", "price": 800, "material": "honey", diff --git a/data/json/items/comestibles/raw_veggy.json b/data/json/items/comestibles/raw_veggy.json index 0aa6ecd7198d6..47c380b373db0 100644 --- a/data/json/items/comestibles/raw_veggy.json +++ b/data/json/items/comestibles/raw_veggy.json @@ -224,8 +224,7 @@ { "type": "COMESTIBLE", "id": "cotton_boll", - "name": "cotton boll", - "name_plural": "cotton bolls", + "name": { "str": "cotton boll" }, "category": "other", "weight": "26 g", "color": "light_green", diff --git a/data/json/items/comestibles/sandwich.json b/data/json/items/comestibles/sandwich.json index bb294461d700e..d0b5a065566a2 100644 --- a/data/json/items/comestibles/sandwich.json +++ b/data/json/items/comestibles/sandwich.json @@ -76,8 +76,7 @@ { "type": "COMESTIBLE", "id": "sandwich_cheese", - "name": "cheese sandwich", - "name_plural": "cheese sandwiches", + "name": { "str": "cheese sandwich", "str_pl": "cheese sandwiches" }, "weight": "106 g", "color": "brown", "spoils_in": "1 day 12 hours", @@ -96,8 +95,7 @@ { "type": "COMESTIBLE", "id": "sandwich_jam", - "name": "jam sandwich", - "name_plural": "jam sandwiches", + "name": { "str": "jam sandwich", "str_pl": "jam sandwiches" }, "weight": "97 g", "color": "brown", "spoils_in": "1 day 13 hours", @@ -117,8 +115,7 @@ { "type": "COMESTIBLE", "id": "sandwich_fairy", - "name": "fairy bread", - "name_plural": "fairy bread", + "name": { "str": "fairy bread", "str_pl": "fairy bread" }, "weight": "114 g", "color": "brown", "spoils_in": "3 days", @@ -136,8 +133,7 @@ { "type": "COMESTIBLE", "id": "sandwich_honey", - "name": "honey sandwich", - "name_plural": "honey sandwiches", + "name": { "str": "honey sandwich", "str_pl": "honey sandwiches" }, "weight": "192 g", "color": "brown", "spoils_in": "10 days", @@ -161,7 +157,7 @@ "name": "boring sandwich", "name_plural": "boring sandwiches", "copy-from": "bread", - "proportional": { "weight": 2, "calories": 2, "volume": 2 }, + "proportional": { "weight": 2.0, "calories": 2.0, "volume": 2.0 }, "color": "brown", "spoils_in": "1 day 22 hours", "container": "wrapper", @@ -219,8 +215,7 @@ { "type": "COMESTIBLE", "id": "sandwich_pb", - "name": "peanut butter sandwich", - "name_plural": "peanut butter sandwiches", + "name": { "str": "peanut butter sandwich", "str_pl": "peanut butter sandwiches" }, "weight": "204 g", "color": "brown", "spoils_in": "1 day 12 hours", @@ -239,8 +234,7 @@ { "type": "COMESTIBLE", "id": "sandwich_pbj", - "name": "PB&J sandwich", - "name_plural": "PB&J sandwiches", + "name": { "str": "PB&J sandwich", "str_pl": "PB&J sandwiches" }, "weight": "102 g", "color": "brown", "spoils_in": "1 day 12 hours", @@ -260,8 +254,7 @@ { "type": "COMESTIBLE", "id": "sandwich_pbh", - "name": "PB&H sandwich", - "name_plural": "PB&H sandwiches", + "name": { "str": "PB&H sandwich", "str_pl": "PB&H sandwiches" }, "weight": "97 g", "color": "brown", "spoils_in": "1 day 12 hours", @@ -281,8 +274,7 @@ { "type": "COMESTIBLE", "id": "sandwich_pbm", - "name": "PB&M sandwich", - "name_plural": "PB&M sandwiches", + "name": { "str": "PB&M sandwich", "str_pl": "PB&M sandwiches" }, "weight": "225 g", "color": "brown", "spoils_in": "1 day 12 hours", @@ -301,8 +293,7 @@ { "type": "COMESTIBLE", "id": "fish_sandwich", - "name": "fish sandwich", - "name_plural": "fish sandwiches", + "name": { "str": "fish sandwich", "str_pl": "fish sandwiches" }, "weight": "201 g", "color": "yellow", "spoils_in": "1 day", @@ -320,8 +311,7 @@ { "type": "COMESTIBLE", "id": "fish_bagel", - "name": "fish and spinach bagel", - "name_plural": "fish and spinach bagels", + "name": { "str": "fish and spinach bagel" }, "weight": "201 g", "color": "magenta", "spoils_in": "1 day", diff --git a/data/json/items/comestibles/seed.json b/data/json/items/comestibles/seed.json index b5c0caeb583b3..c3795537b3010 100644 --- a/data/json/items/comestibles/seed.json +++ b/data/json/items/comestibles/seed.json @@ -332,8 +332,7 @@ { "type": "COMESTIBLE", "id": "garlic_clove", - "name": "garlic clove", - "name_plural": "garlic cloves", + "name": { "str": "garlic clove" }, "weight": "3 g", "color": "white", "spoils_in": "360 days", @@ -439,8 +438,7 @@ "type": "COMESTIBLE", "id": "marloss_seed", "category": "seeds", - "name": "marloss seed", - "name_plural": "marloss seeds", + "name": { "str": "marloss seed" }, "weight": "177 g", "color": "cyan", "addiction_type": "marloss_b", @@ -455,7 +453,7 @@ "price": 0, "material": "fruit", "primary_material": "dried_vegetable", - "volume": 0, + "volume": "100 ml", "stack_size": 10, "fun": 30, "seed_data": { "fruit": "null", "//": "dummy entry, results are hardcoded", "plant_name": "marloss berry", "grow": "91 days" } diff --git a/data/json/items/comestibles/spice.json b/data/json/items/comestibles/spice.json index 41eaf23b974f4..4c00b8e9a2bfb 100644 --- a/data/json/items/comestibles/spice.json +++ b/data/json/items/comestibles/spice.json @@ -120,8 +120,7 @@ "type": "COMESTIBLE", "symbol": "~", "color": "brown", - "name": "soy sauce", - "name_plural": "soy sauce", + "name": { "str": "soy sauce", "str_pl": "soy sauce" }, "description": "Salty fermented soybean sauce.", "price": 190, "weight": "24 g", diff --git a/data/json/items/comestibles/veggy_dishes.json b/data/json/items/comestibles/veggy_dishes.json index 1dec0df2c4db0..9c3d4f809045c 100644 --- a/data/json/items/comestibles/veggy_dishes.json +++ b/data/json/items/comestibles/veggy_dishes.json @@ -420,8 +420,7 @@ { "type": "COMESTIBLE", "id": "veggy_canned", - "name": "canned veggy", - "name_plural": "canned veggies", + "name": { "str": "canned veggy", "str_pl": "canned veggies" }, "weight": "259 g", "color": "green", "spoils_in": "2 days 12 hours", @@ -630,8 +629,7 @@ { "type": "COMESTIBLE", "id": "sushi_rice", - "name": "sushi rice", - "name_plural": "sushi rice", + "name": { "str": "sushi rice", "str_pl": "sushi rice" }, "weight": "55 g", "color": "white", "spoils_in": "3 days", @@ -651,8 +649,7 @@ { "type": "COMESTIBLE", "id": "onigiri", - "name": "onigiri", - "name_plural": "onigiri", + "name": { "str": "onigiri", "str_pl": "onigiri" }, "weight": "99 g", "color": "white", "spoils_in": "1 day 12 hours", @@ -672,8 +669,7 @@ { "type": "COMESTIBLE", "id": "sushi_veggyroll", - "name": "vegetable hosomaki", - "name_plural": "vegetable hosomaki", + "name": { "str": "vegetable hosomaki", "str_pl": "vegetable hosomaki" }, "weight": "312 g", "color": "green", "spoils_in": "1 day 12 hours", @@ -704,8 +700,7 @@ { "type": "COMESTIBLE", "id": "sauerkraut", - "name": "sauerkraut", - "name_plural": "sauerkraut", + "name": { "str": "sauerkraut", "str_pl": "sauerkraut" }, "weight": "255 g", "color": "green", "spoils_in": "30 days",