Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix food plurals + minor typos #56255

Merged
merged 5 commits into from
Mar 22, 2022
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/json/items/comestibles/alcohol.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/comestibles/carnivore.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" ] }
},
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/comestibles/dairy.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/comestibles/drink.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/comestibles/drink_other.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" ],
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/comestibles/egg.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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 their complete shape.",
Faalagorn marked this conversation as resolved.
Show resolved Hide resolved
"price": 22,
"price_postapoc": 25,
"material": [ "egg" ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/comestibles/frozen.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions data/json/items/comestibles/junkfood.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/comestibles/meat_dishes.json
Original file line number Diff line number Diff line change
Expand Up @@ -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" ],
Expand Down
8 changes: 4 additions & 4 deletions data/json/items/comestibles/med.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/comestibles/offal_dishes.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/comestibles/other.json
Original file line number Diff line number Diff line change
Expand Up @@ -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!",
Faalagorn marked this conversation as resolved.
Show resolved Hide resolved
"price": 150,
"price_postapoc": 50,
"material": [ "flesh" ],
Expand Down Expand Up @@ -351,7 +351,7 @@
{
"type": "COMESTIBLE",
"id": "can_beans",
"name": { "str": "canned beans", "str_pl": "beans" },
"name": { "str_pl": "canned beans" },
Faalagorn marked this conversation as resolved.
Show resolved Hide resolved
"weight": "256 g",
"color": "brown",
"spoils_in": "2 days",
Expand Down