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.

Sign up for GitHub

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

Incorporate human meat and fat into existing recipes, remove dedicated recipes #35630

Merged
merged 21 commits into from
Dec 9, 2019
+878 −1,527
Merged

Incorporate human meat and fat into existing recipes, remove dedicated recipes #35630

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
894bdec
JSONize dynamic naming
Davi-DeGanne Nov 25, 2019
407c51d
Partially dehardcode corpse naming
Davi-DeGanne Nov 25, 2019
bfe2fc9
Change meat dishes' names when mutant meat is used
Davi-DeGanne Nov 25, 2019
d99702f
Refactor all the things
Davi-DeGanne Nov 25, 2019
cb0c6f5
Add string extraction for conditional names
Davi-DeGanne Nov 25, 2019
fea7679
Rewrite corpse naming
Davi-DeGanne Nov 25, 2019
42e7889
Apply BevapDin's suggestions
Davi-DeGanne Nov 26, 2019
b0abeaa
Apply I-am-erk's suggestions
Davi-DeGanne Nov 26, 2019
57d996e
Placate clang tidy
Davi-DeGanne Nov 26, 2019
d8fa085
Few small edits to names of mutant meat dishes
Davi-DeGanne Nov 27, 2019
f28ebbb
Correct plural forms of conditional names
Davi-DeGanne Nov 28, 2019
902492f
Revise conditional naming documentation
Davi-DeGanne Nov 28, 2019
b800ddd
Touch-up protein drink/powder conditional names
Davi-DeGanne Nov 28, 2019
f5ed938
Apply suggestions from code review
Davi-DeGanne Nov 28, 2019
6bc8ca5
Make CANNIBALISM flag inheritable
Davi-DeGanne Nov 20, 2019
0a67ba6
Refactor meat requirements part 1
Davi-DeGanne Nov 20, 2019
0b06416
Refactor meat requirements part 2
Davi-DeGanne Nov 20, 2019
03e3e7a
Add human products to all recipes
Davi-DeGanne Nov 20, 2019
3613932
Obsolete dedicated cannibal recipes
Davi-DeGanne Nov 27, 2019
4a74183
Re-add human dish names as conditional names
Davi-DeGanne Nov 28, 2019
4f5fbe6
Linting
Davi-DeGanne Nov 28, 2019
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
Prev Previous commit
Next Next commit
Re-add human dish names as conditional names
@Davi-DeGanne
Davi-DeGanne committed Dec 6, 2019
commit 4a74183a284d8d0fe7f26e21d7ec91fed7ac47b1
12 changes: 9 additions & 3 deletions data/json/items/comestibles/carnivore.json
View file
Original file line number Diff line number Diff line change
@@ -340,7 +340,10 @@
"type": "COMESTIBLE",
"name": "meat jerky",
"name_plural": "meat jerky",
"conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "monster jerky", "str_pl": "monster jerky" } } ],
"conditional_names": [
{ "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "jerk jerky", "str_pl": "jerk jerky" } },
{ "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "monster jerky", "str_pl": "monster jerky" } }
],
"description": "Salty dried meat that lasts for a long time, but will make you thirsty.",
"primary_material": "cured_meat",
"weight": "85 g",
@@ -380,7 +383,10 @@
"copy-from": "meat_cooked",
"type": "COMESTIBLE",
"name": "smoked meat",
"conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "%s, mutant", "str_pl": "%s, mutant" } } ],
"conditional_names": [
{ "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "smoked sucker", "str_pl": "smoked sucker" } },
{ "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "%s, mutant", "str_pl": "%s, mutant" } }
],
"description": "Tasty meat that has been heavily smoked for preservation. It could be further smoked to dehydrate it completely.",
"color": "brown",
"spoils_in": "24 days",
@@ -717,7 +723,7 @@
"copy-from": "bone",
"name": "human bone",
"description": "A bone from a human being. Could be used to make some stuff, if you're feeling sufficiently ghoulish.",
"//": "Not for use in normal food recipes."
"flags": [ "CANNIBALISM" ]
},
{
"type": "COMESTIBLE",
6 changes: 6 additions & 0 deletions data/json/items/comestibles/junkfood.json
View file
Original file line number Diff line number Diff line change
@@ -732,6 +732,7 @@
"name": "meat nachos",
"name_plural": "meat nachos",
"conditional_names": [
{ "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "niño nachos", "str_pl": "niño nachos" } },
{
"type": "COMPONENT_ID",
"condition": "mutant",
@@ -761,6 +762,11 @@
"name": "meat nachos with cheese",
"name_plural": "meat nachos with cheese",
"conditional_names": [
{
"type": "FLAG",
"condition": "CANNIBALISM",
"name": { "str": "niño nachos with cheese", "str_pl": "niño nachos with cheese" }
},
{
"type": "COMPONENT_ID",
"condition": "mutant",
119 changes: 96 additions & 23 deletions data/json/items/comestibles/meat_dishes.json
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,10 @@
"type": "COMESTIBLE",
"id": "sausage_raw",
"name": "raw sausage",
"conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "sinister %s", "str_pl": "sinister %s" } } ],
"conditional_names": [
{ "type": "FLAG", "condition": "CANNIBALISM", "name": "raw Mannwurst" },
{ "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "sinister %s", "str_pl": "sinister %s" } }
],
"weight": "148 g",
"color": "red",
"spoils_in": "1 day",
@@ -26,7 +29,10 @@
"type": "COMESTIBLE",
"id": "sausage",
"name": "sausage",
"conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "sinister %s", "str_pl": "sinister %s" } } ],
"conditional_names": [
{ "type": "FLAG", "condition": "CANNIBALISM", "name": "Mannwurst" },
{ "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "sinister %s", "str_pl": "sinister %s" } }
],
"copy-from": "sausage_raw",
"parasites": 0,
"healthy": 0,
@@ -39,7 +45,10 @@
"type": "COMESTIBLE",
"id": "sausage_cooked",
"name": "cooked sausage",
"conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "sinister %s", "str_pl": "sinister %s" } } ],
"conditional_names": [
{ "type": "FLAG", "condition": "CANNIBALISM", "name": "cooked Mannwurst" },
{ "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "sinister %s", "str_pl": "sinister %s" } }
],
"copy-from": "sausage_raw",
"parasites": 0,
"healthy": 0,
@@ -73,7 +82,10 @@
"id": "bratwurst_sausage",
"name": "bratwurst",
"name_plural": "bratwursts",
"conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "baleful %s", "str_pl": "baleful %s" } } ],
"conditional_names": [
{ "type": "FLAG", "condition": "CANNIBALISM", "name": "Mannbrat" },
{ "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "baleful %s", "str_pl": "baleful %s" } }
],
"weight": "100 g",
"color": "brown",
"spoils_in": "2 days",
@@ -205,7 +217,12 @@
"id": "currywurst",
"name": "currywurst",
"conditional_names": [
{ "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "bloodcurdling %s", "str_pl": "bloodcurdling %s" } }
{ "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "cheapskate %s", "str_pl": "cheapskate %s" } },
{
"type": "COMPONENT_ID",
"condition": "mutant",
"name": { "str": "bloodcurdling %s", "str_pl": "bloodcurdling %s" }
}
],
"weight": "85 g",
"color": "red",
@@ -228,7 +245,10 @@
"type": "COMESTIBLE",
"id": "meat_aspic",
"name": "aspic",
"conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "abomination %s", "str_pl": "abomination %s" } } ],
"conditional_names": [
{ "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "abomination %s", "str_pl": "abomination %s" } },
{ "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "amoral %s", "str_pl": "amoral %s" } }
],
"weight": "154 g",
"color": "red",
"spoils_in": "3 days 8 hours",
@@ -343,7 +363,10 @@
"type": "COMESTIBLE",
"id": "bologna",
"name": "bologna",
"conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "bleak %s", "str_pl": "bleak %s" } } ],
"conditional_names": [
{ "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "brat %s", "str_pl": "brat %s" } },
{ "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "bleak %s", "str_pl": "bleak %s" } }
],
"weight": "56 g",
"//": "Rebalanced: the recipe looks to easily make two pounds.",
"color": "red",
@@ -439,7 +462,10 @@
"id": "sausagegravy",
"name": "sausage gravy",
"name_plural": "sausage gravies",
"conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "ghastly %s", "str_pl": "ghastly %s" } } ],
"conditional_names": [
{ "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "Mannwurst gravy", "str_pl": "Mannwurst gravies" } },
{ "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "ghastly %s", "str_pl": "ghastly %s" } }
],
"weight": "60 g",
"color": "light_gray",
"spoils_in": "2 days",
@@ -459,7 +485,10 @@
"type": "COMESTIBLE",
"id": "pemmican",
"name": "pemmican",
"conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "pernicious %s", "str_pl": "pernicious %s" } } ],
"conditional_names": [
{ "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "prepper %s", "str_pl": "prepper %s" } },
{ "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "pernicious %s", "str_pl": "pernicious %s" } }
],
"weight": "106 g",
"color": "brown",
"spoils_in": "360 days",
@@ -479,7 +508,10 @@
"type": "COMESTIBLE",
"id": "macaroni_helper",
"name": "hamburger helper",
"conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "heinous %s", "str_pl": "heinous %s" } } ],
"conditional_names": [
{ "type": "FLAG", "condition": "CANNIBALISM", "name": "hobo helper" },
{ "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "heinous %s", "str_pl": "heinous %s" } }
],
"weight": "170 g",
"color": "red",
"spoils_in": "1 day",
@@ -522,6 +554,7 @@
"name": "chili con carne",
"name_plural": "chilis con carne",
"conditional_names": [
{ "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "chili con cabron", "str_pl": "chilis con cabron" } },
{
"type": "COMPONENT_ID",
"condition": "mutant",
@@ -765,7 +798,10 @@
"type": "COMESTIBLE",
"id": "pie_meat",
"name": "meat pie",
"conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "malignant %s", "str_pl": "malignant %s" } } ],
"conditional_names": [
{ "type": "FLAG", "condition": "CANNIBALISM", "name": "prick pie" },
{ "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "malignant %s", "str_pl": "malignant %s" } }
],
"weight": "189 g",
"color": "brown",
"spoils_in": "3 days 8 hours",
@@ -788,7 +824,10 @@
"type": "COMESTIBLE",
"id": "pizza_meat",
"name": "meat pizza",
"conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "miserable %s", "str_pl": "miserable %s" } } ],
"conditional_names": [
{ "type": "FLAG", "condition": "CANNIBALISM", "name": "poser pizza" },
{ "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "miserable %s", "str_pl": "miserable %s" } }
],
"weight": "230 g",
"color": "light_red",
"spoils_in": "2 days",
@@ -837,7 +876,10 @@
"type": "COMESTIBLE",
"id": "meat_canned",
"name": "canned meat",
"conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "%s, mutant", "str_pl": "%s, mutant" } } ],
"conditional_names": [
{ "type": "FLAG", "condition": "CANNIBALISM", "name": "soylent slice" },
{ "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "%s, mutant", "str_pl": "%s, mutant" } }
],
"copy-from": "meat_cooked",
"color": "red",
"spoils_in": "1 day 16 hours",
@@ -851,7 +893,10 @@
"type": "COMESTIBLE",
"id": "meat_salted",
"name": "salted meat slice",
"conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "%s, mutant", "str_pl": "%s, mutant" } } ],
"conditional_names": [
{ "type": "FLAG", "condition": "CANNIBALISM", "name": "salted simpleton slice" },
{ "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "%s, mutant", "str_pl": "%s, mutant" } }
],
"copy-from": "meat_cooked",
"color": "red",
"spoils_in": "2 days",
@@ -869,7 +914,10 @@
"id": "spaghetti_bolognese",
"name": "spaghetti bolognese",
"name_plural": "spaghetti bolognese",
"conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "gnarly %s", "str_pl": "gnarly %s" } } ],
"conditional_names": [
{ "type": "FLAG", "condition": "CANNIBALISM", "name": "scoundrel spaghetti" },
{ "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "gnarly %s", "str_pl": "gnarly %s" } }
],
"weight": "150 g",
"color": "red",
"spoils_in": "2 days",
@@ -890,7 +938,10 @@
"type": "COMESTIBLE",
"id": "lasagne",
"name": "lasagne",
"conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "monster %s", "str_pl": "monster %s" } } ],
"conditional_names": [
{ "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "Luigi %s", "str_pl": "Luigi %s" } },
{ "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "monster %s", "str_pl": "monster %s" } }
],
"weight": "255 g",
"color": "red",
"spoils_in": 64,
@@ -926,7 +977,10 @@
"type": "COMESTIBLE",
"id": "cheeseburger",
"name": "cheeseburger",
"conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "chilling %s", "str_pl": "chilling %s" } } ],
"conditional_names": [
{ "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "chump %s", "str_pl": "chump %s" } },
{ "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "chilling %s", "str_pl": "chilling %s" } }
],
"weight": "133 g",
"color": "brown",
"spoils_in": "1 day 12 hours",
@@ -947,7 +1001,10 @@
"type": "COMESTIBLE",
"id": "hamburger",
"name": "hamburger",
"conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "horrible %s", "str_pl": "horrible %s" } } ],
"conditional_names": [
{ "type": "FLAG", "condition": "CANNIBALISM", "name": "bobburger" },
{ "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "horrible %s", "str_pl": "horrible %s" } }
],
"weight": "99 g",
"color": "brown",
"spoils_in": "1 day 12 hours",
@@ -967,7 +1024,10 @@
"type": "COMESTIBLE",
"id": "sloppyjoe",
"name": "sloppy joe",
"conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "suspicious %s", "str_pl": "suspicious %s" } } ],
"conditional_names": [
{ "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "manwich", "str_pl": "manwiches" } },
{ "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "suspicious %s", "str_pl": "suspicious %s" } }
],
"weight": "113 g",
"color": "brown",
"spoils_in": "1 day 12 hours",
@@ -987,7 +1047,10 @@
"type": "COMESTIBLE",
"id": "taco",
"name": "taco",
"conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "terrifying %s", "str_pl": "terrifying %s" } } ],
"conditional_names": [
{ "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "tio %s", "str_pl": "tio %s" } },
{ "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "terrifying %s", "str_pl": "terrifying %s" } }
],
"weight": "102 g",
"color": "yellow",
"spoils_in": "1 day",
@@ -1007,7 +1070,10 @@
"type": "COMESTIBLE",
"id": "meat_pickled",
"name": "pickled meat",
"conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "%s, mutant", "str_pl": "%s, mutant" } } ],
"conditional_names": [
{ "type": "FLAG", "condition": "CANNIBALISM", "name": "pickled punk" },
{ "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "%s, mutant", "str_pl": "%s, mutant" } }
],
"copy-from": "meat_cooked",
"color": "pink",
"spoils_in": "4 days",
@@ -1022,7 +1088,10 @@
"type": "COMESTIBLE",
"id": "dry_meat",
"name": "dehydrated meat",
"conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "%s, mutant", "str_pl": "%s, mutant" } } ],
"conditional_names": [
{ "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "%s, human", "str_pl": "%s, human" } },
{ "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "%s, mutant", "str_pl": "%s, mutant" } }
],
"copy-from": "meat_cooked",
"weight": "85 g",
"color": "red",
@@ -1039,7 +1108,10 @@
"type": "COMESTIBLE",
"id": "rehydrated_meat",
"name": "rehydrated meat",
"conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "%s, mutant", "str_pl": "%s, mutant" } } ],
"conditional_names": [
{ "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "%s, human", "str_pl": "%s, human" } },
{ "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "%s, mutant", "str_pl": "%s, mutant" } }
],
"copy-from": "meat_cooked",
"color": "light_red",
"description": "Reconstituted meat flakes, which are much more enjoyable to eat now that they have been rehydrated.",
@@ -1052,6 +1124,7 @@
"id": "haggis",
"name": "haggis",
"name_plural": "haggii",
"conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "human %s", "str_pl": "human %s" } } ],
"//": "That's whisky without an 'e' because we're talking about Scotch whisky.",
"weight": "156 g",
"color": "brown",
22 changes: 20 additions & 2 deletions data/json/items/comestibles/protein.json
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,10 @@
"type": "COMESTIBLE",
"comestible_type": "DRINK",
"name": "protein drink",
"conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "perturbing %s", "str_pl": "perturbing %s" } } ],
"conditional_names": [
{ "type": "FLAG", "condition": "CANNIBALISM", "name": "soylent green drink" },
{ "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "perturbing %s", "str_pl": "perturbing %s" } }
],
"description": "A thin slurry of refined protein mixed with water. While quite nutritious, it is not particularly tasty.",
"weight": "278 g",
"volume": "250 ml",
@@ -26,7 +29,14 @@
"type": "COMESTIBLE",
"comestible_type": "FOOD",
"name": { "str": "protein powder", "str_pl": "protein powder" },
"conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "perturbing %s", "str_pl": "perturbing %s" } } ],
"conditional_names": [
{
"type": "FLAG",
"condition": "CANNIBALISM",
"name": { "str": "soylent green powder", "str_pl": "soylent green powder" }
},
{ "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "perturbing %s", "str_pl": "perturbing %s" } }
],
"description": "Raw, refined protein. While quite nutritious, it is impossible to enjoy in its pure form, try adding water.",
"//": "1 g of protein powder is 0.959 ml, 1 serving is 28g and 27ml",
"weight": "28 g",
@@ -67,6 +77,10 @@
"copy-from": "protein_drink",
"type": "COMESTIBLE",
"name": "protein shake",
"conditional_names": [
{ "type": "FLAG", "condition": "CANNIBALISM", "name": "soylent green shake" },
{ "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "perturbing %s", "str_pl": "perturbing %s" } }
],
"description": "A thick and tasty beverage made from pure refined protein and nutritious fruit.",
"material": "fruit",
"calories": 150,
@@ -82,6 +96,10 @@
"copy-from": "protein_shake",
"type": "COMESTIBLE",
"name": "fortified protein shake",
"conditional_names": [
{ "type": "FLAG", "condition": "CANNIBALISM", "name": "fortified soylent green shake" },
{ "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "perturbing %s", "str_pl": "perturbing %s" } }
],
"description": "A thick and tasty beverage made from pure refined protein and nutritious fruit. It has been supplemented with extra vitamins and minerals",
"relative": { "vitamins": [ [ "calcium", 5 ], [ "iron", 5 ], [ "vitA", 5 ], [ "vitB", 5 ], [ "vitC", 5 ] ] }
}
5 changes: 4 additions & 1 deletion data/json/items/comestibles/sandwich.json
View file
Original file line number Diff line number Diff line change
@@ -197,7 +197,10 @@
"id": "sandwich_t",
"name": "meat sandwich",
"name_plural": "meat sandwiches",
"conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "mutant %s", "str_pl": "mutant %s" } } ],
"conditional_names": [
{ "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "slob sandwich", "str_pl": "slob sandwiches" } },
{ "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "mutant %s", "str_pl": "mutant %s" } }
],
"weight": "233 g",
"color": "light_gray",
"spoils_in": "1 day 12 hours",
6 changes: 5 additions & 1 deletion data/json/items/comestibles/soup.json
View file
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@
"type": "COMESTIBLE",
"id": "broth_bone",
"name": "bone broth",
"conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "human %s", "str_pl": "human %s" } } ],
"weight": "267 g",
"color": "yellow",
"spoils_in": "6 days 16 hours",
@@ -71,7 +72,10 @@
"type": "COMESTIBLE",
"id": "soup_meat",
"name": "meat soup",
"conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "mutant %s", "str_pl": "mutant %s" } } ],
"conditional_names": [
{ "type": "FLAG", "condition": "CANNIBALISM", "name": "sap soup" },
{ "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "mutant %s", "str_pl": "mutant %s" } }
],
"weight": "253 g",
"color": "red",
"spoils_in": "5 days",