From 628390680f957a85bc9ea942b4cde60de7bc3685 Mon Sep 17 00:00:00 2001 From: Faalagorn Date: Sun, 20 Mar 2022 19:15:20 +0100 Subject: [PATCH 1/5] Fix food plurals + minor typos --- data/json/items/comestibles/alcohol.json | 2 +- data/json/items/comestibles/carnivore.json | 2 +- data/json/items/comestibles/dairy.json | 2 +- data/json/items/comestibles/drink.json | 6 +++--- data/json/items/comestibles/drink_other.json | 2 +- data/json/items/comestibles/egg.json | 4 ++-- data/json/items/comestibles/frozen.json | 2 +- data/json/items/comestibles/junkfood.json | 8 ++++---- data/json/items/comestibles/meat_dishes.json | 2 +- data/json/items/comestibles/med.json | 8 ++++---- data/json/items/comestibles/offal_dishes.json | 2 +- data/json/items/comestibles/other.json | 4 ++-- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/data/json/items/comestibles/alcohol.json b/data/json/items/comestibles/alcohol.json index bd2d41132efe0..4fc4bebe493c7 100644 --- a/data/json/items/comestibles/alcohol.json +++ b/data/json/items/comestibles/alcohol.json @@ -143,7 +143,7 @@ "type": "COMESTIBLE", "id": "wine_noir", "looks_like": "wine_cabernet", - "name": { "str_sp": "pinot noir" }, + "name": { "str_sp": "Pinot noir" }, "weight": "50 g", "color": "red", "addiction_type": "alcohol", diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json index 84cbe1ffda1c5..47cf82f352969 100644 --- a/data/json/items/comestibles/carnivore.json +++ b/data/json/items/comestibles/carnivore.json @@ -644,7 +644,7 @@ "fun": -5, "looks_like": "offal_cooked", "name": { "str": "cooked piece of lung", "str_pl": "cooked pieces of lung" }, - "description": " Prepared in this way, it's a chewy grayish lump of flavorless connective tissue. It doesn't look any tastier than it did raw, but the parasites are all cooked out.", + "description": "Prepared in this way, it's a chewy grayish lump of flavorless connective tissue. It doesn't look any tastier than it did raw, but the parasites are all cooked out.", "parasites": 0, "extend": { "flags": [ "EATEN_HOT" ] } }, diff --git a/data/json/items/comestibles/dairy.json b/data/json/items/comestibles/dairy.json index 9e54793e05926..a745d0acc17a8 100644 --- a/data/json/items/comestibles/dairy.json +++ b/data/json/items/comestibles/dairy.json @@ -335,7 +335,7 @@ "symbol": "~", "quench": 10, "calories": 490, - "description": " Cream that has been skimmed from the top of raw milk left to sit.", + "description": "Cream that has been skimmed from the top of raw milk left to sit.", "price": 70, "price_postapoc": 150, "looks_like": "milk", diff --git a/data/json/items/comestibles/drink.json b/data/json/items/comestibles/drink.json index cf64b96c26898..ebd50557b196f 100644 --- a/data/json/items/comestibles/drink.json +++ b/data/json/items/comestibles/drink.json @@ -1088,7 +1088,7 @@ "symbol": "~", "quench": 40, "calories": 1, - "description": "The beverage of gentlemen everywhere, made from applying hot water to oxidized leaves of the tea plant /Camellia sinensis/.", + "description": "The beverage of gentlemen everywhere, made from applying hot water to oxidized leaves of the tea plant \"Camellia sinensis\".", "price": 90, "price_postapoc": 25, "volume": "250 ml", @@ -1209,7 +1209,7 @@ "color": "green", "fatigue_mod": 7, "stim": 2, - "description": "Made from applying hot water to leaves of the tea plant /Camellia sinensis/. Green tea has a lighter, fresher taste than black and is traditionally preferred in Asian cultures." + "description": "Made from applying hot water to leaves of the tea plant \"Camellia sinensis\". Green tea has a lighter, fresher taste than black and is traditionally preferred in Asian cultures." }, { "type": "COMESTIBLE", @@ -1240,7 +1240,7 @@ "copy-from": "tea", "name": { "str": "sweetened tea" }, "calories": 21, - "description": "The beverage of gentlemen everywhere, made from applying hot water to leaves of the tea plant /Camellia sinensis/. Added sweetener for a better taste.", + "description": "The beverage of gentlemen everywhere, made from applying hot water to leaves of the tea plant \"Camellia sinensis\". Added sweetener for a better taste.", "price": 100, "price_postapoc": 35, "fun": 10 diff --git a/data/json/items/comestibles/drink_other.json b/data/json/items/comestibles/drink_other.json index f57ed4ddc228f..14eec3b864726 100644 --- a/data/json/items/comestibles/drink_other.json +++ b/data/json/items/comestibles/drink_other.json @@ -102,7 +102,7 @@ "symbol": "~", "color": "yellow", "name": { "str_sp": "mustard", "ctxt": "condiment" }, - "description": "A condiment made from the seeds of a mustard plant (/Brassica/ or /Sinapis/), vinegar, salt, and spices.", + "description": "A condiment made from the seeds of a mustard plant (\"Brassica\" or \"Sinapis\"), vinegar, salt, and spices.", "price": 50, "price_postapoc": 100, "material": [ "junk" ], diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index f0665274b367c..906b86f51a56d 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -170,7 +170,7 @@ { "type": "COMESTIBLE", "comestible_type": "FOOD", - "name": { "str": "Insect Egg" }, + "name": { "str": "insect egg" }, "abstract": "egg_insect", "//": "5x the weight and 3x the nutrition of real chicken eggs, toxins equal to 296g mutant meat", "color": "white", @@ -455,7 +455,7 @@ "looks_like": "powder_egg", "quench": 2, "calories": 80, - "description": "Rehydrated eggs. You can use it instead of an egg when cooking, provided you don't care that it has lost its complete shape.", + "description": "Rehydrated eggs. You can use them instead of eggs when cooking, provided you don't care that they had lost its complete shape.", "price": 22, "price_postapoc": 25, "material": [ "egg" ], diff --git a/data/json/items/comestibles/frozen.json b/data/json/items/comestibles/frozen.json index 0d5938e69a7c6..2a2da8140032f 100644 --- a/data/json/items/comestibles/frozen.json +++ b/data/json/items/comestibles/frozen.json @@ -190,7 +190,7 @@ "type": "COMESTIBLE", "copy-from": "icecream", "id": "icecream_yogurt", - "name": { "str_sp": "frozen yogurt" }, + "name": { "str": "frozen yogurt", "str_pl": "frozen yogurt scoops" }, "description": "Tarter than ice cream, this is made with yogurt and other dairy products, and is generally low-fat compared to ice cream itself.", "calories": 127, "price": 275, diff --git a/data/json/items/comestibles/junkfood.json b/data/json/items/comestibles/junkfood.json index 1a78ca5c6812e..827c329dfb834 100644 --- a/data/json/items/comestibles/junkfood.json +++ b/data/json/items/comestibles/junkfood.json @@ -1059,7 +1059,7 @@ { "type": "COMESTIBLE", "id": "chilidogs", - "name": { "str_sp": "chili dogs" }, + "name": { "str": "chili dog" }, "weight": "318 g", "color": "red", "spoils_in": "1 day", @@ -1081,7 +1081,7 @@ { "type": "COMESTIBLE", "id": "chilidogs_wheat_free", - "name": { "str_sp": "wheat-free chili dogs" }, + "name": { "str": "wheat-free chili dog" }, "weight": "318 g", "color": "red", "spoils_in": "1 day", @@ -1103,7 +1103,7 @@ { "type": "COMESTIBLE", "id": "corndogs_frozen", - "name": { "str_sp": "uncooked corn dogs" }, + "name": { "str": "uncooked corn dog" }, "weight": "78 g", "color": "yellow", "spoils_in": "11 days 16 hours", @@ -1386,7 +1386,7 @@ "quench": -4, "calories": 220, "description": "Peanuts coated in a sweet, crunchy candy coating. A regional delicacy.", - "//": "Based on a new england candy called Boston Baked Beans", + "//": "Based on a New England candy called Boston Baked Beans", "price": 150, "price_postapoc": 600, "volume": "250 ml", diff --git a/data/json/items/comestibles/meat_dishes.json b/data/json/items/comestibles/meat_dishes.json index dffb49b323f86..ef717b2fc8524 100644 --- a/data/json/items/comestibles/meat_dishes.json +++ b/data/json/items/comestibles/meat_dishes.json @@ -541,7 +541,7 @@ "symbol": "%", "quench": -3, "calories": 180, - "description": "A canned pork product that is unnaturally pink, oddly rubbery, and not very tasty, this SPAM remains quite filling. Completely unappetizing, but quite filling.", + "description": "A canned pork product that is unnaturally pink, oddly rubbery, and not very tasty, this SPAM remains quite filling, but completely unappetizing.", "price": 400, "price_postapoc": 300, "material": [ "flesh" ], diff --git a/data/json/items/comestibles/med.json b/data/json/items/comestibles/med.json index 83f2c3fe23412..cd84f5314d75e 100644 --- a/data/json/items/comestibles/med.json +++ b/data/json/items/comestibles/med.json @@ -614,7 +614,7 @@ "type": "COMESTIBLE", "comestible_type": "MED", "name": { "str_sp": "high quality shatter" }, - "description": "Concentrated cannabis extract, commonly known as dabs. This particular style of concentrate in is a thin sheet and shatters like glass at room temperature. Argueably its one of the better styles of concentrate compared to wax, crumble, or distillate. Normal cannabis contains around 20%THC, this shatter should be around 55%THC.", + "description": "Concentrated cannabis extract, commonly known as dabs. This particular style of concentrate in is a thin sheet and shatters like glass at room temperature. Argueably its one of the better styles of concentrate compared to wax, crumble, or distillate. Normal cannabis contains around 20% THC, this shatter should be around 55% THC.", "looks_like": "honey_gold", "weight": "1 g", "volume": "1 ml", @@ -650,7 +650,7 @@ "type": "COMESTIBLE", "comestible_type": "MED", "name": { "str_sp": "high quality wax" }, - "description": "Concentrated cannabis extract, commonly known as dabs. This particular style of concentrate has the look and consistency of a yellow waxy substance at room temperature. Normal cannabis contains around 20%THC, this wax should be around 45%THC.", + "description": "Concentrated cannabis extract, commonly known as dabs. This particular style of concentrate has the look and consistency of a yellow waxy substance at room temperature. Normal cannabis contains around 20% THC, this wax should be around 45% THC.", "looks_like": "honey_gold", "weight": "1 g", "volume": "1 ml", @@ -930,7 +930,7 @@ "type": "COMESTIBLE", "comestible_type": "MED", "name": { "str_sp": "high quality distillate" }, - "description": "Concentrated cannabis extract. This style of extract goes through the most processing, eliminating most if not all harmful ingredients. Normal cannabis contains around 20%THC, this distillate should be around 88%THC. Can be smoked in a bowl, used in a dab pen, or used to make distillate cartridges.", + "description": "Concentrated cannabis extract. This style of extract goes through the most processing, eliminating most if not all harmful ingredients. Normal cannabis contains around 20% THC, this distillate should be around 88% THC. Can be smoked in a bowl, used in a dab pen, or used to make distillate cartridges.", "looks_like": "honey_gold", "weight": "1 g", "volume": "1 ml", @@ -969,7 +969,7 @@ "type": "COMESTIBLE", "comestible_type": "MED", "name": { "str": "high quality distillate cartridge" }, - "description": "A small cartridge containing concentrated cannabis extract that's used with dab pens. This style of extract goes through the most processing, eliminating most if not all harmful ingredients. Normal cannabis contains around 20%THC, this distillate should be around 70%THC after reintroducing terpenes for flavoring.", + "description": "A small cartridge containing concentrated cannabis extract that's used with dab pens. This style of extract goes through the most processing, eliminating most if not all harmful ingredients. Normal cannabis contains around 20% THC, this distillate should be around 70% THC after reintroducing terpenes for flavoring.", "looks_like": "canister_empty", "weight": "1 g", "volume": "1 ml", diff --git a/data/json/items/comestibles/offal_dishes.json b/data/json/items/comestibles/offal_dishes.json index 9849bab41c3c9..9a0f9eb0158a0 100644 --- a/data/json/items/comestibles/offal_dishes.json +++ b/data/json/items/comestibles/offal_dishes.json @@ -236,7 +236,7 @@ "id": "tÖttchen", "type": "COMESTIBLE", "comestible_type": "FOOD", - "name": { "str": "tÖttchen" }, + "name": { "str": "töttchen" }, "symbol": "%", "looks_like": "offal_cooked", "quench": 2, diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json index 499872af41c9c..95a9b99cedda8 100644 --- a/data/json/items/comestibles/other.json +++ b/data/json/items/comestibles/other.json @@ -265,7 +265,7 @@ "symbol": "%", "calories": 6, "//": "Same as the meat it's been made from. It's additional ingredient compared to smoking, jerking, and dehydrating, so there's no incentive otherwise.", - "description": "Fresh ", + "description": "Fresh gellatine. Not vegan-friendly!", "price": 150, "price_postapoc": 50, "material": [ "flesh" ], @@ -351,7 +351,7 @@ { "type": "COMESTIBLE", "id": "can_beans", - "name": { "str": "canned beans", "str_pl": "beans" }, + "name": { "str_pl": "canned beans" }, "weight": "256 g", "color": "brown", "spoils_in": "2 days", From b68a8e7efa02d51d5253551b69561cbc6a5e0eed Mon Sep 17 00:00:00 2001 From: Faalagorn Date: Sun, 20 Mar 2022 19:18:26 +0100 Subject: [PATCH 2/5] Update egg.json --- data/json/items/comestibles/egg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index 906b86f51a56d..0ac16f8ee6ccb 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -455,7 +455,7 @@ "looks_like": "powder_egg", "quench": 2, "calories": 80, - "description": "Rehydrated eggs. You can use them instead of eggs when cooking, provided you don't care that they had lost its complete shape.", + "description": "Rehydrated eggs. You can use them instead of eggs when cooking, provided you don't care that they had lost their complete shape.", "price": 22, "price_postapoc": 25, "material": [ "egg" ], From ad20af9cb1d1263288c8c051bde36f46adcd848b Mon Sep 17 00:00:00 2001 From: Faalagorn Date: Sun, 20 Mar 2022 20:19:04 +0100 Subject: [PATCH 3/5] Update data/json/items/comestibles/egg.json Co-authored-by: haveric --- data/json/items/comestibles/egg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index 0ac16f8ee6ccb..e095ed2c4b7e1 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -455,7 +455,7 @@ "looks_like": "powder_egg", "quench": 2, "calories": 80, - "description": "Rehydrated eggs. You can use them instead of eggs when cooking, provided you don't care that they had lost their complete shape.", + "description": "Rehydrated eggs. You can use them instead of eggs when cooking, provided you don't care that they have lost their complete shape.", "price": 22, "price_postapoc": 25, "material": [ "egg" ], From e40717a22ae7ef40a6c95d1ab49bd84eb47dd310 Mon Sep 17 00:00:00 2001 From: Faalagorn Date: Sun, 20 Mar 2022 20:19:11 +0100 Subject: [PATCH 4/5] Update data/json/items/comestibles/other.json Co-authored-by: haveric --- data/json/items/comestibles/other.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json index 95a9b99cedda8..304e7c786f366 100644 --- a/data/json/items/comestibles/other.json +++ b/data/json/items/comestibles/other.json @@ -265,7 +265,7 @@ "symbol": "%", "calories": 6, "//": "Same as the meat it's been made from. It's additional ingredient compared to smoking, jerking, and dehydrating, so there's no incentive otherwise.", - "description": "Fresh gellatine. Not vegan-friendly!", + "description": "Fresh gelatin. Not vegan-friendly!", "price": 150, "price_postapoc": 50, "material": [ "flesh" ], From ed98ff674b2027c322591c653419c58bc47188a1 Mon Sep 17 00:00:00 2001 From: Faalagorn Date: Sun, 20 Mar 2022 20:22:16 +0100 Subject: [PATCH 5/5] Update data/json/items/comestibles/other.json Co-authored-by: haveric --- data/json/items/comestibles/other.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json index 304e7c786f366..5cf3c13a7a9c9 100644 --- a/data/json/items/comestibles/other.json +++ b/data/json/items/comestibles/other.json @@ -351,7 +351,7 @@ { "type": "COMESTIBLE", "id": "can_beans", - "name": { "str_pl": "canned beans" }, + "name": { "str_sp": "canned beans" }, "weight": "256 g", "color": "brown", "spoils_in": "2 days",