diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json index d3881798fc4de..d1606b48ed3c6 100644 --- a/data/json/items/chemicals_and_resources.json +++ b/data/json/items/chemicals_and_resources.json @@ -236,8 +236,7 @@ { "type": "COMESTIBLE", "id": "fertilizer_liquid", - "name": "liquid fertilizer", - "name_plural": "liquid fertilizer", + "name": { "str": "liquid fertilizer", "str_pl": "liquid fertilizer" }, "weight": "67 g", "color": "yellow", "flags": [ "FERTILIZER", "NUTRIENT_OVERRIDE" ], diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json index 6def4d3320490..61c8d5b80cad7 100644 --- a/data/json/items/comestibles/carnivore.json +++ b/data/json/items/comestibles/carnivore.json @@ -964,8 +964,7 @@ "id": "meat_bark", "copy-from": "meat_frond", "type": "COMESTIBLE", - "name": "leech bark", - "name_plural": "scraps of leech bark", + "name": { "str": "leech bark", "str_pl": "scraps of leech bark" }, "description": "Dry and tough bark matter harvested from an alien plant. It is slightly translucent, and if placed against the light you can distinguish glistening blue veins running through it.", "vitamins": [ [ "vitA", 6 ], [ "vitC", 0 ], [ "calcium", 2 ], [ "iron", 8 ], [ "vitB", 6 ], [ "mutant_toxin", 12 ] ] } diff --git a/data/json/items/comestibles/drink.json b/data/json/items/comestibles/drink.json index fb8eb3c9b63a9..98c9fed5604b0 100644 --- a/data/json/items/comestibles/drink.json +++ b/data/json/items/comestibles/drink.json @@ -534,8 +534,7 @@ { "type": "COMESTIBLE", "id": "lemonade", - "name": "lemonade", - "name_plural": "lemonade", + "name": { "str": "lemonade", "str_pl": "lemonade" }, "weight": "260 g", "color": "yellow", "container": "bottle_plastic", diff --git a/data/json/items/comestibles/irradiated_fruit.json b/data/json/items/comestibles/irradiated_fruit.json index 0a37c1b9ee347..53c414f2fd690 100644 --- a/data/json/items/comestibles/irradiated_fruit.json +++ b/data/json/items/comestibles/irradiated_fruit.json @@ -3,10 +3,9 @@ "type": "COMESTIBLE", "id": "irradiated_rose_hips", "copy-from": "rose_hips", - "name": "irradiated rose hips", - "name_plural": "irradiated rose hips", + "name": { "str": "irradiated rose hips", "str_pl": "irradiated rose hips" }, "description": "An irradiated rose hips will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" }, @@ -14,10 +13,9 @@ "type": "COMESTIBLE", "id": "irradiated_elderberries", "copy-from": "elderberries", - "name": "irradiated elderberry", - "name_plural": "irradiated elderberries", + "name": { "str": "irradiated elderberry", "str_pl": "irradiated elderberries" }, "description": "An irradiated elderberry will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" }, @@ -25,10 +23,9 @@ "type": "COMESTIBLE", "id": "irradiated_mulberries", "copy-from": "mulberries", - "name": "irradiated mulberry", - "name_plural": "irradiated mulberries", + "name": { "str": "irradiated mulberry", "str_pl": "irradiated mulberries" }, "description": "An irradiated mulberry will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" }, @@ -36,10 +33,9 @@ "type": "COMESTIBLE", "id": "irradiated_huckleberries", "copy-from": "huckleberries", - "name": "irradiated huckleberry", - "name_plural": "irradiated huckleberries", + "name": { "str": "irradiated huckleberry", "str_pl": "irradiated huckleberries" }, "description": "An irradiated huckleberry will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" }, @@ -47,10 +43,9 @@ "type": "COMESTIBLE", "id": "irradiated_raspberries", "copy-from": "raspberries", - "name": "irradiated raspberry", - "name_plural": "irradiated raspberries", + "name": { "str": "irradiated raspberry", "str_pl": "irradiated raspberries" }, "description": "An irradiated raspberry will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" }, @@ -58,10 +53,9 @@ "type": "COMESTIBLE", "id": "irradiated_cranberries", "copy-from": "cranberries", - "name": "irradiated cranberry", - "name_plural": "irradiated cranberries", + "name": { "str": "irradiated cranberry", "str_pl": "irradiated cranberries" }, "description": "An irradiated cranberry will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" }, @@ -69,10 +63,9 @@ "type": "COMESTIBLE", "id": "irradiated_strawberries", "copy-from": "strawberries", - "name": "irradiated strawberry", - "name_plural": "irradiated strawberries", + "name": { "str": "irradiated strawberry", "str_pl": "irradiated strawberries" }, "description": "An irradiated strawberry will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" }, @@ -80,10 +73,9 @@ "type": "COMESTIBLE", "id": "irradiated_blueberries", "copy-from": "blueberries", - "name": "irradiated blueberry", - "name_plural": "irradiated blueberries", + "name": { "str": "irradiated blueberry", "str_pl": "irradiated blueberries" }, "description": "An irradiated blueberry will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" }, @@ -93,7 +85,7 @@ "copy-from": "apple", "name": "irradiated apple", "description": "Mmm, irradiated. Will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" }, @@ -103,7 +95,7 @@ "copy-from": "banana", "name": "irradiated banana", "description": "An irradiated banana will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" }, @@ -113,7 +105,7 @@ "copy-from": "orange", "name": "irradiated orange", "description": "An irradiated orange will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" }, @@ -123,7 +115,7 @@ "copy-from": "lemon", "name": "irradiated lemon", "description": "An irradiated lemon will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" }, @@ -133,7 +125,7 @@ "copy-from": "grapefruit", "name": "irradiated grapefruit", "description": "An irradiated grapefruit will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" }, @@ -143,7 +135,7 @@ "copy-from": "pear", "name": "irradiated pear", "description": "An irradiated pear will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "flags": [ "FREEZERBURN", "SMOKABLE" ], "container": "bag_plastic" @@ -152,10 +144,9 @@ "type": "COMESTIBLE", "id": "irradiated_cherries", "copy-from": "cherries", - "name": "irradiated cherry", - "name_plural": "irradiated cherries", + "name": { "str": "irradiated cherry", "str_pl": "irradiated cherries" }, "description": "An irradiated cherry will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" }, @@ -165,7 +156,7 @@ "copy-from": "plums", "name": "irradiated plum", "description": "A group of irradiated plums will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" }, @@ -173,10 +164,9 @@ "type": "COMESTIBLE", "id": "irradiated_grapes", "copy-from": "grapes", - "name": "irradiated grape", - "name_plural": "irradiated grapes", + "name": { "str": "irradiated grape" }, "description": "An irradiated grape will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" }, @@ -186,7 +176,7 @@ "copy-from": "pineapple", "name": "irradiated pineapple", "description": "An irradiated pineapple will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" }, @@ -194,10 +184,9 @@ "type": "COMESTIBLE", "id": "irradiated_peach", "copy-from": "peach", - "name": "irradiated peach", - "name_plural": "irradiated peaches", + "name": { "str": "irradiated peach", "str_pl": "irradiated peaches" }, "description": "An irradiated peach will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" }, @@ -207,7 +196,7 @@ "copy-from": "watermelon", "name": "irradiated watermelon", "description": "An irradiated watermelon will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "flags": [ "EATEN_COLD", "FREEZERBURN", "SMOKABLE" ], "container": "bag_plastic" @@ -218,7 +207,7 @@ "copy-from": "melon", "name": "irradiated melon", "description": "An irradiated melon will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" }, @@ -226,10 +215,9 @@ "type": "COMESTIBLE", "id": "irradiated_blackberries", "copy-from": "blackberries", - "name": "irradiated blackberry", - "name_plural": "irradiated blackberries", + "name": { "str": "irradiated blackberry", "str_pl": "irradiated blackberries" }, "description": "An irradiated blackberry will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" }, @@ -239,7 +227,7 @@ "copy-from": "mango", "name": "irradiated mango", "description": "An irradiated mango will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" }, @@ -249,7 +237,7 @@ "copy-from": "pomegranate", "name": "irradiated pomegranate", "description": "An irradiated pomegranate will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" }, @@ -259,7 +247,7 @@ "copy-from": "papaya", "name": "irradiated papaya", "description": "An irradiated papaya will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" }, @@ -269,7 +257,7 @@ "copy-from": "kiwi", "name": "irradiated kiwi", "description": "An irradiated kiwi will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" }, @@ -279,7 +267,7 @@ "copy-from": "apricot", "name": "irradiated apricot", "description": "An irradiated apricot will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" } diff --git a/data/json/items/comestibles/irradiated_veggy.json b/data/json/items/comestibles/irradiated_veggy.json index c7b62d534e3c7..7019d3f402c22 100644 --- a/data/json/items/comestibles/irradiated_veggy.json +++ b/data/json/items/comestibles/irradiated_veggy.json @@ -5,7 +5,7 @@ "copy-from": "lettuce", "name": "irradiated lettuce", "description": "An irradiated head of lettuce will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" }, @@ -15,7 +15,7 @@ "copy-from": "cabbage", "name": "irradiated cabbage", "description": "An irradiated head of cabbage will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" }, @@ -23,10 +23,9 @@ "type": "COMESTIBLE", "id": "irradiated_tomato", "copy-from": "tomato", - "name": "irradiated tomato", - "name_plural": "irradiated tomatoes", + "name": { "str": "irradiated tomato", "str_pl": "irradiated tomatoes" }, "description": "An irradiated tomato will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" }, @@ -34,10 +33,9 @@ "type": "COMESTIBLE", "id": "irradiated_broccoli", "copy-from": "broccoli", - "name": "irradiated broccoli", - "name_plural": "irradiated broccoli", + "name": { "str": "irradiated broccoli", "str_pl": "irradiated broccoli" }, "description": "An irradiated cluster of broccoli will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" }, @@ -47,7 +45,7 @@ "copy-from": "zucchini", "name": "irradiated zucchini", "description": "An irradiated zucchini will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" }, @@ -57,7 +55,7 @@ "copy-from": "onion", "name": "irradiated onion", "description": "An irradiated onion will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" }, @@ -67,7 +65,7 @@ "copy-from": "carrot", "name": "irradiated carrot", "description": "An irradiated bundle of carrots will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" }, @@ -75,10 +73,9 @@ "type": "COMESTIBLE", "id": "irradiated_corn", "copy-from": "corn", - "name": "irradiated corn", - "name_plural": "irradiated corn", + "name": { "str": "irradiated corn", "str_pl": "irradiated corn" }, "description": "An irradiated ear of corn will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" }, @@ -88,7 +85,7 @@ "copy-from": "pumpkin", "name": "irradiated pumpkin", "description": "An irradiated pumpkin will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" }, @@ -96,10 +93,9 @@ "type": "COMESTIBLE", "id": "irradiated_potato", "copy-from": "potato", - "name": "irradiated potato", - "name_plural": "irradiated potatoes", + "name": { "str": "irradiated potato", "str_pl": "irradiated potatoes" }, "description": "An irradiated potato will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" }, @@ -143,7 +139,7 @@ "copy-from": "rhubarb", "name": "irradiated rhubarb", "description": "An irradiated rhubarb will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", - "proportional": { "price": 2 }, + "proportional": { "price": 2.0 }, "spoils_in": "0 hours", "container": "bag_plastic" } diff --git a/data/json/items/comestibles/med.json b/data/json/items/comestibles/med.json index d83bfadf59658..2f3a52e212857 100644 --- a/data/json/items/comestibles/med.json +++ b/data/json/items/comestibles/med.json @@ -744,8 +744,7 @@ "id": "meth", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "low-grade methamphetamine", - "name_plural": "low-grade methamphetamine", + "name": { "str": "low-grade methamphetamine", "str_pl": "low-grade methamphetamine" }, "description": "A profoundly addictive and powerful stimulant. While extremely effective at enhancing alertness, it is hazardous to health and the risk of an adverse reaction is great.", "weight": "1 g", "volume": "250 ml", diff --git a/data/json/items/comestibles/offal_dishes.json b/data/json/items/comestibles/offal_dishes.json index 4a9073ec5cbe2..9d66a78a6a732 100644 --- a/data/json/items/comestibles/offal_dishes.json +++ b/data/json/items/comestibles/offal_dishes.json @@ -24,8 +24,7 @@ "id": "liver_onion", "type": "COMESTIBLE", "comestible_type": "FOOD", - "name": "liver & onions", - "name_plural": "liver & onions", + "name": { "str": "liver & onions", "str_pl": "liver & onions" }, "symbol": "%", "looks_like": "meat_cooked", "description": "A classic way to serve liver.", @@ -127,8 +126,7 @@ "id": "leverpostej", "type": "COMESTIBLE", "comestible_type": "DRINK", - "name": "leverpostej", - "name_plural": "leverpostej", + "name": { "str": "leverpostej", "str_pl": "leverpostej" }, "symbol": "%", "looks_like": "peanutbutter", "quench": -2, diff --git a/data/json/items/comestibles/seed.json b/data/json/items/comestibles/seed.json index 1211540de7961..e2188a45de421 100644 --- a/data/json/items/comestibles/seed.json +++ b/data/json/items/comestibles/seed.json @@ -169,8 +169,7 @@ "id": "seed_lettuce", "copy-from": "seed", "price": 50, - "name": "lettuce seeds", - "name_plural": "lettuce seeds", + "name": { "str": "lettuce seeds", "str_pl": "lettuce seeds" }, "description": "Some lettuce seeds.", "seed_data": { "plant_name": "lettuce", "fruit": "lettuce", "byproducts": [ "withered" ], "grow": "85 days" } },